Merge branch 'main' into issue-1020

Author: yrobla

.gitignore

@@ -22,6 +22,7 @@ wheels/
 
 # Virtual Environment
 venv/
+.venv/
 env/
 ENV/
 

poetry.lock

@@ -14,7 +14,7 @@ PyYAML = "==6.0.2"
 fastapi = "==0.115.11"
 uvicorn = "==0.34.0"
 structlog = "==25.1.0"
-litellm = "==1.61.20"
+litellm = "==1.62.1"
 llama_cpp_python = "==0.3.5"
 cryptography = "==44.0.2"
 sqlalchemy = "==2.0.38"
@@ -50,7 +50,7 @@ ruff = "==0.9.9"
 bandit = "==1.8.3"
 build = "==1.2.2.post1"
 wheel = "==0.45.1"
-litellm = "==1.61.20"
+litellm = "==1.62.1"
 pytest-asyncio = "==0.25.3"
 llama_cpp_python = "==0.3.5"
 scikit-learn = "==1.6.1"

pyproject.toml

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import List, Optional
 from uuid import UUID
 
 import requests
@@ -8,10 +8,10 @@
 from fastapi.routing import APIRoute
 from pydantic import BaseModel, ValidationError
 
-from codegate.config import API_DEFAULT_PAGE_SIZE, API_MAX_PAGE_SIZE
 import codegate.muxing.models as mux_models
 from codegate import __version__
 from codegate.api import v1_models, v1_processing
+from codegate.config import API_DEFAULT_PAGE_SIZE, API_MAX_PAGE_SIZE
 from codegate.db.connection import AlreadyExistsError, DbReader
 from codegate.db.models import AlertSeverity, WorkspaceWithModel
 from codegate.providers import crud as provendcrud

src/codegate/api/v1.py

@@ -2,13 +2,13 @@
 import json
 import uuid
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Type
+from typing import Dict, List, Optional, Type
 
 import structlog
 from alembic import command as alembic_command
 from alembic.config import Config as AlembicConfig
 from pydantic import BaseModel
-from sqlalchemy import CursorResult, TextClause, bindparam, event, text
+from sqlalchemy import CursorResult, TextClause, event, text
 from sqlalchemy.engine import Engine
 from sqlalchemy.exc import IntegrityError, OperationalError
 from sqlalchemy.ext.asyncio import create_async_engine
