get bot working with marketdata api

MarketData.py

@@ -3,7 +3,7 @@
 
 import logging
 import os
-from datetime import datetime
+import datetime as dt
 from logging import warning
 from typing import List, Optional, Tuple
 
@@ -35,7 +35,7 @@ class MarketData:
             MarketData.app API Token
         """
         try:
-            self.MARKETDATA_TOKEN = os.environ["MarketData"]
+            self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
 
             if self.MARKETDATA_TOKEN == "TOKEN":
                 self.MARKETDATA_TOKEN = ""
@@ -46,12 +46,9 @@ class MarketData:
             )
 
         if self.MARKETDATA_TOKEN != "":
-            self.get_symbol_list()
-
-            schedule.every().day.do(self.get_symbol_list)
             schedule.every().day.do(self.clear_charts)
 
-    def get(self, endpoint, params: dict = {}, timeout=5) -> dict:
+    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
         url = "https://api.marketdata.app/v1/" + endpoint
 
         # set token param if it wasn't passed.
@@ -91,43 +88,6 @@ class MarketData:
         """
         self.charts = {}
 
-    def get_symbol_list(
-        self, return_df=False
-    ) -> Optional[Tuple[pd.DataFrame, datetime]]:
-        """Gets list of all symbols supported by IEX
-
-        Parameters
-        ----------
-        return_df : bool, optional
-            return the dataframe of all stock symbols, by default False
-
-        Returns
-        -------
-        Optional[Tuple[pd.DataFrame, datetime]]
-            If `return_df` is set to `True` returns a dataframe, otherwise returns `None`.
-        """
-
-        reg_symbols = self.get("/ref-data/symbols")
-        otc_symbols = self.get("/ref-data/otc/symbols")
-
-        reg = pd.DataFrame(data=reg_symbols)
-        otc = pd.DataFrame(data=otc_symbols)
-        self.otc_list = set(otc["symbol"].to_list())
-
-        symbols = pd.concat([reg, otc])
-
-        # IEX uses backtick ` as apostrophe which breaks telegram markdown parsing
-        symbols["name"] = symbols["name"].str.replace("`", "'")
-
-        symbols["description"] = "$" + symbols["symbol"] + ": " + symbols["name"]
-        symbols["id"] = symbols["symbol"]
-        symbols["type_id"] = "$" + symbols["symbol"].str.lower()
-
-        symbols = symbols[["id", "symbol", "name", "description", "type_id"]]
-        self.symbol_list = symbols
-        if return_df:
-            return symbols, datetime.now()
-
     def status(self) -> str:
         return "status isnt implemented by marketdata.app"
 
@@ -144,12 +104,64 @@ class MarketData:
             Formatted markdown
         """
 
-        if quoteResp := self.get(f"/stocks/quotes/{symbol}/"):
+        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
             return f"The current price of {quoteResp['symbol']} is ${quoteResp['last']}"
 
         else:
             return f"Getting a quote for {symbol} encountered an error."
 
+    def intra_reply(self, symbol: Stock) -> pd.DataFrame:
+        """Returns price data for a symbol of the past month up until the previous trading days close.
+        Also caches multiple requests made in the same day.
+
+        Parameters
+        ----------
+        symbol : str
+            Stock symbol.
+
+        Returns
+        -------
+        pd.DataFrame
+            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+        """
+        schedule.run_pending()
+
+        try:
+            return self.charts[symbol.id.upper()]
+        except KeyError:
+            pass
+
+        to_date = dt.datetime.today().strftime("%Y-%m-%d")
+        resolution = "5"  # minutes
+
+        if data := self.get(
+            f"stocks/candles/{resolution}/{symbol}",
+            params={
+                "from": dt.datetime.now().strftime("%Y-%m-%d"),
+                "to": dt.datetime.now().isoformat(),
+            },
+        ):
+            data.pop("s")
+            df = pd.DataFrame(data)
+            df["t"] = pd.to_datetime(df["t"], unit="s")
+            df.set_index("t", inplace=True)
+
+            df.rename(
+                columns={
+                    "o": "Open",
+                    "h": "High",
+                    "l": "Low",
+                    "c": "Close",
+                    "v": "Volume",
+                },
+                inplace=True,
+            )
+
+            self.charts[symbol.id.upper()] = df
+            return df
+
+        return pd.DataFrame()
+
     def chart_reply(self, symbol: Stock) -> pd.DataFrame:
         """Returns price data for a symbol of the past month up until the previous trading days close.
         Also caches multiple requests made in the same day.
@@ -171,24 +183,34 @@ class MarketData:
         except KeyError:
             pass
 
-        to_date = datetime.today().strftime("%Y-%m-%d")
-        from_date = (datetime.today() - datetime.timedelta(days=30)).strftime(
-            "%Y-%m-%d"
-        )
+        to_date = dt.datetime.today().strftime("%Y-%m-%d")
+        from_date = (dt.datetime.today() - dt.timedelta(days=30)).strftime("%Y-%m-%d")
+        resultion = "daily"
 
         if data := self.get(
-            f"/stocks/candles/h/{symbol}",
+            f"stocks/candles/{resultion}/{symbol}",
             params={
-                "chartInterval": 3,
-                "to": to_date,
                 "from": from_date,
+                "to": to_date,
             },
         ):
-            df = pd.DataFrame(
-                data, columns=["Date", "Open", "High", "Low", "Close"]
-            ).dropna()
-            df["DT"] = pd.to_datetime(df["date"] + "T" + df["minute"])
-            df = df.set_index("DT")
+            data.pop("s")
+
+            df = pd.DataFrame(data)
+            df["t"] = pd.to_datetime(df["t"], unit="s")
+            df.set_index("t", inplace=True)
+
+            df.rename(
+                columns={
+                    "o": "Open",
+                    "h": "High",
+                    "l": "Low",
+                    "c": "Close",
+                    "v": "Volume",
+                },
+                inplace=True,
+            )
+
             self.charts[symbol.id.upper()] = df
             return df