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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: litellm-enterprise
-Version: 0.1.15
+Version: 0.1.16
 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,7 +9,6 @@ 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.15 → litellm_enterprise-0.1.16}/litellm_enterprise/integrations/prometheus.py

@@ -1,4 +1,4 @@
- # used for /metrics endpoint on LiteLLM Proxy
+# used for /metrics endpoint on LiteLLM Proxy
 #### What this does ####
 #    On success, log events to Prometheus
 import sys
@@ -1231,8 +1231,15 @@ class PrometheusLogger(CustomLogger):
                     "team_alias",
                 ] + EXCEPTION_LABELS,
         """
+        from litellm.litellm_core_utils.litellm_logging import (
+            StandardLoggingPayloadSetup,
+        )
+
         try:
-            _tags = cast(List[str], request_data.get("tags") or [])
+            _tags = StandardLoggingPayloadSetup._get_request_tags(
+                request_data.get("metadata", {}),
+                request_data.get("proxy_server_request", {}),
+            )
             enum_values = UserAPIKeyLabelValues(
                 end_user=user_api_key_dict.end_user_id,
                 user=user_api_key_dict.user_id,
@@ -1277,6 +1284,10 @@ class PrometheusLogger(CustomLogger):
         Proxy level tracking - triggered when the proxy responds with a success response to the client
         """
         try:
+            from litellm.litellm_core_utils.litellm_logging import (
+                StandardLoggingPayloadSetup,
+            )
+
             enum_values = UserAPIKeyLabelValues(
                 end_user=user_api_key_dict.end_user_id,
                 hashed_api_key=user_api_key_dict.api_key,
@@ -1288,6 +1299,9 @@ class PrometheusLogger(CustomLogger):
                 user_email=user_api_key_dict.user_email,
                 status_code="200",
                 route=user_api_key_dict.request_route,
+                tags=StandardLoggingPayloadSetup._get_request_tags(
+                    data.get("metadata", {}), data.get("proxy_server_request", {})
+                ),
             )
             _labels = prometheus_label_factory(
                 supported_enum_labels=self.get_labels_for_metric(
@@ -1352,6 +1366,7 @@ class PrometheusLogger(CustomLogger):
                 team_alias=standard_logging_payload["metadata"][
                     "user_api_key_team_alias"
                 ],
+                tags=standard_logging_payload.get("request_tags", []),
             )
 
             """
@@ -2148,9 +2163,11 @@ class PrometheusLogger(CustomLogger):
 
         It emits the current remaining budget metrics for all Keys and Teams.
         """
+        from enterprise.litellm_enterprise.integrations.prometheus import (
+            PrometheusLogger,
+        )
         from litellm.constants import PROMETHEUS_BUDGET_METRICS_REFRESH_INTERVAL_MINUTES
         from litellm.integrations.custom_logger import CustomLogger
-        from enterprise.litellm_enterprise.integrations.prometheus import PrometheusLogger
 
         prometheus_loggers: List[CustomLogger] = (
             litellm.logging_callback_manager.get_custom_loggers_for_type(
@@ -2280,6 +2297,8 @@ def get_custom_labels_from_tags(tags: List[str]) -> Dict[str, str]:
     """
     Get custom labels from tags based on admin configuration
     """
+    from litellm.types.integrations.prometheus import _sanitize_prometheus_label_name
+
     configured_tags = litellm.custom_prometheus_tags
     if configured_tags is None or len(configured_tags) == 0:
         return {}
@@ -2289,7 +2308,7 @@ def get_custom_labels_from_tags(tags: List[str]) -> Dict[str, str]:
     # 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 = f"tag_{configured_tag}".replace("-", "_").replace(".", "_")
+        label_name = _sanitize_prometheus_label_name(f"tag_{configured_tag}")
 
         # Check if this tag is present in the request tags
         if configured_tag in tags:

{litellm_enterprise-0.1.15 → litellm_enterprise-0.1.16}/litellm_enterprise/proxy/common_utils/check_batch_cost.py

@@ -83,15 +83,25 @@ class CheckBatchCost:
                 )
                 continue
 
-            response = await self.llm_router.aretrieve_batch(
-                model=model_id,
-                batch_id=batch_id,
-                litellm_metadata={
-                    "user_api_key_user_id": job.created_by or "default-user-id",
-                    "batch_ignore_default_logging": True,
-                },
+            verbose_proxy_logger.info(
+                f"Querying model ID: {model_id} for cost and usage of batch ID: {batch_id}"
             )
 
+            try:
+                response = await self.llm_router.aretrieve_batch(
+                    model=model_id,
+                    batch_id=batch_id,
+                    litellm_metadata={
+                        "user_api_key_user_id": job.created_by or "default-user-id",
+                        "batch_ignore_default_logging": True,
+                    },
+                )
+            except Exception as e:
+                verbose_proxy_logger.info(
+                    f"Skipping job {unified_object_id} because of error querying model ID: {model_id} for cost and usage of batch ID: {batch_id}: {e}"
+                )
+                continue
+
             ## RETRIEVE THE BATCH JOB OUTPUT FILE
             managed_files_obj = cast(
                 Optional[_PROXY_LiteLLMManagedFiles],
@@ -102,6 +112,9 @@ class CheckBatchCost:
                 and response.output_file_id is not None
                 and managed_files_obj is not None
             ):
+                verbose_proxy_logger.info(
+                    f"Batch ID: {batch_id} is complete, tracking cost and usage"
+                )
                 # track cost
                 model_file_id_mapping = {
                     response.output_file_id: {model_id: response.output_file_id}

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "litellm-enterprise"
-version = "0.1.15"
+version = "0.1.16"
 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.15"
+version = "0.1.16"
 version_files = [
     "pyproject.toml:version",
     "../requirements.txt:litellm-enterprise==",