dev tooling improvements

Resolve "Combine Discord and Telegram bots into one repo and deploy with docker compose"

Closes #101

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

.devcontainer/Dockerfile

@@ -1,19 +1,3 @@
-FROM python:3.9-buster AS builder
-
-
-COPY requirements.txt /requirements.txt
-RUN pip install --user -r requirements.txt
-
-
-FROM python:3.9-slim
-
-ENV MPLBACKEND=Agg
-
-COPY --from=builder /root/.local /root/.local
-
-RUN pip install --no-cache-dir black
-ENV TELEGRAM=TELEGRAM
+FROM python:3.11
 
 COPY . .
-
-# CMD [ "python", "./bot.py" ]

.devcontainer/devcontainer.json

@@ -1,26 +1,39 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/docker-existing-dockerfile
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
-	"name": "DockerDev",
-	// Sets the run context to one level up instead of the .devcontainer folder.
-	"context": "..",
-	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
-	"dockerFile": "Dockerfile",
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
+  "name": "Python 3",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  // "image": "mcr.microsoft.com/devcontainers/python:1-3-bookworm",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/black:2": {},
+    "ghcr.io/devcontainers-contrib/features/mypy:2": {},
+    "ghcr.io/devcontainers-contrib/features/pylint:2": {},
+    "ghcr.io/devcontainers/features/docker-in-docker": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
 		"ms-python.python",
-		"ms-azuretools.vscode-docker"
+		"ms-python.black-formatter",
+		"ms-python.flake8",
+		"ms-python.vscode-pylance",
+		"ms-python.isort",
+		"charliermarsh.ruff"
 	]
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	// Uncomment the next line to run commands after the container is created - for example installing curl.
-	// "postCreateCommand": "apt-get update && apt-get install -y curl",
-	// Uncomment when using a ptrace-based debugger like C++, Go, and Rust
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
-	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
-	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
-	// "remoteUser": "vscode"
+    }
+  },
+  "postCreateCommand": "pip3 install --user -r dev-reqs.txt"
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "pip3 install --user -r requirements.txt",
+  // Configure tool-specific properties.
+  // "customizations": {},
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
 }

.gitignore

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

.gitlab-ci.yml

@@ -1,104 +1,5 @@
 black:
-  stage: .pre
+  # stage: .pre
   image: registry.gitlab.com/pipeline-components/black:latest
   script:
     - black --check --verbose -- .
-
-
-#Following instructions (as of 2020-04-01): https://docs.gitlab.com/ee/ci/docker/using_kaniko.html
-#Kaniko docs are here: https://github.com/GoogleContainerTools/kaniko
-#While this example shows building to multiple registries for all branches, with a few modifications
-#  it can be used to build non-master branches to a "dev" container registry and only build master to 
-#  a production container registry
-
-image: 
-  name: gcr.io/kaniko-project/executor:debug
-  entrypoint: [""]
-
-variables: 
-  #More Information on Kaniko Caching: https://cloud.google.com/build/docs/kaniko-cache
-  KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-ttl=24h"
-  VERSIONLABELMETHOD: "OnlyIfThisCommitHasVersion" # options: "OnlyIfThisCommitHasVersion","LastVersionTagInGit"
-  IMAGE_LABELS: >
-    --label org.opencontainers.image.vendor=$CI_SERVER_URL/$GITLAB_USER_LOGIN
-    --label org.opencontainers.image.authors=$CI_SERVER_URL/$GITLAB_USER_LOGIN
-    --label org.opencontainers.image.revision=$CI_COMMIT_SHA
-    --label org.opencontainers.image.source=$CI_PROJECT_URL
-    --label org.opencontainers.image.documentation=$CI_PROJECT_URL
-    --label org.opencontainers.image.licenses=$CI_PROJECT_URL
-    --label org.opencontainers.image.url=$CI_PROJECT_URL
-    --label vcs-url=$CI_PROJECT_URL
-    --label com.gitlab.ci.user=$CI_SERVER_URL/$GITLAB_USER_LOGIN
-    --label com.gitlab.ci.email=$GITLAB_USER_EMAIL
-    --label com.gitlab.ci.tagorbranch=$CI_COMMIT_REF_NAME
-    --label com.gitlab.ci.pipelineurl=$CI_PIPELINE_URL
-    --label com.gitlab.ci.commiturl=$CI_PROJECT_URL/commit/$CI_COMMIT_SHA
-    --label com.gitlab.ci.cijoburl=$CI_JOB_URL
-    --label com.gitlab.ci.mrurl=$CI_PROJECT_URL/-/merge_requests/$CI_MERGE_REQUEST_ID
-
-get-latest-git-version:
-  stage: .pre
-  image: 
-    name: alpine/git
-    entrypoint: [""]
-  rules:
-    - if: '$VERSIONLABELMETHOD == "LastVersionTagInGit"'    
-  script:
-    - |
-      echo "the google kaniko container does not have git and does not have a packge manager to install it"
-      git clone https://github.com/GoogleContainerTools/kaniko.git
-      cd kaniko
-      echo "$(git describe --abbrev=0 --tags)" > ../VERSIONTAG.txt
-      echo "VERSIONTAG.txt contains $(cat ../VERSIONTAG.txt)"
-  artifacts:
-    paths:
-      - VERSIONTAG.txt
-
-
-.build_with_kaniko:
-  #Hidden job to use as an "extends" template
-  stage: build
-  script:
-    - | 
-      echo "Building and shipping image to $CI_REGISTRY_IMAGE"
-      #Build date for opencontainers
-      BUILDDATE="'$(date '+%FT%T%z' | sed -E -n 's/(\+[0-9]{2})([0-9]{2})$/\1:\2/p')'" #rfc 3339 date
-      IMAGE_LABELS="$IMAGE_LABELS --label org.opencontainers.image.created=$BUILDDATE --label build-date=$BUILDDATE"
-      #Description for opencontainers
-      BUILDTITLE=$(echo $CI_PROJECT_TITLE | tr " " "_")
-      IMAGE_LABELS="$IMAGE_LABELS --label org.opencontainers.image.title=$BUILDTITLE --label org.opencontainers.image.description=$BUILDTITLE"
-      #Add ref.name for opencontainers
-      IMAGE_LABELS="$IMAGE_LABELS --label org.opencontainers.image.ref.name=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
-
-      #Build Version Label and Tag from git tag, LastVersionTagInGit was placed by a previous job artifact
-      if [[ "$VERSIONLABELMETHOD" == "LastVersionTagInGit" ]]; then VERSIONLABEL=$(cat VERSIONTAG.txt); fi
-      if [[ "$VERSIONLABELMETHOD" == "OnlyIfThisCommitHasVersion" ]]; then VERSIONLABEL=$CI_COMMIT_TAG; fi
-      if [[ ! -z "$VERSIONLABEL" ]]; then 
-        IMAGE_LABELS="$IMAGE_LABELS --label org.opencontainers.image.version=$VERSIONLABEL"
-        ADDITIONALTAGLIST="$ADDITIONALTAGLIST $VERSIONLABEL"
-      fi
-      
-      ADDITIONALTAGLIST="$ADDITIONALTAGLIST $CI_COMMIT_REF_NAME $CI_COMMIT_SHORT_SHA"
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then ADDITIONALTAGLIST="$ADDITIONALTAGLIST latest"; fi
-      if [[ -n "$ADDITIONALTAGLIST" ]]; then 
-        for TAG in $ADDITIONALTAGLIST; do 
-          FORMATTEDTAGLIST="${FORMATTEDTAGLIST} --tag $CI_REGISTRY_IMAGE:$TAG "; 
-        done; 
-      fi
-      
-      #Reformat Docker tags to kaniko's --destination argument:
-      FORMATTEDTAGLIST=$(echo "${FORMATTEDTAGLIST}" | sed s/\-\-tag/\-\-destination/g) 
-
-      echo "Kaniko arguments to run: --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile $KANIKO_CACHE_ARGS $FORMATTEDTAGLIST $IMAGE_LABELS"
-      mkdir -p /kaniko/.docker
-      echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(echo -n $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD | base64)\"}}}" > /kaniko/.docker/config.json
-      /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile $KANIKO_CACHE_ARGS $FORMATTEDTAGLIST $IMAGE_LABELS
-
-
-build-for-gitlab-project-registry:
-  extends: .build_with_kaniko
-  environment:
-    #This is only here for completeness, since there are no CI CD Variables with this scope, the project defaults are used
-    # to push to this projects docker registry
-    name: push-to-gitlab-project-registry
-

.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Telegram Bot",
-            "type": "python",
-            "request": "launch",
-            "program": "bot.py",
-            "console": "integratedTerminal"
-        }
-    ]
-}

.vscode/settings.json

@@ -1,13 +1,8 @@
 {
-    "workbench.iconTheme": "vscode-icons",
-    "editor.suggestSelection": "first",
-    "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
-    "python.languageServer": "Pylance",
-    "git.autofetch": true,
     "editor.formatOnSave": true,
-    "files.associations": {
-        "DockerDev": "dockerfile",
-    },
-    "python.formatting.provider": "black",
-    "python.showStartPage": false,
+    "editor.formatOnPaste": true,
+    "editor.formatOnSaveMode": "modificationsIfAvailable",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+    }
 }

IEX_Symbol.py

