aljaz/chatgpt-telegram-bot
1
1
Fork 0
mirror of https://github.com/aljazceru/chatgpt-telegram-bot.git synced 2025-12-20 14:14:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved get_current_cost()

Browse Source
This commit is contained in:
Alexander Hinzer
2023-03-30 01:03:03 +02:00
committed by AlexHTW
parent 3066c60894
commit af7e35bb69
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bot/telegram_bot.py
View File

@@ -91,7 +91,7 @@ class ChatGPTTelegramBot:
tokens_today, tokens_month = self.usage[user_id].get_current_token_usage() tokens_today, tokens_month = self.usage[user_id].get_current_token_usage()
images_today, images_month = self.usage[user_id].get_current_image_count() images_today, images_month = self.usage[user_id].get_current_image_count()
transcribe_durations = self.usage[user_id].get_current_transcription_duration() transcribe_durations = self.usage[user_id].get_current_transcription_duration()
cost_today, cost_month = self.usage[user_id].get_current_cost() current_cost = self.usage[user_id].get_current_cost()
chat_id = update.effective_chat.id chat_id = update.effective_chat.id
chat_messages, chat_token_length = self.openai.get_conversation_stats(chat_id) chat_messages, chat_token_length = self.openai.get_conversation_stats(chat_id)
@@ -105,13 +105,13 @@ class ChatGPTTelegramBot:
f"{tokens_today} chat tokens used.\n"+\ f"{tokens_today} chat tokens used.\n"+\
f"{images_today} images generated.\n"+\ f"{images_today} images generated.\n"+\
f"{transcribe_durations[0]} minutes and {transcribe_durations[1]} seconds transcribed.\n"+\ f"{transcribe_durations[0]} minutes and {transcribe_durations[1]} seconds transcribed.\n"+\
f"💰 For a total amount of ${cost_today:.2f}\n"+\ f"💰 For a total amount of ${current_cost['cost_today']:.2f}\n"+\
f"----------------------------\n" f"----------------------------\n"
text_month = f"*Usage this month:*\n"+\ text_month = f"*Usage this month:*\n"+\
f"{tokens_month} chat tokens used.\n"+\ f"{tokens_month} chat tokens used.\n"+\
f"{images_month} images generated.\n"+\ f"{images_month} images generated.\n"+\
f"{transcribe_durations[2]} minutes and {transcribe_durations[3]} seconds transcribed.\n"+\ f"{transcribe_durations[2]} minutes and {transcribe_durations[3]} seconds transcribed.\n"+\
f"💰 For a total amount of ${cost_month:.2f}" f"💰 For a total amount of ${current_cost['cost_month']:.2f}"
# text_budget filled with conditional content # text_budget filled with conditional content
text_budget = "\n\n" text_budget = "\n\n"
if budget < float('inf'): if budget < float('inf'):
@@ -662,7 +662,7 @@ class ChatGPTTelegramBot:
logging.warning(f'No budget set for user: {update.message.from_user.name} ({user_id}).') logging.warning(f'No budget set for user: {update.message.from_user.name} ({user_id}).')
return 0.0 return 0.0
user_budget = float(user_budgets[user_index]) user_budget = float(user_budgets[user_index])
cost_month = self.usage[user_id].get_current_cost()[1] cost_month = self.usage[user_id].get_current_cost()["cost_month"]
remaining_budget = user_budget - cost_month remaining_budget = user_budget - cost_month
return remaining_budget return remaining_budget
else: else:
@@ -693,7 +693,7 @@ class ChatGPTTelegramBot:
logging.warning(f'No budget set for user: {update.message.from_user.name} ({user_id}).') logging.warning(f'No budget set for user: {update.message.from_user.name} ({user_id}).')
return False return False
user_budget = float(user_budgets[user_index]) user_budget = float(user_budgets[user_index])
cost_month = self.usage[user_id].get_current_cost()[1] cost_month = self.usage[user_id].get_current_cost()["cost_month"]
# Check if allowed user is within budget # Check if allowed user is within budget
return user_budget > cost_month return user_budget > cost_month
@@ -704,7 +704,7 @@ class ChatGPTTelegramBot:
if await self.is_user_in_group(update, context, user): if await self.is_user_in_group(update, context, user):
if 'guests' not in self.usage: if 'guests' not in self.usage:
self.usage['guests'] = UsageTracker('guests', 'all guest users in group chats') self.usage['guests'] = UsageTracker('guests', 'all guest users in group chats')
if self.config['monthly_guest_budget'] >= self.usage['guests'].get_current_cost()[1]: if self.config['monthly_guest_budget'] >= self.usage['guests'].get_current_cost()["cost_month"]:
return True return True
logging.warning('Monthly guest budget for group chats used up.') logging.warning('Monthly guest budget for group chats used up.')
return False return False

2
bot/usage_tracker.py
View File

@@ -249,7 +249,7 @@ class UsageTracker:
cost_month = 0.0 cost_month = 0.0
# add to all_time cost, initialize with calculation of total_cost if key doesn't exist # add to all_time cost, initialize with calculation of total_cost if key doesn't exist
cost_all_time = self.usage["current_cost"].get("all_time", self.initialize_all_time_cost()) cost_all_time = self.usage["current_cost"].get("all_time", self.initialize_all_time_cost())
return cost_day, cost_month#, cost_all_time return {"cost_today": cost_day, "cost_month": cost_month, "cost_all_time": cost_all_time}
def initialize_all_time_cost(self, tokens_price=0.002, image_prices="0.016,0.018,0.02", minute_price=0.006): def initialize_all_time_cost(self, tokens_price=0.002, image_prices="0.016,0.018,0.02", minute_price=0.006):
"""Get total USD amount of all requests in history """Get total USD amount of all requests in history