Credentials: Add support for org credentials

backend/app/alembic/versions/543f97951bd0_add_credential_table.py

@@ -1,4 +1,4 @@
-"""add credetial table
+"""add credential table
 
 Revision ID: 543f97951bd0
 Revises: 8d7a05fd0ad4
@@ -22,7 +22,7 @@ def upgrade():
         "credential",
         sa.Column("id", sa.Integer(), nullable=False),
         sa.Column("is_active", sa.Boolean(), nullable=False),
-        sa.Column("credential", sa.JSON(), nullable=True),
+        sa.Column("credential", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
         sa.Column("organization_id", sa.Integer(), nullable=False),
         sa.Column("inserted_at", sa.DateTime(), nullable=True),
         sa.Column("updated_at", sa.DateTime(), nullable=True),

backend/app/alembic/versions/904ed70e7dab_added_provider_column_to_the_credential_.py

@@ -0,0 +1,93 @@
+"""Added provider column to the credential table
+
+Revision ID: 904ed70e7dab
+Revises: 79e47bc3aac6
+Create Date: 2025-05-10 11:13:17.868238
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+revision = "904ed70e7dab"
+down_revision = "79e47bc3aac6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Add new columns to credential table
+    op.add_column(
+        "credential",
+        sa.Column("provider", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
+    )
+    op.add_column("credential", sa.Column("project_id", sa.Integer(), nullable=True))
+
+    # Create indexes and constraints
+    op.create_index(
+        op.f("ix_credential_provider"), "credential", ["provider"], unique=False
+    )
+
+    # Drop existing foreign keys
+    op.drop_constraint(
+        "credential_organization_id_fkey", "credential", type_="foreignkey"
+    )
+    op.drop_constraint("project_organization_id_fkey", "project", type_="foreignkey")
+
+    # Create all foreign keys together
+    op.create_foreign_key(
+        "credential_organization_id_fkey",
+        "credential",
+        "organization",
+        ["organization_id"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+    op.create_foreign_key(
+        None,
+        "project",
+        "organization",
+        ["organization_id"],
+        ["id"],
+    )
+    op.create_foreign_key(
+        "credential_project_id_fkey",
+        "credential",
+        "project",
+        ["project_id"],
+        ["id"],
+        ondelete="SET NULL",
+    )
+
+
+def downgrade():
+    # Drop project_id foreign key and column
+    op.drop_constraint("credential_project_id_fkey", "credential", type_="foreignkey")
+    op.drop_column("credential", "project_id")
+
+    # Drop existing foreign keys
+    op.drop_constraint(None, "project", type_="foreignkey")
+    op.drop_constraint(
+        "credential_organization_id_fkey", "credential", type_="foreignkey"
+    )
+
+    # Create all foreign keys together
+    op.create_foreign_key(
+        "project_organization_id_fkey",
+        "project",
+        "organization",
+        ["organization_id"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+    op.create_foreign_key(
+        "credential_organization_id_fkey",
+        "credential",
+        "organization",
+        ["organization_id"],
+        ["id"],
+    )
+
+    op.drop_index(op.f("ix_credential_provider"), table_name="credential")
+    op.drop_column("credential", "provider")

backend/app/api/routes/credentials.py

@@ -1,95 +1,147 @@
+from typing import List
+
 from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.exc import IntegrityError
+
 from app.api.deps import SessionDep, get_current_active_superuser
 from app.crud.credentials import (
     get_creds_by_org,
-    get_key_by_org,
+    get_provider_credential,
     remove_creds_for_org,
     set_creds_for_org,
     update_creds_for_org,
+    remove_provider_credential,
 )
 from app.models import CredsCreate, CredsPublic, CredsUpdate
+from app.models.organization import Organization
+from app.models.project import Project
 from app.utils import APIResponse
-from datetime import datetime
+from app.core.providers import validate_provider
 
 router = APIRouter(prefix="/credentials", tags=["credentials"])
 
 
 @router.post(
     "/",
     dependencies=[Depends(get_current_active_superuser)],
-    response_model=APIResponse[CredsPublic],
+    response_model=APIResponse[List[CredsPublic]],
+    summary="Create new credentials for an organization and project",
+    description="Creates new credentials for a specific organization and project combination. This endpoint requires superuser privileges. Each organization can have different credentials for different providers and projects. Only one credential per provider is allowed per organization-project combination.",
 )
 def create_new_credential(*, session: SessionDep, creds_in: CredsCreate):
-    new_creds = None
     try:
-        existing_creds = get_creds_by_org(
-            session=session, org_id=creds_in.organization_id
-        )
-        if not existing_creds:
-            new_creds = set_creds_for_org(session=session, creds_add=creds_in)
+        # Check if organization exists
+        organization = session.get(Organization, creds_in.organization_id)
+        if not organization:
+            raise HTTPException(status_code=404, detail="Organization not found")
+
+        # Check if project exists if project_id is provided
+        if creds_in.project_id:
+            project = session.get(Project, creds_in.project_id)
+            if not project:
+                raise HTTPException(status_code=404, detail="Project not found")
+            if project.organization_id != creds_in.organization_id:
+                raise HTTPException(
+                    status_code=400,
+                    detail="Project does not belong to the specified organization",
+                )
+
+        # Check for existing credentials for each provider
+        for provider in creds_in.credential.keys():
+            existing_cred = get_provider_credential(
+                session=session,
+                org_id=creds_in.organization_id,
+                provider=provider,
+                project_id=creds_in.project_id,
+            )
+            if existing_cred:
+                raise HTTPException(
+                    status_code=400,
+                    detail=f"Credentials for provider '{provider}' already exist for this organization and project combination",
+                )
+
+        # Create new credentials
+        new_creds = set_creds_for_org(session=session, creds_add=creds_in)
+        if not new_creds:
+            raise HTTPException(status_code=500, detail="Failed to create credentials")
+        return APIResponse.success_response([cred.to_public() for cred in new_creds])
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
     except Exception as e:
         raise HTTPException(
             status_code=500, detail=f"An unexpected error occurred: {str(e)}"
         )
 
-    # Ensure inserted_at is set during creation
-    new_creds.inserted_at = datetime.utcnow()
-
-    return APIResponse.success_response(new_creds)
-
 
 @router.get(
     "/{org_id}",
     dependencies=[Depends(get_current_active_superuser)],
-    response_model=APIResponse[CredsPublic],
+    response_model=APIResponse[List[CredsPublic]],
+    summary="Get all credentials for an organization and project",
+    description="Retrieves all provider credentials associated with a specific organization and project combination. If project_id is not provided, returns credentials for the organization level. This endpoint requires superuser privileges.",
 )
-def read_credential(*, session: SessionDep, org_id: int):
-    try:
-        creds = get_creds_by_org(session=session, org_id=org_id)
-    except Exception as e:
-        raise HTTPException(
-            status_code=500, detail=f"An unexpected error occurred: {str(e)}"
-        )
-
-    if creds is None:
+def read_credential(*, session: SessionDep, org_id: int, project_id: int | None = None):
+    creds = get_creds_by_org(session=session, org_id=org_id, project_id=project_id)
+    if not creds:
         raise HTTPException(status_code=404, detail="Credentials not found")
-
-    return APIResponse.success_response(creds)
+    return APIResponse.success_response([cred.to_public() for cred in creds])
 
 
 @router.get(
-    "/{org_id}/api-key",
+    "/{org_id}/{provider}",
     dependencies=[Depends(get_current_active_superuser)],
     response_model=APIResponse[dict],
+    summary="Get specific provider credentials for an organization and project",
+    description="Retrieves credentials for a specific provider (e.g., 'openai', 'anthropic') for a given organization and project combination. If project_id is not provided, returns organization-level credentials. This endpoint requires superuser privileges.",
 )
-def read_api_key(*, session: SessionDep, org_id: int):
-    try:
-        api_key = get_key_by_org(session=session, org_id=org_id)
-    except Exception as e:
-        raise HTTPException(
-            status_code=500, detail=f"An unexpected error occurred: {str(e)}"
-        )
-
-    if api_key is None:
-        raise HTTPException(status_code=404, detail="API key not found")
-
-    return APIResponse.success_response({"api_key": api_key})
+def read_provider_credential(
+    *, session: SessionDep, org_id: int, provider: str, project_id: int | None = None
+):
+    provider_enum = validate_provider(provider)
+    provider_creds = get_provider_credential(
+        session=session,
+        org_id=org_id,
+        provider=provider_enum,
+        project_id=project_id,
+    )
+    if provider_creds is None:
+        raise HTTPException(status_code=404, detail="Provider credentials not found")
+    return APIResponse.success_response(provider_creds)
 
 
 @router.patch(
     "/{org_id}",
     dependencies=[Depends(get_current_active_superuser)],
-    response_model=APIResponse[CredsPublic],
+    response_model=APIResponse[List[CredsPublic]],
+    summary="Update organization and project credentials",
+    description="Updates credentials for a specific organization and project combination. Can update specific provider credentials or add new providers. If project_id is provided in the update, credentials will be moved to that project. This endpoint requires superuser privileges.",
 )
 def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate):
     try:
+        if not creds_in or not creds_in.provider or not creds_in.credential:
+            raise HTTPException(
+                status_code=400, detail="Provider and credential must be provided"
+            )
+        organization = session.get(Organization, org_id)
+        if not organization:
+            raise HTTPException(status_code=404, detail="Organization not found")
         updated_creds = update_creds_for_org(
             session=session, org_id=org_id, creds_in=creds_in
         )
-
-        updated_creds.updated_at = datetime.utcnow()
-
-        return APIResponse.success_response(updated_creds)
+        if not updated_creds:
+            raise HTTPException(status_code=404, detail="Failed to update credentials")
+        return APIResponse.success_response(
+            [cred.to_public() for cred in updated_creds]
+        )
+    except IntegrityError as e:
+        if "ForeignKeyViolation" in str(e):
+            raise HTTPException(
+                status_code=400,
+                detail="Invalid organization ID. Ensure the organization exists before updating credentials.",
+            )
+        raise HTTPException(
+            status_code=500, detail=f"An unexpected database error occurred: {str(e)}"
+        )
     except ValueError as e:
         raise HTTPException(status_code=404, detail=str(e))
     except Exception as e:
@@ -98,30 +150,61 @@ def update_credential(*, session: SessionDep, org_id: int, creds_in: CredsUpdate
         )
 
 
-from fastapi import HTTPException, Depends
-from app.crud.credentials import remove_creds_for_org
-from app.utils import APIResponse
-from app.api.deps import SessionDep, get_current_active_superuser
-
-
 @router.delete(
-    "/{org_id}/api-key",
+    "/{org_id}/{provider}",
     dependencies=[Depends(get_current_active_superuser)],
     response_model=APIResponse[dict],
+    summary="Delete specific provider credentials for an organization and project",
+    description="Removes credentials for a specific provider while keeping other provider credentials intact. If project_id is provided, only removes credentials for that project. This endpoint requires superuser privileges.",
 )
-def delete_credential(*, session: SessionDep, org_id: int):
+def delete_provider_credential(
+    *, session: SessionDep, org_id: int, provider: str, project_id: int | None = None
+):
     try:
-        creds = remove_creds_for_org(session=session, org_id=org_id)
+        provider_enum = validate_provider(provider)
+        updated_creds = remove_provider_credential(
+            session=session,
+            org_id=org_id,
+            provider=provider_enum,
+            project_id=project_id,
+        )
+        if not updated_creds:
+            raise HTTPException(
+                status_code=404, detail="Provider credentials not found"
+            )
+        return APIResponse.success_response(
+            {"message": "Provider credentials removed successfully"}
+        )
+    except ValueError:
+        raise HTTPException(status_code=404, detail="Provider credentials not found")
     except Exception as e:
         raise HTTPException(
             status_code=500, detail=f"An unexpected error occurred: {str(e)}"
         )
 
-    if creds is None:
+
+@router.delete(
+    "/{org_id}",
+    dependencies=[Depends(get_current_active_superuser)],
+    response_model=APIResponse[dict],
+    summary="Delete all credentials for an organization and project",
+    description="Removes all credentials for a specific organization and project combination. If project_id is provided, only removes credentials for that project. This is a soft delete operation that marks credentials as inactive. This endpoint requires superuser privileges.",
+)
+def delete_all_credentials(
+    *, session: SessionDep, org_id: int, project_id: int | None = None
+):
+    try:
+        creds = remove_creds_for_org(
+            session=session, org_id=org_id, project_id=project_id
+        )
+        if not creds:
+            raise HTTPException(
+                status_code=404, detail="Credentials for organization not found"
+            )
+        return APIResponse.success_response(
+            {"message": "Credentials deleted successfully"}
+        )
+    except Exception as e:
         raise HTTPException(
-            status_code=404, detail="Credentials for organization not found"
+            status_code=500, detail=f"An unexpected error occurred: {str(e)}"
         )
-
-    # No need to manually set deleted_at and is_active if it's done in remove_creds_for_org
-    # Simply return the success response
-    return APIResponse.success_response({"message": "Credentials deleted successfully"})