@@ -1,497 +0,0 @@
-"""Class with functions for running the bot with IEX Cloud.
-"""
-
-import logging
-import os
-from datetime import datetime
-from logging import warning
-from typing import List, Optional, Tuple
-
-import pandas as pd
-import requests as r
-import schedule
-
-from Symbol import Stock
-
-
-class IEX_Symbol:
-    """
-    Functions for finding stock market information about symbols.
-    """
-
-    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
-
-    searched_symbols = {}
-    otc_list = []
-    charts = {}
-    trending_cache = None
-
-    def __init__(self) -> None:
-        """Creates a Symbol Object
-
-        Parameters
-        ----------
-        IEX_TOKEN : str
-            IEX API Token
-        """
-        try:
-            self.IEX_TOKEN = os.environ["IEX"]
-
-            if self.IEX_TOKEN == "TOKEN":
-                self.IEX_TOKEN = ""
-        except KeyError:
-            self.IEX_TOKEN = ""
-            warning(
-                "Starting without an IEX Token will not allow you to get market data!"
-            )
-
-        if self.IEX_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:
-
-        url = "https://cloud.iexapis.com/stable" + endpoint
-
-        # set token param if it wasn't passed.
-        params["token"] = params.get("token", self.IEX_TOKEN)
-
-        resp = r.get(url, params=params, timeout=timeout)
-
-        # Make sure API returned a proper status code
-        try:
-            resp.raise_for_status()
-        except r.exceptions.HTTPError as e:
-            logging.error(e)
-            return {}
-
-        # Make sure API returned valid JSON
-        try:
-            resp_json = resp.json()
-
-            # IEX uses backtick ` as apostrophe which breaks telegram markdown parsing
-            if type(resp_json) is dict:
-                resp_json["companyName"] = resp_json.get("companyName", "").replace(
-                    "`", "'"
-                )
-
-            return resp_json
-        except r.exceptions.JSONDecodeError as e:
-            logging.error(e)
-            return {}
-
-    def clear_charts(self) -> None:
-        """
-        Clears cache of chart data.
-        Charts are cached so that only 1 API call per 24 hours is needed since the
-            chart data is expensive and a large download.
-        """
-        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:
-        """Checks IEX Status dashboard for any current API issues.
-
-        Returns
-        -------
-        str
-            Human readable text on status of IEX API
-        """
-
-        if self.IEX_TOKEN == "":
-            return "The `IEX_TOKEN` is not set so Stock Market data is not available."
-
-        resp = r.get(
-            "https://pjmps0c34hp7.statuspage.io/api/v2/status.json",
-            timeout=15,
-        )
-
-        if resp.status_code == 200:
-            status = resp.json()["status"]
-        else:
-            return "IEX Cloud did not respond. Please check their status page for more information. https://status.iexapis.com"
-
-        if status["indicator"] == "none":
-            return "IEX Cloud is currently not reporting any issues with its API."
-        else:
-            return (
-                f"{status['indicator']}: {status['description']}."
-                + " Please check the status page for more information. https://status.iexapis.com"
-            )
-
-    def price_reply(self, symbol: Stock) -> str:
-        """Returns price movement of Stock for the last market day, or after hours.
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-
-        if IEXData := self.get(f"/stock/{symbol.id}/quote"):
-
-            if symbol.symbol.upper() in self.otc_list:
-                return f"OTC - {symbol.symbol.upper()}, {IEXData['companyName']} most recent price is: $**{IEXData['latestPrice']}**"
-
-            keys = (
-                "extendedChangePercent",
-                "extendedPrice",
-                "companyName",
-                "latestPrice",
-                "changePercent",
-            )
-
-            if set(keys).issubset(IEXData):
-
-                if change := IEXData.get("changePercent", 0):
-                    change = round(change * 100, 2)
-                else:
-                    change = 0
-
-                if (
-                    IEXData.get("isUSMarketOpen", True)
-                    or (IEXData["extendedChangePercent"] is None)
-                    or (IEXData["extendedPrice"] is None)
-                ):  # Check if market is open.
-                    message = f"The current stock price of {IEXData['companyName']} is $**{IEXData['latestPrice']}**"
-                else:
-                    message = (
-                        f"{IEXData['companyName']} closed at $**{IEXData['latestPrice']}** with a change of {change}%,"
-                        + f" after hours _(15 minutes delayed)_ the stock price is $**{IEXData['extendedPrice']}**"
-                    )
-                    if change := IEXData.get("extendedChangePercent", 0):
-                        change = round(change * 100, 2)
-                    else:
-                        change = 0
-
-                # Determine wording of change text
-                if change > 0:
-                    message += f", the stock is currently **up {change}%**"
-                elif change < 0:
-                    message += f", the stock is currently **down {change}%**"
-                else:
-                    message += ", the stock hasn't shown any movement today."
-            else:
-                message = (
-                    f"The symbol: {symbol} encountered and error. This could be due to "
-                )
-
-        else:
-            message = f"The symbol: {symbol} was not found."
-
-        return message
-
-    def dividend_reply(self, symbol: Stock) -> str:
-        """Returns the most recent, or next dividend date for a stock symbol.
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        if symbol.symbol.upper() in self.otc_list:
-            return "OTC stocks do not currently support any commands."
-
-        if resp := self.get(f"/stock/{symbol.id}/dividends/next"):
-            try:
-                IEXData = resp[0]
-            except IndexError as e:
-                logging.info(e)
-                return f"Getting dividend information for ${symbol.id.upper()} encountered an error. The provider for upcoming dividend information has been having issues recently which has likely caused this error. It is also possible that the stock has no dividend or does not exist."
-            keys = (
-                "amount",
-                "currency",
-                "declaredDate",
-                "exDate",
-                "frequency",
-                "paymentDate",
-                "flag",
-            )
-
-            if set(keys).issubset(IEXData):
-
-                if IEXData["currency"] == "USD":
-                    price = f"${IEXData['amount']}"
-                else:
-                    price = f"{IEXData['amount']} {IEXData['currency']}"
-
-                # Pattern IEX uses for dividend date.
-                pattern = "%Y-%m-%d"
-
-                declared = datetime.strptime(IEXData["declaredDate"], pattern).strftime(
-                    "%A, %B %w"
-                )
-                ex = datetime.strptime(IEXData["exDate"], pattern).strftime("%A, %B %w")
-                payment = datetime.strptime(IEXData["paymentDate"], pattern).strftime(
-                    "%A, %B %w"
-                )
-
-                daysDelta = (
-                    datetime.strptime(IEXData["paymentDate"], pattern) - datetime.now()
-                ).days
-
-                return (
-                    "The next dividend for "
-                    + f"{self.symbol_list[self.symbol_list['symbol']==symbol.id.upper()]['description'].item()}"  # Get full name without api call
-                    + f" is on {payment} which is in {daysDelta} days."
-                    + f" The dividend is for {price} per share."
-                    + f"\n\nThe dividend was declared on {declared} and the ex-dividend date is {ex}"
-                )
-
-        return f"Getting dividend information for ${symbol.id.upper()} encountered an error. The provider for upcoming dividend information has been having issues recently which has likely caused this error. It is also possible that the stock has no dividend or does not exist."
-
-    def news_reply(self, symbol: Stock) -> str:
-        """Gets most recent, english, non-paywalled news
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        if symbol.symbol.upper() in self.otc_list:
-            return "OTC stocks do not currently support any commands."
-
-        if data := self.get(f"/stock/{symbol.id}/news/last/15"):
-            line = []
-
-            for news in data:
-                if news["lang"] == "en" and not news["hasPaywall"]:
-                    line.append(
-                        f"*{news['source']}*: [{news['headline']}]({news['url']})"
-                    )
-
-            return f"News for **{symbol.id.upper()}**:\n" + "\n".join(line[:5])
-
-        else:
-            return f"No news found for: {symbol.id}\nEither today is boring or the symbol does not exist."
-
-    def info_reply(self, symbol: Stock) -> str:
-        """Gets description for Stock
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted text
-        """
-        if symbol.symbol.upper() in self.otc_list:
-            return "OTC stocks do not currently support any commands."
-
-        if data := self.get(f"/stock/{symbol.id}/company"):
-            [data.pop(k) for k in list(data) if data[k] == ""]
-
-            if "description" in data:
-                return data["description"]
-
-        return f"No information found for: {symbol}\nEither today is boring or the symbol does not exist."
-
-    def stat_reply(self, symbol: Stock) -> str:
-        """Key statistics on a Stock
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        if symbol.symbol.upper() in self.otc_list:
-            return "OTC stocks do not currently support any commands."
-
-        if data := self.get(f"/stock/{symbol.id}/stats"):
-            [data.pop(k) for k in list(data) if data[k] == ""]
-
-            m = ""
-            if "companyName" in data:
-                m += f"Company Name: {data['companyName']}\n"
-            if "marketcap" in data:
-                m += f"Market Cap: ${data['marketcap']:,}\n"
-            if "week52high" in data:
-                m += f"52 Week (high-low): {data['week52high']:,} "
-            if "week52low" in data:
-                m += f"- {data['week52low']:,}\n"
-            if "employees" in data:
-                m += f"Number of Employees: {data['employees']:,}\n"
-            if "nextEarningsDate" in data:
-                m += f"Next Earnings Date: {data['nextEarningsDate']}\n"
-            if "peRatio" in data:
-                m += f"Price to Earnings: {data['peRatio']:.3f}\n"
-            if "beta" in data:
-                m += f"Beta: {data['beta']:.3f}\n"
-            return m
-        else:
-            return f"No information found for: {symbol}\nEither today is boring or the symbol does not exist."
-
-    def cap_reply(self, symbol: Stock) -> str:
-        """Get the Market Cap of a stock"""
-
-        if data := self.get(f"/stock/{symbol.id}/stats"):
-
-            try:
-                cap = data["marketcap"]
-            except KeyError:
-                return f"{symbol.id} returned an error."
-
-            message = f"The current market cap of {symbol.name} is $**{cap:,.2f}**"
-
-        else:
-            message = f"The Stock: {symbol.name} was not found or returned and error."
-
-        return message
-
-    def intra_reply(self, symbol: Stock) -> pd.DataFrame:
-        """Returns price data for a symbol since the last market open.
-
-        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.
-        """
-        if symbol.symbol.upper() in self.otc_list:
-            return pd.DataFrame()
-
-        if symbol.id.upper() not in list(self.symbol_list["symbol"]):
-            return pd.DataFrame()
-
-        if data := self.get(f"/stock/{symbol.id}/intraday-prices"):
-            df = pd.DataFrame(data)
-            df.dropna(inplace=True, subset=["date", "minute", "high", "low", "volume"])
-            df["DT"] = pd.to_datetime(df["date"] + "T" + df["minute"])
-            df = df.set_index("DT")
-            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.
-
-        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()
-
-        if symbol.symbol.upper() in self.otc_list:
-            return pd.DataFrame()
-
-        if symbol.id.upper() not in list(self.symbol_list["symbol"]):
-            return pd.DataFrame()
-
-        try:  # https://stackoverflow.com/a/3845776/8774114
-            return self.charts[symbol.id.upper()]
-        except KeyError:
-            pass
-
-        if data := self.get(
-            f"/stock/{symbol.id}/chart/1mm",
-            params={"chartInterval": 3, "includeToday": "false"},
-        ):
-            df = pd.DataFrame(data)
-            df.dropna(inplace=True, subset=["date", "minute", "high", "low", "volume"])
-            df["DT"] = pd.to_datetime(df["date"] + "T" + df["minute"])
-            df = df.set_index("DT")
-            self.charts[symbol.id.upper()] = df
-            return df
-
-        return pd.DataFrame()
-
-    def spark_reply(self, symbol: Stock) -> str:
-        quote = self.get(f"/stock/{symbol.id}/quote")
-
-        open_change = quote.get("changePercent", 0)
-        after_change = quote.get("extendedChangePercent", 0)
-
-        change = 0
-
-        if open_change:
-            change = change + open_change
-        if after_change:
-            change = change + after_change
-
-        change = change * 100
-
-        return f"`{symbol.tag}`: {quote['companyName']}, {change:.2f}%"
-
-    def trending(self) -> list[str]:
-        """Gets current coins trending on IEX. Only returns when market is open.
-
-        Returns
-        -------
-        list[str]
-            list of $ID: NAME, CHANGE%
-        """
-
-        if data := self.get(f"/stock/market/list/mostactive"):
-            self.trending_cache = [
-                f"`${s['symbol']}`: {s['companyName']}, {100*s['changePercent']:.2f}%"
-                for s in data
-            ]
-
-        return self.trending_cache

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)

