diff --git a/litellm/integrations/callback_configs.json b/litellm/integrations/callback_configs.json index 6d2bcea8bae..7a2295a35ae 100644 --- a/litellm/integrations/callback_configs.json +++ b/litellm/integrations/callback_configs.json @@ -220,6 +220,12 @@ "ui_name": "Host URL", "description": "Langfuse host URL (default: https://cloud.langfuse.com)", "required": false + }, + "langfuse_environment": { + "type": "text", + "ui_name": "Tracing Environment", + "description": "Langfuse tracing environment (lowercase; falls back to LANGFUSE_TRACING_ENVIRONMENT)", + "required": false } }, "description": "Langfuse v2 Logging Integration" @@ -247,6 +253,12 @@ "ui_name": "Host URL", "description": "Langfuse host URL (default: https://cloud.langfuse.com)", "required": false + }, + "langfuse_environment": { + "type": "text", + "ui_name": "Tracing Environment", + "description": "Langfuse tracing environment (lowercase; falls back to LANGFUSE_TRACING_ENVIRONMENT)", + "required": false } }, "description": "Langfuse v3 OTEL Logging Integration" diff --git a/litellm/integrations/langfuse/langfuse.py b/litellm/integrations/langfuse/langfuse.py index 86e392fc166..ae52115f912 100644 --- a/litellm/integrations/langfuse/langfuse.py +++ b/litellm/integrations/langfuse/langfuse.py @@ -22,6 +22,9 @@ from litellm.litellm_core_utils.core_helpers import ( reconstruct_model_name, safe_deep_copy, ) +from litellm.litellm_core_utils.initialize_dynamic_callback_params import ( + validate_langfuse_environment_value, +) from litellm.litellm_core_utils.redact_messages import redact_user_api_key_info from litellm.llms.custom_httpx.http_handler import _get_httpx_client from litellm.secret_managers.main import str_to_bool @@ -161,7 +164,12 @@ class LangFuseLogger: if not (self.langfuse_host.startswith("http://") or self.langfuse_host.startswith("https://")): # add http:// if unset, assume communicating over private network - e.g. render self.langfuse_host = "http://" + self.langfuse_host - self.langfuse_environment = langfuse_environment or os.getenv("LANGFUSE_TRACING_ENVIRONMENT") + _env_override: Final = ( + str(langfuse_environment).strip() if langfuse_environment is not None else None + ) + self.langfuse_environment = _env_override or os.getenv("LANGFUSE_TRACING_ENVIRONMENT") + if self.langfuse_environment: + validate_langfuse_environment_value(self.langfuse_environment) self.langfuse_release = os.getenv("LANGFUSE_RELEASE") self.langfuse_debug = os.getenv("LANGFUSE_DEBUG") self.langfuse_flush_interval = LangFuseLogger._get_langfuse_flush_interval(flush_interval) diff --git a/litellm/integrations/langfuse/langfuse_handler.py b/litellm/integrations/langfuse/langfuse_handler.py index 765e46d9b0c..1977ae9110a 100644 --- a/litellm/integrations/langfuse/langfuse_handler.py +++ b/litellm/integrations/langfuse/langfuse_handler.py @@ -1,3 +1,5 @@ +import os + """ This file contains the LangFuseHandler class @@ -136,9 +138,30 @@ class LangFuseHandler: or standard_callback_dynamic_params.get("langfuse_secret_key"), langfuse_public_key=standard_callback_dynamic_params.get("langfuse_public_key"), langfuse_host=standard_callback_dynamic_params.get("langfuse_host"), - langfuse_environment=standard_callback_dynamic_params.get("langfuse_environment"), + langfuse_environment=LangFuseHandler._meaningful_dynamic_environment(standard_callback_dynamic_params), ) + + @staticmethod + def _meaningful_dynamic_environment( + standard_callback_dynamic_params: StandardCallbackDynamicParams, + ) -> str | None: + """Return the per-request environment only when it changes behavior. + + Empty/whitespace values and values equal to the deployment-wide + LANGFUSE_TRACING_ENVIRONMENT fallback are treated as absent so an + environment-only override that matches the default does not mint a + duplicate SDK client (each client costs threads and counts against + MAX_LANGFUSE_INITIALIZED_CLIENTS). + """ + raw = standard_callback_dynamic_params.get("langfuse_environment") + if raw is None: + return None + value = str(raw).strip() + if not value or value == os.getenv("LANGFUSE_TRACING_ENVIRONMENT"): + return None + return value + @staticmethod def _dynamic_langfuse_credentials_are_passed( standard_callback_dynamic_params: StandardCallbackDynamicParams, @@ -155,7 +178,7 @@ class LangFuseHandler: or standard_callback_dynamic_params.get("langfuse_public_key") is not None or standard_callback_dynamic_params.get("langfuse_secret") is not None or standard_callback_dynamic_params.get("langfuse_secret_key") is not None - or standard_callback_dynamic_params.get("langfuse_environment") is not None + or LangFuseHandler._meaningful_dynamic_environment(standard_callback_dynamic_params) is not None ): return True return False diff --git a/litellm/integrations/langfuse/langfuse_otel.py b/litellm/integrations/langfuse/langfuse_otel.py index a93c45ef840..70a54223204 100644 --- a/litellm/integrations/langfuse/langfuse_otel.py +++ b/litellm/integrations/langfuse/langfuse_otel.py @@ -226,7 +226,10 @@ class LangfuseOtelLogger(OpenTelemetry): from litellm.integrations.arize._utils import safe_set_attribute from litellm.litellm_core_utils.safe_json_dumps import safe_dumps - langfuse_environment: Final = os.environ.get("LANGFUSE_TRACING_ENVIRONMENT") + dynamic_params: Final = kwargs.get("standard_callback_dynamic_params") or {} + langfuse_environment: Final = dynamic_params.get("langfuse_environment") or os.environ.get( + "LANGFUSE_TRACING_ENVIRONMENT" + ) if langfuse_environment: safe_set_attribute( span, diff --git a/litellm/litellm_core_utils/initialize_dynamic_callback_params.py b/litellm/litellm_core_utils/initialize_dynamic_callback_params.py index 3d5ae521e5d..65c5b0d9799 100644 --- a/litellm/litellm_core_utils/initialize_dynamic_callback_params.py +++ b/litellm/litellm_core_utils/initialize_dynamic_callback_params.py @@ -1,3 +1,4 @@ +import re from collections.abc import Iterator, Mapping from typing import Any, Final @@ -45,6 +46,22 @@ def validate_no_callback_env_reference(param: str, value: object, *, source: str _raise_env_reference_error(param, source=source) +# Langfuse rejects events whose environment does not match this pattern +# (lowercase alphanumerics, hyphens, underscores; no "langfuse" prefix). +# Validating here fails fast at config/init time instead of silently +# dropping every trace server-side. +LANGFUSE_ENVIRONMENT_PATTERN: Final = r"^(?!langfuse)[a-z0-9-_]+$" + + +def validate_langfuse_environment_value(value: str) -> None: + if not re.match(LANGFUSE_ENVIRONMENT_PATTERN, value): + raise ValueError( + f"Invalid langfuse_environment {value!r}: must be lowercase " + "alphanumerics/hyphens/underscores and must not start with " + f"'langfuse' (pattern {LANGFUSE_ENVIRONMENT_PATTERN})" + ) + + # Hardcoded list of supported callback params to avoid runtime inspection issues with TypedDict _supported_callback_params: Final[tuple[str, ...]] = ( "langfuse_public_key", diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py index 628e569e1b8..187b9365107 100644 --- a/litellm/proxy/_types.py +++ b/litellm/proxy/_types.py @@ -20,6 +20,7 @@ from typing_extensions import NotRequired, ReadOnly, Required, TypedDict from litellm._uuid import uuid from litellm.constants import DEFAULT_STAGGER_WINDOW_SECONDS, MCP_STDIO_ALLOWED_COMMANDS from litellm.litellm_core_utils.initialize_dynamic_callback_params import ( + validate_langfuse_environment_value, validate_no_callback_env_reference, ) from litellm.types.integrations.compression_interception import ( @@ -2027,6 +2028,8 @@ class AddTeamCallback(LiteLLMPydanticObjectBase): raise ValueError(f"Invalid callback variable: {key}. Must be one of {valid_keys}") callback_vars[key] = str(value) validate_no_callback_env_reference(key, callback_vars[key], source="key/team callback metadata") + if key == "langfuse_environment": + validate_langfuse_environment_value(callback_vars[key]) return values diff --git a/litellm/proxy/common_utils/callback_config_validation.py b/litellm/proxy/common_utils/callback_config_validation.py index 680cc226d18..7ee3bd8d829 100644 --- a/litellm/proxy/common_utils/callback_config_validation.py +++ b/litellm/proxy/common_utils/callback_config_validation.py @@ -14,11 +14,36 @@ _NEWRELIC_VAR_PREFIX: Final = "newrelic_" def callback_config_error(callback_name: str | None, callback_vars: Mapping[str, str] | None) -> str | None: - if callback_name != _NEWRELIC_CALLBACK or not callback_vars: + if not callback_vars: + return None + env_error: Final = _langfuse_environment_error(callback_vars) + if env_error is not None: + return env_error + if callback_name != _NEWRELIC_CALLBACK: return None return _newrelic_config_error(callback_vars) +def _langfuse_environment_error(callback_vars: Mapping[str, str]) -> str | None: + """Reject langfuse_environment values Langfuse ingestion would drop. + + Accepting an invalid value here would 200 the config write and then + silently lose every trace for that key/team at request time. + """ + value: Final = callback_vars.get("langfuse_environment") + if value is None: + return None + from litellm.litellm_core_utils.initialize_dynamic_callback_params import ( + validate_langfuse_environment_value, + ) + + try: + validate_langfuse_environment_value(value) + except ValueError as e: + return str(e) + return None + + def logging_metadata_config_error(metadata: Mapping[str, object] | None) -> str | None: """Validate every ``logging`` entry of a team/key metadata payload.""" if not metadata: diff --git a/litellm/proxy/management_endpoints/team_callback_endpoints.py b/litellm/proxy/management_endpoints/team_callback_endpoints.py index 14a2a8a98a5..16fa830e6a0 100644 --- a/litellm/proxy/management_endpoints/team_callback_endpoints.py +++ b/litellm/proxy/management_endpoints/team_callback_endpoints.py @@ -262,6 +262,7 @@ async def add_team_callbacks( - langfuse_secret_key: The secret key for the Langfuse callback - langfuse_secret: The secret for the Langfuse callback - langfuse_host: The host for the Langfuse callback + - langfuse_environment: The tracing environment for the Langfuse callback (lowercase; falls back to LANGFUSE_TRACING_ENVIRONMENT) - gcs_bucket_name: The name of the GCS bucket - gcs_path_service_account: The path to the GCS service account - langsmith_api_key: The API key for the Langsmith callback diff --git a/tests/test_litellm/integrations/test_langfuse.py b/tests/test_litellm/integrations/test_langfuse.py index 0d717c67829..f153ec1193c 100644 --- a/tests/test_litellm/integrations/test_langfuse.py +++ b/tests/test_litellm/integrations/test_langfuse.py @@ -1472,3 +1472,52 @@ def test_update_trace_keys_matches_whole_keys_not_substrings(): ) assert "input" not in trace_params + + +def test_langfuse_environment_is_coerced_and_validated(monkeypatch): + monkeypatch.setenv("LANGFUSE_MOCK", "false") + monkeypatch.delenv("LANGFUSE_TRACING_ENVIRONMENT", raising=False) + monkeypatch.setattr(litellm, "initialized_langfuse_clients", 0) + with patch("langfuse.Langfuse", _RecordingLangfuse): + logger = LangFuseLogger( + langfuse_public_key="pk-env", + langfuse_secret="sk-env", + langfuse_host="https://test.langfuse.com", + langfuse_environment=123, # non-string: must coerce, not crash + ) + assert logger.langfuse_environment == "123" + + with pytest.raises(ValueError, match="langfuse_environment"): + LangFuseLogger( + langfuse_public_key="pk-env", + langfuse_secret="sk-env", + langfuse_host="https://test.langfuse.com", + langfuse_environment="Production", + ) + + +def test_langfuse_empty_environment_falls_back_and_is_not_dynamic(monkeypatch): + from litellm.integrations.langfuse.langfuse_handler import LangFuseHandler + from litellm.types.utils import StandardCallbackDynamicParams + + monkeypatch.setenv("LANGFUSE_TRACING_ENVIRONMENT", "production") + + # '' falls back to the deployment env var at init + monkeypatch.setenv("LANGFUSE_MOCK", "false") + monkeypatch.setattr(litellm, "initialized_langfuse_clients", 0) + with patch("langfuse.Langfuse", _RecordingLangfuse): + logger = LangFuseLogger( + langfuse_public_key="pk-env", + langfuse_secret="sk-env", + langfuse_host="https://test.langfuse.com", + langfuse_environment="", + ) + assert logger.langfuse_environment == "production" + + # env-only params that add nothing do not select a dynamic logger + for redundant in ["", " ", "production"]: + params = StandardCallbackDynamicParams(langfuse_environment=redundant) + assert LangFuseHandler._dynamic_langfuse_credentials_are_passed(params) is False + + params = StandardCallbackDynamicParams(langfuse_environment="team-a-prod") + assert LangFuseHandler._dynamic_langfuse_credentials_are_passed(params) is True diff --git a/tests/test_litellm/integrations/test_langfuse_otel.py b/tests/test_litellm/integrations/test_langfuse_otel.py index 417921c166b..3b5e0c1ae33 100644 --- a/tests/test_litellm/integrations/test_langfuse_otel.py +++ b/tests/test_litellm/integrations/test_langfuse_otel.py @@ -137,6 +137,29 @@ class TestLangfuseOtelIntegration: mock_span, "langfuse.environment", test_env ) + def test_set_langfuse_environment_attribute_prefers_dynamic_param(self): + """Per-key/team langfuse_environment beats the deployment env var.""" + mock_span = MagicMock() + mock_kwargs = { + "standard_callback_dynamic_params": { + "langfuse_environment": "team-a-env" + } + } + + with patch.dict( + os.environ, {"LANGFUSE_TRACING_ENVIRONMENT": "deployment-wide"} + ): + with patch( + "litellm.integrations.arize._utils.safe_set_attribute" + ) as mock_safe_set_attribute: + LangfuseOtelLogger._set_langfuse_specific_attributes( + mock_span, mock_kwargs, {} + ) + + mock_safe_set_attribute.assert_called_once_with( + mock_span, "langfuse.environment", "team-a-env" + ) + def test_extract_langfuse_metadata_basic(self): """Ensure metadata is correctly pulled from litellm_params.""" metadata_in = {"generation_name": "my-gen", "custom": "data"} diff --git a/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py b/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py index 9b2bd5e2585..fe965f75f8f 100644 --- a/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py +++ b/tests/test_litellm/litellm_core_utils/test_initialize_dynamic_callback_params.py @@ -233,3 +233,18 @@ def test_trusted_vars_overlay_uses_shared_parser_semantics(): ) assert params.get("newrelic_api_key") == "12345" + + +def test_validate_langfuse_environment_value(): + import pytest + + from litellm.litellm_core_utils.initialize_dynamic_callback_params import ( + validate_langfuse_environment_value, + ) + + validate_langfuse_environment_value("team-a-prod") + validate_langfuse_environment_value("staging_2") + + for bad in ["Production", "langfuse-eu", "", "team a"]: + with pytest.raises(ValueError, match="langfuse_environment"): + validate_langfuse_environment_value(bad) diff --git a/tests/test_litellm/proxy/common_utils/test_callback_config_validation.py b/tests/test_litellm/proxy/common_utils/test_callback_config_validation.py new file mode 100644 index 00000000000..2d262db51a1 --- /dev/null +++ b/tests/test_litellm/proxy/common_utils/test_callback_config_validation.py @@ -0,0 +1,16 @@ +from litellm.proxy.common_utils.callback_config_validation import ( + callback_config_error, +) + + +def test_callback_config_error_rejects_invalid_langfuse_environment(): + from litellm.proxy.common_utils.callback_config_validation import ( + callback_config_error, + ) + + for callback in ["langfuse", "langfuse_otel"]: + error = callback_config_error(callback, {"langfuse_environment": "Production"}) + assert error is not None and "langfuse_environment" in error + + assert callback_config_error("langfuse", {"langfuse_environment": "team-a-prod"}) is None + assert callback_config_error("langfuse", {"langfuse_public_key": "pk"}) is None diff --git a/ui/litellm-dashboard/src/components/callback_info_helpers.tsx b/ui/litellm-dashboard/src/components/callback_info_helpers.tsx index 3906aa744f7..4b6f6233fe8 100644 --- a/ui/litellm-dashboard/src/components/callback_info_helpers.tsx +++ b/ui/litellm-dashboard/src/components/callback_info_helpers.tsx @@ -109,6 +109,7 @@ export const CALLBACK_CONFIGS: CallbackConfig[] = [ langfuse_public_key: "text", langfuse_secret_key: "password", langfuse_host: "text", + langfuse_environment: "text", }, description: "Langfuse v2 Logging Integration", }, @@ -121,6 +122,7 @@ export const CALLBACK_CONFIGS: CallbackConfig[] = [ langfuse_public_key: "text", langfuse_secret_key: "password", langfuse_host: "text", + langfuse_environment: "text", }, description: "Langfuse v3 OTEL Logging Integration", }, diff --git a/ui/litellm-dashboard/src/lib/http/schema.d.ts b/ui/litellm-dashboard/src/lib/http/schema.d.ts index 67ec35d36a0..e020696a0a3 100644 --- a/ui/litellm-dashboard/src/lib/http/schema.d.ts +++ b/ui/litellm-dashboard/src/lib/http/schema.d.ts @@ -14838,6 +14838,7 @@ export interface paths { * - langfuse_secret_key: The secret key for the Langfuse callback * - langfuse_secret: The secret for the Langfuse callback * - langfuse_host: The host for the Langfuse callback + * - langfuse_environment: The tracing environment for the Langfuse callback (lowercase; falls back to LANGFUSE_TRACING_ENVIRONMENT) * - gcs_bucket_name: The name of the GCS bucket * - gcs_path_service_account: The path to the GCS service account * - langsmith_api_key: The API key for the Langsmith callback