working on queue, finalization

Consumer.py

@@ -7,27 +7,23 @@ import json
 from agent.agent_graph.StateTasks import ProblemState
 import argparse
 import redis
-#from app import decrypt_token_from_json 
-argparse_model = argparse.ArgumentParser()
-argparse_model.add_argument("--id", type=int, default=0, help="Consumer ID")
-
-"""Basic connection example.
-"""
-redis_host = os.environ["REDIS_HOST"]
-redis_port = os.environ["REDIS_PORT"]   
-redis_password = os.environ["REDIS_PASSWORD"]
-
-
-
-
-
+from encryption_utils import decrypt_token_from_json 
 
 
+##################################################
+# VARIABLES
+##################################################
+# args for this file
+argparse_model = argparse.ArgumentParser()
+argparse_model.add_argument("--id", type=int, default=0, help="Consumer ID")
 consumer_id = argparse_model.parse_args().id
 
 
 RABBITMQ_URL = os.environ["RABBITMQ_URL"]
 QUEUE_NAME = os.environ["QUEUE_NAME"] 
+redis_host = os.environ["REDIS_HOST"]
+redis_port = os.environ["REDIS_PORT"]   
+redis_password = os.environ["REDIS_PASSWORD"]
 
 
 
@@ -58,12 +54,12 @@ def model_call(request):
         password=redis_password,
     )
     
-    user_id = "100"
-    msg_id = "202"
+    user_id = request["user_id"]
+    msg_id = request["msg_id"]
     success = r.set(f'ANSWER_FOR_USER_ID{user_id}_OF_{msg_id}',json.dumps(answer))
 
 
-    return {"Data": answer}
+    return {"STATUS": success , "user_id": user_id, "msg_id": msg_id}
 
 def get_connection():
     params = pika.URLParameters(RABBITMQ_URL)

app.py

@@ -6,11 +6,21 @@ import sys
 import os
 import json
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
-from pydantic import BaseModel
 from agent.agent_graph.StateTasks import ProblemState
 import subprocess
 from Queue_Producer import send_message
 import redis
+from utils import RequestModel, RequestAnswer
+
+
+##################################################
+# VARIABLES
+##################################################
+redis_host = os.environ["REDIS_HOST"]
+redis_port = os.environ["REDIS_PORT"]   
+redis_password = os.environ["REDIS_PASSWORD"]
+
+
 ##################################################
 # START CONSUMERS in a separate process
 ##################################################
@@ -19,11 +29,8 @@ for i in range(1,4):  # Start 3 consumers
 
 
 ##################################################
-# START API
+# START API and METHODS
 ##################################################
-redis_host = os.environ["REDIS_HOST"]
-redis_port = os.environ["REDIS_PORT"]   
-redis_password = os.environ["REDIS_PASSWORD"]
 
 # Create Redis connection (global to make the get very light)
 redis_conn = redis.Redis(
@@ -33,68 +40,13 @@ redis_conn = redis.Redis(
         username="default",
         password=redis_password,
     )
+
+# model and rag are not global for better security ,at least for this version
+
 # Create app instance
 app = FastAPI()
 print("Starting API Server...")
 
-class RequestModel(BaseModel):
-    prompt: str
-    ht_token_encrypted_dumped : str
-    user_email : str
-    user_name : str
-    memory: list[str]
-    last_state : str
-
-class RequestAnswer(BaseModel):
-    user_id: str
-    msg_id:str
-
-##################################################
-import os
-import hashlib
-from cryptography.hazmat.primitives.ciphers.aead import AESGCM
-
-
-# ===== Key (same idea as Node) =====
-def get_key():
-    raw_key = os.environ["TOKEN_KEY_ENCRYPTION"].encode()
-    return hashlib.sha256(raw_key).digest()  # 32 bytes
-
-
-# ===== Encrypt =====
-def encrypt_token_to_json(token: str) -> dict:
-    key = get_key()
-    aesgcm = AESGCM(key)
-
-    iv = os.urandom(12)  # same as crypto.randomBytes(12)
-
-    encrypted = aesgcm.encrypt(iv, token.encode(), None)
-
-    # في AESGCM في Python: التاج (tag) بيكون في آخر 16 بايت
-    ciphertext = encrypted[:-16]
-    tag = encrypted[-16:]
-
-    return {
-        "iv": iv.hex(),
-        "data": ciphertext.hex(),
-        "tag": tag.hex(),
-    }
-
-
-# ===== Decrypt =====
-def decrypt_token_from_json(enc: dict) -> str:
-    key = get_key()
-    aesgcm = AESGCM(key)
-
-    iv = bytes.fromhex(enc["iv"])
-    ciphertext = bytes.fromhex(enc["data"])
-    tag = bytes.fromhex(enc["tag"])
-
-    encrypted = ciphertext + tag
-
-    decrypted = aesgcm.decrypt(iv, encrypted, None)
-
-    return decrypted.decode()
 
 ##################################################
 # ROUTES

encryption_utils.py

@@ -0,0 +1,45 @@
+import os
+import hashlib
+from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+
+
+# ===== Key (same idea as Node) =====
+def get_key():
+    raw_key = os.environ["TOKEN_KEY_ENCRYPTION"].encode()
+    return hashlib.sha256(raw_key).digest()  # 32 bytes
+
+
+# ===== Encrypt =====
+def encrypt_token_to_json(token: str) -> dict:
+    key = get_key()
+    aesgcm = AESGCM(key)
+
+    iv = os.urandom(12)  # same as crypto.randomBytes(12)
+
+    encrypted = aesgcm.encrypt(iv, token.encode(), None)
+
+    # في AESGCM في Python: التاج (tag) بيكون في آخر 16 بايت
+    ciphertext = encrypted[:-16]
+    tag = encrypted[-16:]
+
+    return {
+        "iv": iv.hex(),
+        "data": ciphertext.hex(),
+        "tag": tag.hex(),
+    }
+
+
+# ===== Decrypt =====
+def decrypt_token_from_json(enc: dict) -> str:
+    key = get_key()
+    aesgcm = AESGCM(key)
+
+    iv = bytes.fromhex(enc["iv"])
+    ciphertext = bytes.fromhex(enc["data"])
+    tag = bytes.fromhex(enc["tag"])
+
+    encrypted = ciphertext + tag
+
+    decrypted = aesgcm.decrypt(iv, encrypted, None)
+
+    return decrypted.decode()

utils.py

@@ -0,0 +1,17 @@
+from pydantic import BaseModel
+
+
+class RequestModel(BaseModel):
+    prompt: str
+    ht_token_encrypted_dumped : str
+    user_email : str
+    user_name : str
+    user_id : str
+    msg_id : str
+    memory: list[str]
+    last_state : str
+
+class RequestAnswer(BaseModel):
+    user_id: str
+    msg_id:str
+