Merge pull request #29 from shreypandey/refactor_flow

Refactor flow

db/env.py

@@ -34,7 +34,6 @@
 
 # Construct the SQLAlchemy connection URL using URL class
 db_url = f"postgresql://{db_user}:{db_password}@{db_host}:{db_port}/{db_name}"
-print(f"DB URL: {db_url}")
 config.set_main_option('sqlalchemy.url', db_url)
 
 

flow/Dockerfile

@@ -23,7 +23,8 @@ WORKDIR /app
 
 COPY --from=builder ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 
-COPY ./flow .
+COPY ./flow/src ./flow
+COPY ./flow/template ./template
 COPY ./lib ./lib
 
-CMD ["python", "main.py"]
+CMD ["python", "-m", "flow"]

flow/main.py → flow/src/__main__.py

@@ -9,8 +9,8 @@
 from dotenv import load_dotenv
 
 
-import crud
-from extensions import save_file
+from . import crud
+from .extensions import save_file
 from lib.kafka_utils import KafkaConsumer, KafkaProducer
 from lib.data_models import (
     BotOutput,
@@ -61,7 +61,7 @@ async def install_or_update_bot(bot_config: BotConfig):
     )
     index_urls = bot_config.index_urls if bot_config.index_urls else []
 
-    bots_parent_directory = Path(__file__).parent
+    bots_parent_directory = Path(__file__).parent.parent
     bots_root_directory = Path(os.path.join(bots_parent_directory, "bots"))
     bot_dir = Path(os.path.join(bots_root_directory, bot_id))
 
@@ -296,7 +296,7 @@ def cb(fsm_output: FSMOutput):
             credentials = bot_details.credentials
             credentials = {} if credentials is None else credentials
 
-            path = Path(__file__).parent / "bots" / bot_id
+            path = Path(__file__).parent.parent / "bots" / bot_id
 
             ## need to pass state json and msg_text to the bot
             fsm_runner_input = {

lib/kafka_utils.py

@@ -110,7 +110,6 @@ def __init__(self, bootstrap_servers: str,
                 'auto.offset.reset': auto_offset_reset,
                 ** consumer_config
             }
-        print("consumer config", self.consumer_config)
         self.consumer = Consumer(self.consumer_config)
         self.subscribed=False
         self.subscribed_topics = []
@@ -132,8 +131,7 @@ def from_env_vars(group_id: str, auto_offset_reset: str):
         consumer_password = os.getenv('KAFKA_CONSUMER_PASSWORD')
 
         print("Consumer from env vars")
-        print(kafka_broker, use_sasl, consumer_username, consumer_password)
-
+
         if type(use_sasl) == str and use_sasl.lower() == 'true':
             return KafkaConsumer(kafka_broker, 
                                  group_id,