chore: tidy up

Author: iziang

aperag/api/components/schemas/audit.yaml

@@ -15,7 +15,7 @@ auditLog:
       description: Username for display
     resource_type:
       type: string
-      enum: [collection, document, bot, chat, message, api_key, llm_provider, llm_provider_model, model_service_provider, user, config]
+      enum: [collection, document, bot, chat, message, api_key, llm_provider, llm_provider_model, model_service_provider, user, flow, search_test]
       nullable: true
       description: Type of resource
     resource_id:

aperag/api/paths/audit.yaml

@@ -6,50 +6,12 @@ audit_logs:
     description: List audit logs with filtering options
     operationId: list_audit_logs
     parameters:
-      - name: user_id
-        in: query
-        required: false
-        schema:
-          type: string
-        description: Filter by user ID
-      - name: username
-        in: query
-        required: false
-        schema:
-          type: string
-        description: Filter by username
-      - name: resource_type
-        in: query
-        required: false
-        schema:
-          type: string
-          enum: [collection, document, bot, chat, message, api_key, llm_provider, llm_provider_model, model_service_provider, user, config]
-        description: Filter by resource type
-      - name: resource_id
-        in: query
-        required: false
-        schema:
-          type: string
-        description: Filter by resource ID
       - name: api_name
         in: query
         required: false
         schema:
           type: string
         description: Filter by API name
-      - name: http_method
-        in: query
-        required: false
-        schema:
-          type: string
-          enum: [POST, PUT, DELETE]
-        description: Filter by HTTP method
-      - name: status_code
-        in: query
-        required: false
-        schema:
-          type: integer
-        description: Filter by status code
       - name: start_date
         in: query
         required: false

aperag/app.py

@@ -16,7 +16,6 @@
 
 from aperag.exception_handlers import register_exception_handlers
 from aperag.llm.litellm_track import register_opik_llm_track
-from aperag.middleware.audit_middleware import AuditMiddleware
 from aperag.views.api_key import router as api_key_router
 from aperag.views.audit import router as audit_router
 from aperag.views.auth import router as auth_router
@@ -37,9 +36,6 @@
 
 register_opik_llm_track()
 
-# Add audit middleware - should be added before other middlewares/routers
-app.add_middleware(AuditMiddleware, enabled=True)
-
 app.include_router(auth_router, prefix="/api/v1")
 app.include_router(main_router, prefix="/api/v1")
 app.include_router(api_key_router, prefix="/api/v1")

aperag/db/models.py

@@ -764,6 +764,13 @@ class AuditResource(str, Enum):
     MODEL_SERVICE_PROVIDER = "model_service_provider"
     USER = "user"
     CONFIG = "config"
+    INVITATION = "invitation"
+    AUTH = "auth"
+    CHAT_COMPLETION = "chat_completion"
+    SEARCH_TEST = "search_test"
+    LLM = "llm"
+    FLOW = "flow"
+    SYSTEM = "system"
 
 
 class AuditLog(Base):

aperag/middleware/audit_middleware.py

@@ -1,8 +1,8 @@
 """empty message
 
-Revision ID: 3369b50dc810
+Revision ID: 2768dfee8bbc
 Revises: 12ea6d2bf365
-Create Date: 2025-06-20 17:22:42.655570
+Create Date: 2025-06-21 00:28:36.443046
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = '3369b50dc810'
+revision: str = '2768dfee8bbc'
 down_revision: Union[str, None] = '12ea6d2bf365'
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -25,7 +25,7 @@ def upgrade() -> None:
     sa.Column('id', sa.String(length=36), nullable=False),
     sa.Column('user_id', sa.String(length=36), nullable=True, comment='User ID'),
     sa.Column('username', sa.String(length=255), nullable=True, comment='Username'),
-    sa.Column('resource_type', sa.Enum('collection', 'document', 'bot', 'chat', 'message', 'api_key', 'llm_provider', 'llm_provider_model', 'model_service_provider', 'user', 'config', name='auditresource'), nullable=True, comment='Resource type'),
+    sa.Column('resource_type', sa.Enum('collection', 'document', 'bot', 'chat', 'message', 'api_key', 'llm_provider', 'llm_provider_model', 'model_service_provider', 'user', 'config', 'invitation', 'auth', 'chat_completion', 'search_test', 'llm', 'flow', 'system', name='auditresource'), nullable=True, comment='Resource type'),
     sa.Column('resource_id', sa.String(length=255), nullable=True, comment='Resource ID (extracted at query time)'),
     sa.Column('api_name', sa.String(length=255), nullable=False, comment='API operation name'),
     sa.Column('http_method', sa.String(length=10), nullable=False, comment='HTTP method (POST, PUT, DELETE)'),

aperag/migration/versions/20250620172242-3369b50dc810.py renamed to aperag/migration/versions/20250621002836-2768dfee8bbc.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.merged.yaml
-#   timestamp: 2025-06-20T08:44:29+00:00
+#   timestamp: 2025-06-20T16:37:07+00:00
 
 from __future__ import annotations
 
@@ -1069,7 +1069,8 @@ class AuditLog(BaseModel):
             'llm_provider_model',
             'model_service_provider',
             'user',
-            'config',
+            'flow',
+            'search_test',
         ]
     ] = Field(None, description='Type of resource')
     resource_id: Optional[str] = Field(

aperag/schema/view_models.py

@@ -61,6 +61,13 @@ def __init__(self):
             "user": AuditResource.USER,
             "users": AuditResource.USER,
             "config": AuditResource.CONFIG,
+            "invitation": AuditResource.INVITATION,
+            "invitations": AuditResource.INVITATION,
+            "auth": AuditResource.AUTH,
+            "chat_completion": AuditResource.CHAT_COMPLETION,
+            "search_test": AuditResource.SEARCH_TEST,
+            "llm": AuditResource.LLM,
+            "flow": AuditResource.FLOW,
         }
 
     def _filter_sensitive_data(self, data: Dict[str, Any]) -> Dict[str, Any]: