mirror of
https://gitlab.com/simple-stock-bots/simple-stock-bot.git
synced 2025-06-16 15:17:28 +00:00
updated all packages to newest versions
This commit is contained in:
parent
e1ff4a3d56
commit
f213f1e7e7
37
bot.py
37
bot.py
@ -1,4 +1,4 @@
|
|||||||
# Works with Python 3.7
|
# Works with Python 3.8
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@ -15,7 +15,6 @@ from telegram.ext import (
|
|||||||
from functions import Symbol
|
from functions import Symbol
|
||||||
|
|
||||||
TELEGRAM_TOKEN = os.environ["TELEGRAM"]
|
TELEGRAM_TOKEN = os.environ["TELEGRAM"]
|
||||||
|
|
||||||
IEX_TOKEN = os.environ["IEX"]
|
IEX_TOKEN = os.environ["IEX"]
|
||||||
|
|
||||||
s = Symbol(IEX_TOKEN)
|
s = Symbol(IEX_TOKEN)
|
||||||
@ -28,20 +27,18 @@ logger = logging.getLogger(__name__)
|
|||||||
print("Bot Online")
|
print("Bot Online")
|
||||||
|
|
||||||
|
|
||||||
# Define a few command handlers. These usually take the two arguments bot and
|
def start(update, context):
|
||||||
# update. Error handlers also receive the raised TelegramError object in error.
|
|
||||||
def start(bot, update):
|
|
||||||
"""Send a message when the command /start is issued."""
|
"""Send a message when the command /start is issued."""
|
||||||
update.message.reply_text("I am started and ready to go!")
|
update.message.reply_text("I am started and ready to go!")
|
||||||
|
|
||||||
|
|
||||||
def help(bot, update):
|
def help(update, context):
|
||||||
"""Send link to docs when the command /help is issued."""
|
"""Send link to docs when the command /help is issued."""
|
||||||
message = "[Please see the documentaion for Bot information](https://simple-stock-bots.gitlab.io/site/telegram/)"
|
message = "[Please see the documentaion for Bot information](https://simple-stock-bots.gitlab.io/site/telegram/)"
|
||||||
update.message.reply_text(text=message, parse_mode=telegram.ParseMode.MARKDOWN)
|
update.message.reply_text(text=message, parse_mode=telegram.ParseMode.MARKDOWN)
|
||||||
|
|
||||||
|
|
||||||
def symbol_detect(bot, update):
|
def symbol_detect(update, context):
|
||||||
"""
|
"""
|
||||||
Runs on any message that doesn't have a command and searches for symbols, then returns the prices of any symbols found.
|
Runs on any message that doesn't have a command and searches for symbols, then returns the prices of any symbols found.
|
||||||
"""
|
"""
|
||||||
@ -51,7 +48,7 @@ def symbol_detect(bot, update):
|
|||||||
|
|
||||||
if symbols:
|
if symbols:
|
||||||
# Let user know bot is working
|
# Let user know bot is working
|
||||||
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
||||||
|
|
||||||
for reply in s.price_reply(symbols).items():
|
for reply in s.price_reply(symbols).items():
|
||||||
|
|
||||||
@ -60,7 +57,7 @@ def symbol_detect(bot, update):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def dividend(bot, update):
|
def dividend(update, context):
|
||||||
"""
|
"""
|
||||||
waits for /dividend or /div command and then finds dividend info on that symbol.
|
waits for /dividend or /div command and then finds dividend info on that symbol.
|
||||||
"""
|
"""
|
||||||
@ -69,7 +66,7 @@ def dividend(bot, update):
|
|||||||
symbols = s.find_symbols(message)
|
symbols = s.find_symbols(message)
|
||||||
|
|
||||||
if symbols:
|
if symbols:
|
||||||
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
||||||
|
|
||||||
for reply in s.symbol_name(symbols).items():
|
for reply in s.symbol_name(symbols).items():
|
||||||
|
|
||||||
@ -78,7 +75,7 @@ def dividend(bot, update):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def news(bot, update):
|
def news(update, context):
|
||||||
"""
|
"""
|
||||||
waits for /news command and then finds news info on that symbol.
|
waits for /news command and then finds news info on that symbol.
|
||||||
"""
|
"""
|
||||||
@ -87,7 +84,7 @@ def news(bot, update):
|
|||||||
symbols = s.find_symbols(message)
|
symbols = s.find_symbols(message)
|
||||||
|
|
||||||
if symbols:
|
if symbols:
|
||||||
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
||||||
|
|
||||||
for reply in s.news_reply(symbols).items():
|
for reply in s.news_reply(symbols).items():
|
||||||
|
|
||||||
@ -96,7 +93,7 @@ def news(bot, update):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def info(bot, update):
|
def info(update, context):
|
||||||
"""
|
"""
|
||||||
waits for /info command and then finds info on that symbol.
|
waits for /info command and then finds info on that symbol.
|
||||||
"""
|
"""
|
||||||
@ -105,7 +102,7 @@ def info(bot, update):
|
|||||||
symbols = s.find_symbols(message)
|
symbols = s.find_symbols(message)
|
||||||
|
|
||||||
if symbols:
|
if symbols:
|
||||||
bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
context.bot.send_chat_action(chat_id=chat_id, action=telegram.ChatAction.TYPING)
|
||||||
|
|
||||||
for reply in s.info_reply(symbols).items():
|
for reply in s.info_reply(symbols).items():
|
||||||
|
|
||||||
@ -114,17 +111,17 @@ def info(bot, update):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def inline_query(bot, update):
|
def inline_query(update, context):
|
||||||
"""
|
"""
|
||||||
Handles inline query.
|
Handles inline query.
|
||||||
Does a fuzzy search on input and returns stocks that are close.
|
Does a fuzzy search on input and returns stocks that are close.
|
||||||
"""
|
"""
|
||||||
|
print(update.inline_query.query)
|
||||||
matches = s.search_symbols(update.inline_query.query)
|
matches = s.search_symbols(update.inline_query.query)
|
||||||
results = []
|
results = []
|
||||||
for match in matches:
|
for match in matches:
|
||||||
try:
|
try:
|
||||||
price = s.price_reply([match[0]])[match[0]]
|
price = s.price_reply([match[0]])[match[0]]
|
||||||
print(price)
|
|
||||||
results.append(
|
results.append(
|
||||||
InlineQueryResultArticle(
|
InlineQueryResultArticle(
|
||||||
match[0],
|
match[0],
|
||||||
@ -138,19 +135,19 @@ def inline_query(bot, update):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
if len(results) == 5:
|
if len(results) == 5:
|
||||||
bot.answerInlineQuery(update.inline_query.id, results)
|
update.inline_query.answer(results)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
def error(bot, update, error):
|
def error(update, context):
|
||||||
"""Log Errors caused by Updates."""
|
"""Log Errors caused by Updates."""
|
||||||
logger.warning('Update "%s" caused error "%s"', update, error)
|
logger.warning('Update "%s" caused error "%s"', update, error)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""Start the bot."""
|
"""Start the context.bot."""
|
||||||
# Create the EventHandler and pass it your bot's token.
|
# Create the EventHandler and pass it your bot's token.
|
||||||
updater = Updater(TELEGRAM_TOKEN)
|
updater = Updater(TELEGRAM_TOKEN, use_context=True)
|
||||||
|
|
||||||
# Get the dispatcher to register handlers
|
# Get the dispatcher to register handlers
|
||||||
dp = updater.dispatcher
|
dp = updater.dispatcher
|
||||||
|
@ -39,9 +39,7 @@ class Symbol:
|
|||||||
symbols.sort_values(by="Match", ascending=False, inplace=True)
|
symbols.sort_values(by="Match", ascending=False, inplace=True)
|
||||||
if symbols["Match"].head().sum() < 300:
|
if symbols["Match"].head().sum() < 300:
|
||||||
symbols["Match"] = symbols.apply(
|
symbols["Match"] = symbols.apply(
|
||||||
lambda x: fuzz.partial_ratio(
|
lambda x: fuzz.partial_ratio(search.lower(), x["Issue_Name"].lower()),
|
||||||
search.lower(), f"{x['Symbol']} {x['Issue_Name']}".lower()
|
|
||||||
),
|
|
||||||
axis=1,
|
axis=1,
|
||||||
)
|
)
|
||||||
symbols.sort_values(by="Match", ascending=False, inplace=True)
|
symbols.sort_values(by="Match", ascending=False, inplace=True)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
python-telegram-bot==11.1.0
|
python-telegram-bot==12.5.1
|
||||||
requests==2.21.0
|
requests==2.23.0
|
||||||
pandas==0.25.3
|
pandas==1.0.3
|
||||||
fuzzywuzzy==0.18.0
|
fuzzywuzzy==0.18.0
|
||||||
python-Levenshtein==0.12.0
|
python-Levenshtein==0.12.0
|
Loading…
x
Reference in New Issue
Block a user