bot.py

@@ -1,637 +0,0 @@
-# Works with Python 3.8
-import datetime
-import html
-import io
-import json
-import logging
-import os
-import random
-import string
-import traceback
-from logging import critical, debug, error, info, warning
-from uuid import uuid4
-
-import mplfinance as mpf
-import telegram
-from telegram import (
-    InlineQueryResultArticle,
-    InputTextMessageContent,
-    LabeledPrice,
-    Update,
-)
-from telegram.ext import (
-    CallbackContext,
-    CommandHandler,
-    Filters,
-    InlineQueryHandler,
-    MessageHandler,
-    PreCheckoutQueryHandler,
-    Updater,
-)
-
-from symbol_router import Router
-from T_info import T_info
-
-TELEGRAM_TOKEN = os.environ["TELEGRAM"]
-
-try:
-    STRIPE_TOKEN = os.environ["STRIPE"]
-except KeyError:
-    STRIPE_TOKEN = ""
-    warning("Starting without a STRIPE Token will not allow you to accept Donations!")
-
-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__)
-info("Bot script started.")
-
-
-def start(update: Update, context: CallbackContext):
-    """Send help text when the command /start is issued."""
-    info(f"Start command ran by {update.message.chat.username}")
-    update.message.reply_text(
-        text=t.help_text,
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def help(update: Update, context: CallbackContext):
-    """Send help text when the command /help is issued."""
-    info(f"Help command ran by {update.message.chat.username}")
-    update.message.reply_text(
-        text=t.help_text,
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def license(update: Update, context: CallbackContext):
-    """Send bots license when the /license command is issued."""
-    info(f"License command ran by {update.message.chat.username}")
-    update.message.reply_text(
-        text=t.license,
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def status(update: Update, context: CallbackContext):
-    """Gather status of bot and dependant services and return important status updates."""
-    warning(f"Status command ran by {update.message.chat.username}")
-    bot_resp_time = (
-        datetime.datetime.now(update.message.date.tzinfo) - update.message.date
-    )
-
-    bot_status = s.status(
-        f"It took {bot_resp_time.total_seconds()} seconds for the bot to get your message."
-    )
-
-    update.message.reply_text(
-        text=bot_status,
-        parse_mode=telegram.ParseMode.MARKDOWN,
-    )
-
-
-def donate(update: Update, context: CallbackContext):
-    """Sets up donation."""
-    info(f"Donate command ran by {update.message.chat.username}")
-    chat_id = update.message.chat_id
-
-    if update.message.text.strip() == "/donate" or "/donate@" in update.message.text:
-        update.message.reply_text(
-            text=t.donate_text,
-            parse_mode=telegram.ParseMode.MARKDOWN,
-            disable_notification=True,
-        )
-        amount = 1
-    else:
-        amount = update.message.text.replace("/donate", "").replace("$", "").strip()
-
-    try:
-        price = int(float(amount) * 100)
-    except ValueError:
-        update.message.reply_text(f"{amount} is not a valid donation amount or number.")
-        return
-    info(f"Donation amount: {price} by {update.message.chat.username}")
-
-    context.bot.send_invoice(
-        chat_id=chat_id,
-        title="Simple Stock Bot Donation",
-        description=f"Simple Stock Bot Donation of ${amount} by {update.message.chat.username}",
-        payload=f"simple-stock-bot-{chat_id}",
-        provider_token=STRIPE_TOKEN,
-        currency="USD",
-        prices=[LabeledPrice("Donation:", price)],
-        start_parameter="",
-        # suggested_tip_amounts=[100, 500, 1000, 2000],
-        photo_url="https://simple-stock-bots.gitlab.io/docs/img/Telegram.png",
-        photo_width=500,
-        photo_height=500,
-    )
-
-
-def precheckout_callback(update: Update, context: CallbackContext):
-    """Approves donation"""
-    info(f"precheckout_callback queried")
-    query = update.pre_checkout_query
-
-    query.answer(ok=True)
-    # I dont think I need to check since its only donations.
-    # if query.invoice_payload == "simple-stock-bot":
-    #     # answer False pre_checkout_query
-    #     query.answer(ok=True)
-    # else:
-    #     query.answer(ok=False, error_message="Something went wrong...")
-
-
-def successful_payment_callback(update: Update, context: CallbackContext):
-    """Thanks user for donation"""
-    info(f"Successful payment!")
-    update.message.reply_text(
-        "Thank you for your donation! It goes a long way to keeping the bot free!"
-    )
-
-
-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:
-        update.message.text = update.message.caption
-        symbol_detect(update, context)
-
-
-def symbol_detect(update: Update, context: CallbackContext):
-    """
-    Runs on any message that doesn't have a command and searches for cashtags,
-        then returns the prices of any symbols found.
-    """
-    try:
-        message = update.message.text
-        chat_id = update.message.chat_id
-        if "$" in message:
-            symbols = s.find_symbols(message)
-            info("Looking for Symbols")
-        else:
-            return
-    except AttributeError as ex:
-        info(ex)
-        return
-    if symbols:
-        # Let user know bot is working
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-        info(f"Symbols found: {symbols}")
-
-        for reply in s.price_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def dividend(update: Update, context: CallbackContext):
-    """/dividend or /div command and then finds dividend info on that symbol."""
-    info(f"Dividend command ran by {update.message.chat.username}")
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/dividend":
-        update.message.reply_text(
-            "This command gives info on the next dividend date for a symbol.\nExample: /dividend $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message)
-
-    if symbols:
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-        for reply in s.dividend_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def news(update: Update, context: CallbackContext):
-    """/news command then finds news info on that symbol."""
-    info(f"News command ran by {update.message.chat.username}")
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/news":
-        update.message.reply_text(
-            "This command gives the most recent english news for a symbol.\nExample: /news $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message, trending_weight=10)
-
-    if symbols:
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-
-        for reply in s.news_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def information(update: Update, context: CallbackContext):
-    """/info command then finds info on that symbol."""
-    info(f"Information command ran by {update.message.chat.username}")
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/info":
-        update.message.reply_text(
-            "This command gives information on a symbol.\nExample: /info $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message)
-
-    if symbols:
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-
-        for reply in s.info_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def search(update: Update, context: CallbackContext):
-    """
-    Searches on full list of stocks and crypto descriptions
-    then returns the top matches in order of smallest symbol name length.
-    """
-    info(f"Search command ran by {update.message.chat.username}")
-    message = update.message.text.replace("/search ", "")
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/search":
-        update.message.reply_text(
-            "This command searches for symbols supported by the bot.\nExample: /search Tesla Motors or /search $tsla"
-        )
-        return
-
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-    queries = s.inline_search(message, matches=10)
-    if not queries.empty:
-        reply = "*Search Results:*\n`$ticker` : Company Name\n`" + ("-" * 21) + "`\n"
-        for _, query in queries.iterrows():
-            desc = query["description"]
-            reply += "`" + desc.replace(": ", "` : ") + "\n"
-
-        update.message.reply_text(
-            text=reply,
-            parse_mode=telegram.ParseMode.MARKDOWN,
-            disable_notification=True,
-        )
-
-
-def intra(update: Update, context: CallbackContext):
-    """returns a chart of intraday data for a symbol"""
-    info(f"Intra command ran by {update.message.chat.username}")
-
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/intra":
-        update.message.reply_text(
-            "This command returns a chart of the stocks movement since the most recent market open.\nExample: /intra $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message, trending_weight=5)
-    symbol = symbols[0]
-
-    if len(symbols):
-        symbol = symbols[0]
-    else:
-        update.message.reply_text("No symbols or coins found.")
-        return
-
-    df = s.intra_reply(symbol)
-    if df.empty:
-        update.message.reply_text(
-            text="Invalid symbol please see `/help` for usage details.",
-            parse_mode=telegram.ParseMode.MARKDOWN,
-            disable_notification=True,
-        )
-        return
-
-    context.bot.send_chat_action(
-        chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO
-    )
-
-    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)
-
-    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"\n\n{s.price_reply([symbol])[0]}",
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def chart(update: Update, context: CallbackContext):
-    """returns a chart of the past month of data for a symbol"""
-    info(f"Chart command ran by {update.message.chat.username}")
-
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/chart":
-        update.message.reply_text(
-            "This command returns a chart of the stocks movement for the past month.\nExample: /chart $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message, trending_weight=10)
-
-    if len(symbols):
-        symbol = symbols[0]
-    else:
-        update.message.reply_text("No symbols or coins found.")
-        return
-
-    df = s.chart_reply(symbol)
-    if df.empty:
-        update.message.reply_text(
-            text="Invalid symbol please see `/help` for usage details.",
-            parse_mode=telegram.ParseMode.MARKDOWN,
-            disable_notification=True,
-        )
-        return
-    context.bot.send_chat_action(
-        chat_id=chat_id, action=telegram.ChatAction.UPLOAD_PHOTO
-    )
-
-    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)
-
-    update.message.reply_photo(
-        photo=buf,
-        caption=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')}\n\n{s.price_reply([symbol])[0]}",
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def stat(update: Update, context: CallbackContext):
-    """returns key statistics on symbol"""
-    info(f"Stat command ran by {update.message.chat.username}")
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/stat":
-        update.message.reply_text(
-            "This command returns key statistics for a symbol.\nExample: /stat $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message)
-
-    if symbols:
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-
-        for reply in s.stat_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def cap(update: Update, context: CallbackContext):
-    """returns market cap for symbol"""
-    info(f"Cap command ran by {update.message.chat.username}")
-    message = update.message.text
-    chat_id = update.message.chat_id
-
-    if message.strip().split("@")[0] == "/cap":
-        update.message.reply_text(
-            "This command returns the market cap for a symbol.\nExample: /cap $tsla"
-        )
-        return
-
-    symbols = s.find_symbols(message)
-
-    if symbols:
-        context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-
-        for reply in s.cap_reply(symbols):
-            update.message.reply_text(
-                text=reply,
-                parse_mode=telegram.ParseMode.MARKDOWN,
-                disable_notification=True,
-            )
-
-
-def trending(update: Update, context: CallbackContext):
-    """returns currently trending symbols and how much they've moved in the past trading day."""
-    info(f"Trending command ran by {update.message.chat.username}")
-
-    chat_id = update.message.chat_id
-
-    context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
-
-    trending_list = s.trending()
-    info(trending_list)
-
-    update.message.reply_text(
-        text=trending_list,
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def inline_query(update: Update, context: CallbackContext):
-    """
-    Handles inline query. Searches by looking if query is contained
-        in the symbol and returns matches in alphabetical order.
-    """
-    # info(f"Inline command ran by {update.message.chat.username}")
-    info(f"Query: {update.inline_query.query}")
-
-    ignored_queries = {"$", "$$", " ", ""}
-
-    if update.inline_query.query.strip() in ignored_queries:
-        default_message = """
-        You can type:\n@SimpleStockBot `[search]`\nin any chat or direct message to search for the stock bots full list of stock and crypto symbols and return the price.
-        """
-
-        update.inline_query.answer(
-            [
-                InlineQueryResultArticle(
-                    str(uuid4()),
-                    title="Please enter a query. It can be a ticker or a name of a company.",
-                    input_message_content=InputTextMessageContent(
-                        default_message, parse_mode=telegram.ParseMode.MARKDOWN
-                    ),
-                )
-            ]
-        )
-
-    matches = s.inline_search(update.inline_query.query)
-
-    results = []
-    for _, row in matches.iterrows():
-
-        results.append(
-            InlineQueryResultArticle(
-                str(uuid4()),
-                title=row["description"],
-                input_message_content=InputTextMessageContent(
-                    row["price_reply"], parse_mode=telegram.ParseMode.MARKDOWN
-                ),
-            )
-        )
-
-        if len(results) == 5:
-            update.inline_query.answer(results, cache_time=60 * 60)
-            info("Inline Command was successful")
-            return
-    update.inline_query.answer(results)
-
-
-def rand_pick(update: Update, context: CallbackContext):
-    """For the gamblers. Returns a random symbol to buy and a sell date"""
-    info(
-        f"Someone is gambling! Random_pick command ran by {update.message.chat.username}"
-    )
-
-    update.message.reply_text(
-        text=s.random_pick(),
-        parse_mode=telegram.ParseMode.MARKDOWN,
-        disable_notification=True,
-    )
-
-
-def error(update: Update, context: CallbackContext):
-    """Log Errors caused by Updates."""
-    warning('Update "%s" caused error "%s"', update, error)
-
-    tb_list = traceback.format_exception(
-        None, context.error, context.error.__traceback__
-    )
-    tb_string = "".join(tb_list)
-
-    err_code = "".join([random.choice(string.ascii_lowercase) for i in range(5)])
-    warning(f"Logging error: {err_code}")
-
-    if update:
-        message = (
-            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))}"
-            "</pre>\n\n"
-            f"<pre>context.chat_data = {html.escape(str(context.chat_data))}</pre>\n\n"
-            f"<pre>context.user_data = {html.escape(str(context.user_data))}</pre>\n\n"
-            f"<pre>{html.escape(tb_string)}</pre>"
-        )
-        warning(message)
-    else:
-        warning(tb_string)
-
-    # update.message.reply_text(
-    #     text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
-    #     parse_mode=telegram.ParseMode.MARKDOWN,
-    # )
-
-    # Finally, send the message
-    # update.message.reply_text(text=message, parse_mode=telegram.ParseMode.HTML)
-    # update.message.reply_text(text="Please inform the bot admin of this issue.")
-
-
-def main():
-    """Start the context.bot."""
-    # Create the EventHandler and pass it your bot's token.
-    updater = Updater(TELEGRAM_TOKEN)
-
-    # Get the dispatcher to register handlers
-    dp = updater.dispatcher
-
-    # on different commands - answer in Telegram
-    dp.add_handler(CommandHandler("start", start))
-    dp.add_handler(CommandHandler("help", help))
-    dp.add_handler(CommandHandler("license", license))
-    dp.add_handler(CommandHandler("dividend", dividend))
-    dp.add_handler(CommandHandler("div", dividend))
-    dp.add_handler(CommandHandler("news", news))
-    dp.add_handler(CommandHandler("info", information))
-    dp.add_handler(CommandHandler("stat", stat))
-    dp.add_handler(CommandHandler("stats", stat))
-    dp.add_handler(CommandHandler("cap", cap))
-    dp.add_handler(CommandHandler("trending", trending))
-    dp.add_handler(CommandHandler("search", search))
-    dp.add_handler(CommandHandler("random", rand_pick))
-    dp.add_handler(CommandHandler("donate", donate))
-    dp.add_handler(CommandHandler("status", status))
-    dp.add_handler(CommandHandler("inline", inline_query))
-
-    # Charting can be slow so they run async.
-    dp.add_handler(CommandHandler("intra", intra, run_async=True))
-    dp.add_handler(CommandHandler("intraday", intra, run_async=True))
-    dp.add_handler(CommandHandler("day", intra, run_async=True))
-    dp.add_handler(CommandHandler("chart", chart, run_async=True))
-    dp.add_handler(CommandHandler("month", chart, run_async=True))
-
-    # on noncommand i.e message - echo the message on Telegram
-    dp.add_handler(MessageHandler(Filters.text, symbol_detect))
-    dp.add_handler(MessageHandler(Filters.photo, symbol_detect_image))
-
-    # Inline Bot commands
-    dp.add_handler(InlineQueryHandler(inline_query))
-
-    # Pre-checkout handler to final check
-    dp.add_handler(PreCheckoutQueryHandler(precheckout_callback))
-
-    # Payment success
-    dp.add_handler(
-        MessageHandler(Filters.successful_payment, successful_payment_callback)
-    )
-
-    # log all errors
-    dp.add_error_handler(error)
-
-    # Start the Bot
-    updater.start_polling()
-
-    updater.idle()
-
-
-if __name__ == "__main__":
-    main()

common/MarketData.py

@@ -0,0 +1,269 @@
+import datetime as dt
+import logging
+import os
+from typing import Dict
+
+import pandas as pd
+import pytz
+import requests as r
+import schedule
+
+from common.Symbol import Stock
+
+log = logging.getLogger(__name__)
+
+
+class MarketData:
+    """
+    Functions for finding stock market information about symbols from MarkData.app
+    """
+
+    SYMBOL_REGEX = "[$]([a-zA-Z]{1,4})"
+
+    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
+
+        Parameters
+        ----------
+        MARKETDATA_TOKEN : str
+            MarketData.app API Token
+        """
+
+        try:
+            self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
+
+            if self.MARKETDATA_TOKEN == "TOKEN":
+                self.MARKETDATA_TOKEN = ""
+        except KeyError:
+            self.MARKETDATA_TOKEN = ""
+            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)
+
+    def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
+        url = "https://api.marketdata.app/v1/" + endpoint
+
+        # set token param if it wasn't passed.
+        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)
+
+        # Make sure API returned a proper status code
+        try:
+            resp.raise_for_status()
+        except r.exceptions.HTTPError as e:
+            logging.error(e)
+            return {}
+
+        # Make sure API returned valid JSON
+        try:
+            resp_json = resp.json()
+
+            match resp_json["s"]:
+                case "ok":
+                    return resp_json
+                case "no_data":
+                    return resp_json
+                case "error":
+                    logging.error("MarketData Error:\n" + resp_json["errmsg"])
+                    return {}
+
+        except r.exceptions.JSONDecodeError as e:
+            logging.error(e)
+
+        return {}
+
+    def clear_charts(self) -> None:
+        """
+        Clears cache of chart data.
+        Charts are cached so that only 1 API call per 24 hours is needed since the
+            chart data is expensive and a large download.
+        """
+        self.charts = {}
+
+    def status(self) -> str:
+        # TODO: At the moment this API is poorly documented, this function likely needs to be revisited later.
+
+        try:
+            status = r.get(
+                "https://stats.uptimerobot.com/api/getMonitorList/6Kv3zIow0A",
+                timeout=5,
+            )
+            status.raise_for_status()
+        except r.HTTPError:
+            return f"API returned an HTTP error code {status.status_code} in {status.elapsed.total_seconds()} seconds."
+        except r.Timeout:
+            return "API timed out before it was able to give status. This is likely due to a surge in usage or a complete outage."
+
+        statusJSON = status.json()
+
+        if statusJSON["status"] == "ok":
+            return (
+                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} seconds."
+            )
+        else:
+            return f"MarketData.app is currently reporting the following status: {statusJSON['status']}"
+
+    def price_reply(self, symbol: Stock) -> str:
+        """Returns price movement of Stock for the last market day, or after hours.
+
+        Parameters
+        ----------
+        symbol : Stock
+
+        Returns
+        -------
+        str
+            Formatted markdown
+        """
+
+        if quoteResp := self.get(f"stocks/quotes/{symbol}/"):
+            price = round(quoteResp["last"][0], 2)
+
+            try:
+                changePercent = round(quoteResp["changepct"][0], 2)
+            except TypeError:
+                return f"The price of {symbol} is {price}"
+
+            message = f"The current price of {symbol.name} is ${price} and "
+
+            if changePercent > 0.0:
+                message += f"is currently up {changePercent}% for the day."
+            elif changePercent < 0.0:
+                message += f"is currently down {changePercent}% for the day."
+            else:
+                message += "hasn't shown any movement for the day."
+
+            return message
+        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}/"):
+            try:
+                changePercent = round(quoteResp["changepct"][0], 2)
+                return f"`{symbol.tag}`: {changePercent}%"
+            except TypeError:
+                pass
+
+        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.
+
+        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
+
+        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={"from": startTime.timestamp(), "to": now.timestamp(), "extended": True},
+        ):
+            data.pop("s")
+            df = pd.DataFrame(data)
+            df["t"] = pd.to_datetime(df["t"], unit="s", utc=True)
+            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.
+
+        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")
+        from_date = (dt.datetime.today() - dt.timedelta(days=30)).strftime("%Y-%m-%d")
+        resultion = "daily"
+
+        if data := self.get(
+            f"stocks/candles/{resultion}/{symbol}",
+            params={
+                "from": from_date,
+                "to": to_date,
+            },
+        ):
+            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()

common/Symbol.py

@@ -27,23 +27,13 @@ class Symbol:
 
 
 class Stock(Symbol):
-    """Stock Market Object. Gets data from IEX Cloud"""
+    """Stock Market Object. Gets data from MarketData"""
 
-    def __init__(self, symbol: pd.DataFrame) -> None:
-        if len(symbol) > 1:
-            logging.info(f"Stock with shared id:\n\t{symbol.id}")
-            symbol = symbol.head(1)
-
-        self.symbol = symbol.symbol.values[0]
-        self.id = symbol.id.values[0]
-        self.name = symbol.name.values[0]
-        self.tag = symbol.type_id.values[0].upper()
-
-    def __init__(self):
-        self.symbol = "Placeholder"
-        self.id = "Placeholder"
-        self.name = "Placeholder"
-        self.tag = "Placeholder"
+    def __init__(self, symbol: str) -> None:
+        self.symbol = symbol
+        self.id = symbol
+        self.name = "$" + symbol.upper()
+        self.tag = "$" + symbol.lower()
 
 
 class Coin(Symbol):

common/cg_Crypto.py

@@ -1,17 +1,14 @@
-"""Class with functions for running the bot with IEX Cloud.
-"""
-
 import logging
-from datetime import datetime
-from logging import critical, debug, error, info, warning
-from typing import List, Optional, Tuple
+from typing import List
 
 import pandas as pd
 import requests as r
 import schedule
 from markdownify import markdownify
 
-from Symbol import Coin
+from common.Symbol import Coin
+
+log = logging.getLogger(__name__)
 
 
 class cg_Crypto:
@@ -21,29 +18,20 @@ class cg_Crypto:
 
     vs_currency = "usd"  # simple/supported_vs_currencies for list of options
 
-    searched_symbols = {}
-    trending_cache = None
+    trending_cache: List[str] = []
 
     def __init__(self) -> None:
-        """Creates a Symbol Object
-
-        Parameters
-        ----------
-        IEX_TOKEN : str
-            IEX Token
-        """
         self.get_symbol_list()
         schedule.every().day.do(self.get_symbol_list)
 
     def get(self, endpoint, params: dict = {}, timeout=10) -> dict:
-
         url = "https://api.coingecko.com/api/v3" + endpoint
         resp = r.get(url, params=params, timeout=timeout)
         # Make sure API returned a proper status code
         try:
             resp.raise_for_status()
         except r.exceptions.HTTPError as e:
-            logging.error(e)
+            log.error(e)
             return {}
 
         # Make sure API returned valid JSON
@@ -51,36 +39,27 @@ class cg_Crypto:
             resp_json = resp.json()
             return resp_json
         except r.exceptions.JSONDecodeError as e:
-            logging.error(e)
+            log.error(e)
             return {}
 
     def symbol_id(self, symbol) -> str:
         try:
-            return self.symbol_list[self.symbol_list["symbol"] == symbol]["id"].values[
-                0
-            ]
+            return self.symbol_list[self.symbol_list["symbol"] == symbol]["id"].values[0]
         except KeyError:
             return ""
 
-    def get_symbol_list(
-        self, return_df=False
-    ) -> Optional[Tuple[pd.DataFrame, datetime]]:
-
+    def get_symbol_list(self):
         raw_symbols = self.get("/coins/list")
         symbols = pd.DataFrame(data=raw_symbols)
 
         # Removes all binance-peg symbols
         symbols = symbols[~symbols["id"].str.contains("binance-peg")]
 
-        symbols["description"] = (
-            "$$" + symbols["symbol"].str.upper() + ": " + symbols["name"]
-        )
+        symbols["description"] = "$$" + symbols["symbol"].str.upper() + ": " + symbols["name"]
         symbols = symbols[["id", "symbol", "name", "description"]]
         symbols["type_id"] = "$$" + symbols["symbol"]
 
         self.symbol_list = symbols
-        if return_df:
-            return symbols, datetime.now()
 
     def status(self) -> str:
         """Checks CoinGecko /ping endpoint for API issues.
@@ -97,9 +76,11 @@ class cg_Crypto:
 
         try:
             status.raise_for_status()
-            return f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} Seconds."
-        except:
-            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} Seconds."
+            return (
+                f"CoinGecko API responded that it was OK with a {status.status_code} in {status.elapsed.total_seconds()} seconds."
+            )
+        except r.HTTPError:
+            return f"CoinGecko API returned an error code {status.status_code} in {status.elapsed.total_seconds()} seconds."
 
     def price_reply(self, coin: Coin) -> str:
         """Returns current market price or after hours if its available for a given coin symbol.
@@ -167,9 +148,7 @@ class cg_Crypto:
             f"/coins/{symbol.id}/ohlc",
             params={"vs_currency": self.vs_currency, "days": 1},
         ):
-            df = pd.DataFrame(
-                resp, columns=["Date", "Open", "High", "Low", "Close"]
-            ).dropna()
+            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
             df["Date"] = pd.to_datetime(df["Date"], unit="ms")
             df = df.set_index("Date")
             return df
@@ -195,9 +174,7 @@ class cg_Crypto:
             f"/coins/{symbol.id}/ohlc",
             params={"vs_currency": self.vs_currency, "days": 30},
         ):
-            df = pd.DataFrame(
-                resp, columns=["Date", "Open", "High", "Low", "Close"]
-            ).dropna()
+            df = pd.DataFrame(resp, columns=["Date", "Open", "High", "Low", "Close"]).dropna()
             df["Date"] = pd.to_datetime(df["Date"], unit="ms")
             df = df.set_index("Date")
             return df
@@ -223,7 +200,6 @@ class cg_Crypto:
                 "localization": "false",
             },
         ):
-
             return f"""
                 [{data['name']}]({data['links']['homepage'][0]}) Statistics:
                 Market Cap: ${data['market_data']['market_cap'][self.vs_currency]:,}
@@ -251,14 +227,14 @@ class cg_Crypto:
         """
 
         if resp := self.get(
-            f"/simple/price",
+            "/simple/price",
             params={
                 "ids": coin.id,
                 "vs_currencies": self.vs_currency,
                 "include_market_cap": "true",
             },
         ):
-            debug(resp)
+            log.debug(resp)
             try:
                 data = resp[coin.id]
 
@@ -270,7 +246,10 @@ class cg_Crypto:
             if cap == 0:
                 return f"The market cap for {coin.name} is not available for unknown reasons."
 
-            message = f"The current price of {coin.name} is $**{price:,}** and its market cap is $**{cap:,.2f}** {self.vs_currency.upper()}"
+            message = (
+                f"The current price of {coin.name} is $**{price:,}** and"
+                + " its market cap is $**{cap:,.2f}** {self.vs_currency.upper()}"
+            )
 
         else:
             message = f"The Coin: {coin.name} was not found or returned and error."
@@ -303,7 +282,7 @@ class cg_Crypto:
 
     def spark_reply(self, symbol: Coin) -> str:
         change = self.get(
-            f"/simple/price",
+            "/simple/price",
             params={
                 "ids": symbol.id,
                 "vs_currencies": self.vs_currency,
@@ -331,7 +310,7 @@ class cg_Crypto:
                 sym = c["symbol"].upper()
                 name = c["name"]
                 change = self.get(
-                    f"/simple/price",
+                    "/simple/price",
                     params={
                         "ids": c["id"],
                         "vs_currencies": self.vs_currency,
@@ -344,7 +323,7 @@ class cg_Crypto:
                 trending.append(msg)
 
         except Exception as e:
-            logging.warning(e)
+            log.warning(e)
             return self.trending_cache
 
         self.trending_cache = trending
@@ -365,7 +344,7 @@ class cg_Crypto:
         query = ",".join([c.id for c in coins])
 
         prices = self.get(
-            f"/simple/price",
+            "/simple/price",
             params={
                 "ids": query,
                 "vs_currencies": self.vs_currency,

common/symbol_router.py

@@ -5,24 +5,27 @@ import datetime
 import logging
 import random
 import re
-from logging import critical, debug, error, info, warning
 
 import pandas as pd
 import schedule
 from cachetools import TTLCache, cached
 
-from cg_Crypto import cg_Crypto
-from placeholder_Symbol import placeholder_Symbol
-from Symbol import Coin, Stock, Symbol
+from common.cg_Crypto import cg_Crypto
+from common.MarketData import MarketData
+from common.Symbol import Coin, Stock, Symbol
+
+from typing import Dict
+
+log = logging.getLogger(__name__)
 
 
 class Router:
     STOCK_REGEX = "(?:^|[^\\$])\\$([a-zA-Z.]{1,6})"
     CRYPTO_REGEX = "[$]{2}([a-zA-Z]{1,20})"
-    trending_count = {}
+    trending_count: Dict[str, float] = {}
 
     def __init__(self):
-        self.stock = placeholder_Symbol()
+        self.stock = MarketData()
         self.crypto = cg_Crypto()
 
         schedule.every().hour.do(self.trending_decay)
@@ -43,9 +46,9 @@ class Router:
             t_copy.pop(dead)
 
         self.trending_count = t_copy.copy()
-        info("Decayed trending symbols.")
+        log.info("Decayed trending symbols.")
 
-    def find_symbols(self, text: str, *, trending_weight: int = 1) -> list[Symbol]:
+    def find_symbols(self, text: str, *, trending_weight: int = 1) -> list[Stock | Symbol]:
         """Finds stock tickers starting with a dollar sign, and cryptocurrencies with two dollar signs
         in a blob of text and returns them in a list.
 
@@ -61,29 +64,25 @@ class Router:
         """
         schedule.run_pending()
 
-        symbols = []
-        if re.findall(self.STOCK_REGEX, text):
-            symbols.append(Stock())
+        symbols: list[Symbol] = []
+        stocks = set(re.findall(self.STOCK_REGEX, text))
+        for stock in stocks:
+            # Market data lacks tools to check if a symbol is valid.
+            symbols.append(Stock(stock))
 
         coins = set(re.findall(self.CRYPTO_REGEX, text))
         for coin in coins:
-            sym = self.crypto.symbol_list[
-                self.crypto.symbol_list["symbol"].str.fullmatch(
-                    coin.lower(), case=False
-                )
-            ]
-            if ~sym.empty:
-                symbols.append(Coin(sym))
+            sym = self.crypto.symbol_list[self.crypto.symbol_list["symbol"].str.fullmatch(coin.lower(), case=False)]
+            if sym.empty:
+                log.info(f"{coin} is not in list of coins")
             else:
-                info(f"{coin} is not in list of coins")
+                symbols.append(Coin(sym))
         if symbols:
-            info(symbols)
             for symbol in symbols:
-                self.trending_count[symbol.tag] = (
-                    self.trending_count.get(symbol.tag, 0) + trending_weight
-                )
+                self.trending_count[symbol.tag] = self.trending_count.get(symbol.tag, 0) + trending_weight
+                log.debug(self.trending_count)
 
-            return symbols
+        return symbols
 
     def status(self, bot_resp) -> str:
         """Checks for any issues with APIs.
@@ -105,7 +104,7 @@ class Router:
         {self.crypto.status()}
         """
 
-        warning(stats)
+        log.warning(stats)
 
         return stats
 
@@ -124,11 +123,12 @@ class Router:
             Each tuple contains: (Symbol, Issue Name).
         """
 
-        df = pd.concat([self.stock.symbol_list, self.crypto.symbol_list])
+        # df = pd.concat([self.stock.symbol_list, self.crypto.symbol_list])
+        df = self.crypto.symbol_list
 
-        df = df[
-            df["description"].str.contains(search, regex=False, case=False)
-        ].sort_values(by="type_id", key=lambda x: x.str.len())
+        df = df[df["description"].str.contains(search, regex=False, case=False)].sort_values(
+            by="type_id", key=lambda x: x.str.len()
+        )
 
         symbols = df.head(matches)
         symbols["price_reply"] = symbols["type_id"].apply(
@@ -154,67 +154,13 @@ class Router:
         replies = []
 
         for symbol in symbols:
-            info(symbol)
+            log.info(symbol)
             if isinstance(symbol, Stock):
                 replies.append(self.stock.price_reply(symbol))
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.price_reply(symbol))
             else:
-                info(f"{symbol} is not a Stock or Coin")
-
-        return replies
-
-    def dividend_reply(self, symbols: list) -> list[str]:
-        """Returns the most recent, or next dividend date for a stock symbol.
-
-        Parameters
-        ----------
-        symbols : list
-            List of stock symbols.
-
-        Returns
-        -------
-        Dict[str, str]
-            Each symbol passed in is a key with its value being a human readable
-                formatted string of the symbols div dates.
-        """
-        replies = []
-        for symbol in symbols:
-            if isinstance(symbol, Stock):
-                replies.append(self.stock.dividend_reply(symbol))
-            elif isinstance(symbol, Coin):
-                replies.append("Cryptocurrencies do no have Dividends.")
-            else:
-                debug(f"{symbol} is not a Stock or Coin")
-
-        return replies
-
-    def news_reply(self, symbols: list) -> list[str]:
-        """Gets recent english news on stock symbols.
-
-        Parameters
-        ----------
-        symbols : list
-            List of stock symbols.
-
-        Returns
-        -------
-        Dict[str, str]
-            Each symbol passed in is a key with its value being a human
-                readable markdown formatted string of the symbols news.
-        """
-        replies = []
-
-        for symbol in symbols:
-            if isinstance(symbol, Stock):
-                replies.append(self.stock.news_reply(symbol))
-            elif isinstance(symbol, Coin):
-                # replies.append(self.crypto.news_reply(symbol))
-                replies.append(
-                    "News is not yet supported for cryptocurrencies. If you have any suggestions for news sources please contatct @MisterBiggs"
-                )
-            else:
-                debug(f"{symbol} is not a Stock or Coin")
+                log.info(f"{symbol} is not a Stock or Coin")
 
         return replies
 
@@ -240,7 +186,7 @@ class Router:
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.info_reply(symbol))
             else:
-                debug(f"{symbol} is not a Stock or Coin")
+                log.debug(f"{symbol} is not a Stock or Coin")
 
         return replies
 
@@ -264,7 +210,7 @@ class Router:
         elif isinstance(symbol, Coin):
             return self.crypto.intra_reply(symbol)
         else:
-            debug(f"{symbol} is not a Stock or Coin")
+            log.debug(f"{symbol} is not a Stock or Coin")
             return pd.DataFrame()
 
     def chart_reply(self, symbol: Symbol) -> pd.DataFrame:
@@ -287,7 +233,7 @@ class Router:
         elif isinstance(symbol, Coin):
             return self.crypto.chart_reply(symbol)
         else:
-            debug(f"{symbol} is not a Stock or Coin")
+            log.debug(f"{symbol} is not a Stock or Coin")
             return pd.DataFrame()
 
     def stat_reply(self, symbols: list[Symbol]) -> list[str]:
@@ -312,7 +258,7 @@ class Router:
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.stat_reply(symbol))
             else:
-                debug(f"{symbol} is not a Stock or Coin")
+                log.debug(f"{symbol} is not a Stock or Coin")
 
         return replies
 
@@ -338,7 +284,7 @@ class Router:
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.cap_reply(symbol))
             else:
-                debug(f"{symbol} is not a Stock or Coin")
+                log.debug(f"{symbol} is not a Stock or Coin")
 
         return replies
 
@@ -363,7 +309,7 @@ class Router:
             elif isinstance(symbol, Coin):
                 replies.append(self.crypto.spark_reply(symbol))
             else:
-                debug(f"{symbol} is not a Stock or Coin")
+                log.debug(f"{symbol} is not a Stock or Coin")
 
         return replies
 
@@ -377,32 +323,24 @@ 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]
-
+            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"
+            reply += "\n\n🦎Trending on CoinGecko:\n`"
+            reply += "━" * len("Trending on CoinGecko:") + "`\n"
             for coin in coins:
                 reply += coin + "\n"
 
@@ -412,18 +350,13 @@ class Router:
         if reply:
             return reply
         else:
-            warning("Failed to collect trending data.")
+            log.warning("Failed to collect trending data.")
             return "Trending data is not currently available."
 
     def random_pick(self) -> str:
-
-        choice = random.choice(
-            list(self.stock.symbol_list["description"])
-            + list(self.crypto.symbol_list["description"])
-        )
-        hold = (
-            datetime.date.today() + datetime.timedelta(random.randint(1, 365))
-        ).strftime("%b %d, %Y")
+        # choice = random.choice(list(self.stock.symbol_list["description"]) + list(self.crypto.symbol_list["description"]))
+        choice = random.choice(list(self.crypto.symbol_list["description"]))
+        hold = (datetime.date.today() + datetime.timedelta(random.randint(1, 365))).strftime("%b %d, %Y")
 
         return f"{choice}\nBuy and hold until: {hold}"
 
@@ -451,10 +384,9 @@ class Router:
             elif isinstance(symbol, Coin):
                 coins.append(symbol)
             else:
-                debug(f"{symbol} is not a Stock or Coin")
+                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

@@ -0,0 +1,9 @@
+-r telegram/requirements.txt
+black==23.7.0
+flake8==6.1.0
+Flake8-pyproject==1.2.3
+pylama==8.4.1
+mypy==1.5.1
+types-cachetools==5.3.0.6
+types-pytz==2023.3.0.1
+ruff==0.0.287

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,17 +1,18 @@
-FROM python:3.9-buster AS builder
+FROM python:3.11-buster AS builder
 
 
-COPY requirements.txt /requirements.txt
+COPY discord/requirements.txt .
+
 RUN pip install --user -r requirements.txt
 
 
