Merge pull request #52 from pattern-tech/fix/routes

Fix/routes

Author: yasinfakhar

api/src/conversation/routers/playground_conversation_router.py

@@ -1,14 +1,15 @@
 from uuid import UUID
 from enum import Enum
-from pydantic import BaseModel
+from datetime import datetime
 from sqlalchemy.orm import Session
+from pydantic import BaseModel, Field
 from fastapi.responses import StreamingResponse
 from typing import List, Optional, Dict, Literal
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from src.db.sql_alchemy import Database
-from src.util.execptions import NotFoundError
 from src.auth.utils.get_token import authenticate_user
+from src.util.execptions import NotFoundError, RateLimitError
 from src.project.services.project_service import ProjectService
 from src.query_usage.services.query_usage_service import QueryUsageService
 from src.conversation.services.conversation_service import ConversationService
@@ -57,6 +58,9 @@ class CreateConversationInput(BaseModel):
     name: str
     project_id: UUID
     conversation_id: Optional[UUID] = None
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True
@@ -114,12 +118,14 @@ class ChatHistory(BaseModel):
     """
     history: List[HistoryMessage]
 
+
 class TitleOutput(BaseModel):
     """
     Schema for title output.
     """
     title: str
 
+
 @router.post(
     "",
     response_model=GlobalResponse[ConversationOutput, Dict],
@@ -200,6 +206,8 @@ def get_conversation(
     - **service**: Conversation service handling business logic.
     - **user_id**: The authenticated user's ID.
 
+    - **metadata**: The chat history metadata.
+
     Returns:
         ConversationOutput: The conversation data with chat history metadata.
     """
@@ -318,7 +326,7 @@ def update_conversation(
         400: {
                 "model": ExceptionResponse,
                 "description": "Bad request received"
-        }
+                }
     },
 )
 def delete_conversation(
@@ -364,6 +372,10 @@ def delete_conversation(
         400: {
             "model": ExceptionResponse,
             "description": "Bad request received"
+        },
+        429: {
+            "model": ExceptionResponse,
+            "description": "Rate daily limit exceeded"
         }
     }
 )
@@ -387,8 +399,6 @@ async def send_message(
     - **service**: Conversation service handling business logic.
     - **user_id**: The authenticated user's ID.
 
-    - **metadata**: The chat history metadata.
-
     Returns:
         StreamingResponse: If `stream` is true.
         dict: A JSON response containing the complete message data if `stream` is false.
@@ -436,6 +446,9 @@ async def send_message(
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail=str(e)
         )
+    except RateLimitError as e:
+        raise HTTPException(
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS, detail=str(e))
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))

api/src/project/routers/project_router.py

@@ -1,7 +1,8 @@
 from uuid import UUID
+from datetime import datetime
 from typing import List, Dict
-from pydantic import BaseModel
 from sqlalchemy.orm import Session
+from pydantic import BaseModel, Field
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from src.db.sql_alchemy import Database
@@ -50,6 +51,9 @@ class ProjectOutput(BaseModel):
     id: UUID
     name: str
     workspace_id: UUID
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True

api/src/query_usage/routers/query_usage_router.py

@@ -1,5 +1,5 @@
 from uuid import UUID
-from datetime import timedelta
+from datetime import datetime, timedelta
 from sqlalchemy.orm import Session
 from pydantic import BaseModel, Field
 from typing import List, Optional, Dict
@@ -49,6 +49,9 @@ class QueryUsageOutput(BaseModel):
     """
     id: UUID = Field(..., example="123e4567-e89b-12d3-a456-426614174000")
     provider: str = Field(..., example="morpheus")
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True
@@ -106,7 +109,7 @@ def get_query_usage(
     description="Get number of used and total number of allowed query for a user",
     response_description="Number of used and total number of allowed query for a user",
     responses={
-        403: {
+        429: {
             "model": ExceptionResponse,
             "description": "Not enough balance"
         },
@@ -147,7 +150,7 @@ def get_user_query_usages(
         return global_response(data)
     except NotEnoughBalanceError as e:
         raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail=str(e))
+            status_code=status.HTTP_429_TOO_MANY_REQUESTS, detail=str(e))
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))

api/src/user/routers/user_router.py

@@ -1,5 +1,6 @@
 from uuid import UUID
-from pydantic import BaseModel
+from datetime import datetime
+from pydantic import BaseModel, Field
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from sqlalchemy.orm import Session
@@ -38,6 +39,9 @@ class UserOutput(BaseModel):
     email: str
     wallet_address: str
     chain_id: int
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
 
     class Config:
         from_attributes = True

api/src/util/execptions.py

@@ -85,3 +85,10 @@ class InvalidTokenError(Exception):
     def __init__(self, message="invalid token"):
         self.message = message
         super().__init__(f"{self.message}")
+
+
+class RateLimitError(Exception):
+    """Exception raised when the rate limit is exceeded"""
+    def __init__(self, message="rate limit exceeded"):
+        self.message = message
+        super().__init__(self.message)

api/src/workspace/routers/workspace_router.py

@@ -1,4 +1,5 @@
 from uuid import UUID
+from datetime import datetime
 from typing import List, Dict
 from sqlalchemy.orm import Session
 from pydantic import BaseModel, Field
@@ -48,6 +49,10 @@ class WorkspaceOutput(BaseModel):
     """
     id: UUID = Field(..., example="123e4567-e89b-12d3-a456-426614174000")
     name: str = Field(..., example="New Workspace")
+    created_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    updated_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+    deleted_at: datetime = Field(None, example="2025-03-15T15:30:20+03:30")
+
 
     class Config:
         from_attributes = True