Reword routes + prepare for private gen

api/solutions.py

@@ -7,7 +7,7 @@ from jinja2 import Environment
 from litellm.router import Router
 from dependencies import INSIGHT_FINDER_BASE_URL, get_http_client, get_llm_router, get_prompt_templates
 from typing import Awaitable, Callable, TypeVar
-from schemas import _RefinedSolutionModel,  _SearchedSolutionModel, _SolutionCriticismOutput, CriticizeSolutionsRequest, CritiqueResponse, InsightFinderConstraintsList, ReqGroupingCategory, ReqGroupingRequest, ReqGroupingResponse, ReqSearchLLMResponse, ReqSearchRequest, ReqSearchResponse, SolutionCriticism, SolutionModel, SolutionSearchResponse, SolutionSearchV2Request, TechnologyData
+from schemas import _RefinedSolutionModel,  _BootstrappedSolutionModel, _SolutionCriticismOutput, CriticizeSolutionsRequest, CritiqueResponse, InsightFinderConstraintsList, ReqGroupingCategory, ReqGroupingRequest, ReqGroupingResponse, ReqSearchLLMResponse, ReqSearchRequest, ReqSearchResponse, SolutionCriticism, SolutionModel, SolutionBootstrapResponse, SolutionBootstrapRequest, TechnologyData
 
 # Router for solution generation and critique
 router = APIRouter(tags=["solution generation and critique"])
@@ -34,10 +34,14 @@ async def retry_until(
 
 # =================================================== Search solutions ============================================================================
 
-@router.post("/search_solutions")
-async def search_solutions_if(req: SolutionSearchV2Request, prompt_env: Environment = Depends(get_prompt_templates), llm_router: Router = Depends(get_llm_router), http_client: AsyncClient = Depends(get_http_client)) -> SolutionSearchResponse:
 
-    async def _search_solution_inner(cat: ReqGroupingCategory):
+@router.post("/bootstrap_solutions")
+async def bootstrap_solutions(req: SolutionBootstrapRequest, prompt_env: Environment = Depends(get_prompt_templates), llm_router: Router = Depends(get_llm_router), http_client: AsyncClient = Depends(get_http_client)) -> SolutionBootstrapResponse:
+    """
+    Boostraps a solution for each of the passed in requirements categories using Insight Finder's API.
+    """
+
+    async def _bootstrap_solution_inner(cat: ReqGroupingCategory):
         # process requirements into insight finder format
         fmt_completion = await llm_router.acompletion("gemini-v2", messages=[
             {
@@ -67,32 +71,32 @@ async def search_solutions_if(req: SolutionSearchV2Request, prompt_env: Environm
                 "category": cat.model_dump(),
                 "technologies": technologies.model_dump()["technologies"],
                 "user_constraints": req.user_constraints,
-                "response_schema": _SearchedSolutionModel.model_json_schema()
+                "response_schema": _BootstrappedSolutionModel.model_json_schema()
             })}
-        ], response_format=_SearchedSolutionModel)
+        ], response_format=_BootstrappedSolutionModel)
 
