Merge branch 'main' into redacting

Author: rdimitrov

.github/workflows/image-build.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
       - name: Download artifact
         id: download-artifact
         uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc # v8

.github/workflows/image-publish.yml

@@ -22,9 +22,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Set up QEMU for cross-platform builds
-        uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3
+        uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3
       - name: Compute version number
         id: version-string
         run: |

api/openapi.json

@@ -1145,14 +1145,7 @@
             "default": ""
           },
           "auth_type": {
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/ProviderAuthType"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "$ref": "#/components/schemas/ProviderAuthType",
             "default": "none"
           },
           "api_key": {
@@ -1175,6 +1168,74 @@
         "title": "AddProviderEndpointRequest",
         "description": "Represents a request to add a provider endpoint."
       },
+      "Alert": {
+        "properties": {
+          "id": {
+            "type": "string",
+            "title": "Id"
+          },
+          "prompt_id": {
+            "type": "string",
+            "title": "Prompt Id"
+          },
+          "code_snippet": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CodeSnippet"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "trigger_string": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "object"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Trigger String"
+          },
+          "trigger_type": {
+            "type": "string",
+            "title": "Trigger Type"
+          },
+          "trigger_category": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Trigger Category"
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time",
+            "title": "Timestamp"
+          }
+        },
+        "type": "object",
+        "required": [
+          "id",
+          "prompt_id",
+          "code_snippet",
+          "trigger_string",
+          "trigger_type",
+          "trigger_category",
+          "timestamp"
+        ],
+        "title": "Alert",
+        "description": "Represents an alert."
+      },
       "AlertConversation": {
         "properties": {
           "conversation": {
@@ -1389,6 +1450,14 @@
                 "type": "null"
               }
             ]
+          },
+          "alerts": {
+            "items": {
+              "$ref": "#/components/schemas/Alert"
+            },
+            "type": "array",
+            "title": "Alerts",
+            "default": []
           }
         },
         "type": "object",
@@ -1593,14 +1662,7 @@
             "default": ""
           },
           "auth_type": {
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/ProviderAuthType"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "$ref": "#/components/schemas/ProviderAuthType",
             "default": "none"
           }
         },
@@ -1621,7 +1683,7 @@
           "ollama",
           "lm_studio",
           "llamacpp",
-          "openai"
+          "openrouter"
         ],
         "title": "ProviderType",
         "description": "Represents the different types of providers we support."

poetry.lock

@@ -12,7 +12,7 @@ PyYAML = "==6.0.2"
 fastapi = "==0.115.8"
 uvicorn = "==0.34.0"
 structlog = "==25.1.0"
-litellm = "==1.60.4"
+litellm = "==1.60.5"
 llama_cpp_python = "==0.3.5"
 cryptography = "==44.0.0"
 sqlalchemy = "==2.0.37"
@@ -37,11 +37,11 @@ legacy-cgi = "==2.6.2"
 pytest = "==8.3.4"
 pytest-cov = "==6.0.0"
 black = "==25.1.0"
-ruff = "==0.9.4"
+ruff = "==0.9.5"
 bandit = "==1.8.2"
 build = "==1.2.2.post1"
 wheel = "==0.45.1"
-litellm = "==1.60.4"
+litellm = "==1.60.5"
 pytest-asyncio = "==0.25.3"
 llama_cpp_python = "==0.3.5"
 scikit-learn = "==1.6.1"

pyproject.toml

@@ -123,6 +123,10 @@ async def add_provider_endpoint(
             status_code=400,
             detail=str(e),
         )
