litellm-enterprise 0.1.16__tar.gz → 0.1.18__tar.gz

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: litellm-enterprise
-Version: 0.1.16
+Version: 0.1.18
 Summary: Package for LiteLLM Enterprise features
 Author: BerriAI
 Requires-Python: >=3.8, !=2.7.*, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*, !=3.7.*
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Project-URL: Documentation, https://docs.litellm.ai
 Project-URL: Homepage, https://litellm.ai
 Project-URL: Repository, https://github.com/BerriAI/litellm

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/enterprise_callbacks/llama_guard.py

@@ -105,6 +105,7 @@ class _ENTERPRISE_LlamaGuard(CustomLogger):
             "moderation",
             "audio_transcription",
             "responses",
+            "mcp_call",
         ],
     ):
         """

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/enterprise_callbacks/llm_guard.py

@@ -127,6 +127,7 @@ class _ENTERPRISE_LLMGuard(CustomLogger):
             "moderation",
             "audio_transcription",
             "responses",
+            "mcp_call",
         ],
     ):
         """

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/enterprise_callbacks/pagerduty/pagerduty.py

@@ -147,6 +147,7 @@ class PagerDutyAlerting(SlackAlerting):
             "audio_transcription",
             "pass_through_endpoint",
             "rerank",
+            "mcp_call",
         ],
     ) -> Optional[Union[Exception, str, dict]]:
         """

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/integrations/prometheus.py

@@ -122,19 +122,19 @@ class PrometheusLogger(CustomLogger):
 
             # Counter for total_output_tokens
             self.litellm_tokens_metric = self._counter_factory(
-                "litellm_total_tokens",
+                "litellm_total_tokens_metric",
                 "Total number of input + output tokens from LLM requests",
                 labelnames=self.get_labels_for_metric("litellm_total_tokens_metric"),
             )
 
             self.litellm_input_tokens_metric = self._counter_factory(
-                "litellm_input_tokens",
+                "litellm_input_tokens_metric",
                 "Total number of input tokens from LLM requests",
                 labelnames=self.get_labels_for_metric("litellm_input_tokens_metric"),
             )
 
             self.litellm_output_tokens_metric = self._counter_factory(
-                "litellm_output_tokens",
+                "litellm_output_tokens_metric",
                 "Total number of output tokens from LLM requests",
                 labelnames=self.get_labels_for_metric("litellm_output_tokens_metric"),
             )
@@ -2293,10 +2293,60 @@ def get_custom_labels_from_metadata(metadata: dict) -> Dict[str, str]:
     return result
 
 
+def _tag_matches_wildcard_configured_pattern(tags: List[str], configured_tag: str) -> bool:
+    """
+    Check if any of the request tags matches a wildcard configured pattern
+
+    Args:
+        tags: List[str] - The request tags
+        configured_tag: str - The configured tag
+
+    Returns:
+        bool - True if any of the request tags matches the configured tag, False otherwise
+
+    e.g.
+    tags = ["User-Agent: curl/7.68.0", "User-Agent: python-requests/2.28.1", "prod"]
+    configured_tag = "User-Agent: curl/*"
+    _tag_matches_wildcard_configured_pattern(tags=tags, configured_tag=configured_tag) # True
+
+    configured_tag = "User-Agent: python-requests/*"
+    _tag_matches_wildcard_configured_pattern(tags=tags, configured_tag=configured_tag) # True
+
+    configured_tag = "gm"
+    _tag_matches_wildcard_configured_pattern(tags=tags, configured_tag=configured_tag) # False
+    """
+    import re
+
+    from litellm.router_utils.pattern_match_deployments import PatternMatchRouter
+    pattern_router = PatternMatchRouter()
+    regex_pattern = pattern_router._pattern_to_regex(configured_tag)
+    return any(re.match(pattern=regex_pattern, string=tag) for tag in tags)
+
+
 def get_custom_labels_from_tags(tags: List[str]) -> Dict[str, str]:
     """
