Fix azure sas key for blob container & Fix create weight response

externals/databases/pg_crud.py

@@ -408,10 +408,10 @@ async def create_filter_and_weight(
 async def create_weight(
     db: AsyncSession,
     cv_weight: CVWeight,
-):
+) -> CVWeight:
     db.add(cv_weight)
-    await db.commit()
-
+    await db.commit()  
+    return cv_weight
 
 # =========================
 # MATCHING

externals/databases/pg_models.py

@@ -1,3 +1,4 @@
+import uuid
 from config.get_config import master_config
 from sqlalchemy import Column, String, Integer, TIMESTAMP, func
 from sqlalchemy.dialects.postgresql import UUID, ARRAY, DOUBLE_PRECISION, BOOLEAN
@@ -103,8 +104,8 @@ class CVFilter(Base):
 class CVWeight(Base):
     __tablename__ = "cv_weight"
 
-    weight_id = Column(UUID(as_uuid=True), primary_key=True, server_default=func.uuid_generate_v4())
-    criteria_id = Column(UUID(as_uuid=True), primary_key=True)
+    weight_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    criteria_id = Column(UUID(as_uuid=True), primary_key=False, nullable=False)
 
     gpa_edu_1 = Column(DOUBLE_PRECISION)
     gpa_edu_2 = Column(DOUBLE_PRECISION)

externals/storages/azure_blob.py

@@ -1,56 +1,70 @@
-import os
-import uuid
-from typing import List, Dict, Any
-
 from azure.identity.aio import DefaultAzureCredential
 from azure.storage.blob.aio import BlobServiceClient, ContainerClient
 from azure.core.credentials import AzureSasCredential
 from azure.storage.blob import ContentSettings
 
 from config.constant import AzureBlobConstants
-from fastapi import UploadFile, HTTPException, status
+from fastapi import UploadFile
 from utils.logger import get_logger
 
 logger = get_logger("azure-blob")
 
-# ---------- SINGLETONS ----------
 
+# async def get_blob_service_client() -> BlobServiceClient:
+#     try:
+#         # credential = AzureSasCredential(AzureBlobConstants.SAS_KEY)
+#         credential = AzureBlobConstants.SAS_KEY
+#         logger.info(f"✅ Initialized Azure AI Cred: Using **Azure SAS Key Credential**")
+        
+#         _blob_service_client = BlobServiceClient(
+#             account_url=AzureBlobConstants.ENDPOINT,
+#             credential=credential,
+#         )
+#         return _blob_service_client
+#     except Exception as E:
+#         logger.error(f'❌ Getting blob service client error, {E}')
+#         logger.error(f'⚠️ using DefaultAzureCredential')
+#         credential=DefaultAzureCredential()
+#         _blob_service_client = BlobServiceClient(
+#             account_url=AzureBlobConstants.ENDPOINT,
+#             credential=credential,
+#         )
+#         return _blob_service_client
 
 
-async def get_blob_service_client() -> BlobServiceClient:
+async def get_container_client() -> ContainerClient:
     try:
-        credential = AzureSasCredential(AzureBlobConstants.SAS_KEY)
-        logger.info(f"✅ Initialized Azure AI Cred: Using **Default Credential**")
-        
-        _blob_service_client = BlobServiceClient(
+        container_client = ContainerClient(
             account_url=AzureBlobConstants.ENDPOINT,
-            credential=credential,
+            container_name=AzureBlobConstants.CONTAINER_NAME,
+            credential=AzureSasCredential(AzureBlobConstants.SAS_KEY)
         )
-        return _blob_service_client
+        return container_client
     except Exception as E:
-        logger.error(f'❌ Getting blob service client error, {E}')
+        logger.error(f'❌ Getting container client error, {E}')
         logger.error(f'⚠️ using DefaultAzureCredential')
-        credential=DefaultAzureCredential()
-        _blob_service_client = BlobServiceClient(
+        container_client = ContainerClient(
             account_url=AzureBlobConstants.ENDPOINT,
-            credential=credential,
+            container_name=AzureBlobConstants.CONTAINER_NAME,
+            credential=DefaultAzureCredential()
         )
-        return _blob_service_client
+        return container_client
 
 
-async def get_container_client() -> ContainerClient:
-    service = await get_blob_service_client()
-    container = service.get_container_client(
-        AzureBlobConstants.CONTAINER_NAME
-    )
 
-    try:
-        await container.create_container()
-        logger.info("✅ Blob container created")
-    except Exception:
-        pass  # already exists
+# async def get_container_client() -> ContainerClient:
+#     service = await get_blob_service_client()
+#     container = service.get_container_client(
+#         AzureBlobConstants.CONTAINER_NAME
+#     )
+
+#     try:
+#         await container.create_container()
+#         logger.info("✅ Blob container created")
+#     except Exception:
+#         pass  # already exists
 
-    return container
+#     return container
 
 
 # ---------- HELPERS ----------

interfaces/api/agentic.py

@@ -103,6 +103,7 @@ async def create_weight(
 
         cv_weight = CVWeight(
             criteria_id=criteria_id,
+            weight_id=uuid4(),
 
             gpa_edu_1=weight.get("gpa_edu_1"),
             gpa_edu_2=weight.get("gpa_edu_2"),
@@ -125,13 +126,12 @@ async def create_weight(
             business_domain=weight.get("business_domain")
         )
 
-        logger.info(f"cv_weight: {cv_weight}")
 
         data = await agentic_service.weight.create_weight(weight=cv_weight)
         return {
             "status": "success",
             "message": "Weight created successfully",
-            "criteria_id": data
+            "data": data
             }
     except Exception as E:
         logger.error(f"create weight error: {E}")

services/agentic/weight.py

@@ -21,25 +21,27 @@ class AgenticWeightService:
         self.user = user
 
     
-    async def create_weight(self, weight: CVWeight) -> str:
+    async def create_weight(self, weight: CVWeight) -> dict:
         """Return criteria_id:str"""
         
         try:
             # check weight existence
             filter = await get_filter_by_id(self.db, weight.criteria_id)
-            
+            # print("weight.weight_id:", weight.weight_id)
             # loop weight fields is none or empty list
             weighted_field_name = [] # store field name for not none and not empty list
+            excluded_fields = ["_sa_instance_state","created_at", "criteria_id", "weight_id"]
 
             for field in filter.__dict__.items():
-                if field[1] is None or (isinstance(field[1], list) and not field[1]):
-                    continue
-                weighted_field_name.append(field[0])
-            print("weighted_field_name:", weighted_field_name)
+                # if field[1] is None or (isinstance(field[1], list) and not field[1]):
+                #     continue
+                if field[0] not in excluded_fields:
+                    weighted_field_name.append(field[0])
 
+            print("weighted_field_name:", weighted_field_name)
             # check current weight, apply default weight
-            new_weight = CVWeight(criteria_id=weight.criteria_id)
-            excluded_fields = ["created_at", "_sa_instance_state", "criteria_id"]
+            new_weight = CVWeight(criteria_id=weight.criteria_id,
+                                  weight_id=weight.weight_id)
             all_weight = [
                             getattr(weight, field)
                             for field in weighted_field_name
@@ -67,9 +69,12 @@ class AgenticWeightService:
                     setattr(new_weight, field_name, normalized_w)
 
             # create weight
-            await create_weight(self.db, new_weight)
-            logger.info(f"Weight created: {new_weight.criteria_id}")
-            return new_weight.criteria_id
+            created_weight = await create_weight(self.db, new_weight)
+            logger.info(f"Weight created: {created_weight.weight_id}")
+            return {
+                "criteria_id": created_weight.criteria_id,
+                "weight_id": created_weight.weight_id,
+                }
         except Exception as E:
             logger.error(f"❌ create weight error: {E}")
             exc_type, exc_obj, exc_tb = sys.exc_info()

services/knowledge/upload_file.py

@@ -1,5 +1,5 @@
 from fastapi import UploadFile
-from sqlalchemy.ext.asyncio import AsyncSession
+# from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.exc import IntegrityError
 from externals.storages.azure_blob import upload_pdf as upload_file
 from externals.databases.pg_crud import get_file_by_filename, get_file_by_user_id

services/uploader/azure_blob_service.py

@@ -4,68 +4,12 @@ from config.env_constant import EnvFilepath
 dotenv.load_dotenv(EnvFilepath.ENVPATH)
 
 from config.constant import AzureBlobConstants
-from azure.identity import DefaultAzureCredential
-
-from azure.core.credentials import AzureSasCredential
-
-# from azure.storage.blob import BlobServiceClient, ContainerClient
-from azure.storage.blob.aio import BlobServiceClient, ContainerClient
-# from azure.storage.blob import BlobServiceClient, ContainerClient
+from externals.storages.azure_blob import get_container_client
 from fastapi import UploadFile
-
-
 from utils.logger import get_logger
-# from src.utils.decorator import trace_runtime
-
-logger = get_logger("azure blob")
 
 
-# --- Environment Variables ---
-async def get_blob_service_client() -> BlobServiceClient:
-    try:
-        credential = AzureSasCredential(AzureBlobConstants.SAS_KEY)
-        logger.info(f"✅ Initialized Azure AI Cred: Using **Azure Key Credential**")
-
-        _blob_service_client = BlobServiceClient(
-            account_url=AzureBlobConstants.ENDPOINT,
-            credential=credential,
-        )
-        return _blob_service_client
-    except Exception as E:
-        logger.error(f'❌ Getting blob service client error, {E}')
-        logger.error(f'⚠️ using DefaultAzureCredential')
-        credential=DefaultAzureCredential()
-        _blob_service_client = BlobServiceClient(
-            account_url=AzureBlobConstants.ENDPOINT,
-            credential=credential,
-        )
-        return _blob_service_client
-
-# async def get_blob_service_client() -> BlobServiceClient:
-#     try:
-#         account_url = os.environ.get("azureai__container__endpoint")
-#         sas_token = os.environ.get("azureai__search__sas")
-
-#         if not account_url or not sas_token:
-#             raise ValueError("Missing AZURE_STORAGE_ACCOUNT_URL or AZURE_STORAGE_SAS_TOKEN")
-
-#         blob_service_client = BlobServiceClient(
-#             account_url=account_url,
-#             credential=sas_token
-#         )
-#         return blob_service_client
-#     except Exception as e:
-#         logger.error(f"❌ Getting blob service client error: {e}")
-#         raise
-
-
-async def get_container_client(container_name=os.environ.get("azureai__container__name")) -> ContainerClient:
-    try:
-        blob_service_client = await get_blob_service_client()
-        blob_client = blob_service_client.get_container_client(container_name)
-        return blob_client
-    except Exception as E:
-        logger.error(f'❌ Getting container client error, {E}')
+logger = get_logger("azure blob")
 
 
 class AzureBlobStorageService:
@@ -75,12 +19,12 @@ class AzureBlobStorageService:
     """
     def __init__(self):
         # Initialize the BlobServiceClient for the entire application lifetime
-        self.blob_service_client = get_blob_service_client()
-        self.container_client = get_container_client()
+        # self.blob_service_client = get_blob_service_client()
+        # self.container_client = get_container_client()
         self.prefix = AzureBlobConstants.BLOB_PREFIX
         
-        if not self.blob_service_client:
-            raise ValueError("azure service client is not set.")
+        # if not self.container_client:
+        #     raise ValueError("azure container client is not set.")
 
 
     async def upload_pdf(self, file: UploadFile) -> str:
@@ -98,7 +42,8 @@ class AzureBlobStorageService:
         blob_name = file.filename 
 
         # 2. Get the blob client
-        blob_client = self.container_client.get_blob_client(blob_name)
+        container_client = await get_container_client()
+        blob_client = container_client.get_blob_client(blob_name)
 
         # 3. Read the file content asynchronously
         #    The file is read in chunks to avoid loading the entire file into memory