Bugfix

Author: GorkiPower

backend/datamodel.py

@@ -3,7 +3,8 @@
 import hashlib
 import json
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Optional
+
 from pydantic import BaseModel, Field, model_validator
 
 ALLOWED_FIELD_TYPES = {
@@ -15,10 +16,11 @@
     "datetime",
 }
 
+
 def compute_schema_hash(
-    name: Optional[str],
-    version: Optional[str],
-    content: Optional[Dict[str, Any]],
+    name: str | None,
+    version: str | None,
+    content: dict[str, Any] | None,
 ) -> str:
     """
     Compute a deterministic SHA-256 hash from the canonical JSON of {name, version, content}.
@@ -32,16 +34,16 @@ def compute_schema_hash(
 
 class SchemaDefinition(BaseModel):
     id: str = Field(..., description="Unique identifier for the schema (content hash)")
-    name: Optional[str] = Field(
+    name: str | None = Field(
         None,
         description="Human-readable name of the schema",
         min_length=3,
     )
-    version: Optional[str] = Field(None, description="Version of the schema")
-    content: Optional[Dict[str, Any]] = Field(
+    version: str | None = Field(None, description="Version of the schema")
+    content: dict[str, Any] | None = Field(
         None, description="The actual schema content as a dictionary"
     )
-    updated_at: Optional[datetime] = Field(
+    updated_at: datetime | None = Field(
         None, description="Timestamp of the last update"
     )
 

backend/main.py

@@ -1,15 +1,14 @@
 
 # main.py
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
+from database import schemas_collection
+from datamodel import ALLOWED_FIELD_TYPES, SchemaDefinition, compute_schema_hash
 from fastapi import FastAPI, HTTPException
 from fastapi.encoders import jsonable_encoder
 from fastapi.middleware.cors import CORSMiddleware
 
-from database import schemas_collection
-from datamodel import SchemaDefinition, compute_schema_hash, ALLOWED_FIELD_TYPES
-
 # ---- FastAPI app & CORS ----
 app = FastAPI()
 app.add_middleware(
@@ -21,7 +20,7 @@
 )
 
 # ---- Helpers ----
-def _merge_flat_content(existing: Optional[Dict[str, Any]], incoming: Optional[Dict[str, Any]]) -> Dict[str, Any]:
+def _merge_flat_content(existing: dict[str, Any] | None, incoming: dict[str, Any] | None) -> dict[str, Any]:
     """
     Merge two flat dicts for schema `content`.
     - Existing values are overwritten by incoming values for the same key.
@@ -112,7 +111,7 @@ async def update_schema(id: str, update: SchemaDefinition) -> dict[str, str]:
     merged_version = payload.get("version") if payload.get("version") is not None else existing.get("version")
 
     # --- Merge content (flat dict) ---
-    incoming_content = payload.get("content")
+    incoming_content: dict[str, Any] | None = payload.get("content")
     merged_content = _merge_flat_content(existing.get("content"), incoming_content)
 
     # Optional: validate merged content types
@@ -141,7 +140,7 @@ async def update_schema(id: str, update: SchemaDefinition) -> dict[str, str]:
 
 
 @app.patch("/schemas/{id}/content", response_model=dict[str, str])
-async def patch_schema_content(id: str, content_updates: Dict[str, str]) -> dict[str, str]:
+async def patch_schema_content(id: str, content_updates: dict[str, str]) -> dict[str, str]:
     """
     Convenience endpoint to ONLY upsert fields in `content`:
     - Adds new fields.
@@ -195,6 +194,7 @@ async def patch_schema_content(id: str, content_updates: Dict[str, str]) -> dict
     return {"message": "Content patched", "id": new_id}
 
 
+
 @app.delete("/schemas/{id}", response_model=dict[str, str])
 async def delete_schema(id: str) -> dict[str, str]:
     """
@@ -207,4 +207,6 @@ async def delete_schema(id: str) -> dict[str, str]:
     result = schemas_collection.delete_one({"id": id})
     if result.deleted_count == 0:
         raise HTTPException(status_code=404, detail="Schema not found")
-    return {"message": "Schema deleted"}
+
+    # ✅ Return a simple success message
+    return {"message": "Schema deleted", "id": id}