-    Get custom labels from tags based on admin configuration
+    Get custom labels from tags based on admin configuration.
+    
+    Supports both exact matches and wildcard patterns:
+    - Exact match: "prod" matches "prod" exactly
+    - Wildcard pattern: "User-Agent: curl/*" matches "User-Agent: curl/7.68.0" 
+    
+    Reuses PatternMatchRouter for wildcard pattern matching.
+
+    Returns dict of label_name: "true" if the tag matches the configured tag, "false" otherwise
+
+    {
+        "tag_User-Agent_curl": "true",
+        "tag_User-Agent_python_requests": "false",
+        "tag_Environment_prod": "true",
+        "tag_Environment_dev": "false",
+        "tag_Service_api_gateway_v2": "true",
+        "tag_Service_web_app_v1": "false",
+    }
     """
+    import re
+
+    from litellm.router_utils.pattern_match_deployments import PatternMatchRouter
     from litellm.types.integrations.prometheus import _sanitize_prometheus_label_name
 
     configured_tags = litellm.custom_prometheus_tags
@@ -2304,16 +2354,22 @@ def get_custom_labels_from_tags(tags: List[str]) -> Dict[str, str]:
         return {}
 
     result: Dict[str, str] = {}
+    pattern_router = PatternMatchRouter()
 
-    # Map each configured tag to its presence in the request tags
     for configured_tag in configured_tags:
-        # Create a safe prometheus label name
         label_name = _sanitize_prometheus_label_name(f"tag_{configured_tag}")
-
-        # Check if this tag is present in the request tags
+        
+        # Check for exact match first (backwards compatibility)
         if configured_tag in tags:
             result[label_name] = "true"
-        else:
-            result[label_name] = "false"
+            continue
+            
+        # Use PatternMatchRouter for wildcard pattern matching
+        if "*" in configured_tag and _tag_matches_wildcard_configured_pattern(tags=tags, configured_tag=configured_tag):
+            result[label_name] = "true"
+            continue
+        
+        # No match found
+        result[label_name] = "false"
 
     return result

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/proxy/auth/route_checks.py

@@ -20,7 +20,6 @@ class EnterpriseRouteChecks:
                     status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
                     detail=f"🚨🚨🚨 DISABLING LLM API ENDPOINTS is an Enterprise feature\n🚨 {CommonProxyErrors.not_premium_user.value}",
                 )
-            return False
 
         return get_secret_bool("DISABLE_LLM_API_ENDPOINTS") is True
 

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/proxy/auth/user_api_key_auth.py

@@ -3,7 +3,7 @@ from typing import Any, Optional
 from fastapi import Request
 
 from litellm._logging import verbose_proxy_logger
-from litellm.proxy._types import UserAPIKeyAuth
+from litellm.proxy._types import ProxyException, UserAPIKeyAuth
 
 
 async def enterprise_custom_auth(
@@ -24,6 +24,8 @@ async def enterprise_custom_auth(
     elif custom_auth_settings["mode"] == "auto":
         try:
             return await user_custom_auth(request, api_key)
+        except ProxyException as e:
+            raise e
         except Exception as e:
             verbose_proxy_logger.debug(
                 f"Error in custom auth, checking litellm auth: {e}"

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/litellm_enterprise/proxy/hooks/managed_files.py

@@ -290,6 +290,7 @@ class _PROXY_LiteLLMManagedFiles(CustomLogger, BaseFileEndpoints):
             "aretrieve_fine_tuning_job",
             "alist_fine_tuning_jobs",
             "acancel_fine_tuning_job",
+            "mcp_call",
         ],
     ) -> Union[Exception, str, Dict, None]:
         """

{litellm_enterprise-0.1.16 → litellm_enterprise-0.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "litellm-enterprise"
-version = "0.1.16"
+version = "0.1.18"
 description = "Package for LiteLLM Enterprise features"
 authors = ["BerriAI"]
 readme = "README.md"
@@ -22,7 +22,7 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.commitizen]
-version = "0.1.16"
+version = "0.1.18"
 version_files = [
     "pyproject.toml:version",
     "../requirements.txt:litellm-enterprise==",