Added initial Docker compatibility

Now using env vars rather than config files
Source code moved to app folder
Removed Heroku support
Removed obsolete files

Author: smcclennon

.gitignore

@@ -1,6 +1,5 @@
 __pycache__
 *.png
 *.psd
-token.json
-userdata.json
-data/downloads
+#userdata.json
+set_env_vars.sh

Dockerfile

@@ -0,0 +1,20 @@
+# Use the official Python image from the Docker Hub
+FROM python:3.9-slim
+
+# Install Git
+RUN apt-get update && apt-get install -y git
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the requirements file
+COPY requirements.txt .
+
+# Install dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the current directory contents into the container at /app
+COPY app .
+
+# Command to run your application
+CMD ["python", "SongID.py"]

Procfile

@@ -6,37 +6,33 @@
 
 
 # Get the ACRCloud config
-with open('data/acrcloud.json', 'r') as f:
-    config = json.load(f)
-    logger.info('Loaded: ACR Config')
-
-
-# Get the ACRCloud access & private keys
-acrkey = all_tokens["acr"]
-
-
-
-
-config_clear = config["clear"]
-config_clear["access_key"] = acrkey["clear"]["access_key"]
-config_clear["access_secret"] = acrkey["clear"]["access_secret"]
-config_clear["recognize_type"] = ACRCloudRecognizeType.ACR_OPT_REC_AUDIO
-config_clear["debug"] = False
-
-
-config_noisy = config["noisy"]
-config_noisy["access_key"] = acrkey["noisy"]["access_key"]
-config_noisy["access_secret"] = acrkey["noisy"]["access_secret"]
-config_noisy["recognize_type"] = ACRCloudRecognizeType.ACR_OPT_REC_AUDIO
-config_noisy["debug"] = False
-
-
-config_hum = config["hum"]
-config_hum["access_key"] = acrkey["hum"]["access_key"]
-config_hum["access_secret"] = acrkey["hum"]["access_secret"]
-config_hum["recognize_type"] = ACRCloudRecognizeType.ACR_OPT_REC_BOTH
-config_hum["debug"] = False
-
+config = {
+    "clear": {
+        "host": env['acr']['clear']['host'],
+        "access_key": env['acr']['clear']['access_key'],
+        "access_secret": env['acr']['clear']['access_secret'],
+        "recognize_type": ACRCloudRecognizeType.ACR_OPT_REC_AUDIO,
+        "debug":  False,
+        "timeout": env['acr']['clear']['timeout']
+    },
+    "noisy": {
+        "host": env['acr']['noisy']['host'],
+        "access_key": env['acr']['noisy']['access_key'],
+        "access_secret": env['acr']['noisy']['access_secret'],
+        "recognize_type": ACRCloudRecognizeType.ACR_OPT_REC_AUDIO,
+        "debug": False,
+        "timeout": env['acr']['noisy']['timeout']
+    },
+    "hum": {
+        "host": env['acr']['hum']['host'],
+        "access_key": env['acr']['hum']['access_key'],
+        "access_secret": env['acr']['hum']['access_secret'],
+        "recognize_type": ACRCloudRecognizeType.ACR_OPT_REC_BOTH,
+        "debug": False,
+        "timeout": env['acr']['hum']['timeout']
+    }
+}
+logger.info('Loaded: ACR Config')
 
 
 # Functions for sending files to the ACRCloud API and getting a response

ACRAPI.py renamed to app/ACRAPI.py

@@ -282,15 +282,6 @@ def humProcess(update, context):
 
 
 logger.info('Loading Complete!')
-if heroku_enabled == 'True':
-    logger.info('Initialising Heroku webhook...')
-    PORT = int(os.environ.get('PORT', int(heroku_port)))
-    u.start_webhook(listen=heroku_listen,
-                            port=int(PORT),
-                            url_path=token)
-    u.bot.setWebhook(heroku_webhook + token)
-    logger.info('Heroku webhook initialised')
-else:
-    u.start_polling()
-    logger.info('Standard polling initialised')
+u.start_polling()
+logger.info('Standard polling initialised')
 u.idle()

SongID.py renamed to app/SongID.py

@@ -3,12 +3,12 @@
 import sentry_sdk
 
 
-ver='0.2.4'
+ver='1.0.0-beta1'
 botName=f'SongID'
 botVer=f'{botName} {ver}'
 botAt=f'@SongIDBot'
 botUsername='SongIDbot'
