Update main.py

main.py

@@ -54,63 +54,55 @@ sys_prompts = {
     },
 }
 
-class QueryModel(BaseModel):
-    topic: str = Query(default="market research", description="input query to generate Report")
-    description: str = Query(default="", description="additional context for report")
-    user_id: str = Query(default="", description="unique user id")
-    user_name: str = Query(default="", description="user name")
-    internet: bool = Query(default=True, description="Enable Internet search")
-    output_format: str = Query(default="Tabular Report", description="Output format for the report", enum=["Chat", "Full Text Report", "Tabular Report", "Tables only"])
-    data_format: str = Query(default="Structured data", description="Type of data to extract from the internet", enum=["No presets", "Structured data", "Quantitative data"])
-
-
-
- 
 @app.post("/generate_report")
-@cache(expire=604800)
-async def generate_report(query: QueryModel):
-    query_str = query.topic
-    description = query.description
-    user_id = query.user_id
-    internet = "online" if query.internet else "offline"
-    sys_prompt_output_format = sys_prompts[internet][query.output_format]
-    data_format = query.data_format
+@cache(expire=604800)  # Set cache expiration to 7 days (7 * 24 * 60 * 60 seconds)
+async def generate_report(
+    topic: str = Query(default="market research", description="input query to generate Report"),
+    description: str = Query(default="", description="additional context for report"),
+    user_id: str = Query(default="", description="unique user id"),
+    user_name: str = Query(default="", description="user name"),
+    internet: bool = Query(default=True, description="Enable Internet search"),
+    output_format: str = Query(default="Tabular Report", description="Output format for the report", enum=["Chat", "Full Text Report", "Tabular Report", "Tables only"]),
+    data_format: str = Query(default="Structured data", description="Type of data to extract from the internet", enum=["No presets", "Structured data", "Quantitative data"])
+):
+    query_str = topic
+    internet_status = "online" if internet else "offline"
+    sys_prompt_output_format = sys_prompts[internet_status][output_format]
     optimized_search_query = ""
     all_text_with_urls = [("","")]
-    
+
     # Combine query with user keywords
-    if query.internet:
+    if internet:
         search_query = description
         # Search for relevant URLs
         try:
-            urls,optimized_search_query = search_brave(search_query, num_results=4)
+            urls, optimized_search_query = search_brave(search_query, num_results=4)
             # Fetch and extract content from the URLs
             all_text_with_urls = fetch_and_extract_content(data_format, urls, query_str)
             # Prepare the prompt for generating the report
             additional_context = limit_tokens(str(all_text_with_urls))
             prompt = f"#### COMPLETE THE TASK: {description} #### IN THE CONTEXT OF ### CONTEXT: {query_str} USING THE #### SCRAPED DATA:{additional_context}"
-            
         except Exception as e:
-            query.internet = False
+            internet = False
             print("failed to search/scrape results, falling back to LLM response")
-    
-    if not query.internet:
+
+    if not internet:
         prompt = f"#### COMPLETE THE TASK: {description} #### IN THE CONTEXT OF ### CONTEXT: {query_str}"
 
     md_report = together_response(prompt, model=llm_default_medium, SysPrompt=sys_prompt_output_format)
-    
-    if user_id != "test":    
-        insert_data(user_id, query_str, description,  str(all_text_with_urls), md_report)
+
+    if user_id != "test":
+        insert_data(user_id, query_str, description, str(all_text_with_urls), md_report)
+
     references_html = dict()
     for text, url in all_text_with_urls:
         references_html[url] = str(md_to_html(text))
 
-
     # Return the generated report
     return {
         "report": md_to_html(md_report),
         "references": references_html,
-        "search_qury":optimized_search_query
+        "search_query": optimized_search_query
     }
 
 app.add_middleware(