Merge pull request #8 from SaM-92/dev_b

tidy up the code using Ruff

.history/main_20240223010121.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from dotenv import load_dotenv
@@ -66,7 +64,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225012936.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from dotenv import load_dotenv
@@ -66,7 +64,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225012943.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from dotenv import load_dotenv
@@ -66,7 +64,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225013545.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from dotenv import load_dotenv
@@ -66,7 +64,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225013632.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -67,7 +65,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225013640.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -67,7 +65,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225013736.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -67,7 +65,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225014248.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -67,7 +65,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225014329.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -40,7 +38,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225021607.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -40,7 +38,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225021703.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,10 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
-from subs.telegram_func import send_co2_intensity_plot, telegram_carbon_intensity
+from subs.telegram_func import telegram_carbon_intensity
 from dotenv import load_dotenv
 
 # add vars to azure
@@ -40,7 +38,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225021708.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,11 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from subs.telegram_func import (
-    send_co2_intensity_plot,
     telegram_carbon_intensity,
     telegram_fuel_mix,
 )
@@ -44,7 +41,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225021709.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,11 +10,9 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from subs.telegram_func import (
-    send_co2_intensity_plot,
     telegram_carbon_intensity,
     telegram_fuel_mix,
 )
@@ -44,7 +41,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225021716.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from subs.telegram_func import (
@@ -43,7 +41,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text

.history/main_20240225025949.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import pandas as pd
 from telegram import Update, ReplyKeyboardMarkup
 from telegram.ext import (
     Application,
@@ -11,7 +10,6 @@
     ConversationHandler,
     CallbackContext,
 )
-from elevenlabs import generate
 from subs.energy_api import *
 from subs.openai_script import *
 from subs.telegram_func import (
@@ -43,7 +41,7 @@ async def energy_api_func(update: Update, context: CallbackContext):
     user_first_name = update.message.from_user.first_name
 
     await update.message.reply_text(
-        f"""Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
+        """Thank you! \n 🚀 We are now processing your request and we will get back to you shortly. \n ⏱️ It takes up to 10 seconds.. """
     )
 
     user_selected_option = update.message.text