chore: api layer refactoring

app/api/chat_api.py

@@ -2,9 +2,7 @@
 
 from typing import Any, List, Optional
 from fastapi import APIRouter, HTTPException, Depends, Request
-from pydantic import BaseModel
 from app.schema.chat_schema import ChatCompletionRequest, ChatCompletionResponse, ChatMessageResponse
-from app.schema.conversation_schema import ConversationResponse, ConversationItemResponse
 from app.service.chat_service import ChatService
 from app.security.auth_service import AuthService
 from loguru import logger
@@ -14,16 +12,6 @@ service = ChatService()
 auth_service = AuthService()
 
 
-class VersionResponse(BaseModel):
-    version: str = "0.0.1"
-
-
-# version api from pyproject.toml
-@router.get("/version", response_model=VersionResponse)
-async def get_version():
-    return VersionResponse()
-
-
 ################
 # chat completion api list
 ################
@@ -99,7 +87,9 @@ async def list_messages(completion_id: str, request: Request, username: str = De
 ################
 # get a plot for a message
 @router.get(
-    "/chat/completions/{completion_id}/messages/{message_id}/plot", response_model=Optional[dict[str, Any]], response_model_exclude_none=True
+    "/chat/completions/{completion_id}/messages/{message_id}/plot",
+    response_model=Optional[dict[str, Any]],
+    response_model_exclude_none=True,
 )
 async def retrieve_plot(completion_id: str, message_id: str, request: Request, username: str = Depends(auth_service.verify_credentials)):
     """
@@ -110,46 +100,3 @@ async def retrieve_plot(completion_id: str, message_id: str, request: Request, u
         return await service.find_plot_by_message(completion_id, message_id)
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
-
-
-################
-# conversation api list
-################
-# GET https://chatgpt.com/backend-api/conversations
-# GET https://chatgpt.com/backend-api/conversations/{completion_id}
-
-
-# get all conversations
-@router.get("/conversations", response_model=ConversationResponse, response_model_exclude_none=True)
-async def list_conversations(
-    request: Request,
-    username: str = Depends(auth_service.verify_credentials),
-):
-    """
-    Get all conversations
-    """
-    logger.debug(f"Listing conversations for username: {username}")
-    try:
-        return await service.find_all_conversations(username)
-    except Exception as e:
-        logger.error(f"Error in list_conversations: {str(e)}")
-        raise HTTPException(status_code=500, detail=str(e))
-
-
-# get a conversation by id
-
-
-@router.get("/conversations/{completion_id}", response_model=ConversationItemResponse, response_model_exclude_none=True)
-async def retrieve_conversation(
-    completion_id: str,
-    request: Request,
-    username: str = Depends(auth_service.verify_credentials),
-):
-    """
-    Get a conversation by id
-    """
-    logger.debug(f"Retrieving conversation with completion_id: {completion_id}")
-    try:
-        return await service.find_conversation_by_id(completion_id)
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))

app/service/chat_service.py

@@ -8,7 +8,7 @@ from app.mapper.chat_mapper import ChatMapper
 from app.mapper.conversation_mapper import ConversationMapper
 import uuid
 from loguru import logger
-from app.schema.conversation_schema import ConversationResponse
+from app.schema.conversation_schema import ConversationItemResponse, ConversationResponse
 from app.service.chat_validation import ChatValidation
 from app.agent.chat_agent_client import ChatAgentClient
 
@@ -57,19 +57,18 @@ class ChatService:
         return ConversationResponse(items=result, total=len(result), limit=100, offset=0)
 
     # conversation service
-    async def find_conversation_by_id(self, completion_id: str) -> ConversationResponse | None:
+    async def find_conversation_by_id(self, completion_id: str) -> ConversationItemResponse | None:
         """Find a conversation by its completion ID."""
         logger.debug(f"BEGIN SERVICE: find_conversation_by_id for completion_id: {completion_id}")
         projection = {"messages": 0, "_id": 0}
         entity = await self.chat_repository.find_by_id(completion_id, projection=projection)
-        logger.debug(f"END SERVICE: find_conversation_by_id for completion_id: {completion_id}, entity: {entity}")
 
         if entity:
             conversation_item = self.conversation_mapper.to_schema(entity)
-            result = ConversationResponse(items=[conversation_item], total=1, limit=1, offset=0)
-            return result
-        else:
-            return None
+            logger.debug(f"END SERVICE: find_conversation_by_id for completion_id: {completion_id}, entity: {conversation_item}")
+            return conversation_item
+
+        return None
 
     async def find_plot_by_message(self, completion_id: str, message_id: str) -> dict[str, Any]:
         logger.debug(f"BEGIN SERVICE: find_plot_by_message for completion_id: {completion_id}, message_id: {message_id}")

main.py

@@ -3,7 +3,7 @@ from fastapi import FastAPI
 from fastapi.responses import RedirectResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.middleware.cors import CORSMiddleware
-from app.api import chat_api
+from app.api import chat_api, conversation_api, management_api
 from app.config.log import log_config
 from loguru import logger
 from environs import Env
@@ -116,6 +116,8 @@ app.add_middleware(
 app.mount("/static", StaticFiles(directory="static"), name="static")
 app.mount("/.well-known", StaticFiles(directory=".well-known"), name="well-known")
 app.include_router(chat_api.router)
+app.include_router(management_api.router)
+app.include_router(conversation_api.router)
 
 # Build and mount Gradio app
 demo = build_gradio_app()