-        format_solution_model = _SearchedSolutionModel.model_validate_json(
+        format_solution_model = _BootstrappedSolutionModel.model_validate_json(
             format_solution.choices[0].message.content)
 
         final_solution = SolutionModel(
-            Context="",
-            Requirements=[
+            context="",
+            requirements=[
                 cat.requirements[i].requirement for i in format_solution_model.requirement_ids
             ],
-            Problem_Description=format_solution_model.problem_description,
-            Solution_Description=format_solution_model.solution_description,
-            References=[],
-            Category_Id=cat.id,
+            problem_description=format_solution_model.problem_description,
+            solution_description=format_solution_model.solution_description,
+            references=[],
+            category_id=cat.id,
         )
 
         # ========================================================================================================================================
 
         return final_solution
 
-    tasks = await asyncio.gather(*[_search_solution_inner(cat) for cat in req.categories], return_exceptions=True)
+    tasks = await asyncio.gather(*[_bootstrap_solution_inner(cat) for cat in req.categories], return_exceptions=True)
     final_solutions = [sol for sol in tasks if not isinstance(sol, Exception)]
 
-    return SolutionSearchResponse(solutions=final_solutions)
+    return SolutionBootstrapResponse(solutions=final_solutions)
 
 
 @router.post("/criticize_solution", response_model=CritiqueResponse)
@@ -123,8 +127,8 @@ async def criticize_solution(params: CriticizeSolutionsRequest, prompt_env: Envi
 
 # =================================================================== Refine solution ====================================
 
-@router.post("/refine_solutions", response_model=SolutionSearchResponse)
-async def refine_solutions(params: CritiqueResponse, prompt_env: Environment = Depends(get_prompt_templates), llm_router: Router = Depends(get_llm_router)) -> SolutionSearchResponse:
+@router.post("/refine_solutions", response_model=SolutionBootstrapResponse)
+async def refine_solutions(params: CritiqueResponse, prompt_env: Environment = Depends(get_prompt_templates), llm_router: Router = Depends(get_llm_router)) -> SolutionBootstrapResponse:
     """Refines the previously critiqued solutions."""
 
     async def __refine_solution(crit: SolutionCriticism):
@@ -143,12 +147,11 @@ async def refine_solutions(params: CritiqueResponse, prompt_env: Environment = D
 
         # copy previous solution model
         refined_solution = crit.solution.model_copy(deep=True)
-        refined_solution.Problem_Description = req_model.problem_description
-        refined_solution.Solution_Description = req_model.solution_description
+        refined_solution.problem_description = req_model.problem_description
+        refined_solution.solution_description = req_model.solution_description
 
         return refined_solution
 
     refined_solutions = await asyncio.gather(*[__refine_solution(crit) for crit in params.critiques], return_exceptions=False)
 
-    return SolutionSearchResponse(solutions=refined_solutions)
-
+    return SolutionBootstrapResponse(solutions=refined_solutions)

prompts/criticize.txt

@@ -8,9 +8,9 @@ Here are the solutions:
 <solutions>
 {% for solution in solutions %}
 ## Solution
-- Context: {{solution["Context"]}}
-- Problem description: {{solution["Problem_Description"]}}
-- Solution description: {{solution["Solution_Description"]}}
+- Context: {{solution["context"]}}
+- Problem description: {{solution["problem_description"]}}
+- Solution description: {{solution["solution_description"]}}
 ---
 {% endfor -%}
 </solutions>

prompts/refine_solution.txt

@@ -7,18 +7,18 @@ No need to include that the solution is refined.
 Here is the solution:
 <solution>
 # Solution Context: 
-{{solution['Context']}}
+{{solution['context']}}
 
 # Requirements solved by the solution
-{% for req in solution['Requirements'] -%}
+{% for req in solution['requirements'] -%}
 - {{req}}
 {% endfor %}
 
 # Problem description associated to the solution
-{{solution['Problem_Description']}}
+{{solution['problem_description']}}
 
 # Description of the solution
-{{solution['Solution_Description']}}
+{{solution['solution_description']}}
 </solution>
 
 Here is the criticism:

schemas.py

@@ -1,39 +1,48 @@
 from pydantic import BaseModel, Field
 from typing import Any, List, Dict, Optional
 
+
 class MeetingsRequest(BaseModel):
     working_group: str
 
+
 class MeetingsResponse(BaseModel):
     meetings: Dict[str, str]
 # --------------------------------------
 
+
 class DataRequest(BaseModel):
     working_group: str
     meeting: str
 
+
 class DataResponse(BaseModel):
     data: List[Dict[Any, Any]]
 
 # --------------------------------------
 
+
 class DocInfo(BaseModel):
     document: str
     url: str
 
+
 class RequirementsRequest(BaseModel):
     documents: List[DocInfo]
 
+
 class DocRequirements(BaseModel):
     document: str
     context: str
     requirements: List[str]
 
+
 class RequirementsResponse(BaseModel):
     requirements: List[DocRequirements]
 
 # --------------------------------------
 
+
 class RequirementInfo(BaseModel):
     req_id: int = Field(..., description="The ID of this requirement")
     context: str = Field(..., description="Context for the requirement.")
@@ -71,21 +80,22 @@ class ReqGroupingCategory(BaseModel):
 
 
 class SolutionModel(BaseModel):
-    Context: str = Field(...,
+    context: str = Field(...,
                          description="Full context provided for this category.")
-    Requirements: List[str] = Field(...,
-                                    description="List of each requirement as string.")
-    Problem_Description: str = Field(..., alias="Problem Description",
+    requirements: List[str] = Field(...,
+                                    description="List of each requirement covered by the solution as a string.")
+    problem_description: str = Field(...,
                                      description="Description of the problem being solved.")
-    Solution_Description: str = Field(..., alias="Solution Description",
+    solution_description: str = Field(...,
                                       description="Detailed description of the solution.")
-    References: list[dict] = Field(
+    references: list[dict] = Field(
         ..., description="References to documents used for the solution.")
-    Category_Id: int = Field(
+    
+    category_id: int = Field(
         ..., description="ID of the requirements category the solution is based on")
 
-    class Config:
-        validate_by_name = True  # Enables alias handling on input/output
+    # class Config:
+    #     validate_by_name = True  # Enables alias handling on input/output
 
 
 # ============================================================= Categorize requirements endpoint
@@ -115,14 +125,14 @@ class _ReqGroupingOutput(BaseModel):
         ..., description="List of grouping categories")
 
 
-# =================================================================== search solution response endpoint
+# =================================================================== bootstrap solution response
 
-class _SolutionSearchOutput(BaseModel):
+class _SolutionBootstrapOutput(BaseModel):
     solution: SolutionModel
 
 
-class _SearchedSolutionModel(BaseModel):
-    """"Internal model used for solutions searched using gemini"""
+class _BootstrappedSolutionModel(BaseModel):
+    """"Internal model used for solutions bootstrapped using """
     requirement_ids: List[int] = Field(...,
                                        description="List of each requirement ID addressed by the solution")
     problem_description: str = Field(...,
@@ -131,13 +141,12 @@ class _SearchedSolutionModel(BaseModel):
                                       description="Detailed description of the solution.")
 
 
-class SolutionSearchResponse(BaseModel):
-    """Response model for solution search"""
+class SolutionBootstrapResponse(BaseModel):
+    """Response model for solution bootstrapping"""
     solutions: list[SolutionModel]
 
 
-class SolutionSearchV2Request(BaseModel):
-    """Response of a requirement grouping call."""
+class SolutionBootstrapRequest(BaseModel):
     categories: List[ReqGroupingCategory]
     user_constraints: Optional[str] = Field(
         default=None, description="Additional user constraints to respect when generating the solutions.")

static/js/app.js

@@ -756,7 +756,7 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
     const criticism = item.criticism;
 
     // Récupérer le titre de la catégorie
-    const categoryTitle = categorizedRequirements.categories.find(c => c.id == solution['Category_Id']).title;
+    const categoryTitle = categorizedRequirements.categories.find(c => c.id == solution['category_id']).title;
 
     // Container pour chaque solution
     const solutionCard = document.createElement('div');
@@ -777,7 +777,7 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
             <h3 class="text-sm font-semibold text-gray-800">${categoryTitle}</h3>
             <div class="flex items-center space-x-2 bg-white px-3 py-1 rounded-full border">
                 <button class="version-btn-left w-6 h-6 flex items-center justify-center rounded-full hover:bg-gray-100 transition-colors ${currentVersion === 1 ? 'opacity-50 cursor-not-allowed' : ''}" 
-                        data-solution-index="${solution['Category_Id']}"
+                        data-solution-index="${solution['category_id']}"
                         ${currentVersion === 1 ? 'disabled' : ''}>
                     <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
@@ -785,7 +785,7 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
                 </button>
                 <span class="text-xs font-medium text-gray-600 min-w-[60px] text-center version-indicator">Version ${currentVersion}</span>
                 <button class="version-btn-right w-6 h-6 flex items-center justify-center rounded-full hover:bg-gray-100 transition-colors ${currentVersion === totalVersions ? 'opacity-50 cursor-not-allowed' : ''}" 
-                        data-solution-index="${solution['Category_Id']}"
+                        data-solution-index="${solution['category_id']}"
                         ${currentVersion === totalVersions ? 'disabled' : ''}>
                     <svg class="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path>
@@ -795,7 +795,7 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
         </div>
         <!--
         <button class="delete-btn text-red-500 hover:text-red-700 transition-colors" 
-                data-solution-index="${solution['Category_Id']}" id="solution-delete-btn">
+                data-solution-index="${solution['category_id']}" id="solution-delete-btn">
             <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5-3h4m-4 0a1 1 0 00-1 1v1h6V5a1 1 0 00-1-1m-4 0h4" />
             </svg>
@@ -807,10 +807,10 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
     // Contenu de l'accordéon
     const content = document.createElement('div');
     content.className = `accordion-content px-4 py-3 space-y-3`;
-    content.id = `content-${solution['Category_Id']}`;
+    content.id = `content-${solution['category_id']}`;
 
     // Vérifier l'état d'ouverture précédent
-    const isOpen = accordionStates[solution['Category_Id']] || false;
+    const isOpen = accordionStates[solution['category_id']] || false;
     console.log(isOpen);
     if (!isOpen)
         content.classList.add('hidden');
@@ -825,13 +825,13 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
             </svg>
             Problem Description
         </h4>
-        <p class="text-xs text-gray-700 leading-relaxed">${solution['Problem Description'] || 'Aucune description du problème disponible.'}</p>
+        <p class="text-xs text-gray-700 leading-relaxed">${solution["problem_description"] || 'Aucune description du problème disponible.'}</p>
     `;
 
     // Section Problem requirements
     const reqsSection = document.createElement('div');
     reqsSection.className = "bg-gray-50 border-l-2 border-red-400 p-3 rounded-r-md";
-    const reqItemsUl = solution["Requirements"].map(req => `<li>${req}</li>`).join('');
+    const reqItemsUl = solution["requirements"].map(req => `<li>${req}</li>`).join('');
     reqsSection.innerHTML = `
         <h4 class="text-sm font-semibold text-gray-800 mb-2 flex items-center">
             <svg class="w-4 h-4 mr-1" fill="currentColor" viewBox="0 0 20 20">
@@ -862,10 +862,10 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
     solutionSection.appendChild(solContents);
 
     try {
-        solContents.innerHTML = marked.parse(solution['Solution Description']);
+        solContents.innerHTML = marked.parse(solution['solution_description']);
     }
     catch (e) {
-        solContents.innerHTML = `<p class="text-xs text-gray-700 leading-relaxed">${solution['Solution Description'] || 'No available solution description'}</p>`;
+        solContents.innerHTML = `<p class="text-xs text-gray-700 leading-relaxed">${solution['solution_description'] || 'No available solution description'}</p>`;
     }
 
 
@@ -956,7 +956,7 @@ function createSingleAccordionItem(item, index, versionIndex, solutionCriticized
     });
 
     // create source reference pills
-    solution['References'].forEach(source => {
+    solution['references'].forEach(source => {
         const pillLink = createEl('a', {
             href: source.url,
             target: '_blank',
@@ -1055,7 +1055,7 @@ async function generateSolutions(selected_categories, user_constraints = null) {
     let input_req = structuredClone(selected_categories);
     input_req.user_constraints = user_constraints;
 
-    let response = await fetch("/solutions/search_solutions", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(input_req) })
+    let response = await fetch("/solutions/bootstrap_solutions", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(input_req) })
     let responseObj = await response.json()
     return responseObj;
 }