fix pipeline?

Resolve "`/intra` command not working for marketdata"

Closes #89

See merge request simple-stock-bots/simple-telegram-stock-bot!47

.devcontainer/Dockerfile

@@ -13,7 +13,7 @@ COPY --from=builder /root/.local /root/.local
 
 RUN pip install --no-cache-dir black
 ENV TELEGRAM=TOKEN
-ENV IEX=TOKEN
+ENV MARKETDATA=TOKEN
 
 COPY . .
 

.gitignore

@@ -1 +1,2 @@
-__pycache__
+__pycache__
+.env

.gitlab-ci.yml

@@ -1,34 +1,5 @@
 black:
-  stage: .pre
+  # stage: .pre
   image: registry.gitlab.com/pipeline-components/black:latest
   script:
     - black --check --verbose -- .
-
-
-build:master:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:v1.9.0-debug
-    entrypoint: [""]
-  script:
-    - /kaniko/executor
-      --context "${CI_PROJECT_DIR}"
-      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CI_REGISTRY_IMAGE}:latest"
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-
-
-build:branch:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:v1.9.0-debug
-    entrypoint: [""]
-  script:
-    - /kaniko/executor
-      --context "${CI_PROJECT_DIR}"
-      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}"
-      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}"
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'

README.md

@@ -15,7 +15,7 @@ https://docs.simplestockbot.com/commands/
 
 ## Donate
 
