Update document_generator.py

document_generator.py

@@ -11,7 +11,6 @@ OUTPUT IN FOLLOWING JSON FORMAT enclosed in <output> tags
       "Author": "Author Name",
       "Date": "YYYY-MM-DD",
       "Version": "1.0",
-
       "Sections": [
         {
           "SectionNumber": "1",
@@ -52,7 +51,6 @@ OUTPUT IN FOLLOWING JSON FORMAT enclosed in <output> tags
       "Author": "Author Name",
       "Date": "YYYY-MM-DD",
       "Version": "1.0",
-
       "Sections": [
         {
           "SectionNumber": "1",
@@ -163,7 +161,7 @@ from typing import List, Dict, Optional, Any, Callable, Union
 from openai import OpenAI
 import logging
 import functools
-from fastapi import APIRouter, HTTPException, Request, UploadFile, File, Depends
+from fastapi import APIRouter, HTTPException, Request, UploadFile, File
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
 from fastapi_cache.decorator import cache
@@ -456,17 +454,12 @@ class JsonDocumentResponse(BaseModel):
 class JsonDocumentRequest(BaseModel):
     query: str
     template: bool = False
-    images: Optional[List[Union[UploadFile, str]]] = None
-    documents: Optional[List[Union[UploadFile, str]]] = None
-    conversation_id: str = ""
-
-    class Config:
-        arbitrary_types_allowed = True
+    images: Optional[List[UploadFile]] = File(None)
 
 class MarkdownDocumentRequest(BaseModel):
     json_document: Dict
     query: str
-    conversation_id: str = ""
+    template: bool = False
 
 MESSAGE_DELIMITER = b"\n---DELIMITER---\n"
 
@@ -535,10 +528,9 @@ async def generate_document_stream(document_generator: DocumentGenerator, docume
 
     db_manager.update_database("elevatics", query, markdown_document)
 
-@router.post("/generate-document/json", response_model=JsonDocumentResponse)
-async def generate_document_outline_endpoint(
-    request: JsonDocumentRequest = Depends()
-):
+
+@router.post("/generate-document/markdown-stream")
+async def generate_markdown_document_stream_endpoint(request: MarkdownDocumentRequest):
     ai_client = AIClient()
     document_generator = DocumentGenerator(ai_client)
     
@@ -556,21 +548,9 @@ async def generate_document_outline_endpoint(
 
 
 @cache(expire=600*24*7)
-@router.post("/generate-document/json", response_model=JsonDocumentResponse)
-async def generate_document_outline_endpoint(
-    query: str,
-    template: bool = False,
-    images: Optional[List[UploadFile]] = File(None),
-    documents: Optional[List[UploadFile]] = File(None),
-    conversation_id: str = ""
+@router.post("/generate-document/json")
+async def generate_document_outline_endpoint(request: jsonDocumentRequest):
 ):
-    request = JsonDocumentRequest(
-        query=query,
-        template=template,
-        images=images,
-        documents=documents,
-        conversation_id=conversation_id
-    )
     ai_client = AIClient()
     document_generator = DocumentGenerator(ai_client)
     vision_tools = VisionTools(ai_client)
@@ -651,8 +631,6 @@ async def get_last_observations(limit: int = 10, format: str = "json"):
         raise HTTPException(status_code=500, detail=f"Failed to retrieve observations: {str(e)}")
 
 
-
-
 ###########################################
 class MarkdownDocumentResponse(BaseModel):
     markdown_document: str