+    except provendcrud.ProviderModelsNotFoundError:
+        raise HTTPException(status_code=401, detail="Provider models could not be found")
+    except provendcrud.ProviderInvalidAuthConfigError:
+        raise HTTPException(status_code=400, detail="Invalid auth configuration")
     except ValidationError as e:
         # TODO: This should be more specific
         raise HTTPException(
@@ -151,6 +155,10 @@ async def configure_auth_material(
         await pcrud.configure_auth_material(provider_id, request)
     except provendcrud.ProviderNotFoundError:
         raise HTTPException(status_code=404, detail="Provider endpoint not found")
+    except provendcrud.ProviderModelsNotFoundError:
+        raise HTTPException(status_code=401, detail="Provider models could not be found")
+    except provendcrud.ProviderInvalidAuthConfigError:
+        raise HTTPException(status_code=400, detail="Invalid auth configuration")
     except Exception:
         raise HTTPException(status_code=500, detail="Internal server error")
 
@@ -405,8 +413,12 @@ async def get_workspace_messages(workspace_name: str) -> List[v1_models.Conversa
         raise HTTPException(status_code=500, detail="Internal server error")
 
     try:
-        prompts_outputs = await dbreader.get_prompts_with_output(ws.id)
-        conversations, _ = await v1_processing.parse_messages_in_conversations(prompts_outputs)
+        prompts_with_output_alerts_usage = (
+            await dbreader.get_prompts_with_output_alerts_usage_by_workspace_id(ws.id)
+        )
+        conversations, _ = await v1_processing.parse_messages_in_conversations(
+            prompts_with_output_alerts_usage
+        )
         return conversations
     except Exception:
         logger.exception("Error while getting messages")

src/codegate/api/v1.py

@@ -147,6 +147,32 @@ def add_model_token_usage(self, model_token_usage: TokenUsageByModel) -> None:
         self.token_usage += model_token_usage.token_usage
 
 
+class Alert(pydantic.BaseModel):
+    """
+    Represents an alert.
+    """
+
+    @staticmethod
+    def from_db_model(db_model: db_models.Alert) -> "Alert":
+        return Alert(
+            id=db_model.id,
+            prompt_id=db_model.prompt_id,
+            code_snippet=db_model.code_snippet,
+            trigger_string=db_model.trigger_string,
+            trigger_type=db_model.trigger_type,
+            trigger_category=db_model.trigger_category,
+            timestamp=db_model.timestamp,
+        )
+
+    id: str
+    prompt_id: str
+    code_snippet: Optional[CodeSnippet]
+    trigger_string: Optional[Union[str, dict]]
+    trigger_type: str
+    trigger_category: Optional[str]
+    timestamp: datetime.datetime
+
+
 class PartialQuestionAnswer(pydantic.BaseModel):
     """
     Represents a partial conversation.
@@ -155,6 +181,7 @@ class PartialQuestionAnswer(pydantic.BaseModel):
     partial_questions: PartialQuestions
     answer: Optional[ChatMessage]
     model_token_usage: TokenUsageByModel
+    alerts: List[Alert] = []
 
 
 class Conversation(pydantic.BaseModel):
@@ -168,6 +195,7 @@ class Conversation(pydantic.BaseModel):
     chat_id: str
     conversation_timestamp: datetime.datetime
     token_usage_agg: Optional[TokenUsageAggregate]
+    alerts: List[Alert] = []
 
 
 class AlertConversation(pydantic.BaseModel):
@@ -210,7 +238,7 @@ class ProviderEndpoint(pydantic.BaseModel):
     description: str = ""
     provider_type: db_models.ProviderType
     endpoint: str = ""  # Some providers have defaults we can leverage
-    auth_type: Optional[ProviderAuthType] = ProviderAuthType.none
+    auth_type: ProviderAuthType = ProviderAuthType.none
 
     @staticmethod
     def from_db_model(db_model: db_models.ProviderEndpoint) -> "ProviderEndpoint":

src/codegate/api/v1_models.py

@@ -8,6 +8,7 @@
 import requests
 import structlog
 
+from codegate.api import v1_models
 from codegate.api.v1_models import (
     AlertConversation,
     ChatMessage,
@@ -200,10 +201,15 @@ async def _get_partial_question_answer(
         model=model, token_usage=token_usage, provider_type=provider
     )
 
+    alerts: List[v1_models.Alert] = [
+        v1_models.Alert.from_db_model(db_alert) for db_alert in row.alerts
+    ]
+
     return PartialQuestionAnswer(
         partial_questions=request_message,
         answer=output_message,
         model_token_usage=model_token_usage,
+        alerts=alerts,
     )
 
 
@@ -367,6 +373,7 @@ async def match_conversations(
     for group in grouped_partial_questions:
         questions_answers: List[QuestionAnswer] = []
         token_usage_agg = TokenUsageAggregate(tokens_by_model={}, token_usage=TokenUsage())
+        alerts: List[v1_models.Alert] = []
         first_partial_qa = None
         for partial_question in sorted(group, key=lambda x: x.timestamp):
             # Partial questions don't contain the answer, so we need to find the corresponding
@@ -385,6 +392,7 @@ async def match_conversations(
                 qa = _get_question_answer_from_partial(selected_partial_qa)
                 qa.question.message = parse_question_answer(qa.question.message)
                 questions_answers.append(qa)
+                alerts.extend(selected_partial_qa.alerts)
                 token_usage_agg.add_model_token_usage(selected_partial_qa.model_token_usage)
 
         # only add conversation if we have some answers
@@ -398,6 +406,7 @@ async def match_conversations(
                 chat_id=first_partial_qa.partial_questions.message_id,
                 conversation_timestamp=first_partial_qa.partial_questions.timestamp,
                 token_usage_agg=token_usage_agg,
+                alerts=alerts,
             )
             for qa in questions_answers:
                 map_q_id_to_conversation[qa.question.message_id] = conversation