first pass at setting up app.json

.gitignore

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

.gitlab-ci.yml

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

Dockerfile

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

MarketData.py

@@ -1,14 +1,13 @@
-import datetime as dt
 import logging
 import os
+import datetime as dt
 from typing import Dict
 
 import pandas as pd
-import pytz
 import requests as r
 import schedule
 
-from common.Symbol import Stock
+from Symbol import Stock
 
 log = logging.getLogger(__name__)
 
@@ -22,9 +21,6 @@ class MarketData:
 
     charts: Dict[Stock, pd.DataFrame] = {}
 
-    openTime = dt.time(hour=9, minute=30, second=0)
-    marketTimeZone = pytz.timezone("US/Eastern")
-
     def __init__(self) -> None:
         """Creates a Symbol Object
 
@@ -33,7 +29,6 @@ class MarketData:
         MARKETDATA_TOKEN : str
             MarketData.app API Token
         """
-
         try:
             self.MARKETDATA_TOKEN = os.environ["MARKETDATA"]
 
@@ -42,8 +37,6 @@ class MarketData:
         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)
@@ -52,11 +45,7 @@ class MarketData:
         url = "https://api.marketdata.app/v1/" + endpoint
 
         # set token param if it wasn't passed.
-        params["token"] = self.MARKETDATA_TOKEN
+        params["token"] = params.get("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)
 
@@ -175,21 +164,18 @@ class MarketData:
         except KeyError:
             pass
 
-        resolution = "15"  # minutes
+        resolution = "5"  # 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},
+            params={
+                "from": dt.datetime.now().strftime("%Y-%m-%d"),
+                "to": dt.datetime.now().isoformat(),
+            },
         ):
             data.pop("s")
             df = pd.DataFrame(data)
-            df["t"] = pd.to_datetime(df["t"], unit="s", utc=True)
+            df["t"] = pd.to_datetime(df["t"], unit="s")
             df.set_index("t", inplace=True)
 
             df.rename(

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 [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo).
+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 [Market Data](https://www.marketdata.app/).
 
 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)
-  - [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=repo)
+  - [Market Data](https://www.marketdata.app/)

T_info.py

@@ -16,8 +16,6 @@ class T_info:
     help_text = """
 Thanks for using this bot, consider supporting it by [buying me a beer.](https://www.buymeacoffee.com/Anson)
 
-If you are interested in stock market data, or want to host your own bot, be sure to use my affiliate link so that the bot can stay free: [marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram)
-
 Keep up with the latest news for the bot in its Telegram Channel: https://t.me/simplestockbotnews
 
 Full documentation on using and running your own stock bot can be found on the bots [docs.](https://docs.simplestockbot.com)
@@ -36,7 +34,7 @@ Simply calling a symbol in any message that the bot can see will also return the
 **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=telegram)
+    Market data is provided by [Market Data](https://www.marketdata.app/)
 
     If you believe the bot is not behaving properly run `/status` or [get in touch](https://docs.simplestockbot.com/contact).
     """
@@ -44,22 +42,27 @@ 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
-[marketdata.app](https://dashboard.marketdata.app/marketdata/aff/go/misterbiggs?keyword=telegram).
+[Market Data](https://www.marketdata.app/).
 
 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 = """ # Not used by the bot but for updating commands with BotFather
+commands = """
 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

app.json

@@ -0,0 +1,26 @@
+{
+    "name": "Simple Stock Bot: Telegram",
+    "description": "Deploy the Telegram version of the Simple Stock Bot to Heroku",
+    "keywords": [
+        "stock",
+        "telegram",
+        "chat bot"
+    ],
+    "website": "https://simplestockbot.com/",
+    "repository": "https://gitlab.com/simple-stock-bots/simple-telegram-stock-bot",
+    "logo": "https://gitlab.com/uploads/-/system/project/avatar/10295651/TelegramLogo.jpg",
+    "env": {
+        "TELEGRAM": {
+            "description": "Telegram API key.",
+            "required": true
+        },
+        "MARKETDATA": {
+            "description": "(https://www.marketdata.app/ API key.",
+            "required": false
+        },
+        "STRIPE": {
+            "description": "Optional, API key for stripe integration.",
+            "required": false
+        }
+    }
+}

bot.py

@@ -28,7 +28,7 @@ from telegram.ext import (
     Updater,
 )
 
-from common.symbol_router import Router
+from symbol_router import Router
 from T_info import T_info
 
 # Enable logging
@@ -156,12 +156,9 @@ 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.
     """
-    try:
     if update.message.caption:
         update.message.text = update.message.caption
         symbol_detect(update, context)
-    except AttributeError:
-        return
 
 
 def symbol_detect(update: Update, context: CallbackContext):
@@ -240,7 +237,7 @@ def intra(update: Update, context: CallbackContext):
     update.message.reply_photo(
         photo=buf,
         caption=f"\nIntraday chart for {symbol.name} from {df.first_valid_index().strftime('%d %b at %H:%M')} to"
-        + f" {df.last_valid_index().strftime('%d %b at %H:%M %Z')}"
+        + 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,

cg_Crypto.py

@@ -6,7 +6,7 @@ import requests as r
 import schedule
 from markdownify import markdownify
 
-from common.Symbol import Coin
+from Symbol import Coin
 
 log = logging.getLogger(__name__)
 

dev-reqs.txt

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

discord/D_info.py

@@ -1,65 +0,0 @@
-"""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/bot.py

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

discord/requirements.txt

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

docker-compose.yaml

@@ -1,13 +0,0 @@
-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

symbol_router.py

@@ -10,9 +10,9 @@ import pandas as pd
 import schedule
 from cachetools import TTLCache, cached
 
-from common.cg_Crypto import cg_Crypto
+from cg_Crypto import cg_Crypto
-from common.MarketData import MarketData
+from MarketData import MarketData
-from common.Symbol import Coin, Stock, Symbol
+from Symbol import Coin, Stock, Symbol
 
 from typing import Dict
 
@@ -80,7 +80,7 @@ class Router:
         if symbols:
             for symbol in symbols:
                 self.trending_count[symbol.tag] = self.trending_count.get(symbol.tag, 0) + trending_weight
-                log.debug(self.trending_count)
+                log.warning(self.trending_count)
 
         return symbols
 

telegram/Dockerfile

@@ -1,21 +0,0 @@
-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" ]