-FROM python:3.9-slim
+FROM python:3.11-slim
 
 ENV MPLBACKEND=Agg
 
 COPY --from=builder /root/.local /root/.local
 
-
-COPY . .
+COPY common common
+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*10:.4f} seconds") + "\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

@@ -1,6 +1,6 @@
-python-telegram-bot==13.5
+nextcord==2.4.2
 requests==2.25.1
-pandas==1.2.1
+pandas==2.0.0
 schedule==1.0.0
 mplfinance==0.12.7a5
 markdownify==0.6.5

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

placeholder_Symbol.py

@@ -1,158 +0,0 @@
-"""Class with functions for running the bot with IEX Cloud.
-"""
-
-import logging
-
-import pandas as pd
-
-from Symbol import Stock
-
-
-class placeholder_Symbol:
-    """
-    Functions for finding stock market information about symbols.
-    """
-
-    placeholder_message = """
-    Due to increased costs for market data from IEX Cloud, a new provider will be required for the bot to have stock market data. Until then only cryptocurrency data will be available on the bot.
-    *Track this issue here:* https://t.me/simplestockbotnews
-    """
-
-    def __init__(self) -> None:
-        """Creates a placeholder Symbol Object"""
-
-        logging.warning("Creating a placeholder Symbol.")
-
-    def status(self) -> str:
-        """Checks IEX Status dashboard for any current API issues.
-
-        Returns
-        -------
-        str
-            Human readable text on status of stock market data
-        """
-
-        return self.placeholder_message
-
-    def price_reply(self, symbol: Stock) -> str:
-        """Returns price movement of Stock for the last market day, or after hours.
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-
-        return self.placeholder_message
-
-    def dividend_reply(self, symbol: Stock) -> str:
-        """Returns the most recent, or next dividend date for a stock symbol.
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        return self.placeholder_message
-
-    def news_reply(self, symbol: Stock) -> str:
-        """Gets most recent, english, non-paywalled news
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        return self.placeholder_message
-
-    def info_reply(self, symbol: Stock) -> str:
-        """Gets description for Stock
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted text
-        """
-        return self.placeholder_message
-
-    def stat_reply(self, symbol: Stock) -> str:
-        """Key statistics on a Stock
-
-        Parameters
-        ----------
-        symbol : Stock
-
-        Returns
-        -------
-        str
-            Formatted markdown
-        """
-        return self.placeholder_message
-
-    def cap_reply(self, symbol: Stock) -> str:
-        """Get the Market Cap of a stock"""
-
-        return self.placeholder_message
-
-    def intra_reply(self, symbol: Stock) -> pd.DataFrame:
-        """Returns price data for a symbol since the last market open.
-
-        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.
-        """
-
-        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.
-
-        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.
-        """
-
-        return pd.DataFrame()
-
-    def spark_reply(self, symbol: Stock) -> str:
-        return ""
-
-    def trending(self) -> list[str]:
-        """Gets current coins trending on IEX. Only returns when market is open.
-
-        Returns
-        -------
-        list[str]
-            list of $ID: NAME, CHANGE%
-        """
-
-        return [self.placeholder_message]

