Improve configuration and environment variables

Author: KingAkeem

torbot/dev.env

@@ -3,6 +3,7 @@
 """
 import argparse
 import sys
+import os
 
 from .modules import link_io
 from .modules.linktree import LinkTree
@@ -15,6 +16,18 @@
 
 from . import version
 
+from dotenv import load_dotenv
+
+"""
+dev_file = find_file("dev.env", "../../")
+if not dev_file:
+    raise FileNotFoundError
+"""
+load_dotenv()
+
+port = os.getenv("PORT")
+host = os.getenv("HOST")
+data_directory = os.getenv('TORBOT_DATA_DIR')
 
 # TorBot CLI class
 class TorBot:

torbot/main.py

@@ -5,8 +5,8 @@
 """
 import requests
 
-from .utils import host, port
-from .log import info
+from .log import debug
+from .config import host, port
 
 base_url: str = f'http://{host}:{port}'
 
@@ -17,10 +17,10 @@ def get_node(link: str, depth: int):
     """
     endpoint = f'/tree?link={link}&depth={depth}'
     url = base_url + endpoint
-    info(f'requesting {url}')
+    debug(f'requesting {url}')
     resp = requests.get(url)
     data = resp.json()
-    info(f'retrieved {data}')
+    debug(f'retrieved {data}')
     return data
 
 
@@ -30,9 +30,9 @@ def get_ip():
     """
     endpoint = '/ip'
     url = base_url + endpoint
-    info(f'requesting {url}')
+    debug(f'requesting {url}')
     resp = requests.get(url)
-    info(f'retrieved {resp.text}')
+    debug(f'retrieved {resp.text}')
     return resp.text
 
 
@@ -42,10 +42,10 @@ def get_emails(link: str):
     """
     endpoint = f'/emails?link={link}'
     url = base_url + endpoint
-    info(f'requesting {url}')
+    debug(f'requesting {url}')
     resp = requests.get(url)
     data = resp.json()
-    info(f'retrieved {data}')
+    debug(f'retrieved {data}')
     return data
 
 
@@ -55,10 +55,10 @@ def get_phone(link: str):
     """
     endpoint = f'/phone?link={link}'
     url = base_url + endpoint
-    info(f'requesting {url}')
+    debug(f'requesting {url}')
     resp = requests.get(url)
     data = resp.json()
-    info(f'retrieved {data}')
+    debug(f'retrieved {data}')
     return data
 
 
@@ -68,7 +68,7 @@ def get_web_content(link: str):
     """
     endpoint = f'/content?link={link}'
     url = base_url + endpoint
-    info(f'requesting {url}')
+    debug(f'requesting {url}')
     resp = requests.get(url)
-    info(f'retrieved {resp.text}')
+    debug(f'retrieved {resp.text}')
     return resp.text

torbot/modules/api.py

@@ -0,0 +1,23 @@
+import os
+import logging
+
+from dotenv import load_dotenv
+
+load_dotenv()
+port = os.getenv("PORT")
+host = os.getenv("HOST")
+data_directory = os.getenv('TORBOT_DATA_DIR')
+
+
+log_level_str = os.getenv("LOG_LEVEL").lower() if os.getenv("LOG_LEVEL") else "info"
+LOG_LEVELS = {
+	"info": logging.INFO,
+	"error": logging.ERROR,
+	"debug": logging.DEBUG,
+	"warning": logging.WARNING,
+}
+
+def get_log_level():
+	for str_input, log_level in LOG_LEVELS.items():
+		if log_level_str == str_input:
+			return log_level

torbot/modules/config.py

@@ -1,8 +1,15 @@
 import logging
 
+from .config import get_log_level
 
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S')
+
+logging.basicConfig(level=get_log_level(), format='%(asctime)s - %(levelname)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S')
 
 def info(msg: str):
 	logging.info(msg)
 
+def fatal(msg: str):
+	logging.error(msg)
+
+def debug(msg: str):
+	logging.debug(msg)

torbot/modules/log.py

@@ -3,7 +3,8 @@
 """
 import os
 
-from dotenv import load_dotenv
+from .config import data_directory
+
 
 # File Functions
 
@@ -18,15 +19,6 @@ def find_file(name: str, path: str):
             return os.path.join(root, name)
     return False
 
-dev_file = find_file("dev.env", "../../")
-if not dev_file:
-    raise FileNotFoundError
-load_dotenv(dotenv_path=dev_file)
-
-port = os.getenv("PORT")
-host = os.getenv("HOST")
-data_directory = os.getenv('TORBOT_DATA_DIR')
-
 
 def join_local_path(file_name: str=""):
     """