Merge branch 'main' into enahncement/polling_llmcall_db

Author: nishika26

backend/app/api/docs/config/list.md

@@ -1,3 +1,7 @@
+query: Search string used for partial matching across configurations
+skip: Number of records to skip for pagination (default: 0)
+limit: Maximum number of records to return (default: 100, max: 100)
+
 Retrieve all configurations for the current project.
 
 Returns a paginated list of configurations ordered by most recently

backend/app/api/docs/organization/list.md

@@ -1,3 +1,3 @@
 List all organizations.
 
-Returns paginated list of all organizations in the system.
+Returns paginated list of all organizations in the system. The response includes a `has_more` field in `metadata` indicating whether additional pages are available.

backend/app/api/docs/projects/list_by_org.md

@@ -0,0 +1,3 @@
+List all projects for a given organization.
+
+Returns all projects belonging to the specified organization ID. The organization must exist and be active.

backend/app/api/routes/config/config.py

@@ -53,18 +53,17 @@ def create_config(
 def list_configs(
     current_user: AuthContextDep,
     session: SessionDep,
+    query: str | None = Query(None, description="search query"),
     skip: int = Query(0, ge=0, description="Number of records to skip"),
     limit: int = Query(100, ge=1, le=100, description="Maximum records to return"),
-):
+) -> APIResponse[list[ConfigPublic]]:
     """
     List all configurations for the current project.
     Ordered by updated_at in descending order.
     """
     config_crud = ConfigCrud(session=session, project_id=current_user.project_.id)
-    configs = config_crud.read_all(skip=skip, limit=limit)
-    return APIResponse.success_response(
-        data=configs,
-    )
+    configs, has_more = config_crud.read_all(query=query, skip=skip, limit=limit)
+    return APIResponse.success_response(data=configs, metadata=dict(has_more=has_more))
 
 
 @router.get(

backend/app/api/routes/documents.py

@@ -81,7 +81,7 @@ def list_docs(
     ),
 ):
     crud = DocumentCrud(session, current_user.project_.id)
-    documents = crud.read_many(skip, limit)
+    documents, has_more = crud.read_many(skip, limit)
 
     storage = (
         get_cloud_storage(session=session, project_id=current_user.project_.id)
@@ -94,7 +94,7 @@ def list_docs(
         include_url=include_url,
         storage=storage,
     )
-    return APIResponse.success_response(results)
+    return APIResponse.success_response(results, metadata=dict(has_more=has_more))
 
 
 @router.post(

backend/app/api/routes/organization.py

@@ -1,7 +1,7 @@
 import logging
 from typing import List
 
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy import func
 from sqlmodel import select
 
@@ -27,14 +27,19 @@
     response_model=APIResponse[List[OrganizationPublic]],
     description=load_description("organization/list.md"),
 )
-def read_organizations(session: SessionDep, skip: int = 0, limit: int = 100):
+def read_organizations(
+    session: SessionDep,
+    skip: int = Query(0, ge=0),
+    limit: int = Query(100, ge=1, le=100),
+) -> APIResponse[List[OrganizationPublic]]:
     count_statement = select(func.count()).select_from(Organization)
     count = session.exec(count_statement).one()
 
     statement = select(Organization).offset(skip).limit(limit)
     organizations = session.exec(statement).all()
 
-    return APIResponse.success_response(organizations)
+    has_more = (skip + limit) < count
+    return APIResponse.success_response(organizations, metadata={"has_more": has_more})
 
 
 # Create a new organization
@@ -44,7 +49,9 @@ def read_organizations(session: SessionDep, skip: int = 0, limit: int = 100):
     response_model=APIResponse[OrganizationPublic],
     description=load_description("organization/create.md"),
 )
-def create_new_organization(*, session: SessionDep, org_in: OrganizationCreate):
+def create_new_organization(
+    *, session: SessionDep, org_in: OrganizationCreate
+) -> APIResponse[OrganizationPublic]:
     new_org = create_organization(session=session, org_create=org_in)
     return APIResponse.success_response(new_org)
 
@@ -55,7 +62,9 @@ def create_new_organization(*, session: SessionDep, org_in: OrganizationCreate):
     response_model=APIResponse[OrganizationPublic],
     description=load_description("organization/get.md"),
 )
-def read_organization(*, session: SessionDep, org_id: int):
+def read_organization(
+    *, session: SessionDep, org_id: int
+) -> APIResponse[OrganizationPublic]:
     """
     Retrieve an organization by ID.
     """
