Commit
Β·
f69039a
1
Parent(s):
d637ff8
new weekly data and historical folder
Browse files- data/all_trades_profitability.parquet +2 -2
- data/daily_info.parquet +2 -2
- data/fpmmTrades.parquet +2 -2
- data/fpmms.parquet +2 -2
- data/new_fpmmTrades.parquet +2 -2
- data/new_tools.parquet +2 -2
- data/summary_profitability.parquet +2 -2
- data/tools.parquet +2 -2
- data/tools_accuracy.csv +2 -2
- {data β historical_data}/all_fpmms.parquet +0 -0
- historical_data/all_trades_profitability_20241129_153007.parquet +3 -0
- historical_data/all_trades_profitability_20241202_091215.parquet +3 -0
- {data β historical_data}/delivers.parquet +0 -0
- {data β historical_data}/requests.parquet +0 -0
- historical_data/tools_20241129_153007.parquet +3 -0
- historical_data/tools_20241202_091215.parquet +3 -0
- scripts/cleaning_old_info.py +0 -3
- scripts/profitability.py +16 -10
data/all_trades_profitability.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:a68b38ee2dbaf6add318f6637d921f991641b1f2e1c6b91b34e4848c30d41bd1
|
3 |
+
size 3225038
|
data/daily_info.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:195d5d8c5252f2c663eb5226e70074515124ac3dce174fbc153eb7dd85b2ba00
|
3 |
+
size 499139
|
data/fpmmTrades.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:6e3791d1bd7596439089a61667b72f5054b5086016af69d43996a2d8d04cacff
|
3 |
+
size 21345678
|
data/fpmms.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:6fdcaf956aa1fecb53fbb5b34bb7c3b200c4e3df14477c82392c73acfab44e47
|
3 |
+
size 536235
|
data/new_fpmmTrades.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:65482c09468f61f676d0fddddc4afe6818fedb5df55d37b5b292693be5ce657e
|
3 |
+
size 1907525
|
data/new_tools.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:1e2bd4aacc316286d95b7c2d304aa22fa56a53f6bf586a7836954ad5d41b0f8a
|
3 |
+
size 24727423
|
data/summary_profitability.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:cee5c37645de66824cb74faaa07bae45673086664518f6fd127afe9ba5a74a65
|
3 |
+
size 93516
|
data/tools.parquet
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:255f264c677007a32fbba217dd4a7835290732dbf46502eaec66a861930c639a
|
3 |
+
size 455022141
|
data/tools_accuracy.csv
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
-
oid sha256:
|
3 |
-
size
|
|
|
1 |
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:b3a0887662471990e6e43c7ef0ba0f1734dd1a81270e0b6c3af2ab3474838fd8
|
3 |
+
size 1339
|
{data β historical_data}/all_fpmms.parquet
RENAMED
File without changes
|
historical_data/all_trades_profitability_20241129_153007.parquet
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:a68b38ee2dbaf6add318f6637d921f991641b1f2e1c6b91b34e4848c30d41bd1
|
3 |
+
size 3225038
|
historical_data/all_trades_profitability_20241202_091215.parquet
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:a68b38ee2dbaf6add318f6637d921f991641b1f2e1c6b91b34e4848c30d41bd1
|
3 |
+
size 3225038
|
{data β historical_data}/delivers.parquet
RENAMED
File without changes
|
{data β historical_data}/requests.parquet
RENAMED
File without changes
|
historical_data/tools_20241129_153007.parquet
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:cf99c5cd3d48c602d269f81962f9c0b8f08cf7d604f40d1a6af7463086ac5b25
|
3 |
+
size 451439409
|
historical_data/tools_20241202_091215.parquet
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
1 |
+
version https://git-lfs.github.com/spec/v1
|
2 |
+
oid sha256:e99cd1d2db2dcd649ce1eabda3c2fd61162bad2afba71fa28070691e5058299d
|
3 |
+
size 455141895
|
scripts/cleaning_old_info.py
CHANGED
@@ -1,7 +1,4 @@
|
|
1 |
-
import requests
|
2 |
-
import json
|
3 |
import pandas as pd
|
4 |
-
import numpy as np
|
5 |
from profitability import DATA_DIR, summary_analyse
|
6 |
from staking import label_trades_by_staking
|
7 |
|
|
|
|
|
|
|
1 |
import pandas as pd
|
|
|
2 |
from profitability import DATA_DIR, summary_analyse
|
3 |
from staking import label_trades_by_staking
|
4 |
|
scripts/profitability.py
CHANGED
@@ -599,16 +599,22 @@ def run_profitability_analysis(
|
|
599 |
all_trades_df.to_parquet(JSON_DATA_DIR / "all_trades_df.parquet")
|
600 |
# filter invalid markets. Condition: "is_invalid" is True
|
601 |
invalid_trades = all_trades_df.loc[all_trades_df["is_invalid"] == True]
|
602 |
-
if
|
603 |
-
|
604 |
-
|
605 |
-
|
606 |
-
|
607 |
-
|
608 |
-
|
609 |
-
|
610 |
-
|
611 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
612 |
|
613 |
all_trades_df = all_trades_df.loc[all_trades_df["is_invalid"] == False]
|
614 |
|
|
|
599 |
all_trades_df.to_parquet(JSON_DATA_DIR / "all_trades_df.parquet")
|
600 |
# filter invalid markets. Condition: "is_invalid" is True
|
601 |
invalid_trades = all_trades_df.loc[all_trades_df["is_invalid"] == True]
|
602 |
+
if len(invalid_trades) == 0:
|
603 |
+
print("No new invalid trades")
|
604 |
+
else:
|
605 |
+
if merge:
|
606 |
+
try:
|
607 |
+
print("Merging invalid trades parquet file")
|
608 |
+
old_invalid_trades = pd.read_parquet(
|
609 |
+
DATA_DIR / "invalid_trades.parquet"
|
610 |
+
)
|
611 |
+
merge_df = pd.concat(
|
612 |
+
[old_invalid_trades, invalid_trades], ignore_index=True
|
613 |
+
)
|
614 |
+
invalid_trades = merge_df.drop_duplicates()
|
615 |
+
except Exception as e:
|
616 |
+
print(f"Error updating the invalid trades parquet {e}")
|
617 |
+
invalid_trades.to_parquet(DATA_DIR / "invalid_trades.parquet", index=False)
|
618 |
|
619 |
all_trades_df = all_trades_df.loc[all_trades_df["is_invalid"] == False]
|
620 |
|