-downloadDIR='data/downloads'
+downloadDIR='downloads'
 
 
 # Initialise the logger and format it's output
@@ -21,18 +21,44 @@
 logger = logging.getLogger(__name__)
 
 
-#  Load private information regarding the telegram bot
-with open('data/token.json', 'r') as f:
-    all_tokens = json.load(f)
-    telegramConfig = all_tokens["telegram"]
-    token = telegramConfig["token"]
-    devid = telegramConfig["devid"]
-    devusername = telegramConfig["devusername"]
-    heroku_enabled = all_tokens["heroku"]["enabled"]
-    heroku_webhook = all_tokens["heroku"]["webhook"]
-    heroku_listen = all_tokens["heroku"]["listen"]
-    heroku_port = all_tokens["heroku"]["port"]
-    sentry_dsn = all_tokens["sentry"]["dsn"]
+#  Load environment variables
+env = {
+    'sentry_dsn': os.getenv('SONGID_SENTRY_DSN'),
+    'telegram': {
+        'bot_token': os.getenv('SONGID_TELEGRAM_BOT_TOKEN'),
+        'dev_id': os.getenv('SONGID_TELEGRAM_DEV_ID'),
+        'dev_username': os.getenv('SONGID_TELEGRAM_DEV_USERNAME')
+    },
+    'acr': {
+        'clear': {
+            'host': os.getenv('SONGID_ACR_CLEAR_HOST'),
+            'access_key': os.getenv('SONGID_ACR_CLEAR_ACCESS_KEY'),
+            'access_secret': os.getenv('SONGID_ACR_CLEAR_ACCESS_SECRET'),
+            'recognize_type': os.getenv('SONGID_ACR_CLEAR_RECOGNIZE_TYPE'),
+            'timeout': os.getenv('SONGID_ACR_CLEAR_TIMEOUT')
+        },
+        'noisy': {
+            'host': os.getenv('SONGID_ACR_NOISY_HOST'),
+            'access_key': os.getenv('SONGID_ACR_NOISY_ACCESS_KEY'),
+            'access_secret': os.getenv('SONGID_ACR_NOISY_ACCESS_SECRET'),
+            'recognize_type': os.getenv('SONGID_ACR_NOISY_RECOGNIZE_TYPE'),
+            'timeout': os.getenv('SONGID_ACR_NOISY_TIMEOUT')
+        },
+        'hum': {
+            'host': os.getenv('SONGID_ACR_HUM_HOST'),
+            'access_key': os.getenv('SONGID_ACR_HUM_ACCESS_KEY'),
+            'access_secret': os.getenv('SONGID_ACR_HUM_ACCESS_SECRET'),
+            'recognize_type': os.getenv('SONGID_ACR_HUM_RECOGNIZE_TYPE'),
+            'timeout': os.getenv('SONGID_ACR_HUM_TIMEOUT')
+        }
+    }
+}
+
+print(env)
+token = env['telegram']['bot_token']
+devid = env['telegram']['dev_id']
+devusername = env['telegram']['dev_username']
+sentry_dsn = env['sentry_dsn']
 
 sentry_sdk.init(
 dsn=sentry_dsn,
@@ -93,4 +119,4 @@ def logbot(update, msg):
 
 
 
-logger.info('Loaded: SongIDFramework')
+logger.info('Loaded: SongIDFramework')

SongIDCore.py renamed to app/SongIDCore.py

@@ -218,22 +218,9 @@ def addUserData(update, apiCalls, lastCall):
     # Get user data for the respective user
     def getUserData(update):
         #update = json.loads(update)
-        logger.debug('getUserData(0/2)')
-
-        # May be completely unnecessary, just in case
-        if hasattr(update, 'effective_chat'):
-            # Get users Telegram ID
-            userID=str(update.effective_chat.id)
-            # Add user to userdata in case they did not initially send /start
-            # to prevent AttributeErrors occurring from their key not being
-            # present in the database
-            # (https://github.com/smcclennon/SongID/issues/6#issuecomment-1021517621)
-            if userID not in userdata:
-                SIDProcessor.addUserData(update, '0', '0')
-        logger.debug('getUserData(1/2)')
-
+        logger.debug('getUserData(0/1)')
         data = userdata[f'{update.effective_user.id}']
-        logger.debug('getUserData(2/2)')
+        logger.debug('getUserData(1/1)')
         return data