mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-13 23:11:40 +00:00
chore(typing): clear basedpyright Any errors in litellm_logging
Type the module-level in-memory logger registry and callback plumbing with CustomLogger instead of Any, move optional enterprise imports under TYPE_CHECKING with local Protocols, and tighten a few dict parameters to Mapping/dict[str, object]. Ratchet the ruff-strict, type-discipline, and basedpyright budgets down to reflect the combined improvement across all touched files: reportAny 19419 -> 18865, reportExplicitAny 6527 -> 6373 whole-tree.
This commit is contained in:
mateo-berri
parent
3b3def610f
commit
f7146a661d
4 changed files with 100 additions and 65 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"reportAny": {
|
||||
"limit": 29809
|
||||
"limit": 29255
|
||||
},
|
||||
"reportArgumentType": {
|
||||
"limit": 2645
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"limit": 24
|
||||
},
|
||||
"reportExplicitAny": {
|
||||
"limit": 9473
|
||||
"limit": 9319
|
||||
},
|
||||
"reportFunctionMemberAccess": {
|
||||
"limit": 11
|
||||
|
|
@ -54,13 +54,13 @@
|
|||
"limit": 0
|
||||
},
|
||||
"reportMissingParameterType": {
|
||||
"limit": 5855
|
||||
"limit": 5845
|
||||
},
|
||||
"reportMissingTypeArgument": {
|
||||
"limit": 15849
|
||||
"limit": 15837
|
||||
},
|
||||
"reportMissingTypeStubs": {
|
||||
"limit": 40
|
||||
"limit": 31
|
||||
},
|
||||
"reportOperatorIssue": {
|
||||
"limit": 0
|
||||
|
|
@ -105,13 +105,13 @@
|
|||
"limit": 113
|
||||
},
|
||||
"reportUnknownMemberType": {
|
||||
"limit": 40452
|
||||
"limit": 40396
|
||||
},
|
||||
"reportUnknownParameterType": {
|
||||
"limit": 20309
|
||||
"limit": 20285
|
||||
},
|
||||
"reportUnknownVariableType": {
|
||||
"limit": 31978
|
||||
"limit": 31955
|
||||
},
|
||||
"reportUnnecessaryCast": {
|
||||
"limit": 124
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ import subprocess
|
|||
import sys
|
||||
import time
|
||||
import traceback
|
||||
from collections.abc import Callable
|
||||
from collections.abc import Callable, Mapping
|
||||
from datetime import datetime as dt_object
|
||||
from functools import lru_cache
|
||||
from typing import TYPE_CHECKING, Any, Final, Literal, Optional, Union, cast
|
||||
from typing import TYPE_CHECKING, Any, Final, Literal, Optional, Protocol, Union, cast
|
||||
|
||||
from httpx import Response
|
||||
from pydantic import BaseModel
|
||||
|
|
@ -169,41 +169,73 @@ from .specialty_caches.dynamic_logging_cache import DynamicLoggingCache
|
|||
|
||||
if TYPE_CHECKING:
|
||||
from litellm.llms.base_llm.passthrough.transformation import BasePassthroughConfig
|
||||
try:
|
||||
from litellm_enterprise.enterprise_callbacks.callback_controls import (
|
||||
EnterpriseCallbackControls,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.pagerduty.pagerduty import (
|
||||
PagerDutyAlerting,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.resend_email import (
|
||||
ResendEmailLogger,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.sendgrid_email import (
|
||||
SendGridEmailLogger,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.smtp_email import (
|
||||
SMTPEmailLogger,
|
||||
)
|
||||
from litellm_enterprise.litellm_core_utils.litellm_logging import (
|
||||
StandardLoggingPayloadSetup as EnterpriseStandardLoggingPayloadSetup,
|
||||
)
|
||||
|
||||
from litellm.integrations.generic_api.generic_api_callback import GenericAPILogger
|
||||
class _EnterpriseCallbackControlsProtocol(Protocol):
|
||||
@staticmethod
|
||||
def is_callback_disabled_dynamically(
|
||||
callback: object,
|
||||
litellm_params: Mapping[str, object],
|
||||
standard_callback_dynamic_params: StandardCallbackDynamicParams,
|
||||
) -> bool: ...
|
||||
|
||||
EnterpriseStandardLoggingPayloadSetupVAR: type[EnterpriseStandardLoggingPayloadSetup] | None = (
|
||||
EnterpriseStandardLoggingPayloadSetup
|
||||
)
|
||||
except Exception as e:
|
||||
verbose_logger.debug("[Non-Blocking] Unable to import GenericAPILogger - LiteLLM Enterprise Feature - %s", e)
|
||||
GenericAPILogger = CustomLogger # type: ignore
|
||||
ResendEmailLogger = CustomLogger # type: ignore
|
||||
SendGridEmailLogger = CustomLogger # type: ignore
|
||||
SMTPEmailLogger = CustomLogger # type: ignore
|
||||
PagerDutyAlerting = CustomLogger # type: ignore
|
||||
EnterpriseCallbackControls = None # type: ignore
|
||||
EnterpriseStandardLoggingPayloadSetupVAR = None
|
||||
_in_memory_loggers: Final[list[Any]] = []
|
||||
class _EnterpriseStandardLoggingPayloadSetupProtocol(Protocol):
|
||||
@staticmethod
|
||||
def apply_enterprise_specific_metadata(
|
||||
standard_logging_metadata: StandardLoggingMetadata,
|
||||
proxy_server_request: Mapping[str, object],
|
||||
) -> StandardLoggingMetadata: ...
|
||||
|
||||
EnterpriseCallbackControls: type[_EnterpriseCallbackControlsProtocol] | None
|
||||
EnterpriseStandardLoggingPayloadSetupVAR: type[_EnterpriseStandardLoggingPayloadSetupProtocol] | None
|
||||
else:
|
||||
try:
|
||||
from litellm_enterprise.enterprise_callbacks.callback_controls import (
|
||||
EnterpriseCallbackControls,
|
||||
)
|
||||
from litellm_enterprise.litellm_core_utils.litellm_logging import (
|
||||
StandardLoggingPayloadSetup as EnterpriseStandardLoggingPayloadSetup,
|
||||
)
|
||||
|
||||
EnterpriseStandardLoggingPayloadSetupVAR = EnterpriseStandardLoggingPayloadSetup
|
||||
except Exception as e:
|
||||
verbose_logger.debug(
|
||||
"[Non-Blocking] Unable to import EnterpriseCallbackControls - LiteLLM Enterprise Feature - %s", e
|
||||
)
|
||||
EnterpriseCallbackControls = None
|
||||
EnterpriseStandardLoggingPayloadSetupVAR = None
|
||||
|
||||
if TYPE_CHECKING:
|
||||
GenericAPILogger: type[CustomLogger]
|
||||
ResendEmailLogger: type[CustomLogger]
|
||||
SendGridEmailLogger: type[CustomLogger]
|
||||
SMTPEmailLogger: type[CustomLogger]
|
||||
PagerDutyAlerting: type[CustomLogger]
|
||||
else:
|
||||
try:
|
||||
from litellm_enterprise.enterprise_callbacks.pagerduty.pagerduty import (
|
||||
PagerDutyAlerting,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.resend_email import (
|
||||
ResendEmailLogger,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.sendgrid_email import (
|
||||
SendGridEmailLogger,
|
||||
)
|
||||
from litellm_enterprise.enterprise_callbacks.send_emails.smtp_email import (
|
||||
SMTPEmailLogger,
|
||||
)
|
||||
|
||||
from litellm.integrations.generic_api.generic_api_callback import GenericAPILogger
|
||||
except Exception as e:
|
||||
verbose_logger.debug("[Non-Blocking] Unable to import GenericAPILogger - LiteLLM Enterprise Feature - %s", e)
|
||||
GenericAPILogger = CustomLogger # type: ignore
|
||||
ResendEmailLogger = CustomLogger # type: ignore
|
||||
SendGridEmailLogger = CustomLogger # type: ignore
|
||||
SMTPEmailLogger = CustomLogger # type: ignore
|
||||
PagerDutyAlerting = CustomLogger # type: ignore
|
||||
_in_memory_loggers: Final[
|
||||
list[CustomLogger]
|
||||
] = [] # mutable-ok: module-level registry appended to from many call sites at runtime
|
||||
|
||||
_STANDARD_LOGGING_METADATA_KEYS: Final[frozenset] = frozenset(StandardLoggingMetadata.__annotations__.keys())
|
||||
|
||||
|
|
@ -1131,21 +1163,16 @@ class Logging(LiteLLMLoggingBaseClass):
|
|||
self.model_call_details["additional_args"] = additional_args
|
||||
self.model_call_details["log_event_type"] = "post_api_call"
|
||||
|
||||
if self.litellm_request_debug:
|
||||
attr = "warning"
|
||||
else:
|
||||
attr = "debug"
|
||||
log_fn = verbose_logger.warning if self.litellm_request_debug else verbose_logger.debug
|
||||
|
||||
if json_logs:
|
||||
callattr = getattr(verbose_logger, attr)
|
||||
callattr(
|
||||
log_fn(
|
||||
"RAW RESPONSE:\n{}\n\n".format(
|
||||
self.model_call_details.get("original_response", self.model_call_details)
|
||||
),
|
||||
)
|
||||
else:
|
||||
callattr = getattr(verbose_logger, attr)
|
||||
callattr(
|
||||
log_fn(
|
||||
"RAW RESPONSE:\n{}\n\n".format(
|
||||
self.model_call_details.get("original_response", self.model_call_details)
|
||||
)
|
||||
|
|
@ -1652,7 +1679,9 @@ class Logging(LiteLLMLoggingBaseClass):
|
|||
self.model_call_details[f"has_logged_{event_type}"] = True
|
||||
return
|
||||
|
||||
def should_run_callback(self, callback: litellm.CALLBACK_TYPES, litellm_params: dict, event_hook: str) -> bool:
|
||||
def should_run_callback(
|
||||
self, callback: litellm.CALLBACK_TYPES, litellm_params: Mapping[str, object], event_hook: str
|
||||
) -> bool:
|
||||
if litellm.global_disable_no_log_param:
|
||||
return True
|
||||
|
||||
|
|
@ -1664,8 +1693,9 @@ class Logging(LiteLLMLoggingBaseClass):
|
|||
return False
|
||||
|
||||
# Check for dynamically disabled callbacks via headers
|
||||
_callback_for_disable_check: Final[str | Callable[..., object] | CustomLogger] = callback
|
||||
if EnterpriseCallbackControls is not None and EnterpriseCallbackControls.is_callback_disabled_dynamically(
|
||||
callback=callback,
|
||||
callback=_callback_for_disable_check,
|
||||
litellm_params=litellm_params,
|
||||
standard_callback_dynamic_params=self.standard_callback_dynamic_params,
|
||||
):
|
||||
|
|
@ -4115,7 +4145,7 @@ def _init_custom_logger_compatible_class(
|
|||
return callback
|
||||
|
||||
# Get global BitBucket config
|
||||
bitbucket_config: Final = getattr(litellm, "global_bitbucket_config", None)
|
||||
bitbucket_config: Final = litellm.global_bitbucket_config
|
||||
if bitbucket_config is None:
|
||||
raise ValueError("BitBucket configuration not found. Please set litellm.global_bitbucket_config first.")
|
||||
|
||||
|
|
@ -4132,7 +4162,7 @@ def _init_custom_logger_compatible_class(
|
|||
return callback
|
||||
|
||||
# Get global BitBucket config
|
||||
gitlab_config: Final = getattr(litellm, "global_gitlab_config", None)
|
||||
gitlab_config: Final = litellm.global_gitlab_config
|
||||
if gitlab_config is None:
|
||||
raise ValueError("Gitlab configuration not found. Please set litellm.global_gitlab_config first.")
|
||||
|
||||
|
|
@ -4153,7 +4183,10 @@ def _init_custom_logger_compatible_class(
|
|||
return None
|
||||
|
||||
|
||||
def _maybe_construct_otel_v2(callback_name: str, _in_memory_loggers: list) -> Any | None:
|
||||
def _maybe_construct_otel_v2(
|
||||
callback_name: str,
|
||||
_in_memory_loggers: list[CustomLogger], # mutable-ok: caller's registry, appended to below
|
||||
) -> CustomLogger | None:
|
||||
"""If ``LITELLM_OTEL_V2`` is on, build (or reuse) a single ``OpenTelemetryV2``
|
||||
instance configured via the preset for ``callback_name``.
|
||||
|
||||
|
|
@ -4184,7 +4217,9 @@ def _maybe_construct_otel_v2(callback_name: str, _in_memory_loggers: list) -> An
|
|||
return v2_logger
|
||||
|
||||
|
||||
def _maybe_auto_initialize_arize_phoenix(_in_memory_loggers: list) -> None:
|
||||
def _maybe_auto_initialize_arize_phoenix(
|
||||
_in_memory_loggers: list[CustomLogger], # mutable-ok: caller's registry, appended to below
|
||||
) -> None:
|
||||
"""
|
||||
Auto-initialize ArizePhoenixLogger when Phoenix env vars are detected.
|
||||
|
||||
|
|
@ -4594,7 +4629,7 @@ class StandardLoggingPayloadSetup:
|
|||
mcp_tool_call_metadata: StandardLoggingMCPToolCall | None = None,
|
||||
vector_store_request_metadata: list[StandardLoggingVectorStoreRequest] | None = None,
|
||||
usage_object: dict | None = None,
|
||||
proxy_server_request: dict | None = None,
|
||||
proxy_server_request: Mapping[str, object] | None = None,
|
||||
start_time: dt_object | None = None,
|
||||
response_id: str | None = None,
|
||||
) -> StandardLoggingMetadata:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"ANN001": {
|
||||
"limit": 3097
|
||||
"limit": 3087
|
||||
},
|
||||
"ANN002": {
|
||||
"limit": 69
|
||||
|
|
@ -9,10 +9,10 @@
|
|||
"limit": 831
|
||||
},
|
||||
"ANN201": {
|
||||
"limit": 2137
|
||||
"limit": 2121
|
||||
},
|
||||
"ANN202": {
|
||||
"limit": 941
|
||||
"limit": 939
|
||||
},
|
||||
"ANN204": {
|
||||
"limit": 724
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"limit": 130
|
||||
},
|
||||
"ANN401": {
|
||||
"limit": 1848
|
||||
"limit": 1792
|
||||
},
|
||||
"ASYNC230": {
|
||||
"limit": 14
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"LIT001": {
|
||||
"limit": 23348
|
||||
"limit": 23315
|
||||
},
|
||||
"LIT002": {
|
||||
"limit": 27227
|
||||
"limit": 27213
|
||||
},
|
||||
"LIT003": {
|
||||
"limit": 292
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
"limit": 1004
|
||||
},
|
||||
"LIT009": {
|
||||
"limit": 2460
|
||||
"limit": 2458
|
||||
},
|
||||
"LIT010": {
|
||||
"limit": 25327
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue