Changed the handling of filenames

Author: filipmomot

src/entity_graph_api/config.py

@@ -36,6 +36,8 @@ def setup_logger(name: str) -> logging.Logger:
 
 URL = Annotated[AnyUrl, AfterValidator(str)]
 
+UPLOAD_DIR = "/app/uploads"
+
 # Custom StrEnum is more handy than using integers that represent logging levels
 class LoggingLevels(StrEnum):
     DEBUG = "DEBUG"
@@ -44,8 +46,6 @@ class LoggingLevels(StrEnum):
     ERROR = "ERROR"
     CRITICAL = "CRITICAL"
 
-
-
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
         env_file=(".env"), env_nested_delimiter="__", extra="ignore"

src/entity_graph_api/models/entity_graph.py

@@ -1,11 +1,38 @@
+import os
 from typing import List, Dict, Any
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
+from src.entity_graph_api.config import UPLOAD_DIR
 
 class LoadTableRequest(BaseModel):
     config: Dict[str, Any] | str
     filename: str
     table_name: str
     instance_type: str
 
+    @field_validator('config')
+    @classmethod
+    def config_must_have_filename(cls, v):
+        if isinstance(v, dict):
+            filename = v.get("filename")
+            if not filename:
+                raise ValueError('config dictionary must contain a "filename" field')
+            full_path = os.path.join(UPLOAD_DIR, filename)
+            if not os.path.exists(full_path):
+                raise ValueError(f'File not found: {full_path}')
+            v["filename"] = full_path
+            return v
+        if isinstance(v, str):
+            full_path = os.path.join(UPLOAD_DIR, v)
+            if not os.path.exists(full_path):
+                raise ValueError(f'File not found: {full_path}')
+            return full_path
+        return v
+
+class LoadTableRequestWithString(BaseModel):
+    config: str
+    filename: str
+    table_name: str
+    instance_type: str
+
 class ExtractEntitiesRequest(BaseModel):
     steps: Dict[str, List[Any]]

src/entity_graph_api/routers/entity_graph.py

@@ -1,13 +1,12 @@
 import os
+from src.entity_graph_api.config import UPLOAD_DIR
 from fastapi import APIRouter, UploadFile, File, HTTPException
 from src.entity_graph_api.models.entity_graph import LoadTableRequest, ExtractEntitiesRequest
 from entity_graph.graph_extractor.entities_graph_extractor import EntitiesGraphExtractor
 
 extractor = EntitiesGraphExtractor()
 entities = extractor.entities_graph_manager.entities
 
-UPLOAD_DIR = "/app/uploads"
-
 os.makedirs(UPLOAD_DIR, exist_ok=True)
 
 router = APIRouter(
@@ -47,7 +46,6 @@ async def load_table(request: LoadTableRequest):
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"Failed to load table: {e}")
 
-
 @router.post("/extract-entities")
 async def extract_entities(request: ExtractEntitiesRequest):
     """Extract entities and build the graph based on the provided steps."""