pyproject.toml

@@ -0,0 +1,11 @@
+[tool.black]
+line-length = 130
+
+[tool.flake8]
+max-line-length = 130
+
+[tool.pycodestyle]
+max_line_length = 130
+
+[tool.ruff]
+line-length = 130

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

@@ -10,14 +10,14 @@ class T_info:
     license = re.sub(
         r"\b\n",
         " ",
-        r.get(
-            "https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot/-/raw/master/LICENSE"
-        ).text,
+        r.get("https://gitlab.com/simple-stock-bots/simple-telegram-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=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)
@@ -28,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).
     """
@@ -49,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

@@ -0,0 +1,457 @@
+# Works with Python 3.8
+import datetime
+import html
+import io
+import json
+import logging
+import os
+import random
+import string
+import traceback
+from uuid import uuid4
+
+import mplfinance as mpf
+import telegram
+from telegram import (
+    InlineQueryResultArticle,
+    InputTextMessageContent,
+    LabeledPrice,
+    Update,
+)
+
+from telegram.ext import (
+    Application,
+    CommandHandler,
+    InlineQueryHandler,
+    PreCheckoutQueryHandler,
+    MessageHandler,
+    filters,
+    ContextTypes,
+)
+
+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)
+
+# set higher logging level for httpx to avoid all GET and POST requests being logged
+logging.getLogger("httpx").setLevel(logging.WARNING)
+
+log = logging.getLogger(__name__)
+
+TELEGRAM_TOKEN = os.environ["TELEGRAM"]
+
+try:
+    STRIPE_TOKEN = os.environ["STRIPE"]
+except KeyError:
+    STRIPE_TOKEN = ""
+    log.warning("Starting without a STRIPE Token will not allow you to accept Donations!")
+
+s = Router()
+t = T_info()
+
+
+log.info("Bot script started.")
+
+
+async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Send help text when the command /start is issued."""
+    log.info(f"Start command ran by {update.message.chat.username}")
+    await update.message.reply_text(
+        text=t.help_text,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def help(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Send help text when the command /help is issued."""
+    log.info(f"Help command ran by {update.message.chat.username}")
+    await update.message.reply_text(
+        text=t.help_text,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def license(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Send bots license when the /license command is issued."""
+    log.info(f"License command ran by {update.message.chat.username}")
+    await update.message.reply_text(
+        text=t.license,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def status(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Gather status of bot and dependant services and return important status updates."""
+    log.warning(f"Status command ran by {update.message.chat.username}")
+    bot_resp_time = datetime.datetime.now(update.message.date.tzinfo) - update.message.date
+
+    bot_status = s.status(f"It took {bot_resp_time.total_seconds()} seconds for the bot to get your message.")
+
+    await update.message.reply_text(
+        text=bot_status,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+    )
+
+
+async def donate(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Sets up donation."""
+    log.info(f"Donate command ran by {update.message.chat.username}")
+    chat_id = update.message.chat_id
+
+    if update.message.text.strip() == "/donate" or "/donate@" in update.message.text:
+        await update.message.reply_text(
+            text=t.donate_text,
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
+            disable_notification=True,
+        )
+        amount = 1.0
+    else:
+        amount = float(update.message.text.replace("/donate", "").replace("$", "").strip())
+
+    try:
+        price = int(amount * 100)
+    except ValueError:
+        await update.message.reply_text(f"{amount} is not a valid donation amount or number.")
+        return
+    log.info(f"Donation amount: {price} by {update.message.chat.username}")
+
+    await context.bot.send_invoice(
+        chat_id=chat_id,
+        title="Simple Stock Bot Donation",
+        description=f"Simple Stock Bot Donation of ${amount} by {update.message.chat.username}",
+        payload=f"simple-stock-bot-{chat_id}",
+        provider_token=STRIPE_TOKEN,
+        currency="USD",
+        prices=[LabeledPrice("Donation:", price)],
+        start_parameter="",
+        # suggested_tip_amounts=[100, 500, 1000, 2000],
+        photo_url="https://simple-stock-bots.gitlab.io/docs/img/Telegram.png",
+        photo_width=500,
+        photo_height=500,
+    )
+
+
+async def precheckout_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Approves donation"""
+    log.info("precheckout_callback queried")
+    query = update.pre_checkout_query
+
+    await query.answer(ok=True)
+    # I dont think I need to check since its only donations.
+    # if query.invoice_payload == "simple-stock-bot":
+    #     # answer False pre_checkout_query
+    #     await query.answer(ok=True)
+    # else:
+    #     await query.answer(ok=False, error_message="Something went wrong...")
+
+
+async def successful_payment_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Thanks user for donation"""
+    log.info("Successful payment!")
+    await update.message.reply_text("Thank you for your donation! It goes a long way to keeping the bot free!")
+
+
+async def symbol_detect_image(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """
+    Makes image captions into text then passes the `update` and `context`
+        to symbol detect so that it can reply cashtags in image captions.
+    """
+    try:
+        if update.message.caption:
+            update.message.text = update.message.caption
+            await symbol_detect(update, context)
+    except AttributeError:
+        return
+
+
+async def symbol_detect(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """
+    Runs on any message that doesn't have a command and searches for cashtags,
+        then returns the prices of any symbols found.
+    """
+    try:
+        message = update.message.text
+        chat_id = update.message.chat_id
+        if "$" in message:
+            symbols = s.find_symbols(message)
+            log.info("Looking for Symbols")
+        else:
+            return
+    except AttributeError as ex:
+        log.info(ex)
+        return
+    if symbols:
+        # Let user know bot is working
+        await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
+        log.info(f"Symbols found: {symbols}")
+
+        for reply in s.price_reply(symbols):
+            await update.message.reply_text(
+                text=reply,
+                parse_mode=telegram.constants.ParseMode.MARKDOWN,
+                disable_notification=True,
+            )
+
+
+async def intra(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """returns a chart of intraday data for a symbol"""
+    log.info(f"Intra command ran by {update.message.chat.username}")
+
+    message = update.message.text
+    chat_id = update.message.chat_id
+
+    if message.strip().split("@")[0] == "/intra":
+        await update.message.reply_text(
+            "This command returns a chart of the stocks movement since the most recent market open.\nExample: /intra $tsla"
+        )
+        return
+
+    symbols = s.find_symbols(message, trending_weight=5)
+    symbol = symbols[0]
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await update.message.reply_text("No symbols or coins found.")
+        return
+
+    df = s.intra_reply(symbol)
+    if df.empty:
+        await update.message.reply_text(
+            text="Invalid symbol please see `/help` for usage details.",
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
+            disable_notification=True,
+        )
+        return
+
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
+
+    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)
+
+    await 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 %Z')}"
+        + f"\n\n{s.price_reply([symbol])[0]}",
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def chart(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """returns a chart of the past month of data for a symbol"""
+    log.info(f"Chart command ran by {update.message.chat.username}")
+
+    message = update.message.text
+    chat_id = update.message.chat_id
+
+    if message.strip().split("@")[0] == "/chart":
+        await update.message.reply_text(
+            "This command returns a chart of the stocks movement for the past month.\nExample: /chart $tsla"
+        )
+        return
+
+    symbols = s.find_symbols(message, trending_weight=10)
+
+    if len(symbols):
+        symbol = symbols[0]
+    else:
+        await update.message.reply_text("No symbols or coins found.")
+        return
+
+    df = s.chart_reply(symbol)
+    if df.empty:
+        await update.message.reply_text(
+            text="Invalid symbol please see `/help` for usage details.",
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
+            disable_notification=True,
+        )
+        return
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.UPLOAD_PHOTO)
+
+    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)
+
+    await update.message.reply_photo(
+        photo=buf,
+        caption=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')}\n\n{s.price_reply([symbol])[0]}",
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def trending(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """returns currently trending symbols and how much they've moved in the past trading day."""
+    log.info(f"Trending command ran by {update.message.chat.username}")
+
+    chat_id = update.message.chat_id
+
+    await context.bot.send_chat_action(chat_id=chat_id, action=telegram.constants.ChatAction.TYPING)
+
+    trending_list = s.trending()
+
+    await update.message.reply_text(
+        text=trending_list,
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    """
+    Handles inline query. Searches by looking if query is contained
+        in the symbol and returns matches in alphabetical order.
+    """
+
+    if not update.inline_query.query:
+        return
+
+    print(f"Query: {update.inline_query.query}")
+
+    ignored_queries = {"$", "$$", " ", ""}
+
+    if update.inline_query.query.strip() in ignored_queries:
+        default_message = """
+        You can type:\n@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.
+        """
+
+        await update.inline_query.answer(
+            [
+                InlineQueryResultArticle(
+                    str(uuid4()),
+                    title="Please enter a query. It can be a ticker or a name of a company.",
+                    input_message_content=InputTextMessageContent(
+                        default_message, parse_mode=telegram.constants.ParseMode.MARKDOWN
+                    ),
+                )
+            ]
+        )
+
+    matches = s.inline_search(update.inline_query.query)
+
+    results = []
+    for _, row in matches.iterrows():
+        results.append(
+            InlineQueryResultArticle(
+                str(uuid4()),
+                title=row["description"],
+                input_message_content=InputTextMessageContent(
+                    row["price_reply"], parse_mode=telegram.constants.ParseMode.MARKDOWN
+                ),
+            )
+        )
+
+        if len(results) == 5:
+            await update.inline_query.answer(results, cache_time=60 * 60)
+            log.info("Inline Command was successful")
+            return
+    await update.inline_query.answer(results)
+
+
+async def rand_pick(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """For the gamblers. Returns a random symbol to buy and a sell date"""
+    log.info(f"Someone is gambling! Random_pick command ran by {update.message.chat.username}")
+
+    await update.message.reply_text(
+        text=s.random_pick(),
+        parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        disable_notification=True,
+    )
+
+
+async def error(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """Log Errors caused by Updates."""
+    log.warning('Update "%s" caused error "%s"', update, error)
+
+    tb_list = traceback.format_exception(None, context.error, context.error.__traceback__)
+    tb_string = "".join(tb_list)
+
+    err_code = "".join([random.choice(string.ascii_lowercase) for i in range(5)])
+    log.warning(f"Logging error: {err_code}")
+
+    if update:
+        log.warning(
+            f"An exception was raised while handling an update\n"
+            f"\tupdate = {html.escape(json.dumps(update.to_dict(), indent=2, ensure_ascii=False))}\n"
+            f"\tcontext.chat_data = {str(context.chat_data)}\n"
+            f"\tcontext.user_data = {str(context.user_data)}\n"
+            f"\t{html.escape(tb_string)}"
+        )
+
+        await update.message.reply_text(
+            text=f"An error has occured. Please inform @MisterBiggs if the error persists. Error Code: `{err_code}`",
+            parse_mode=telegram.constants.ParseMode.MARKDOWN,
+        )
+    else:
+        log.warning("No message to send to user.")
+        log.warning(tb_string)
+
+
+def main():
+    """Start the context.bot."""
+    # Create the EventHandler and pass it your bot's token.
+    application = Application.builder().token(TELEGRAM_TOKEN).build()
+
+    # on different commands - answer in Telegram
+    application.add_handler(CommandHandler("start", start))
+    application.add_handler(CommandHandler("help", help))
+    application.add_handler(CommandHandler("license", license))
+    application.add_handler(CommandHandler("trending", trending))
+    application.add_handler(CommandHandler("random", rand_pick))
+    application.add_handler(CommandHandler("donate", donate))
+    application.add_handler(CommandHandler("status", status))
+    application.add_handler(CommandHandler("inline", inline_query))
+
+    # Charting can be slow so they run async.
+    application.add_handler(CommandHandler("intra", intra, block=False))
+    application.add_handler(CommandHandler("intraday", intra, block=False))
+    application.add_handler(CommandHandler("day", intra, block=False))
+    application.add_handler(CommandHandler("chart", chart, block=False))
+    application.add_handler(CommandHandler("month", chart, block=False))
+
+    # on noncommand i.e message - echo the message on Telegram
+    application.add_handler(MessageHandler(filters.TEXT, symbol_detect))
+    application.add_handler(MessageHandler(filters.PHOTO, symbol_detect_image))
+
+    # Inline Bot commands
+    application.add_handler(InlineQueryHandler(inline_query))
+
+    # Pre-checkout handler to final check
+    application.add_handler(PreCheckoutQueryHandler(precheckout_callback))
+
+    # Payment success
+    application.add_handler(MessageHandler(filters.SUCCESSFUL_PAYMENT, successful_payment_callback))
+
+    # log all errors
+    application.add_error_handler(error)
+
+    # Start the Bot
+    application.run_polling(allowed_updates=Update.ALL_TYPES)
+
+
+if __name__ == "__main__":
+    main()

telegram/requirements.txt

@@ -0,0 +1,7 @@
+python-telegram-bot==20.5
+requests==2.31.0
+pandas==2.1.0
+schedule==1.2.0
+mplfinance==0.12.10b0
+markdownify==0.11.6
+cachetools==5.3.1