@@ -627,10 +627,10 @@ async def get_prompts_with_output_alerts_usage_by_workspace_id(
         conditions["limit"] = limit
         conditions["offset"] = offset
 
-        fetched_rows: List[IntermediatePromptWithOutputUsageAlerts] = (
-            await self._exec_select_conditions_to_pydantic(
-                IntermediatePromptWithOutputUsageAlerts, sql, conditions, should_raise=True
-            )
+        fetched_rows: List[
+            IntermediatePromptWithOutputUsageAlerts
+        ] = await self._exec_select_conditions_to_pydantic(
+            IntermediatePromptWithOutputUsageAlerts, sql, conditions, should_raise=True
         )
         prompts_dict: Dict[str, GetPromptWithOutputsRow] = {}
         for row in fetched_rows:
@@ -668,7 +668,7 @@ async def get_prompts_with_output_alerts_usage_by_workspace_id(
     async def get_total_messages_count_by_workspace_id(
         self, workspace_id: str, trigger_category: Optional[str] = None
     ) -> int:
-        """Get total count of messages for a given workspace_id, considering trigger_category if provided."""
+        """Get total count of messages for a given workspace_id, considering trigger_category."""
         sql = text(
             """
             SELECT COUNT(*) 

src/codegate/db/connection.py

@@ -1,4 +1,5 @@
 import copy
+import fnmatch
 from abc import ABC, abstractmethod
 from asyncio import Lock
 from typing import Dict, List, Optional
@@ -116,16 +117,16 @@ def _extract_request_filenames(self, detected_client: ClientType, data: dict) ->
     def _is_matcher_in_filenames(self, detected_client: ClientType, data: dict) -> bool:
         """
         Check if the matcher is in the request filenames.
+        The matcher is treated as a glob pattern and matched against the filenames.
         """
         # Empty matcher_blob means we match everything
         if not self._mux_rule.matcher:
             return True
         filenames_to_match = self._extract_request_filenames(detected_client, data)
-        # _mux_rule.matcher can be a filename or a file extension. We match if any of the filenames
-        # match the rule.
+        # _mux_rule.matcher is a glob pattern. We match if any of the filenames
+        # match the pattern.
         is_filename_match = any(
-            self._mux_rule.matcher == filename or filename.endswith(self._mux_rule.matcher)
-            for filename in filenames_to_match
+            fnmatch.fnmatch(filename, self._mux_rule.matcher) for filename in filenames_to_match
         )
         return is_filename_match
 

src/codegate/muxing/rulematcher.py

@@ -401,7 +401,7 @@ async def try_update_to_provider(
             dbprovend.endpoint, authm.auth_type, authm.auth_blob, prov
         )
     except Exception as err:
-        logger.error(
+        logger.info(
             "Unable to get models from provider. Skipping",
             provider=dbprovend.name,
             err=str(err),

src/codegate/providers/crud/crud.py

@@ -231,7 +231,7 @@ async def _setup_muxing(
         provider_endpoint = muxing_config.get("provider_endpoint")
         try:
             data_with_api_keys = self.replace_env_variables(provider_endpoint["data"], os.environ)
-            response_create_provider = self.call_codegate(
+            response_create_provider = self.call_provider(
                 provider=provider,
                 url=provider_endpoint["url"],
                 headers=provider_endpoint["headers"],
@@ -250,7 +250,7 @@ async def _setup_muxing(
                 mux["provider_id"] = created_provider_endpoint["id"]
 
             # The endpoint actually takes a list
-            self.call_codegate(
+            self.call_provider(
                 provider=provider,
                 url=muxes_rules["url"],
                 headers=muxes_rules["headers"],

tests/integration/integration_tests.py

@@ -51,13 +51,13 @@ def test_catch_all(matcher_blob, thing_to_match):
     [
         (None, [], True),  # Empty filenames and no blob
         (None, ["main.py"], True),  # Empty blob should match
-        (".py", ["main.py"], True),  # Extension match
+        ("*.py", ["main.py"], True),  # Extension match
         ("main.py", ["main.py"], True),  # Full name match
-        (".py", ["main.py", "test.py"], True),  # Extension match
+        ("*.py", ["main.py", "test.py"], True),  # Extension match
         ("main.py", ["main.py", "test.py"], True),  # Full name match
         ("main.py", ["test.py"], False),  # Full name no match
-        (".js", ["main.py", "test.py"], False),  # Extension no match
-        (".ts", ["main.tsx", "test.tsx"], False),  # Extension no match
+        ("*.js", ["main.py", "test.py"], False),  # Extension no match
+        ("*.ts", ["main.tsx", "test.tsx"], False),  # Extension no match
     ],
 )
 def test_file_matcher(
@@ -89,13 +89,13 @@ def test_file_matcher(
     [
         (None, [], True),  # Empty filenames and no blob
         (None, ["main.py"], True),  # Empty blob should match
-        (".py", ["main.py"], True),  # Extension match
+        ("*.py", ["main.py"], True),  # Extension match
         ("main.py", ["main.py"], True),  # Full name match
-        (".py", ["main.py", "test.py"], True),  # Extension match
+        ("*.py", ["main.py", "test.py"], True),  # Extension match
         ("main.py", ["main.py", "test.py"], True),  # Full name match
         ("main.py", ["test.py"], False),  # Full name no match
-        (".js", ["main.py", "test.py"], False),  # Extension no match
-        (".ts", ["main.tsx", "test.tsx"], False),  # Extension no match
+        ("*.js", ["main.py", "test.py"], False),  # Extension no match
+        ("*.ts", ["main.tsx", "test.tsx"], False),  # Extension no match
     ],
 )
 @pytest.mark.parametrize(