@@ -75,7 +84,7 @@ def read_organization(*, session: SessionDep, org_id: int):
 )
 def update_organization(
     *, session: SessionDep, org_id: int, org_in: OrganizationUpdate
-):
+) -> APIResponse[OrganizationPublic]:
     org = get_organization_by_id(session=session, org_id=org_id)
     if org is None:
         logger.error(
@@ -103,7 +112,7 @@ def update_organization(
     include_in_schema=False,
     description=load_description("organization/delete.md"),
 )
-def delete_organization(session: SessionDep, org_id: int):
+def delete_organization(session: SessionDep, org_id: int) -> APIResponse[None]:
     org = get_organization_by_id(session=session, org_id=org_id)
     if org is None:
         logger.error(

backend/app/api/routes/project.py

@@ -11,7 +11,9 @@
 from app.crud.project import (
     create_project,
     get_project_by_id,
+    get_projects_by_organization,
 )
+from app.crud.organization import validate_organization
 from app.utils import APIResponse, load_description
 
 logger = logging.getLogger(__name__)
@@ -36,7 +38,8 @@ def read_projects(
     statement = select(Project).offset(skip).limit(limit)
     projects = session.exec(statement).all()
 
-    return APIResponse.success_response(projects)
+    has_more = (skip + limit) < count
+    return APIResponse.success_response(projects, metadata={"has_more": has_more})
 
 
 # Create a new project
@@ -112,3 +115,18 @@ def delete_project(session: SessionDep, project_id: int):
         f"[delete_project] Project deleted successfully | project_id={project_id}"
     )
     return APIResponse.success_response(None)
+
+
+# Get projects by organization
+@router.get(
+    "/organization/{org_id}",
+    dependencies=[Depends(require_permission(Permission.SUPERUSER))],
+    response_model=APIResponse[List[ProjectPublic]],
+    description=load_description("projects/list_by_org.md"),
+)
+def read_projects_by_organization(
+    session: SessionDep, org_id: int
+) -> APIResponse[List[ProjectPublic]]:
+    validate_organization(session=session, org_id=org_id)
+    projects = get_projects_by_organization(session=session, org_id=org_id)
+    return APIResponse.success_response(projects)

backend/app/crud/config/config.py

@@ -85,20 +85,31 @@ def read_one(self, config_id: UUID) -> Config | None:
         )
         return self.session.exec(statement).one_or_none()
 
-    def read_all(self, skip: int = 0, limit: int = 100) -> list[Config]:
+    def read_all(
+        self, query: str | None, skip: int = 0, limit: int = 100
+    ) -> tuple[list[Config], bool]:
+        filters = [
+            Config.project_id == self.project_id,
+            Config.deleted_at.is_(None),
+        ]
+
+        if query:
+            filters.append(Config.name.ilike(f"{query}%"))
+
         statement = (
             select(Config)
-            .where(
-                and_(
-                    Config.project_id == self.project_id,
-                    Config.deleted_at.is_(None),
-                )
-            )
+            .where(and_(*filters))
             .order_by(Config.updated_at.desc())
             .offset(skip)
-            .limit(limit)
+            .limit(limit + 1)
         )
-        return self.session.exec(statement).all()
+        configs = self.session.exec(statement).all()
+        has_more = False
+        if limit is not None and len(configs) > limit:
+            has_more = True
+            configs = configs[:limit]
+
+        return configs, has_more
 
     def update_or_raise(self, config_id: UUID, config_update: ConfigUpdate) -> Config:
         config = self.exists_or_raise(config_id)

backend/app/crud/document/document.py

@@ -37,10 +37,11 @@ def read_many(
         self,
         skip: int | None = None,
         limit: int | None = None,
-    ) -> list[Document]:
+    ) -> tuple[list[Document], bool]:
         statement = select(Document).where(
             and_(Document.project_id == self.project_id, Document.is_deleted.is_(False))
         )
+        statement = statement.order_by(Document.inserted_at.desc())
 
         if skip is not None:
             if skip < 0:
@@ -64,10 +65,16 @@ def read_many(
                         exc_info=True,
                     )
                     raise
-            statement = statement.limit(limit)
+            statement = statement.limit(limit + 1)
 
         documents = self.session.exec(statement).all()
-        return documents
+
+        has_more = False
+        if limit is not None and len(documents) > limit:
+            has_more = True
+            documents = documents[:limit]
+
+        return documents, has_more
 
     def read_each(self, doc_ids: list[UUID]):
         statement = select(Document).where(

backend/app/crud/evaluations/batch.py

@@ -106,12 +106,12 @@ def build_evaluation_jsonl(
         body: dict[str, Any] = {
             "model": config.model,
             "instructions": config.instructions,
-            "temperature": config.temperature
-            if config.temperature is not None
-            else 0.01,
             "input": question,  # Add input from dataset
         }
 
+        if "temperature" in config.model_fields_set:
+            body["temperature"] = config.temperature
+
         # Add reasoning only if provided
         if config.reasoning:
             body["reasoning"] = {"effort": config.reasoning}
@@ -189,7 +189,7 @@ def start_evaluation_batch(
             "description": f"Evaluation: {eval_run.run_name}",
             "completion_window": "24h",
             # Store complete config for reference
-            "evaluation_config": config.model_dump(exclude_none=True),
+            "evaluation_config": config.model_dump(exclude_unset=True),
         }
 
         # Step 5: Start batch job using generic infrastructure