-Simple Stock Bot is run entirely on donations, and costs about $420 a year to run. All donations go directly towards paying for servers, and premium market data provided by [IEX Cloud](https://iexcloud.io/).
+Simple Stock Bot is run entirely on donations, and costs about $420 a year to run. All donations go directly towards paying for servers, and premium market data provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
 
 The best way to donate is through [Buy Me A Coffee](https://www.buymeacoffee.com/Anson) which accepts Paypal or Credit card.
 
@@ -29,4 +29,4 @@ If you have any questions get in [touch.](contact.md)
 - Contribute to the project on [GitLab](https://gitlab.com/simple-stock-bots) or just leave a star
 - Using my referral links to host your own Bot
   - [DigitalOcean](https://m.do.co/c/6b5df7ef55b6)
-  - [IEX Cloud](https://iexcloud.io/s/62c8503e)
+  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)

common/MarketData.py

@@ -1,17 +1,16 @@
-"""Class with functions for running the bot with IEX Cloud.
+import datetime as dt
-"""
-
 import logging
 import os
-import datetime as dt
-from logging import warning
 from typing import Dict
 
 import pandas as pd
+import pytz
 import requests as r
 import schedule
 
-from Symbol import Stock
+from common.Symbol import Stock
+
+log = logging.getLogger(__name__)
 
 
 class MarketData:
@@ -23,6 +22,9 @@ class MarketData:
 
     charts: Dict[Stock, pd.DataFrame] = {}
 
+    openTime = dt.time(hour=9, minute=30, second=0)
+    marketTimeZone = pytz.timezone("US/Eastern")
+
     def __init__(self) -> None:
         """Creates a Symbol Object
 
@@ -31,6 +33,7 @@ class MarketData:
         MARKETDATA_TOKEN : str
             MarketData.app API Token
         """
+
         try:
             self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
 
@@ -38,7 +41,9 @@ class MarketData:
                 self.MARKETDATA_TOKEN = ""
         except KeyError:
             self.MARKETDATA_TOKEN = ""
-            warning("Starting without an MarketData.app Token will not allow you to get market data!")
+            log.warning("Starting without an MarketData.app Token will not allow you to get market data!")
+            log.warning("Use this affiliate link so that the bot can stay free:")
+            log.warning("https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo")
 
         if self.MARKETDATA_TOKEN != "":
             schedule.every().day.do(self.clear_charts)
@@ -47,7 +52,11 @@ class MarketData:
         url = "https://api.marketdata.app/v1/" + endpoint
 
         # set token param if it wasn't passed.
-        params["token"] = params.get("token", self.MARKETDATA_TOKEN)
+        params["token"] = self.MARKETDATA_TOKEN
+
+        # Undocumented query variable that ensures bot usage can be
+        # monitored even if someone doesn't make it through an affiliate link.
+        params["application"] = "simplestockbot"
 
         resp = r.get(url, params=params, timeout=timeout)
 
@@ -137,6 +146,14 @@ class MarketData:
         else:
             return f"Getting a quote for {symbol} encountered an error."
 
+    def spark_reply(self, symbol: Stock) -> str:
+        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
+            changePercent = round(quoteResp["changepct"][0], 2)
+            return f"`{symbol.tag}`: {changePercent}%"
+        else:
+            logging.warning(f"{symbol} did not have 'changepct' field.")
+            return f"`{symbol.tag}`"
+
     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.
@@ -158,18 +175,21 @@ class MarketData:
         except KeyError:
             pass
 
-        resolution = "5"  # minutes
+        resolution = "15"  # minutes
+        now = dt.datetime.now(self.marketTimeZone)
+
+        if self.openTime < now.time():
+            startTime = now.replace(hour=9, minute=30)
+        else:
+            startTime = now - dt.timedelta(days=1)
 
         if data := self.get(
             f"stocks/candles/{resolution}/{symbol}",
-            params={
+            params={"from": startTime.timestamp(), "to": now.timestamp(), "extended": True},
-                "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["t"] = pd.to_datetime(df["t"], unit="s", utc=True)
             df.set_index("t", inplace=True)
 
             df.rename(

common/cg_Crypto.py

@@ -1,375 +1,367 @@
-"""Class with functions for running the bot with IEX Cloud.
+import logging
-"""
+from typing import List
-
+
-import logging as log
+import pandas as pd
-from typing import List
+import requests as r
-
+import schedule
-import pandas as pd
+from markdownify import markdownify
-import requests as r
+
-import schedule
+from common.Symbol import Coin
-from markdownify import markdownify
+
-
+log = logging.getLogger(__name__)
-from Symbol import Coin
+
-
+
-
+class cg_Crypto:
-class cg_Crypto:
+    """
-    """
+    Functions for finding crypto info
-    Functions for finding crypto info
+    """
-    """
+
-
+    vs_currency = "usd"  # simple/supported_vs_currencies for list of options
-    vs_currency = "usd"  # simple/supported_vs_currencies for list of options
+
-
+    trending_cache: List[str] = []
-    trending_cache: List[str] = []
+
-
+    def __init__(self) -> None:
-    def __init__(self) -> None:
+        self.get_symbol_list()
-        """Creates a Symbol Object
+        schedule.every().day.do(self.get_symbol_list)
-
+
-        Parameters
+    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
-        ----------
+        url = "https://api.coingecko.com/api/v3" + endpoint
-        IEX_TOKEN : str
+        resp = r.get(url, params=params, timeout=timeout)
-            IEX Token
+        # Make sure API returned a proper status code
-        """
+        try:
-        self.get_symbol_list()
+            resp.raise_for_status()
-        schedule.every().day.do(self.get_symbol_list)
+        except r.exceptions.HTTPError as e:
-
+            log.error(e)
-    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
+            return {}
-        url = "https://api.coingecko.com/api/v3" + endpoint
+
-        resp = r.get(url, params=params, timeout=timeout)
+        # Make sure API returned valid JSON
-        # Make sure API returned a proper status code
+        try:
-        try:
+            resp_json = resp.json()
-            resp.raise_for_status()
+            return resp_json
-        except r.exceptions.HTTPError as e:
+        except r.exceptions.JSONDecodeError as e:
-            log.error(e)
+            log.error(e)
-            return {}
+            return {}
-
+
-        # Make sure API returned valid JSON
+    def symbol_id(self, symbol) -> str:
-        try:
+        try:
-            resp_json = resp.json()
+            return self.symbol_list[self.symbol_list["symbol"] == symbol]["id"].values[0]
-            return resp_json
+        except KeyError:
-        except r.exceptions.JSONDecodeError as e:
+            return ""
-            log.error(e)
+
-            return {}
+    def get_symbol_list(self):
-
+        raw_symbols = self.get("/coins/list")
-    def symbol_id(self, symbol) -> str:
+        symbols = pd.DataFrame(data=raw_symbols)
-        try:
+
-            return self.symbol_list[self.symbol_list["symbol"] == symbol]["id"].values[0]
+        # Removes all binance-peg symbols
-        except KeyError:
+        symbols = symbols[~symbols["id"].str.contains("binance-peg")]
-            return ""
+
-
+        symbols["description"] = "$$" + symbols["symbol"].str.upper() + ": " + symbols["name"]
-    def get_symbol_list(self):
+        symbols = symbols[["id", "symbol", "name", "description"]]
-        raw_symbols = self.get("/coins/list")
+        symbols["type_id"] = "$$" + symbols["symbol"]
-        symbols = pd.DataFrame(data=raw_symbols)
+
-
+        self.symbol_list = symbols
-        # Removes all binance-peg symbols
+
-        symbols = symbols[~symbols["id"].str.contains("binance-peg")]
+    def status(self) -> str:
-
+        """Checks CoinGecko /ping endpoint for API issues.
-        symbols["description"] = "$$" + symbols["symbol"].str.upper() + ": " + symbols["name"]
+
-        symbols = symbols[["id", "symbol", "name", "description"]]
+        Returns
-        symbols["type_id"] = "$$" + symbols["symbol"]
+        -------
-
+        str
-        self.symbol_list = symbols
+            Human readable text on status of CoinGecko API
-
+        """
-    def status(self) -> str:
+        status = r.get(
-        """Checks CoinGecko /ping endpoint for API issues.
+            "https://api.coingecko.com/api/v3/ping",
-
+            timeout=5,
-        Returns
+        )
-        -------
+
-        str
+        try:
-            Human readable text on status of CoinGecko API
+            status.raise_for_status()
-        """
+            return (
-        status = r.get(
+                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} Seconds."
-            "https://api.coingecko.com/api/v3/ping",
+            )
-            timeout=5,
+        except r.HTTPError:
-        )
+            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} Seconds."
-
+
-        try:
+    def price_reply(self, coin: Coin) -> str:
-            status.raise_for_status()
+        """Returns current market price or after hours if its available for a given coin symbol.
-            return (
+
-                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+        Parameters
-            )
+        ----------
-        except r.HTTPError:
+        symbols : list
-            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+            List of coin symbols.
-
+
-    def price_reply(self, coin: Coin) -> str:
+        Returns
-        """Returns current market price or after hours if its available for a given coin symbol.
+        -------
-
+        Dict[str, str]
-        Parameters
+            Each symbol passed in is a key with its value being a human readable
-        ----------
+            markdown formatted string of the symbols price and movement.
-        symbols : list
+        """
-            List of coin symbols.
+
-
+        if resp := self.get(
-        Returns
+            "/simple/price",
-        -------
+            params={
-        Dict[str, str]
+                "ids": coin.id,
-            Each symbol passed in is a key with its value being a human readable
+                "vs_currencies": self.vs_currency,
-            markdown formatted string of the symbols price and movement.
+                "include_24hr_change": "true",
-        """
+            },
-
+        ):
-        if resp := self.get(
+            try:
-            "/simple/price",
+                data = resp[coin.id]
-            params={
+
-                "ids": coin.id,
+                price = data[self.vs_currency]
-                "vs_currencies": self.vs_currency,
+                change = data[self.vs_currency + "_24h_change"]
-                "include_24hr_change": "true",
+                if change is None:
-            },
+                    change = 0
-        ):
+            except KeyError:
-            try:
+                return f"{coin.id} returned an error."
-                data = resp[coin.id]
+
-
+            message = f"The current price of {coin.name} is $**{price:,}**"
-                price = data[self.vs_currency]
+
-                change = data[self.vs_currency + "_24h_change"]
+            # Determine wording of change text
-                if change is None:
+            if change > 0:
-                    change = 0
+                message += f", the coin is currently **up {change:.3f}%** for today"
-            except KeyError:
+            elif change < 0:
-                return f"{coin.id} returned an error."
+                message += f", the coin is currently **down {change:.3f}%** for today"
-
+            else:
-            message = f"The current price of {coin.name} is $**{price:,}**"
+                message += ", the coin hasn't shown any movement today."
-
+
-            # Determine wording of change text
+        else:
-            if change > 0:
+            message = f"The price for {coin.name} is not available. If you suspect this is an error run `/status`"
-                message += f", the coin is currently **up {change:.3f}%** for today"
+
-            elif change < 0:
+        return message
-                message += f", the coin is currently **down {change:.3f}%** for today"
+
-            else:
+    def intra_reply(self, symbol: Coin) -> pd.DataFrame:
-                message += ", the coin hasn't shown any movement today."
+        """Returns price data for a symbol since the last market open.
-
+
-        else:
+        Parameters
-            message = f"The price for {coin.name} is not available. If you suspect this is an error run `/status`"
+        ----------
-
+        symbol : str
-        return message
+            Stock symbol.
-
+
-    def intra_reply(self, symbol: Coin) -> pd.DataFrame:
+        Returns
-        """Returns price data for a symbol since the last market open.
+        -------
-
+        pd.DataFrame
-        Parameters
+            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
-        ----------
+        """
-        symbol : str
+
-            Stock symbol.
+        if resp := self.get(
-
+            f"/coins/{symbol.id}/ohlc",
-        Returns
+            params={"vs_currency": self.vs_currency, "days": 1},
-        -------
+        ):
-        pd.DataFrame
+            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
-            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+            df["Date"] = pd.to_datetime(df["Date"], unit="ms")
-        """
+            df = df.set_index("Date")
-
+            return df
-        if resp := self.get(
+
-            f"/coins/{symbol.id}/ohlc",
+        return pd.DataFrame()
-            params={"vs_currency": self.vs_currency, "days": 1},
+
-        ):
+    def chart_reply(self, symbol: Coin) -> pd.DataFrame:
-            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
+        """Returns price data for a symbol of the past month up until the previous trading days close.
-            df["Date"] = pd.to_datetime(df["Date"], unit="ms")
+        Also caches multiple requests made in the same day.
-            df = df.set_index("Date")
+
-            return df
+        Parameters
-
+        ----------
-        return pd.DataFrame()
+        symbol : str
-
+            Stock symbol.
-    def chart_reply(self, symbol: Coin) -> pd.DataFrame:
+
-        """Returns price data for a symbol of the past month up until the previous trading days close.
+        Returns
-        Also caches multiple requests made in the same day.
+        -------
-
+        pd.DataFrame
-        Parameters
+            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
-        ----------
+        """
-        symbol : str
+
-            Stock symbol.
+        if resp := self.get(
-
+            f"/coins/{symbol.id}/ohlc",
-        Returns
+            params={"vs_currency": self.vs_currency, "days": 30},
-        -------
+        ):
-        pd.DataFrame
+            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
-            Returns a timeseries dataframe with high, low, and volume data if its available. Otherwise returns empty pd.DataFrame.
+            df["Date"] = pd.to_datetime(df["Date"], unit="ms")
-        """
+            df = df.set_index("Date")
-
+            return df
-        if resp := self.get(
+
-            f"/coins/{symbol.id}/ohlc",
+        return pd.DataFrame()
-            params={"vs_currency": self.vs_currency, "days": 30},
+
-        ):
+    def stat_reply(self, symbol: Coin) -> str:
-            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
+        """Gathers key statistics on coin. Mostly just CoinGecko scores.
-            df["Date"] = pd.to_datetime(df["Date"], unit="ms")
+
-            df = df.set_index("Date")
+        Parameters
-            return df
+        ----------
-
+        symbol : Coin
-        return pd.DataFrame()
+
-
+        Returns
-    def stat_reply(self, symbol: Coin) -> str:
+        -------
-        """Gathers key statistics on coin. Mostly just CoinGecko scores.
+        str
-
+            Preformatted markdown.
-        Parameters
+        """
-        ----------
+
-        symbol : Coin
+        if data := self.get(
-
+            f"/coins/{symbol.id}",
-        Returns
+            params={
-        -------
+                "localization": "false",
-        str
+            },
-            Preformatted markdown.
+        ):
-        """
+            return f"""
-
+                [{data['name']}]({data['links']['homepage'][0]}) Statistics:
-        if data := self.get(
+                Market Cap: ${data['market_data']['market_cap'][self.vs_currency]:,}
-            f"/coins/{symbol.id}",
+                Market Cap Ranking: {data.get('market_cap_rank',"Not Available")}
-            params={
+                CoinGecko Scores:
-                "localization": "false",
+                    Overall: {data.get('coingecko_score','Not Available')}
-            },
+                    Development: {data.get('developer_score','Not Available')}
-        ):
+                    Community: {data.get('community_score','Not Available')}
-            return f"""
+                    Public Interest: {data.get('public_interest_score','Not Available')}
-                [{data['name']}]({data['links']['homepage'][0]}) Statistics:
+                    """
-                Market Cap: ${data['market_data']['market_cap'][self.vs_currency]:,}
+        else:
-                Market Cap Ranking: {data.get('market_cap_rank',"Not Available")}
+            return f"{symbol.symbol} returned an error."
-                CoinGecko Scores:
+
-                    Overall: {data.get('coingecko_score','Not Available')}
+    def cap_reply(self, coin: Coin) -> str:
-                    Development: {data.get('developer_score','Not Available')}
+        """Gets market cap for Coin
-                    Community: {data.get('community_score','Not Available')}
+
-                    Public Interest: {data.get('public_interest_score','Not Available')}
+        Parameters
-                    """
+        ----------
-        else:
+        coin : Coin
-            return f"{symbol.symbol} returned an error."
+
-
+        Returns
-    def cap_reply(self, coin: Coin) -> str:
+        -------
-        """Gets market cap for Coin
+        str
-
+            Preformatted markdown.
-        Parameters
+        """
-        ----------
+
-        coin : Coin
+        if resp := self.get(
-
+            "/simple/price",
-        Returns
+            params={
-        -------
+                "ids": coin.id,
-        str
+                "vs_currencies": self.vs_currency,
-            Preformatted markdown.
+                "include_market_cap": "true",
-        """
+            },
-
+        ):
-        if resp := self.get(
+            log.debug(resp)
-            "/simple/price",
+            try:
-            params={
+                data = resp[coin.id]
-                "ids": coin.id,
+
-                "vs_currencies": self.vs_currency,
+                price = data[self.vs_currency]
-                "include_market_cap": "true",
+                cap = data[self.vs_currency + "_market_cap"]
-            },
+            except KeyError:
-        ):
+                return f"{coin.id} returned an error."
-            log.debug(resp)
+
-            try:
+            if cap == 0:
-                data = resp[coin.id]
+                return f"The market cap for {coin.name} is not available for unknown reasons."
-
+
-                price = data[self.vs_currency]
+            message = (
-                cap = data[self.vs_currency + "_market_cap"]
+                f"The current price of {coin.name} is $**{price:,}** and"
-            except KeyError:
+                + " its market cap is $**{cap:,.2f}** {self.vs_currency.upper()}"
-                return f"{coin.id} returned an error."
+            )
-
+
-            if cap == 0:
+        else:
-                return f"The market cap for {coin.name} is not available for unknown reasons."
+            message = f"The Coin: {coin.name} was not found or returned and error."
-
+
-            message = (
+        return message
-                f"The current price of {coin.name} is $**{price:,}** and"
+
-                + " its market cap is $**{cap:,.2f}** {self.vs_currency.upper()}"
+    def info_reply(self, symbol: Coin) -> str:
-            )
+        """Gets coin description
-
+
-        else:
+        Parameters
-            message = f"The Coin: {coin.name} was not found or returned and error."
+        ----------
-
+        symbol : Coin
-        return message
+
-
+        Returns
-    def info_reply(self, symbol: Coin) -> str:
+        -------
-        """Gets coin description
+        str
-
+            Preformatted markdown.
-        Parameters
+        """
-        ----------
+
-        symbol : Coin
+        if data := self.get(
-
+            f"/coins/{symbol.id}",
-        Returns
+            params={"localization": "false"},
-        -------
+        ):
-        str
+            try:
-            Preformatted markdown.
+                return markdownify(data["description"]["en"])
-        """
+            except KeyError:
-
+                return f"{symbol} does not have a description available."
-        if data := self.get(
+
-            f"/coins/{symbol.id}",
+        return f"No information found for: {symbol}\nEither today is boring or the symbol does not exist."
-            params={"localization": "false"},
+
-        ):
+    def spark_reply(self, symbol: Coin) -> str:
-            try:
+        change = self.get(
-                return markdownify(data["description"]["en"])
+            "/simple/price",
-            except KeyError:
+            params={
-                return f"{symbol} does not have a description available."
+                "ids": symbol.id,
-
+                "vs_currencies": self.vs_currency,
-        return f"No information found for: {symbol}\nEither today is boring or the symbol does not exist."
+                "include_24hr_change": "true",
-
+            },
-    def spark_reply(self, symbol: Coin) -> str:
+        )[symbol.id]["usd_24h_change"]
-        change = self.get(
+
-            "/simple/price",
+        return f"`{symbol.tag}`: {symbol.name}, {change:.2f}%"
-            params={
+
-                "ids": symbol.id,
+    def trending(self) -> list[str]:
-                "vs_currencies": self.vs_currency,
+        """Gets current coins trending on coingecko
-                "include_24hr_change": "true",
+
-            },
+        Returns
-        )[symbol.id]["usd_24h_change"]
+        -------
-
+        list[str]
-        return f"`{symbol.tag}`: {symbol.name}, {change:.2f}%"
+            list of $$ID: NAME, CHANGE%
-
+        """
-    def trending(self) -> list[str]:
+
-        """Gets current coins trending on coingecko
+        coins = self.get("/search/trending")
-
+        try:
-        Returns
+            trending = []
-        -------
+            for coin in coins["coins"]:
-        list[str]
+                c = coin["item"]
-            list of $$ID: NAME, CHANGE%
+
-        """
+                sym = c["symbol"].upper()
-
+                name = c["name"]
-        coins = self.get("/search/trending")
+                change = self.get(
-        try:
+                    "/simple/price",
-            trending = []
+                    params={
-            for coin in coins["coins"]:
+                        "ids": c["id"],
-                c = coin["item"]
+                        "vs_currencies": self.vs_currency,
-
+                        "include_24hr_change": "true",
-                sym = c["symbol"].upper()
+                    },
-                name = c["name"]
+                )[c["id"]]["usd_24h_change"]
-                change = self.get(
+
-                    "/simple/price",
+                msg = f"`$${sym}`: {name}, {change:.2f}%"
-                    params={
+
-                        "ids": c["id"],
+                trending.append(msg)
-                        "vs_currencies": self.vs_currency,
+
-                        "include_24hr_change": "true",
+        except Exception as e:
-                    },
+            log.warning(e)
-                )[c["id"]]["usd_24h_change"]
+            return self.trending_cache
-
+
-                msg = f"`$${sym}`: {name}, {change:.2f}%"
+        self.trending_cache = trending
-
+        return trending
-                trending.append(msg)
+
-
+    def batch_price(self, coins: list[Coin]) -> list[str]:
-        except Exception as e:
+        """Gets price of a list of coins all in one API call
-            log.warning(e)
+
-            return self.trending_cache
+        Parameters
-
+        ----------
-        self.trending_cache = trending
+        coins : list[Coin]
-        return trending
+
-
+        Returns
-    def batch_price(self, coins: list[Coin]) -> list[str]:
+        -------
-        """Gets price of a list of coins all in one API call
+        list[str]
-
+            returns preformatted list of strings detailing price movement of each coin passed in.
-        Parameters
+        """
-        ----------
+        query = ",".join([c.id for c in coins])
-        coins : list[Coin]
+
-
+        prices = self.get(
-        Returns
+            "/simple/price",
-        -------
+            params={
-        list[str]
+                "ids": query,
-            returns preformatted list of strings detailing price movement of each coin passed in.
+                "vs_currencies": self.vs_currency,
-        """
+                "include_24hr_change": "true",
-        query = ",".join([c.id for c in coins])
+            },
-
+        )
-        prices = self.get(
+
-            "/simple/price",
+        replies = []
-            params={
+        for coin in coins:
-                "ids": query,
+            if coin.id in prices:
-                "vs_currencies": self.vs_currency,
+                p = prices[coin.id]
-                "include_24hr_change": "true",
+
-            },
+                if p.get("usd_24h_change") is None:
-        )
+                    p["usd_24h_change"] = 0
-
+
-        replies = []
+                replies.append(
-        for coin in coins:
+                    f"{coin.name}: ${p.get('usd',0):,} and has moved {p.get('usd_24h_change',0.0):.2f}% in the past 24 hours."
-            if coin.id in prices:
+                )
-                p = prices[coin.id]
+
-
+        return replies
-                if p.get("usd_24h_change") is None:
-                    p["usd_24h_change"] = 0
-
-                replies.append(
-                    f"{coin.name}: ${p.get('usd',0):,} and has moved {p.get('usd_24h_change',0.0):.2f}% in the past 24 hours."
-                )
-
-        return replies

common/symbol_router.py

@@ -5,18 +5,19 @@ import datetime
 import logging
 import random
 import re
-import logging as log
 
 import pandas as pd
 import schedule
 from cachetools import TTLCache, cached
 
-from cg_Crypto import cg_Crypto
+from common.cg_Crypto import cg_Crypto
-from MarketData import MarketData
+from common.MarketData import MarketData
-from Symbol import Coin, Stock, Symbol
+from common.Symbol import Coin, Stock, Symbol
 
 from typing import Dict
 
+log = logging.getLogger(__name__)
+
 
 class Router:
     STOCK_REGEX = "(?:^|[^\\$])\\$([a-zA-Z.]{1,6})"
@@ -77,9 +78,9 @@ class Router:
             else:
                 symbols.append(Coin(sym))
         if symbols:
-            log.info(symbols)
             for symbol in symbols:
                 self.trending_count[symbol.tag] = self.trending_count.get(symbol.tag, 0) + trending_weight
+                log.debug(self.trending_count)
 
         return symbols
 
@@ -303,8 +304,7 @@ class Router:
 
         for symbol in symbols:
             if isinstance(symbol, Stock):
-                replies.append("Command not supported for stocks.")
+                replies.append(self.stock.spark_reply(symbol))
-                # replies.append(self.stock.spark_reply(symbol))
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.spark_reply(symbol))
             else:
@@ -322,26 +322,21 @@ class Router:
             List of preformatted strings to be sent to user.
         """
 
-        stocks = self.stock.trending()
+        # stocks = self.stock.trending()
         coins = self.crypto.trending()
 
         reply = ""
 
+        log.warning(self.trending_count)
         if self.trending_count:
             reply += "🔥Trending on the Stock Bot:\n`"
             reply += "━" * len("Trending on the Stock Bot:") + "`\n"
 
             sorted_trending = [s[0] for s in sorted(self.trending_count.items(), key=lambda item: item[1])][::-1][0:5]
-
+            log.warning(sorted_trending)
             for t in sorted_trending:
                 reply += self.spark_reply(self.find_symbols(t))[0] + "\n"
 
-        if stocks:
-            reply += "\n\n💵Trending Stocks:\n`"
-            reply += "━" * len("Trending Stocks:") + "`\n"
-            for stock in stocks:
-                reply += stock + "\n"
-
         if coins:
             reply += "\n\n🦎Trending Crypto:\n`"
             reply += "━" * len("Trending Crypto:") + "`\n"
@@ -390,7 +385,6 @@ class Router:
                 log.debug(f"{symbol} is not a Stock or Coin")
 
         if stocks:
-            # IEX batch endpoint doesnt seem to be working right now
             for stock in stocks:
                 replies.append(self.stock.price_reply(stock))
         if coins:

dev-reqs.txt

@@ -1,6 +1,8 @@
--r requirements.txt
+-r telegram/requirements.txt
 black==23.3.0
 flake8==5.0.4
 Flake8-pyproject==1.2.3
 pylama==8.4.1
-mypy==1.2.0
+mypy==1.2.0
+types-cachetools==5.3.0.5
+types-pytz==2023.3.0.0

discord/D_info.py

@@ -0,0 +1,65 @@
+"""Functions and Info specific to the discord Bot
+"""
+
+import re
+
+import requests as r
+
+
+class D_info:
+    license = re.sub(
+        r"\b\n",
+        " ",
+        r.get("https://gitlab.com/simple-stock-bots/simple-discord-stock-bot/-/raw/master/LICENSE").text,
+    )
+
+    help_text = """
+Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
+
+If you are interested in stock market data, or want to host your own bot, be sure to use my affiliate link so that the bot can stay free: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord)
+
+Keep up with the latest news for the bot in its discord Channel: https://t.me/simplestockbotnews
+
+Full documentation on using and running your own stock bot can be found on the bots [docs.](https://docs.simplestockbot.com)
+
+The bot detects _"Symbols"_ using either one `$` or two `$$` dollar signs before the symbol. One dollar sign is for a stock market ticker, while two is for a cryptocurrency coin. `/chart $$eth` would return a chart of the past month of data for Ethereum, while `/dividend $psec` returns dividend information for Prospect Capital stock.
+
+Simply calling a symbol in any message that the bot can see will also return the price. So a message like: `I wonder if $$btc will go to the Moon now that $tsla accepts it as payment` would return the current price for both Bitcoin and Tesla. 
+
+**Commands**
+        - `/donate [amount in USD]` to donate. 🎗️
+        - `/intra $[symbol]` Plot of the stocks movement since the last market open.  📈
+        - `/chart $[symbol]` Plot of the stocks movement for the past 1 month. 📊
+        - `/trending` Trending Stocks and Cryptos. 💬
+        - `/help` Get some help using the bot. 🆘
+
+**Inline Features**
+    You can type @SimpleStockBot `[search]` in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price. Then once you select the ticker want the bot will send a message as you in that chat with the latest stock price. Prices may be delayed by up to an hour.
+
+    Market data is provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord)
+
+    If you believe the bot is not behaving properly run `/status` or [get in touch](https://docs.simplestockbot.com/contact).
+    """
+
+    donate_text = """
+Simple Stock Bot is run entirely on donations[.](https://www.buymeacoffee.com/Anson)
+All donations go directly towards paying for servers, and market data is provided by
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=discord).
+
+The easiest way to donate is to run the `/donate [amount in USD]` command with US dollars you would like to donate.
+
+Example: `/donate 2` would donate 2 USD.
+
+An alternative way to donate is through https://www.buymeacoffee.com/Anson which requires no account and accepts Paypal or Credit card.
+If you have any questions see the [website](https://docs.simplestockbot.com)
+
+    """
+
+
+commands = """ # Not used by the bot but for updating commands with BotFather
+donate - Donate to the bot 🎗️
+help - Get some help using the bot. 🆘
+trending - Trending Stocks and Cryptos. 💬
+intra - $[symbol] Plot since the last market open. 📈
+chart - $[chart] Plot of the past month. 📊
+"""

discord/Dockerfile

@@ -1,7 +1,8 @@
 FROM python:3.11-buster AS builder
 
 
-COPY requirements.txt /requirements.txt
+COPY discord/requirements.txt .
+
 RUN pip install --user -r requirements.txt
 
 
@@ -11,7 +12,7 @@ ENV MPLBACKEND=Agg
 
 COPY --from=builder /root/.local /root/.local
 
-
+COPY common common
-COPY . .
+COPY discord .
 
 CMD [ "python", "./bot.py" ]

discord/bot.py

@@ -0,0 +1,202 @@
+import datetime
+import io
+import logging
+import os
+
+import mplfinance as mpf
+import nextcord
+from nextcord.ext import commands
+
+from D_info import D_info
+from common.symbol_router import Router
+
+DISCORD_TOKEN = os.environ["DISCORD"]
+
+s = Router()
+d = D_info()
+
+
+intents = nextcord.Intents.default()
+
+
+client = nextcord.Client(intents=intents)
+bot = commands.Bot(command_prefix="/", description=d.help_text, intents=intents)
+
+logger = logging.getLogger("nextcord")
+logger.setLevel(logging.INFO)
+handler = logging.FileHandler(filename="nextcord.log", encoding="utf-8", mode="w")
+handler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+logger.addHandler(handler)
+
+
+@bot.event
+async def on_ready():
+    logging.info("Starting Simple Stock Bot")
+    logging.info(f"Logged in as {bot.user.name} {bot.user.id}")
+
+
+@bot.command()
+async def status(ctx: commands):
+    """Debug command for diagnosing if the bot is experiencing any issues."""
+    logging.warning(f"Status command ran by {ctx.message.author}")
+    message = ""
+    try:
+        message = "Contact MisterBiggs#0465 if you need help.\n"
+        message += s.status(f"Bot recieved your message in: {bot.latency*1000:.4f}ms") + "\n"
+
+    except Exception as ex:
+        logging.critical(ex)
+        message += (
+            f"*\n\nERROR ENCOUNTERED:*\n{ex}\n\n"
+            + "*The bot encountered an error while attempting to find errors. Please contact the bot admin.*"
+        )
+    await ctx.send(message)
+
+
+@bot.command()
+async def license(ctx: commands):
+    """Returns the bots license agreement."""
+    await ctx.send(d.license)
+
+
+@bot.command()
+async def donate(ctx: commands):
+    """Details on how to support the development and hosting of the bot."""
+    await ctx.send(d.donate_text)
+
+
+@bot.command()
+async def search(ctx: commands, *, query: str):
+    """Search for a stock symbol using either symbol of company name."""
+    results = s.search_symbols(query)
+    if results:
+        reply = "*Search Results:*\n`$ticker: Company Name`\n"
+        for query in results:
+            reply += "`" + query[1] + "`\n"
+        await ctx.send(reply)
+
+
+@bot.command()
+async def crypto(ctx: commands, _: str):
+    """Get the price of a cryptocurrency using in USD."""
+    await ctx.send("Crypto now has native support. Any crypto can be called using two dollar signs: `$$eth` `$$btc` `$$doge`")
+
+
+@bot.command()
+async def intra(ctx: commands, sym: str):
+    """Get a chart for the stocks movement since market open."""
+    symbols = s.find_symbols(sym)
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await ctx.send("No symbols or coins found.")
+        return
+
+    df = s.intra_reply(symbol)
+    if df.empty:
+        await ctx.send("Invalid symbol please see `/help` for usage details.")
+        return
+    with ctx.channel.typing():
+        buf = io.BytesIO()
+        mpf.plot(
+            df,
+            type="renko",
+            title=f"\n{symbol.name}",
+            volume="volume" in df.keys(),
+            style="yahoo",
+            savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+        )
+
+        buf.seek(0)
+
+        # Get price so theres no request lag after the image is sent
+        price_reply = s.price_reply([symbol])[0]
+        await ctx.send(
+            file=nextcord.File(
+                buf,
+                filename=f"{symbol.name}:intra{datetime.date.today().strftime('%S%M%d%b%Y')}.png",
+            ),
+            content=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
+            + f" {df.last_valid_index().strftime('%d %b at %H:%M')}",
+        )
+        await ctx.send(price_reply)
+
+
+@bot.command()
+async def chart(ctx: commands, sym: str):
+    """returns a chart of the past month of data for a symbol"""
+
+    symbols = s.find_symbols(sym)
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await ctx.send("No symbols or coins found.")
+        return
+
+    df = s.chart_reply(symbol)
+    if df.empty:
+        await ctx.send("Invalid symbol please see `/help` for usage details.")
+        return
+    with ctx.channel.typing():
+        buf = io.BytesIO()
+        mpf.plot(
+            df,
+            type="candle",
+            title=f"\n{symbol.name}",
+            volume="volume" in df.keys(),
+            style="yahoo",
+            savefig=dict(fname=buf, dpi=400, bbox_inches="tight"),
+        )
+        buf.seek(0)
+
+        # Get price so theres no request lag after the image is sent
+        price_reply = s.price_reply([symbol])[0]
+        await ctx.send(
+            file=nextcord.File(
+                buf,
+                filename=f"{symbol.name}:1M{datetime.date.today().strftime('%d%b%Y')}.png",
+            ),
+            content=f"\n1 Month chart for {symbol.name} from {df.first_valid_index().strftime('%d, %b %Y')}"
+            + f" to {df.last_valid_index().strftime('%d, %b %Y')}",
+        )
+        await ctx.send(price_reply)
+
+
+@bot.command()
+async def cap(ctx: commands, sym: str):
+    """Get the market cap of a symbol"""
+    symbols = s.find_symbols(sym)
+    if symbols:
+        with ctx.channel.typing():
+            for reply in s.cap_reply(symbols):
+                await ctx.send(reply)
+
+
+@bot.command()
+async def trending(ctx: commands):
+    """Get a list of Trending Stocks and Coins"""
+    with ctx.channel.typing():
+        await ctx.send(s.trending())
+
+
+@bot.event
+async def on_message(message):
+    if message.author.id == bot.user.id:
+        return
+    if message.content:
+        if message.content[0] == "/":
+            await bot.process_commands(message)
+            return
+
+        if "$" in message.content:
+            symbols = s.find_symbols(message.content)
+
+            if symbols:
+                for reply in s.price_reply(symbols):
+                    await message.channel.send(reply)
+                return
+
+
+bot.run(DISCORD_TOKEN)

discord/requirements.txt

@@ -0,0 +1,7 @@
+nextcord==2.4.2
+requests==2.25.1
+pandas==2.0.0
+schedule==1.0.0
+mplfinance==0.12.7a5
+markdownify==0.6.5
+cachetools==4.2.2

docker-compose.yaml

@@ -0,0 +1,13 @@
+version: '3'
+services:
+  telegram:
+    build:
+      context: .
+      dockerfile: telegram/Dockerfile
+    image: registry.gitlab.com/simple-stock-bots/simple-telegram-stock-bot
+    env_file: .env
+  discord:
+    build:
+      context: .
+      dockerfile: discord/Dockerfile
+    env_file: .env

telegram/Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3.11-buster AS builder
+
+
+COPY telegram/requirements.txt .
+
+RUN pip install --user -r requirements.txt
+
+
+FROM python:3.11-slim
+
+ENV MPLBACKEND=Agg
+
+COPY --from=builder /root/.local /root/.local
+
+
+COPY common common
+COPY telegram .
+
+
+
+CMD [ "python", "./bot.py" ]

telegram/T_info.py

@@ -16,6 +16,8 @@ class T_info:
     help_text = """
 Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
 
+If you are interested in stock market data, or want to host your own bot, be sure to use my affiliate link so that the bot can stay free: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram)
+
 Keep up with the latest news for the bot in its Telegram Channel: https://t.me/simplestockbotnews
 
 Full documentation on using and running your own stock bot can be found on the bots [docs.](https://docs.simplestockbot.com)
@@ -26,20 +28,15 @@ Simply calling a symbol in any message that the bot can see will also return the
 
 **Commands**
         - `/donate [amount in USD]` to donate. 🎗️
-        - `/dividend $[symbol]` Dividend information for the symbol. 📅
         - `/intra $[symbol]` Plot of the stocks movement since the last market open.  📈
         - `/chart $[symbol]` Plot of the stocks movement for the past 1 month. 📊
-        - `/news $[symbol]` News about the symbol. 📰
-        - `/info $[symbol]` General information about the symbol. ℹ️
-        - `/stat $[symbol]` Key statistics about the symbol. 🔢
-        - `/cap $[symbol]` Market Capitalization of symbol. 💰
         - `/trending` Trending Stocks and Cryptos. 💬
         - `/help` Get some help using the bot. 🆘
 
 **Inline Features**
     You can type @SimpleStockBot `[search]` in any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price. Then once you select the ticker want the bot will send a message as you in that chat with the latest stock price. Prices may be delayed by up to an hour.
-    
+
-    Market data is provided by [IEX Cloud](https://iexcloud.io)
+    Market data is provided by [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram)
 
     If you believe the bot is not behaving properly run `/status` or [get in touch](https://docs.simplestockbot.com/contact).
     """
@@ -47,27 +44,22 @@ Simply calling a symbol in any message that the bot can see will also return the
     donate_text = """
 Simple Stock Bot is run entirely on donations[.](https://www.buymeacoffee.com/Anson)
 All donations go directly towards paying for servers, and market data is provided by
-[IEX Cloud](https://iexcloud.io/).
+[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
 
 The easiest way to donate is to run the `/donate [amount in USD]` command with US dollars you would like to donate.
 
 Example: `/donate 2` would donate 2 USD.
 
 An alternative way to donate is through https://www.buymeacoffee.com/Anson which requires no account and accepts Paypal or Credit card.
-If you have any questions see the [website](https:docs.simplestockbot.com)
+If you have any questions see the [website](https://docs.simplestockbot.com)
 
     """
 
 
-commands = """
+commands = """ # Not used by the bot but for updating commands with BotFather
 donate - Donate to the bot 🎗️
 help - Get some help using the bot. 🆘
-info - $[symbol] General information about the symbol. ℹ️
-news - $[symbol] News about the symbol. 📰
-stat - $[symbol] Key statistics about the symbol. 🔢
-cap - $[symbol] Market Capitalization of symbol. 💰
-dividend - $[symbol] Dividend info 📅
 trending - Trending Stocks and Cryptos. 💬
 intra - $[symbol] Plot since the last market open. 📈
 chart - $[chart] Plot of the past month. 📊
-"""  # Not used by the bot but for updaing commands with BotFather
+"""

telegram/bot.py

@@ -8,7 +8,6 @@ import os
 import random
 import string
 import traceback
-import logging as log
 from uuid import uuid4
 
 import mplfinance as mpf
@@ -29,9 +28,13 @@ from telegram.ext import (
     Updater,
 )
 
-from symbol_router import Router
+from common.symbol_router import Router
 from T_info import T_info
 
+# Enable logging
+logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
+log = logging.getLogger(__name__)
+
 TELEGRAM_TOKEN = os.environ["TELEGRAM"]
 
 try:
@@ -43,10 +46,7 @@ except KeyError:
 s = Router()
 t = T_info()
 
-# Enable logging
-logging.basicConfig(format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO)
 
-logger = logging.getLogger(__name__)
 log.info("Bot script started.")
 
 
@@ -156,9 +156,12 @@ def symbol_detect_image(update: Update, context: CallbackContext):
     Makes image captions into text then passes the `update` and `context`
         to symbol detect so that it can reply cashtags in image captions.
     """
-    if update.message.caption:
+    try:
-        update.message.text = update.message.caption
+        if update.message.caption:
-        symbol_detect(update, context)
+            update.message.text = update.message.caption
+            symbol_detect(update, context)
+    except AttributeError:
+        return
 
 
 def symbol_detect(update: Update, context: CallbackContext):
@@ -237,7 +240,7 @@ def intra(update: Update, context: CallbackContext):
     update.message.reply_photo(
         photo=buf,
         caption=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
-        + f" {df.last_valid_index().strftime('%d %b at %H:%M')}"
+        + f" {df.last_valid_index().strftime('%d %b at %H:%M %Z')}"
         + f"\n\n{s.price_reply([symbol])[0]}",
         parse_mode=telegram.ParseMode.MARKDOWN,
         disable_notification=True,
@@ -304,7 +307,6 @@ def trending(update: Update, context: CallbackContext):
     context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
 
     trending_list = s.trending()
-    log.info(trending_list)
 
     update.message.reply_text(
         text=trending_list,
@@ -380,22 +382,21 @@ def error(update: Update, context: CallbackContext):
     log.warning(f"Logging error: {err_code}")
 
     if update:
-        message = (
+        log.warning(
             f"An exception was raised while handling an update\n"
-            f"<pre>update = {html.escape(json.dumps(update.to_dict(), indent=2, ensure_ascii=False))}"
+            f"\tupdate = {html.escape(json.dumps(update.to_dict(), indent=2, ensure_ascii=False))}\n"
-            "</pre>\n\n"
+            f"\tcontext.chat_data = {str(context.chat_data)}\n"
-            f"<pre>context.chat_data = {html.escape(str(context.chat_data))}</pre>\n\n"
+            f"\tcontext.user_data = {str(context.user_data)}\n"
-            f"<pre>context.user_data = {html.escape(str(context.user_data))}</pre>\n\n"
+            f"\t{html.escape(tb_string)}"
-            f"<pre>{html.escape(tb_string)}</pre>"
         )
-        log.warning(message)
-    else:
-        log.warning(tb_string)
 
-    update.message.reply_text(
+        update.message.reply_text(
-        text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
+            text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
-        parse_mode=telegram.ParseMode.MARKDOWN,
+            parse_mode=telegram.ParseMode.MARKDOWN,
-    )
+        )
+    else:
+        log.warning("No message to send to user.")
+        log.warning(tb_string)
 
 
 def main():