add more parameters

Author: dakixr

src/isbtchot/__main__.py

@@ -1,21 +1,35 @@
 from isbtchot import controller
+from isbtchot.schemas.args import TypeTime
 import argparse
 
 parser = argparse.ArgumentParser(description="BTC Hotness Index", prog="isbtchot")
 
 # Add an optional positional argument named 'year' with default value of 6
 parser.add_argument(
-    "year",
+    "-periods_back",
+    "--p",
     type=int,
-    nargs="?",
-    default=7,
-    help="The year to be processed. Defaults to 6 if not provided.",
+    default=85,
+    help="Periods back to be processed. Defaults to 50 if not provided.",
 )
 
-def main(year):
-    controller.dashboard(months=12 * year)
+parser.add_argument(
+    "-time",
+    "--t",
+    type=TypeTime,
+    default=TypeTime.WEEK,
+    help="Candle stick time to use. Defaults to W (Weekly),"
+)
 
-if __name__ == "__main__":
+
+def main():
+
+    # Parse args
     args = parser.parse_args()
-    year = args.year
-    main(year)
+    time_grouping: TypeTime = args.t
+    periods_back: int = args.p
+
+    controller.dashboard(periods_back=periods_back, time_grouping=time_grouping)
+
+if __name__ == "__main__":
+    main()

src/isbtchot/controller.py

@@ -1,15 +1,17 @@
 from isbtchot import model
 from isbtchot import view as v
+from isbtchot.schemas.args import TypeTime
+
 
 view = v.ViewPlotText()
 
-def btc_terminal(months):
-    df = model.btc_monthly(months)
+def btc_terminal(time_grouping: TypeTime, periods_back: int):
+    df = model.btc_hist(time_grouping, periods_back)
     view.candle_stick_terminal(df, "BTC/USD")
     view.plt.yscale("log")
 
-def btc_pi_terminal(months):
-    df = model.btc_pi(months)
+def btc_pi_terminal(time_grouping: TypeTime, periods_back):
+    df = model.btc_pi(time_grouping, periods_back)
     view.chart_terminal(df.time, df.pi, "Hotness Index")
     view.add_horizontal_line(1, "red")
     view.add_horizontal_line(0.35, "green")
@@ -21,11 +23,11 @@ def btc_pi_terminal(months):
     view.plt.ylim(0.20, 1.1)
 
 
-def dashboard(months=None):
+def dashboard(time_grouping: TypeTime, periods_back: int):
     view.dimensions(0, -4)
     view.subplots(2,1)
     view.select_subplot(1,1)
-    btc_terminal(months)
+    btc_terminal(time_grouping, periods_back)
     view.select_subplot(2,1)
-    btc_pi_terminal(months)
+    btc_pi_terminal(time_grouping, periods_back)
     view.show()

src/isbtchot/model.py

@@ -2,6 +2,7 @@
 import datetime
 import pandas as pd
 import isbtchot
+from isbtchot.schemas.args import TypeTime
 
 
 CACHE_BTC_PATH = isbtchot.root_path / "cache" / "btc.csv"
@@ -20,9 +21,18 @@ def btc_historical_daily() -> pd.DataFrame:
         df = pd.read_csv(CACHE_BTC_PATH)
 
     else:
-        data = requests.get(
-            "https://min-api.cryptocompare.com/data/v2/histoday?fsym=BTC&tsym=USD&allData=true"
-        ).json()["Data"]["Data"]
+        try:
+            data = requests.get(
+                "https://min-api.cryptocompare.com/data/v2/histoday?fsym=BTC&tsym=USD&allData=true"
+            ).json()["Data"]["Data"]
+
+        except Exception as _:
+            # Try without ssl enabled
+            data = requests.get(
+                "https://min-api.cryptocompare.com/data/v2/histoday?fsym=BTC&tsym=USD&allData=true",
+                verify=False
+            ).json()["Data"]["Data"]
+
         df = pd.DataFrame(data)
         df.to_csv(CACHE_BTC_PATH, index=False)
 
@@ -31,7 +41,7 @@ def btc_historical_daily() -> pd.DataFrame:
     return df
 
 
-def btc_pi(months):
+def btc_pi(time_grouping: TypeTime, periods_back: int):
     df = btc_historical_daily()[["close"]].rename({"close": "price"}, axis=1)
 
     df["sma111"] = df["price"].rolling(window=111).mean()
@@ -42,14 +52,14 @@ def btc_pi(months):
     df = df.dropna()
 
     # Sell Indicator
-    mask_pi_sell = (df["pi"].shift(-1) < 1) & (df["pi"] >= 1)
+    mask_pi_sell = (df["pi"].shift(-1) > 1) & (df["pi"] <= 1)
     df["pi_sell"] = mask_pi_sell
 
     # Buy indicator
-    mask_pi_buy = (df["pi"].shift(-1) > 0.35) & (df["pi"] <= 0.35)
+    mask_pi_buy = (df["pi"].shift(-1) < 0.35) & (df["pi"] >= 0.35)
     df["pi_buy"] = mask_pi_buy
 
-    df = df.resample("M").agg(
+    df = df.resample(time_grouping.value).agg(
         {
             "price": "last",
             "pi": "max",
@@ -61,25 +71,25 @@ def btc_pi(months):
     df = df.reset_index()
     df.time = df.time.dt.strftime("%d/%m/%Y")
 
-    if months:
-        df = df.iloc[-months:]
+    if periods_back:
+        df = df.iloc[-periods_back:]
 
     return df
 
 
-def btc_monthly(months):
+def btc_hist(time_grouping: TypeTime, periods_back: int):
     df = btc_historical_daily()
     df = df.rename(
         {"open": "Open", "close": "Close", "high": "High", "low": "Low"}, axis=1
     )
-    df = df.resample("M").agg(
+    df = df.resample(time_grouping.value).agg(
         {
             "Open": "first",
             "High": "max",
             "Low": "min",
             "Close": "last",
         }
     )
-    if months:
-        df = df.iloc[-months:]
+    if periods_back:
+        df = df.iloc[-periods_back:]
     return df

src/isbtchot/schemas/args.py

@@ -0,0 +1,5 @@
+from enum import Enum
+
+class TypeTime(Enum):
+    MONTH = "M"
+    WEEK = "W"