categorize the strengths

alembic/versions/a3bbab758ddb_categorize_the_analysis.py

@@ -0,0 +1,91 @@
+"""categorize the analysis
+
+Revision ID: a3bbab758ddb
+Revises: 7fae52a30825
+Create Date: 2025-06-04 14:01:24.366580
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "a3bbab758ddb"
+down_revision: Union[str, None] = "7fae52a30825"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    strength_category_enum = sa.Enum(
+        "TECHNICAL", "MANAGEMENT", "PAST_PERFORMANCE", "PRICE", name="strengthcategory"
+    )
+    strength_category_enum.create(op.get_bind())
+    op.add_column(
+        "proposal_strengths",
+        sa.Column(
+            "category",
+            strength_category_enum,
+            nullable=False,
+            server_default="TECHNICAL",
+        ),
+    )
+    weakness_category_enum = sa.Enum(
+        "TECHNICAL", "MANAGEMENT", "PAST_PERFORMANCE", "PRICE", name="weaknesscategory"
+    )
+    weakness_category_enum.create(op.get_bind())
+    op.add_column(
+        "proposal_weaknesses",
+        sa.Column(
+            "category",
+            weakness_category_enum,
+            nullable=False,
+            server_default="TECHNICAL",
+        ),
+    )
+    rejection_category_enum = sa.Enum(
+        "TECHNICAL", "MANAGEMENT", "PAST_PERFORMANCE", "PRICE", name="rejectioncategory"
+    )
+    rejection_category_enum.create(op.get_bind())
+    op.add_column(
+        "proposal_rejection_reasons",
+        sa.Column(
+            "category",
+            rejection_category_enum,
+            nullable=False,
+            server_default="TECHNICAL",
+        ),
+    )
+    improvement_category_enum = sa.Enum(
+        "TECHNICAL",
+        "MANAGEMENT",
+        "PAST_PERFORMANCE",
+        "PRICE",
+        name="improvementcategory",
+    )
+    improvement_category_enum.create(op.get_bind())
+    op.add_column(
+        "proposal_improvements",
+        sa.Column(
+            "category",
+            improvement_category_enum,
+            nullable=False,
+            server_default="TECHNICAL",
+        ),
+    )
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    sa.Enum(name="strengthcategory").drop(op.get_bind(), checkfirst=True)
+    op.drop_column("proposal_strengths", "category")
+    sa.Enum(name="weaknesscategory").drop(op.get_bind(), checkfirst=True)
+    op.drop_column("proposal_weaknesses", "category")
+    sa.Enum(name="rejectioncategory").drop(op.get_bind(), checkfirst=True)
+    op.drop_column("proposal_rejection_reasons", "category")
+    sa.Enum(name="improvementcategory").drop(op.get_bind(), checkfirst=True)
+    op.drop_column("proposal_improvements", "category")

src/controllers/_proposal_ai_analysis_controller.py

@@ -8,7 +8,7 @@ from src.config import logger
 
 from src.services import ProposalAIAnalysisService
 
-from src.models import QueryType, CreateOrUpdateType
+from src.models import QueryType, CreateOrUpdateType, Category
 
 
 class ProposalAIAnalysis(BaseModel):
@@ -23,6 +23,7 @@ class ProposalStrength(BaseModel):
     id: UUID
     proposal_id: UUID
     strength_point: str
+    category: Category
     created_at: datetime
     updated_at: datetime
 
@@ -31,6 +32,7 @@ class ProposalWeakness(BaseModel):
     id: UUID
     proposal_id: UUID
     weakness_point: str
+    category: Category
     created_at: datetime
     updated_at: datetime
 
@@ -39,6 +41,7 @@ class ProposalRejectionReason(BaseModel):
     id: UUID
     proposal_id: UUID
     reason: str
+    category: Category
     created_at: datetime
     updated_at: datetime
 
@@ -47,6 +50,7 @@ class ProposalImprovement(BaseModel):
     id: UUID
     proposal_id: UUID
     improvement_point: str
+    category: Category
     created_at: datetime
     updated_at: datetime
 
@@ -95,13 +99,18 @@ class ProposalImprovementResponse(BaseModel):
     status: str
     data: Optional[List[ProposalImprovement]]
 
+class Analysis(BaseModel):
+    strengths: Optional[List[str]] = None
+    weaknesses: Optional[List[str]] = None
+    rejection_reasons: Optional[List[str]] = None
+    improvements: Optional[List[str]] = None
 
 class ProposalCompleteAnalysis(BaseModel):
     ai_score: float
-    strengths: List[str]
-    weaknesses: List[str]
-    rejection_reasons: List[str]
-    improvements: List[str]
+    technical: Optional[Analysis] = None
+    management: Optional[Analysis] = None
+    past_performance: Optional[Analysis] = None
+    price: Optional[Analysis] = None
 
 
 class ProposalCompleteAnalysisResponse(BaseModel):
@@ -116,41 +125,49 @@ class DeleteResponse(BaseModel):
 class ProposalStrengthRequest(BaseModel):
     proposal_id: UUID
     strength_point: str
+    category: Category
 
 
 class UpdateProposalStrengthRequest(BaseModel):
     proposal_id: Optional[UUID] = None
     strength_point: Optional[str] = None
+    category: Optional[Category] = None
 
 
 class ProposalWeaknessRequest(BaseModel):
     proposal_id: UUID
     weakness_point: str
+    category: Category
 
 
 class UpdateProposalWeaknessRequest(BaseModel):
     proposal_id: Optional[UUID] = None
     weakness_point: Optional[str] = None
+    category: Optional[Category] = None
 
 
 class ProposalRejectionReasonRequest(BaseModel):
     proposal_id: UUID
     reason: str
+    category: Category
 
 
 class UpdateProposalRejectionReasonRequest(BaseModel):
     proposal_id: Optional[UUID] = None
     reason: Optional[str] = None
+    category: Optional[Category] = None
 
 
 class ProposalImprovementRequest(BaseModel):
     proposal_id: UUID
     improvement_point: str
+    category: Category
 
 
 class UpdateProposalImprovementRequest(BaseModel):
     proposal_id: Optional[UUID] = None
     improvement_point: Optional[str] = None
+    category: Optional[Category] = None
 
 
 class CreateAiAnalysisRequest(BaseModel):
@@ -169,34 +186,40 @@ class UpdateAIAnalysisRequestByProposalId(BaseModel):
 
 class CreateAllProposalStrengthsRequest(BaseModel):
     strength_point: List[str]
+    category: Category
 
+class UpdateAllProposalStrengthsRequest(BaseModel):
+    strength_point: Optional[List[str]] = None
 
 class CreateAllProposalWeaknessRequest(BaseModel):
     weakness_point: List[str]
+    category: Category
 
 
 class CreateAllProposalRejectionReasonsRequest(BaseModel):
     reason: List[str]
+    category: Category
 
 
 class CreateAllProposalImprovementsRequest(BaseModel):
     improvement_point: List[str]
+    category: Category
 
 
 class CreateAllProposalAnalysisRequest(BaseModel):
     ai_score: float
-    strengths: Optional[List[str]] = None
-    weaknesses: Optional[List[str]] = None
-    rejection_reasons: Optional[List[str]] = None
-    improvements: Optional[List[str]] = None
+    technical: Optional[Analysis] = None
+    management: Optional[Analysis] = None
+    past_performance: Optional[Analysis] = None
+    price: Optional[Analysis] = None
 
 
 class UpdateAllProposalAnalysisRequest(BaseModel):
     ai_score: Optional[float] = None
-    strengths: Optional[List[str]] = None
-    weaknesses: Optional[List[str]] = None
-    rejection_reasons: Optional[List[str]] = None
-    improvements: Optional[List[str]] = None
+    technical: Optional[Analysis] = None
+    management: Optional[Analysis] = None
+    past_performance: Optional[Analysis] = None
+    price: Optional[Analysis] = None
 
 
 class ProposalAIController:
@@ -204,419 +227,454 @@ class ProposalAIController:
         self.__service = ProposalAIAnalysisService
         self.router = APIRouter()
 
+        # self.router.add_api_route(
+        #     "/proposal-strengths",
+        #     self.get_proposal_strengths,
+        #     methods=["GET"],
+        #     tags=["Proposal Strengths"],
+        #     response_model=ProposalStrengthResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-strengths/{id}",
+        #     self.get_proposal_strengths_by_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Strengths by ID"],
+        #     response_model=ProposalStrengthResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-strengths",
-            self.get_proposal_strengths,
-            methods=["GET"],
-            tags=["Proposal Strengths"],
-            response_model=ProposalStrengthResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-strengths/{id}",
-            self.get_proposal_strengths_by_id,
-            methods=["GET"],
-            tags=["Proposal Strengths by ID"],
-            response_model=ProposalStrengthResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths",
             self.get_proposal_strengths_by_proposal_id,
             methods=["GET"],
             tags=["Proposal Strengths by Proposal ID"],
             response_model=ProposalAllStrengthsResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths/{id}",
-            self.get_proposal_strengths_by_proposal_and_id,
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths/{category}",
+            self.get_proposal_strengths_by_proposal_and_category,
             methods=["GET"],
-            tags=["Proposal Strengths by Proposal and ID"],
-            response_model=ProposalStrengthResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-strengths",
-            self.create_proposal_strengths,
-            methods=["POST"],
-            tags=["Proposal Strengths"],
-            response_model=ProposalStrengthResponse,
+            tags=["Proposal Strengths by Proposal and Category"],
+            response_model=ProposalAllStrengthsResponse,
         )
+        # self.router.add_api_route(
+        #     "/rfps/{rfp_id}/proposals/{proposal_id}/strengths/{id}",
+        #     self.get_proposal_strengths_by_proposal_and_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Strengths by Proposal and ID"],
+        #     response_model=ProposalStrengthResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-strengths",
+        #     self.create_proposal_strengths,
+        #     methods=["POST"],
+        #     tags=["Proposal Strengths"],
+        #     response_model=ProposalStrengthResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths",
             self.create_all_proposal_strengths,
             methods=["POST"],
             tags=["Proposal Strengths by Proposal ID"],
             response_model=ProposalAllStrengthsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-strengths/{id}",
+        #     self.update_proposal_strengths,
+        #     methods=["PUT"],
+        #     tags=["Proposal Strengths by ID"],
+        #     response_model=ProposalStrengthResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-strengths/{id}",
-            self.update_proposal_strengths,
-            methods=["PUT"],
-            tags=["Proposal Strengths by ID"],
-            response_model=ProposalStrengthResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths/{category}",
             self.update_all_proposal_strengths,
             methods=["PUT"],
-            tags=["Proposal Strengths by Proposal ID"],
+            tags=["Proposal Strengths by Proposal and Category"],
             response_model=ProposalAllStrengthsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-strengths/{id}",
+        #     self.delete_proposal_strength,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Strengths by ID"],
+        #     response_model=DeleteResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-strengths/{id}",
-            self.delete_proposal_strength,
-            methods=["DELETE"],
-            tags=["Proposal Strengths by ID"],
-            response_model=DeleteResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths",
             self.delete_all_proposal_strengths,
             methods=["DELETE"],
             tags=["Proposal Strengths by Proposal ID"],
             response_model=DeleteResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-strengths/{id}",
-            self.delete_proposal_strengths_by_proposal_and_id,
+            "/rfps/{rfp_id}/proposals/{proposal_id}/strengths/{category}",
+            self.delete_proposal_strengths_by_proposal_and_category,
             methods=["DELETE"],
-            tags=["Proposal Strengths by Proposal and ID"],
+            tags=["Proposal Strengths by Proposal and Category"],
             response_model=DeleteResponse,
         )
-
-        self.router.add_api_route(
-            "/proposal-weakness",
-            self.get_proposal_weakness,
-            methods=["GET"],
-            tags=["Proposal Weakness"],
-            response_model=ProposalWeaknessResponse,
-        )
+        # self.router.add_api_route(
+        #     "rfps/{rfp_id}/proposals/{proposal_id}/strengths/{id}",
+        #     self.delete_proposal_strengths_by_proposal_and_id,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Strengths by Proposal and ID"],
+        #     response_model=DeleteResponse,
+        # )
+
+        # self.router.add_api_route(
+        #     "/proposal-weakness",
+        #     self.get_proposal_weakness,
+        #     methods=["GET"],
+        #     tags=["Proposal Weakness"],
+        #     response_model=ProposalWeaknessResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-weakness/{id}",
+        #     self.get_proposal_weakness_by_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Weakness by ID"],
+        #     response_model=ProposalWeaknessResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-weakness/{id}",
-            self.get_proposal_weakness_by_id,
-            methods=["GET"],
-            tags=["Proposal Weakness by ID"],
-            response_model=ProposalWeaknessResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/weakness",
             self.get_proposal_weakness_by_proposal_id,
             methods=["GET"],
             tags=["Proposal Weakness by Proposal ID"],
             response_model=ProposalAllWeaknessesResponse,
         )
+        # self.router.add_api_route(
+        #     "/rfps/{rfp_id}/proposals/{proposal_id}/weakness/{id}",
+        #     self.get_proposal_weakness_by_proposal_and_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Weakness by Proposal and ID"],
+        #     response_model=ProposalWeaknessResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-weakness",
+        #     self.create_proposal_weakness,
+        #     methods=["POST"],
+        #     tags=["Proposal Weakness"],
+        #     response_model=ProposalWeaknessResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness/{id}",
-            self.get_proposal_weakness_by_proposal_and_id,
-            methods=["GET"],
-            tags=["Proposal Weakness by Proposal and ID"],
-            response_model=ProposalWeaknessResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-weakness",
-            self.create_proposal_weakness,
-            methods=["POST"],
-            tags=["Proposal Weakness"],
-            response_model=ProposalWeaknessResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/weakness",
             self.create_all_proposal_weakness,
             methods=["POST"],
             tags=["Proposal Weakness by Proposal ID"],
             response_model=ProposalAllWeaknessesResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-weakness/{id}",
+        #     self.update_proposal_weakness,
+        #     methods=["PUT"],
+        #     tags=["Proposal Weakness by ID"],
+        #     response_model=ProposalWeaknessResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-weakness/{id}",
-            self.update_proposal_weakness,
-            methods=["PUT"],
-            tags=["Proposal Weakness by ID"],
-            response_model=ProposalWeaknessResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/weakness",
             self.update_all_proposal_weakness,
             methods=["PUT"],
             tags=["Proposal Weakness by Proposal ID"],
             response_model=ProposalAllWeaknessesResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-weakness/{id}",
+        #     self.delete_proposal_weakness,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Weakness by ID"],
+        #     response_model=DeleteResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-weakness/{id}",
-            self.delete_proposal_weakness,
-            methods=["DELETE"],
-            tags=["Proposal Weakness by ID"],
-            response_model=DeleteResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/weakness",
             self.delete_all_proposal_weakness,
             methods=["DELETE"],
             tags=["Proposal Weakness by Proposal ID"],
             response_model=DeleteResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-weakness/{id}",
-            self.delete_proposal_weakness_by_proposal_and_id,
+            "/rfps/{rfp_id}/proposals/{proposal_id}/weakness/{category}",
+            self.delete_proposal_weakness_by_proposal_and_category,
             methods=["DELETE"],
-            tags=["Proposal Weakness by Proposal and ID"],
+            tags=["Proposal Weakness by Proposal and Category"],
             response_model=DeleteResponse,
         )
-
-        self.router.add_api_route(
-            "/proposal-rejections",
-            self.get_proposal_rejections,
-            methods=["GET"],
-            tags=["Proposal Rejections"],
-            response_model=ProposalRejectionReasonResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-rejections/{id}",
-            self.get_proposal_rejections_by_id,
-            methods=["GET"],
-            tags=["Proposal Rejections by ID"],
-            response_model=ProposalRejectionReasonResponse,
-        )
+        # self.router.add_api_route(
+        #     "/rfps/{rfp_id}/proposals/{proposal_id}/weakness/{id}",
+        #     self.delete_proposal_weakness_by_proposal_and_id,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Weakness by Proposal and ID"],
+        #     response_model=DeleteResponse,
+        # )
+
+        # self.router.add_api_route(
+        #     "/proposal-rejections",
+        #     self.get_proposal_rejections,
+        #     methods=["GET"],
+        #     tags=["Proposal Rejections"],
+        #     response_model=ProposalRejectionReasonResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-rejections/{id}",
+        #     self.get_proposal_rejections_by_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Rejections by ID"],
+        #     response_model=ProposalRejectionReasonResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/rejections",
             self.get_proposal_rejections_by_proposal_id,
             methods=["GET"],
             tags=["Proposal Rejections by Proposal ID"],
             response_model=ProposalAllRejectionReasonsResponse,
         )
+        # self.router.add_api_route(
+        #     "/rfps/{rfp_id}/proposals/{proposal_id}/rejections/{id}",
+        #     self.get_proposal_rejections_by_proposal_and_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Rejections by Proposal and ID"],
+        #     response_model=ProposalRejectionReasonResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-rejections",
+        #     self.create_proposal_rejections,
+        #     methods=["POST"],
+        #     tags=["Proposal Rejections"],
+        #     response_model=ProposalRejectionReasonResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections/{id}",
-            self.get_proposal_rejections_by_proposal_and_id,
-            methods=["GET"],
-            tags=["Proposal Rejections by Proposal and ID"],
-            response_model=ProposalRejectionReasonResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-rejections",
-            self.create_proposal_rejections,
-            methods=["POST"],
-            tags=["Proposal Rejections"],
-            response_model=ProposalRejectionReasonResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/rejections",
             self.create_all_proposal_rejections,
             methods=["POST"],
             tags=["Proposal Rejections by Proposal ID"],
             response_model=ProposalAllRejectionReasonsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-rejections/{id}",
+        #     self.update_proposal_rejections,
+        #     methods=["PUT"],
+        #     tags=["Proposal Rejections by ID"],
+        #     response_model=ProposalRejectionReasonResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-rejections/{id}",
-            self.update_proposal_rejections,
-            methods=["PUT"],
-            tags=["Proposal Rejections by ID"],
-            response_model=ProposalRejectionReasonResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/rejections",
             self.update_all_proposal_rejections,
             methods=["PUT"],
             tags=["Proposal Rejections by Proposal ID"],
             response_model=ProposalAllRejectionReasonsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-rejections/{id}",
+        #     self.delete_proposal_rejections,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Rejections by ID"],
+        #     response_model=DeleteResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-rejections/{id}",
-            self.delete_proposal_rejections,
-            methods=["DELETE"],
-            tags=["Proposal Rejections by ID"],
-            response_model=DeleteResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/rejections",
             self.delete_all_proposal_rejections,
             methods=["DELETE"],
             tags=["Proposal Rejections by Proposal ID"],
             response_model=DeleteResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-rejections/{id}",
-            self.delete_proposal_rejections_by_proposal_and_id,
+            "/rfps/{rfp_id}/proposals/{proposal_id}/rejections/{category}",
+            self.delete_proposal_rejections_by_proposal_and_category,
             methods=["DELETE"],
-            tags=["Proposal Rejections by Proposal and ID"],
+            tags=["Proposal Rejections by Proposal and Category"],
             response_model=DeleteResponse,
         )
-
-        self.router.add_api_route(
-            "/proposal-improvements",
-            self.get_proposal_improvements,
-            methods=["GET"],
-            tags=["Proposal Improvements"],
-            response_model=ProposalImprovementResponse,
-        )
+        # self.router.add_api_route(
+        #     "/rfps/{rfp_id}/proposals/{proposal_id}/proposal-rejections/{id}",
+        #     self.delete_proposal_rejections_by_proposal_and_id,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Rejections by Proposal and ID"],
+        #     response_model=DeleteResponse,
+        # )
+
+        # self.router.add_api_route(
+        #     "/proposal-improvements",
+        #     self.get_proposal_improvements,
+        #     methods=["GET"],
+        #     tags=["Proposal Improvements"],
+        #     response_model=ProposalImprovementResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-improvements/{id}",
+        #     self.get_proposal_improvements_by_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Improvements by ID"],
+        #     response_model=ProposalImprovementResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-improvements/{id}",
-            self.get_proposal_improvements_by_id,
-            methods=["GET"],
-            tags=["Proposal Improvements by ID"],
-            response_model=ProposalImprovementResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/improvements",
             self.get_proposal_improvements_by_proposal_id,
             methods=["GET"],
             tags=["Proposal Improvements by Proposal ID"],
             response_model=ProposalAllImprovementsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposals/{proposal_id}/proposal-improvements/{id}",
+        #     self.get_proposal_improvements_by_proposal_and_id,
+        #     methods=["GET"],
+        #     tags=["Proposal Improvements by Proposal and ID"],
+        #     response_model=ProposalImprovementResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-improvements",
+        #     self.create_proposal_improvements,
+        #     methods=["POST"],
+        #     tags=["Proposal Improvements"],
+        #     response_model=ProposalImprovementResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements/{id}",
-            self.get_proposal_improvements_by_proposal_and_id,
-            methods=["GET"],
-            tags=["Proposal Improvements by Proposal and ID"],
-            response_model=ProposalImprovementResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-improvements",
-            self.create_proposal_improvements,
-            methods=["POST"],
-            tags=["Proposal Improvements"],
-            response_model=ProposalImprovementResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/improvements",
             self.create_all_proposal_improvements,
             methods=["POST"],
             tags=["Proposal Improvements by Proposal ID"],
             response_model=ProposalAllImprovementsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-improvements/{id}",
+        #     self.update_proposal_improvements,
+        #     methods=["PUT"],
+        #     tags=["Proposal Improvements by ID"],
+        #     response_model=ProposalImprovementResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-improvements/{id}",
-            self.update_proposal_improvements,
-            methods=["PUT"],
-            tags=["Proposal Improvements by ID"],
-            response_model=ProposalImprovementResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/improvements",
             self.update_all_proposal_improvements,
             methods=["PUT"],
             tags=["Proposal Improvements by Proposal ID"],
             response_model=ProposalAllImprovementsResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-improvements/{id}",
+        #     self.delete_proposal_improvements,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Improvements by ID"],
+        #     response_model=DeleteResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-improvements/{id}",
-            self.delete_proposal_improvements,
-            methods=["DELETE"],
-            tags=["Proposal Improvements by ID"],
-            response_model=DeleteResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/improvements",
             self.delete_all_proposal_improvements,
             methods=["DELETE"],
             tags=["Proposal Improvements by Proposal ID"],
             response_model=DeleteResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-improvements/{id}",
-            self.delete_proposal_improvements_by_proposal_and_id,
+            "/rfps/{rfp_id}/proposals/{proposal_id}/improvements/{category}",
+            self.delete_proposal_improvements_by_proposal_and_category,
             methods=["DELETE"],
-            tags=["Proposal Improvements by Proposal and ID"],
+            tags=["Proposal Improvements by Proposal and Category"],
             response_model=DeleteResponse,
         )
-
-        self.router.add_api_route(
-            "/proposal-ai-score",
-            self.get_proposal_ai_score,
-            methods=["GET"],
-            tags=["Proposal AI Score"],
-            response_model=ProposalAIAnalysisResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-ai-score/{id}",
-            self.get_proposal_ai_score_by_id,
-            methods=["GET"],
-            tags=["Proposal AI Score by ID"],
-            response_model=ProposalAIAnalysisResponse,
-        )
+        # self.router.add_api_route(
+        #     "/proposals/{proposal_id}/proposal-improvements/{id}",
+        #     self.delete_proposal_improvements_by_proposal_and_id,
+        #     methods=["DELETE"],
+        #     tags=["Proposal Improvements by Proposal and ID"],
+        #     response_model=DeleteResponse,
+        # )
+
+        # self.router.add_api_route(
+        #     "/proposal-ai-score",
+        #     self.get_proposal_ai_score,
+        #     methods=["GET"],
+        #     tags=["Proposal AI Score"],
+        #     response_model=ProposalAIAnalysisResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-ai-score/{id}",
+        #     self.get_proposal_ai_score_by_id,
+        #     methods=["GET"],
+        #     tags=["Proposal AI Score by ID"],
+        #     response_model=ProposalAIAnalysisResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/ai-score",
             self.get_proposal_ai_score_by_proposal_id,
             methods=["GET"],
             tags=["Proposal AI Score by Proposal ID"],
             response_model=ProposalAIAnalysisResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposals/{proposal_id}/proposal-ai-score/{id}",
+        #     self.get_proposal_ai_score_by_proposal_and_id,
+        #     methods=["GET"],
+        #     tags=["Proposal AI Score by Proposal and ID"],
+        #     response_model=ProposalAIAnalysisResponse,
+        # )
+        # self.router.add_api_route(
+        #     "/proposal-ai-score",
+        #     self.create_proposal_ai_score,
+        #     methods=["POST"],
+        #     tags=["Proposal AI Score"],
+        #     response_model=ProposalAIAnalysisResponse,
+        # )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score/{id}",
-            self.get_proposal_ai_score_by_proposal_and_id,
-            methods=["GET"],
-            tags=["Proposal AI Score by Proposal and ID"],
-            response_model=ProposalAIAnalysisResponse,
-        )
-        self.router.add_api_route(
-            "/proposal-ai-score",
-            self.create_proposal_ai_score,
-            methods=["POST"],
-            tags=["Proposal AI Score"],
-            response_model=ProposalAIAnalysisResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/ai-score",
             self.create_proposal_ai_score_by_proposal_id,
             methods=["POST"],
             tags=["Proposal AI Score by Proposal ID"],
             response_model=ProposalAIAnalysisResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-ai-score/{id}",
+        #     self.update_proposal_ai_score,
+        #     methods=["PUT"],
+        #     tags=["Proposal AI Score by ID"],
+        #     response_model=ProposalAIAnalysisResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-ai-score/{id}",
-            self.update_proposal_ai_score,
-            methods=["PUT"],
-            tags=["Proposal AI Score by ID"],
-            response_model=ProposalAIAnalysisResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/ai-score",
             self.update_proposal_ai_score_by_proposal_id,
             methods=["PUT"],
             tags=["Proposal AI Score by Proposal ID"],
             response_model=ProposalAIAnalysisResponse,
         )
+        # self.router.add_api_route(
+        #     "/proposal-ai-score/{id}",
+        #     self.delete_proposal_ai_score,
+        #     methods=["DELETE"],
+        #     tags=["Proposal AI Score by ID"],
+        #     response_model=DeleteResponse,
+        # )
         self.router.add_api_route(
-            "/proposal-ai-score/{id}",
-            self.delete_proposal_ai_score,
-            methods=["DELETE"],
-            tags=["Proposal AI Score by ID"],
-            response_model=DeleteResponse,
-        )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/ai-score",
             self.delete_proposal_ai_score_by_proposal_id,
             methods=["DELETE"],
             tags=["Proposal AI Score by Proposal ID"],
             response_model=DeleteResponse,
         )
-        self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-ai-score/{id}",
-            self.delete_proposal_ai_score_by_proposal_and_id,
-            methods=["DELETE"],
-            tags=["Proposal AI Score by Proposal and ID"],
-            response_model=DeleteResponse,
-        )
+        # self.router.add_api_route(
+        #     "/proposals/{proposal_id}/proposal-ai-score/{id}",
+        #     self.delete_proposal_ai_score_by_proposal_and_id,
+        #     methods=["DELETE"],
+        #     tags=["Proposal AI Score by Proposal and ID"],
+        #     response_model=DeleteResponse,
+        # )
 
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-analysis",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/analysis",
             self.get_all_proposal_analysis,
             methods=["GET"],
             tags=["Proposal Complete Analysis"],
             response_model=ProposalCompleteAnalysisResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-analysis",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/analysis",
             self.create_proposal_analysis,
             methods=["POST"],
             tags=["Proposal Complete Analysis"],
             response_model=ProposalCompleteAnalysisResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-analysis",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/analysis",
             self.update_proposal_analysis,
             methods=["PUT"],
             tags=["Proposal Complete Analysis"],
             response_model=ProposalCompleteAnalysisResponse,
         )
         self.router.add_api_route(
-            "/proposals/{proposal_id}/proposal-analysis",
+            "/rfps/{rfp_id}/proposals/{proposal_id}/analysis",
             self.delete_proposal_analysis,
             methods=["DELETE"],
             tags=["Proposal Complete Analysis"],
@@ -655,7 +713,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve strength."
                 )
             
-    async def get_proposal_strengths_by_proposal_id(self, proposal_id: UUID = Path(...)):
+    async def get_proposal_strengths_by_proposal_id(self, rfp_id: UUID = Path(...), proposal_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 strength = await service.get_all_data(
@@ -670,7 +728,22 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve strength."
                 )
             
-    async def get_proposal_strengths_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...)):
+    async def get_proposal_strengths_by_proposal_and_category(self, rfp_id: UUID = Path(...), proposal_id: UUID = Path(...), category: Category = Path(...)):
+        async with self.__service() as service:
+            try:
+                strength = await service.get_all_data(
+                    query_type=QueryType.STRENGTHS, proposal_id=proposal_id, category=category
+                )
+                return ProposalAllStrengthsResponse(
+                    status="success", data=[s["strength_point"] for s in strength]
+                )
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to retrieve strength."
+                )
+            
+    async def get_proposal_strengths_by_proposal_and_id(self, rfp_id: UUID = Path(...), proposal_id: UUID = Path(...), id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 strength = await service.get_all_data(
@@ -703,7 +776,7 @@ class ProposalAIController:
                 )
 
     async def create_all_proposal_strengths(
-        self, strengths: CreateAllProposalStrengthsRequest, proposal_id: UUID = Path(...)
+        self, strengths: CreateAllProposalStrengthsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -743,12 +816,13 @@ class ProposalAIController:
                 )
 
     async def update_all_proposal_strengths(
-        self, strengths: CreateAllProposalStrengthsRequest, proposal_id: UUID = Path(...)
+        self, strengths: UpdateAllProposalStrengthsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...), category: Category = Path(...)
     ):
         async with self.__service() as service:
             try:
                 strengths_request = strengths.model_dump(mode="json", exclude_unset=True)
                 strengths_request["proposal_id"] = proposal_id
+                strengths_request["category"] = category
                 updated = await service.update_data(
                     query_type=QueryType.STRENGTHS,
                     create_or_update_type=CreateOrUpdateType.ALL,
@@ -778,7 +852,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete strength."
                 )
             
-    async def delete_all_proposal_strengths(self, proposal_id: UUID = Path(...)):
+    async def delete_all_proposal_strengths(self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 result = await service.delete_data(
@@ -791,7 +865,20 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete strengths."
                 )
             
-    async def delete_proposal_strengths_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...)):
+    async def delete_proposal_strengths_by_proposal_and_category(self, proposal_id: UUID = Path(...), category: Category = Path(...), rfp_id: UUID = Path(...)):
+        async with self.__service() as service:
+            try:
+                result = await service.delete_data(
+                    query_type=QueryType.STRENGTHS, proposal_id=proposal_id, category=category
+                )
+                return DeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete strength."
+                )
+            
+    async def delete_proposal_strengths_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 result = await service.delete_data(
@@ -836,11 +923,11 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve weakness."
                 )
             
-    async def get_proposal_weakness_by_proposal_id(self, proposal_id: UUID = Path(...)):
+    async def get_proposal_weakness_by_proposal_id(self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...), category: Category = Query(None)):
         async with self.__service() as service:
             try:
                 weakness = await service.get_all_data(
-                    query_type=QueryType.WEAKNESSES, proposal_id=proposal_id
+                    query_type=QueryType.WEAKNESSES, proposal_id=proposal_id, category=category
                 )
                 return ProposalAllWeaknessesResponse(
                     status="success", data=[w["weakness_point"] for w in weakness]
@@ -851,7 +938,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve weakness."
                 )
             
-    async def get_proposal_weakness_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...)):
+    async def get_proposal_weakness_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 weakness = await service.get_all_data(
@@ -960,7 +1047,7 @@ class ProposalAIController:
                 )
             
     async def delete_all_proposal_weakness(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -974,7 +1061,20 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete weaknesses."
                 )
             
-    async def delete_proposal_weakness_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...)):
+    async def delete_proposal_weakness_by_proposal_and_category(self, proposal_id: UUID = Path(...), category: Category = Path(...), rfp_id: UUID = Path(...)):
+        async with self.__service() as service:
+            try:
+                result = await service.delete_data(
+                    query_type=QueryType.WEAKNESSES, proposal_id=proposal_id, category=category
+                )
+                return DeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete weakness."
+                )
+            
+    async def delete_proposal_weakness_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 result = await service.delete_data(
@@ -1020,11 +1120,11 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve rejection reason."
                 )
             
-    async def get_proposal_rejections_by_proposal_id(self, proposal_id: UUID = Path(...)):
+    async def get_proposal_rejections_by_proposal_id(self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...), category: Category = Query(None)):
         async with self.__service() as service:
             try:
                 rejection_reason = await service.get_all_data(
-                    query_type=QueryType.REJECTION_REASONS, proposal_id=proposal_id
+                    query_type=QueryType.REJECTION_REASONS, proposal_id=proposal_id, category=category
                 )
                 return ProposalAllRejectionReasonsResponse(
                     status="success", data=[r["reason"] for r in rejection_reason]
@@ -1035,7 +1135,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to retrieve rejection reason."
                 )
             
-    async def get_proposal_rejections_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...)):
+    async def get_proposal_rejections_by_proposal_and_id(self, proposal_id: UUID = Path(...), id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 rejection_reason = await service.get_all_data(
@@ -1071,7 +1171,7 @@ class ProposalAIController:
                 )
 
     async def create_all_proposal_rejections(
-        self, rejection_reasons: CreateAllProposalRejectionReasonsRequest, proposal_id: UUID = Path(...)
+        self, rejection_reasons: CreateAllProposalRejectionReasonsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1115,7 +1215,7 @@ class ProposalAIController:
                 )
 
     async def update_all_proposal_rejections(
-        self, rejection_reasons: CreateAllProposalRejectionReasonsRequest, proposal_id: UUID = Path(...)
+        self, rejection_reasons: CreateAllProposalRejectionReasonsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1153,7 +1253,7 @@ class ProposalAIController:
                 )
             
     async def delete_all_proposal_rejections(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1168,6 +1268,23 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete rejection reasons."
                 )
             
+    async def delete_proposal_rejections_by_proposal_and_category(
+        self, proposal_id: UUID = Path(...), category: str = Path(...), rfp_id: UUID = Path(...)
+    ):
+        async with self.__service() as service:
+            try:
+                result = await service.delete_data(
+                    query_type=QueryType.REJECTION_REASONS,
+                    category=category,
+                    proposal_id=proposal_id
+                )
+                return DeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete rejection reason."
+                )
+            
     async def delete_proposal_rejections_by_proposal_and_id(
         self, proposal_id: UUID = Path(...), id: UUID = Path(...)
     ):
@@ -1223,13 +1340,14 @@ class ProposalAIController:
                 )
             
     async def get_proposal_improvements_by_proposal_id(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...), category: Category = Query(None)
     ):
         async with self.__service() as service:
             try:
                 improvements = await service.get_all_data(
                     query_type=QueryType.IMPROVEMENTS,
-                    proposal_id=proposal_id
+                    proposal_id=proposal_id,
+                    category=category
                 )
                 return ProposalAllImprovementsResponse(
                     status="success",
@@ -1281,7 +1399,7 @@ class ProposalAIController:
                 )
 
     async def create_all_proposal_improvements(
-        self, improvements: CreateAllProposalImprovementsRequest, proposal_id: UUID = Path(...)
+        self, improvements: CreateAllProposalImprovementsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1323,7 +1441,7 @@ class ProposalAIController:
                 )
 
     async def update_all_proposal_improvements(
-        self, improvements: CreateAllProposalImprovementsRequest, proposal_id: UUID = Path(...)
+        self, improvements: CreateAllProposalImprovementsRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1359,7 +1477,7 @@ class ProposalAIController:
                 )
             
     async def delete_all_proposal_improvements(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1373,6 +1491,21 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete improvements."
                 )
             
+    async def delete_proposal_improvements_by_proposal_and_category(
+        self, category: str = Path(...), proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
+    ):
+        async with self.__service() as service:
+            try:
+                result = await service.delete_data(
+                    query_type=QueryType.IMPROVEMENTS, category=category, proposal_id=proposal_id
+                )
+                return DeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete improvement."
+                )
+            
     async def delete_proposal_improvements_by_proposal_and_id(
         self, id: UUID = Path(...), proposal_id: UUID = Path(...)
     ):
@@ -1423,7 +1556,7 @@ class ProposalAIController:
                 )
             
     async def get_proposal_ai_score_by_proposal_id(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1473,7 +1606,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to create AI score."
                 )
             
-    async def create_proposal_ai_score_by_proposal_id(self, score: CreateAIAnalysisRequestByProposalId, proposal_id: UUID = Path(...)):
+    async def create_proposal_ai_score_by_proposal_id(self, score: CreateAIAnalysisRequestByProposalId, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 data = score.model_dump(mode="json", exclude_unset=True)
@@ -1512,7 +1645,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to update AI score."
                 )
             
-    async def update_proposal_ai_score_by_proposal_id(self, score: UpdateAIAnalysisRequestByProposalId, proposal_id: UUID = Path(...)):
+    async def update_proposal_ai_score_by_proposal_id(self, score: UpdateAIAnalysisRequestByProposalId, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 data = score.model_dump(mode="json", exclude_unset=True)
@@ -1547,7 +1680,7 @@ class ProposalAIController:
                 )
             
     async def delete_proposal_ai_score_by_proposal_id(
-        self, proposal_id: UUID = Path(...)
+        self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1576,7 +1709,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to delete AI score."
                 )
 
-    async def get_all_proposal_analysis(self, proposal_id: UUID = Path(...)):
+    async def get_all_proposal_analysis(self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 analysis = await service.get_all_data(
@@ -1593,7 +1726,7 @@ class ProposalAIController:
                 )
 
     async def create_proposal_analysis(
-        self, analysis: CreateAllProposalAnalysisRequest, proposal_id: UUID = Path(...)
+        self, analysis: CreateAllProposalAnalysisRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1615,7 +1748,7 @@ class ProposalAIController:
                 )
 
     async def update_proposal_analysis(
-        self, analysis: UpdateAllProposalAnalysisRequest, proposal_id: UUID = Path(...)
+        self, analysis: UpdateAllProposalAnalysisRequest, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)
     ):
         async with self.__service() as service:
             try:
@@ -1636,7 +1769,7 @@ class ProposalAIController:
                     status_code=500, detail="Failed to update analysis."
                 )
 
-    async def delete_proposal_analysis(self, proposal_id: UUID = Path(...)):
+    async def delete_proposal_analysis(self, proposal_id: UUID = Path(...), rfp_id: UUID = Path(...)):
         async with self.__service() as service:
             try:
                 result = await service.delete_data(

src/models/__init__.py

@@ -7,6 +7,7 @@ from ._proposal_ai_analysis import (
     ProposalWeakness,
     ProposalImprovement,
     ProposalRejectionReason,
+    Category
 )
 from ._proposal_detailed_analysis import ProposalDetailAnalysis, OperationCriteria
 from ._proposal_query_models import QueryType, CreateOrUpdateType
@@ -33,6 +34,7 @@ __all__ = [
     "EvaluationCriteria",
     "EvaluationCriteriaType",
     "RFPStatus",
+    "Category",
 ]
 __version__ = "0.1.0"
 __author__ = "Aryan Jain"

src/models/_proposal_ai_analysis.py

@@ -13,6 +13,11 @@ from sqlalchemy import (
 from sqlalchemy.dialects.postgresql import UUID
 from ._base import Base
 
+class Category(PyEnum):
+    TECHNICAL = "TECHNICAL"
+    MANAGEMENT = "MANAGEMENT"
+    PAST_PERFORMANCE = "PAST_PERFORMANCE"
+    PRICE = "PRICE"
 
 class ProposalAIAnalysis(Base):
     __tablename__ = "proposal_ai_analyses"
@@ -40,6 +45,7 @@ class ProposalStrength(Base):
         nullable=False,
     )
     strength_point = Column(String, nullable=False)
+    category = Column(Enum(Category, name="strengthcategory"), nullable=False)
     created_at = Column(DateTime, nullable=False, default=func.now())
     updated_at = Column(
         DateTime, nullable=False, default=func.now(), onupdate=func.now()
@@ -56,6 +62,7 @@ class ProposalRejectionReason(Base):
         nullable=False,
     )
     reason = Column(String, nullable=False)
+    category = Column(Enum(Category, name="rejectioncategory"), nullable=False)
     created_at = Column(DateTime, nullable=False, default=func.now())
     updated_at = Column(
         DateTime, nullable=False, default=func.now(), onupdate=func.now()
@@ -72,6 +79,7 @@ class ProposalWeakness(Base):
         nullable=False,
     )
     weakness_point = Column(String, nullable=False)
+    category = Column(Enum(Category, name="weaknesscategory"), nullable=False)
     created_at = Column(DateTime, nullable=False, default=func.now())
     updated_at = Column(
         DateTime, nullable=False, default=func.now(), onupdate=func.now()
@@ -88,6 +96,7 @@ class ProposalImprovement(Base):
         nullable=False,
     )
     improvement_point = Column(String, nullable=False)
+    category = Column(Enum(Category, name="improvementcategory"), nullable=False)
     created_at = Column(DateTime, nullable=False, default=func.now())
     updated_at = Column(
         DateTime, nullable=False, default=func.now(), onupdate=func.now()

src/services/_proposal_ai_analysis_service.py

@@ -2,7 +2,7 @@ from enum import Enum as PyEnum
 
 from src.utils import ProposalAIAnalysisClient
 
-from src.models import QueryType, CreateOrUpdateType
+from src.models import QueryType, CreateOrUpdateType, Category
 
 
 class ProposalAIAnalysisService:
@@ -20,13 +20,14 @@ class ProposalAIAnalysisService:
         query_type: QueryType = QueryType.ALL,
         id: str = None,
         proposal_id: str = None,
+        category: Category = None,
     ):
         async with self.proposal_ai_analysis_client() as client:
             if query_type == QueryType.ALL:
                 return await client.get_complete_analysis(proposal_id=proposal_id)
             else:
                 return await client.get_all_data(
-                    query_type=query_type, id=id, proposal_id=proposal_id
+                    query_type=query_type, id=id, proposal_id=proposal_id, category=category
                 )
 
     async def create_data(
@@ -66,11 +67,12 @@ class ProposalAIAnalysisService:
         query_type: QueryType = QueryType.ALL,
         id: str = None,
         proposal_id: str = None,
+        category: Category = None,
     ):
         async with self.proposal_ai_analysis_client() as client:
             if query_type == QueryType.ALL:
                 return await client.delete_complete_analysis(proposal_id=proposal_id)
             else:
                 return await client.delete_data(
-                    query_type=query_type, id=id, proposal_id=proposal_id
+                    query_type=query_type, id=id, proposal_id=proposal_id, category=category
                 )

src/utils/_proposal_ai_analysis_client.py

@@ -4,7 +4,7 @@ import uuid
 from sqlalchemy import select
 from src.repositories import BaseRepository
 
-from src.models import QueryType, CreateOrUpdateType, ProposalAIAnalysis, ProposalStrength, ProposalWeakness, ProposalRejectionReason, ProposalImprovement
+from src.models import QueryType, CreateOrUpdateType, ProposalAIAnalysis, ProposalStrength, ProposalWeakness, ProposalRejectionReason, ProposalImprovement, Category
 
 class ProposalAIAnalysisClient:
     def __init__(self):
@@ -23,13 +23,15 @@ class ProposalAIAnalysisClient:
     async def __aexit__(self, exc_type, exc_value, traceback):
         pass
 
-    async def get_all_data(self, query_type: QueryType = QueryType.ALL, id: str = None, proposal_id: str = None):
+    async def get_all_data(self, query_type: QueryType = QueryType.ALL, id: str = None, proposal_id: str = None, category: Category = None):
         async with self.repository(model=self.tables_mapping[query_type.name]).get_session() as session:
             query = select(self.tables_mapping[query_type.name])
             if id:
                 query = query.where(self.tables_mapping[query_type.name].id == id)
             if proposal_id:
                 query = query.where(self.tables_mapping[query_type.name].proposal_id == proposal_id)
+            if category:
+                query = query.where(self.tables_mapping[query_type.name].category == category)
             result = await session.execute(query)
             all_result = result.scalars().all()
             final_result_dict = [{k: v for k, v in r.__dict__.items() if not k.startswith("_")} for r in all_result]
@@ -50,11 +52,11 @@ class ProposalAIAnalysisClient:
             return await self.get_all_data(query_type=query_type, id=result.id)
         else:
             for d in data:
-                if d != "proposal_id":
+                if d != "proposal_id" and d != "category":
                     for point in data[d]:
-                        entry_data = {"proposal_id": data["proposal_id"], d: point}
+                        entry_data = {"proposal_id": data["proposal_id"], "category": data["category"], d: point}
                         await self.create_entry(query_type=query_type, data=entry_data)
-        return await self.get_all_data(query_type=query_type, proposal_id=data["proposal_id"])
+        return await self.get_all_data(query_type=query_type, proposal_id=data["proposal_id"], category=data["category"])
 
     async def update_data(self, query_type: QueryType = QueryType.ALL, create_or_update_type: CreateOrUpdateType = CreateOrUpdateType.ALL, data: dict = None):
         if query_type == QueryType.AI_SCORE:
@@ -88,16 +90,18 @@ class ProposalAIAnalysisClient:
                         await session.refresh(r)
                     return await self.get_all_data(query_type=query_type, id=data["id"])
             else:
-                await self.delete_data(query_type=query_type, proposal_id=data["proposal_id"])
+                await self.delete_data(query_type=query_type, proposal_id=data["proposal_id"], category=data["category"])
                 return await self.create_data(query_type=query_type, create_or_update_type=create_or_update_type, data=data)
 
-    async def delete_data(self, query_type: QueryType = QueryType.ALL, id: str = None, proposal_id: str = None):
+    async def delete_data(self, query_type: QueryType = QueryType.ALL, id: str = None, proposal_id: str = None, category: Category = None):
         async with self.repository(model=self.tables_mapping[query_type.name]).get_session() as session:
             query = select(self.tables_mapping[query_type.name])
             if id:
                 query = query.where(self.tables_mapping[query_type.name].id == id)
             if proposal_id:
                 query = query.where(self.tables_mapping[query_type.name].proposal_id == proposal_id)
+            if category:
+                query = query.where(self.tables_mapping[query_type.name].category == category)
             result = await session.execute(query)
             all_result = result.scalars().all()
             for r in all_result:
@@ -108,34 +112,72 @@ class ProposalAIAnalysisClient:
     async def get_complete_analysis(self, proposal_id: str = None):
         analysis = {
             "ai_score": 0,
-            "strengths": [],
-            "weaknesses": [],
-            "rejection_reasons": [],
-            "improvements": []
+            "technical": {
+                "strengths": [],
+                "weaknesses": [],
+                "rejection_reasons": [],
+                "improvements": []
+            },
+            "management": {
+                "strengths": [],
+                "weaknesses": [],
+                "rejection_reasons": [],
+                "improvements": []
+            },
+            "past_performance": {
+                "strengths": [],
+                "weaknesses": [],
+                "rejection_reasons": [],
+                "improvements": []
+            },
+            "price": {
+                "strengths": [],
+                "weaknesses": [],
+                "rejection_reasons": [],
+                "improvements": []
+            }
         }
         result = await self.get_all_data(query_type=QueryType.AI_SCORE, proposal_id=proposal_id)
         analysis["ai_score"] = result[0]["ai_score"]
-        strengths = await self.get_all_data(query_type=QueryType.STRENGTHS, proposal_id=proposal_id)
-        analysis["strengths"] = [s["strength_point"] for s in strengths]
-        weakness = await self.get_all_data(query_type=QueryType.WEAKNESSES, proposal_id=proposal_id)
-        analysis["weaknesses"] = [w["weakness_point"] for w in weakness]
-        rejection_reason = await self.get_all_data(query_type=QueryType.REJECTION_REASONS, proposal_id=proposal_id)
-        analysis["rejection_reasons"] = [r["reason"] for r in rejection_reason]
-        improvements = await self.get_all_data(query_type=QueryType.IMPROVEMENTS, proposal_id=proposal_id)
-        analysis["improvements"] = [i["improvement_point"] for i in improvements]
+        for category in Category:
+            strengths = await self.get_all_data(query_type=QueryType.STRENGTHS, proposal_id=proposal_id, category=category)
+            analysis[category.value.lower()]["strengths"] = [s["strength_point"] for s in strengths] if strengths else []
+            weaknesses = await self.get_all_data(query_type=QueryType.WEAKNESSES, proposal_id=proposal_id, category=category)
+            analysis[category.value.lower()]["weaknesses"] = [w["weakness_point"] for w in weaknesses] if weaknesses else []
+            rejection_reason = await self.get_all_data(query_type=QueryType.REJECTION_REASONS, proposal_id=proposal_id, category=category)
+            analysis[category.value.lower()]["rejection_reasons"] = [r["reason"] for r in rejection_reason] if rejection_reason else []
+            improvements = await self.get_all_data(query_type=QueryType.IMPROVEMENTS, proposal_id=proposal_id, category=category)
+            analysis[category.value.lower()]["improvements"] = [i["improvement_point"] for i in improvements] if improvements else []
+        # strengths = await self.get_all_data(query_type=QueryType.STRENGTHS, proposal_id=proposal_id)
+        # analysis["strengths"] = [s["strength_point"] for s in strengths]
+        # weakness = await self.get_all_data(query_type=QueryType.WEAKNESSES, proposal_id=proposal_id)
+        # analysis["weaknesses"] = [w["weakness_point"] for w in weakness]
+        # rejection_reason = await self.get_all_data(query_type=QueryType.REJECTION_REASONS, proposal_id=proposal_id)
+        # analysis["rejection_reasons"] = [r["reason"] for r in rejection_reason]
+        # improvements = await self.get_all_data(query_type=QueryType.IMPROVEMENTS, proposal_id=proposal_id)
+        # analysis["improvements"] = [i["improvement_point"] for i in improvements]
         return analysis
     
     async def create_complete_analysis(self, data: dict = None):
         if "ai_score" in data:
             await self.create_data(query_type=QueryType.AI_SCORE, create_or_update_type=CreateOrUpdateType.ID, data={"proposal_id": data["proposal_id"], "ai_score": data["ai_score"]})
-        if "strengths" in data:
-            await self.create_data(query_type=QueryType.STRENGTHS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "strength_point": data["strengths"]})
-        if "weaknesses" in data:
-            await self.create_data(query_type=QueryType.WEAKNESSES, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "weakness_point": data["weaknesses"]})
-        if "rejection_reasons" in data:
-            await self.create_data(query_type=QueryType.REJECTION_REASONS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "reason": data["rejection_reasons"]})
-        if "improvements" in data:
-            await self.create_data(query_type=QueryType.IMPROVEMENTS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "improvement_point": data["improvements"]})
+        for category in Category:
+            if "strengths" in data[category.value.lower()]:
+                await self.create_data(query_type=QueryType.STRENGTHS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "category": category, "strength_point": data[category.value.lower()]["strengths"]})
+            if "weaknesses" in data[category.value.lower()]:
+                await self.create_data(query_type=QueryType.WEAKNESSES, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "category": category, "weakness_point": data[category.value.lower()]["weaknesses"]})
+            if "rejection_reasons" in data[category.value.lower()]:
+                await self.create_data(query_type=QueryType.REJECTION_REASONS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "category": category, "reason": data[category.value.lower()]["rejection_reasons"]})
+            if "improvements" in data[category.value.lower()]:
+                await self.create_data(query_type=QueryType.IMPROVEMENTS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "category": category, "improvement_point": data[category.value.lower()]["improvements"]})
+        # if "strengths" in data:
+        #     await self.create_data(query_type=QueryType.STRENGTHS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "strength_point": data["strengths"]})
+        # if "weaknesses" in data:
+        #     await self.create_data(query_type=QueryType.WEAKNESSES, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "weakness_point": data["weaknesses"]})
+        # if "rejection_reasons" in data:
+        #     await self.create_data(query_type=QueryType.REJECTION_REASONS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "reason": data["rejection_reasons"]})
+        # if "improvements" in data:
+        #     await self.create_data(query_type=QueryType.IMPROVEMENTS, create_or_update_type=CreateOrUpdateType.ALL, data={"proposal_id": data["proposal_id"], "improvement_point": data["improvements"]})
         return await self.get_complete_analysis(proposal_id=data["proposal_id"])
     
     async def delete_complete_analysis(self, proposal_id: str = None):
@@ -150,14 +192,25 @@ class ProposalAIAnalysisClient:
         old_data = await self.get_complete_analysis(proposal_id=data["proposal_id"])
         if "ai_score" in data:
             old_data["ai_score"] = data["ai_score"]
-        if "strengths" in data:
-            old_data["strengths"] = data["strengths"]
-        if "weaknesses" in data:
-            old_data["weaknesses"] = data["weaknesses"]
-        if "rejection_reasons" in data:
-            old_data["rejection_reasons"] = data["rejection_reasons"]
-        if "improvements" in data:
-            old_data["improvements"] = data["improvements"]
+        for category in Category:
+            if category.value.lower() not in data:
+                continue
+            if "strengths" in data[category.value.lower()]:
+                old_data[category.value.lower()]["strengths"] = data[category.value.lower()]["strengths"]
+            if "weaknesses" in data[category.value.lower()]:
+                old_data[category.value.lower()]["weaknesses"] = data[category.value.lower()]["weaknesses"]
+            if "rejection_reasons" in data[category.value.lower()]:
+                old_data[category.value.lower()]["rejection_reasons"] = data[category.value.lower()]["rejection_reasons"]
+            if "improvements" in data[category.value.lower()]:
+                old_data[category.value.lower()]["improvements"] = data[category.value.lower()]["improvements"]
+        # if "strengths" in data:
+        #     old_data["strengths"] = data["strengths"]
+        # if "weaknesses" in data:
+        #     old_data["weaknesses"] = data["weaknesses"]
+        # if "rejection_reasons" in data:
+        #     old_data["rejection_reasons"] = data["rejection_reasons"]
+        # if "improvements" in data:
+        #     old_data["improvements"] = data["improvements"]
         await self.delete_complete_analysis(proposal_id=data["proposal_id"])
         old_data["proposal_id"] = data["proposal_id"]
         return await self.create_complete_analysis(data=old_data)