feat: forward-port dd user_email span tag and model hub description from internal staging

litellm/proxy/dd_span_tagger.py

@@ -36,11 +36,15 @@ def tag_request(
         - ``litellm.key_alias``      — human-readable alias for the API key
         - ``litellm.key_hash``       — hashed API key (safe to log; never the raw secret)
         - ``litellm.requested_model``— model name as sent by the client
+        - ``litellm.user_email``     — email of the authenticated user
 
         Use cases:
         - Trace all requests from a specific user/key: filter by ``litellm.key_alias`` or
           ``litellm.key_hash``.
         - Trace all requests for a specific model: filter by ``litellm.requested_model``.
+        - Trace all requests from a specific person under JWT auth, where there is no key_alias:
+          filter by ``@litellm.user_email:"user@example.com"``. The value comes from the JWT claim
+          mapped by ``litellm_jwtauth.user_email_jwt_field``, or from the user row for virtual keys.
 
         Note: key_alias / key_hash are not available for unauthenticated (e.g. 401) requests.
         """
@@ -51,8 +55,10 @@ def tag_request(
                 set_active_span_tag("litellm.key_hash", str(user_api_key_dict.token))
             if requested_model:
                 set_active_span_tag("litellm.requested_model", str(requested_model))
+            if user_api_key_dict.user_email:
+                set_active_span_tag("litellm.user_email", str(user_api_key_dict.user_email))
         except Exception:
             verbose_proxy_logger.debug(
-                "Failed to tag active ddtrace span with key/model tags",
+                "Failed to tag active ddtrace span with key/model/user tags",
                 exc_info=True,
             )

litellm/router.py

@@ -11396,6 +11396,10 @@ def _set_model_group_info(self, model_group: str, user_facing_model_group_name:
         reasoning_efforts_initialized = False
         reasoning_efforts_unknown = False
         model_list: Final = self.get_model_list_of_routed_group(model_group)
+        model_group_description: Final[str | None] = next(
+            (d for d in (m.get("model_info", {}).get("description") for m in model_list) if isinstance(d, str)),
+            None,
+        )
         for model in model_list:
             is_match = False
             if (
@@ -11501,6 +11505,7 @@ def _set_model_group_info(self, model_group: str, user_facing_model_group_name:
                     **{
                         "model_group": user_facing_model_group_name,
                         "providers": [llm_provider],
+                        "description": model_group_description,
                         **model_info,
                         "supports_fast_mode": True,
                         "supported_reasoning_efforts": None,

litellm/types/router.py

@@ -926,6 +926,7 @@ class ModelGroupInfo(LiteLLMBaseModel):
     supported_reasoning_efforts: tuple[str, ...] | None = Field(default=None)
     supported_openai_params: list[str] | None = Field(default=[])
     configurable_clientside_auth_params: CONFIGURABLE_CLIENTSIDE_AUTH_PARAMS = None
+    description: str | None = None
 
     def __init__(self, **data) -> None:
         for field_name, field_type in _resolved_annotations(self.__class__).items():

tests/unit/proxy/test_common_request_processing.py

@@ -3890,12 +3890,13 @@ def test_streaming_overhead_header_in_custom_headers_from_stream_hidden_params(
 class TestDDSpanTaggerTagRequest:
     """Tests for DDSpanTagger.tag_request - key/model DD span tagging."""
 
-    def _make_user_api_key_dict(self, key_alias=None, token=None):
+    def _make_user_api_key_dict(self, key_alias=None, token=None, user_email=None):
         from litellm.proxy._types import UserAPIKeyAuth
 
         d = UserAPIKeyAuth()
         d.key_alias = key_alias
         d.token = token
+        d.user_email = user_email
         return d
 
     def test_tags_key_alias_and_model(self):
@@ -3936,6 +3937,30 @@ def test_only_model_tagged_when_no_key_info(self):
 
         mock_set_tag.assert_called_once_with("litellm.requested_model", "claude-3-5-sonnet")
 
+    def test_tags_user_email(self):
+        """user_email is tagged so JWT-authenticated requests are traceable per person."""
+        user_key = self._make_user_api_key_dict(user_email="user@example.com")
+
+        with patch("litellm.proxy.dd_span_tagger.set_active_span_tag") as mock_set_tag:
+            DDSpanTagger.tag_request(
+                user_api_key_dict=user_key,
+                requested_model=None,
+            )
+
+        mock_set_tag.assert_called_once_with("litellm.user_email", "user@example.com")
+
+    def test_no_user_email_tag_when_absent(self):
+        """No user email tag when the authenticated identity has no email."""
+        user_key = self._make_user_api_key_dict(key_alias="my-prod-key", user_email=None)
+
+        with patch("litellm.proxy.dd_span_tagger.set_active_span_tag") as mock_set_tag:
+            DDSpanTagger.tag_request(
+                user_api_key_dict=user_key,
+                requested_model="gpt-4o",
+            )
+
+        assert all(call.args[0] != "litellm.user_email" for call in mock_set_tag.call_args_list)
+
 
 class TestHasAttributeErrorInChain:
     """Tests for _has_attribute_error_in_chain helper."""

tests/unit/test_router/test_router.py

@@ -2318,6 +2318,31 @@ def test_model_group_info_cost_none_for_unpriced_deployment_but_zero_when_declar
     assert priced.output_cost_per_token is not None and priced.output_cost_per_token > 0
 
 
+def test_model_group_info_description_from_model_info():
+    """
+    model_info.description set in the config should surface on ModelGroupInfo,
+    including when only a later deployment in the group carries it.
+    """
+    router = litellm.Router(
+        model_list=[
+            {
+                "model_name": "gpt-4",
+                "litellm_params": {"model": "gpt-4", "api_key": "fake"},
+                "model_info": {},
+            },
+            {
+                "model_name": "gpt-4",
+                "litellm_params": {"model": "gpt-4", "api_key": "fake2"},
+                "model_info": {"description": "State-of-the-art language model."},
+            },
+        ]
+    )
+
+    result = router.get_model_group_info("gpt-4")
+    assert result is not None
+    assert result.description == "State-of-the-art language model."
+
+
 def _alias_cost_router() -> Router:
     return Router(
         model_list=[

ui/litellm-dashboard/src/components/AIHub/ModelHubTable.tsx

@@ -76,7 +76,7 @@
   premiumUser,
   userRole,
   canOpenPlayground,
 }) => {
   const syntaxTheme = useSyntaxTheme(prism);
   // Admin Viewer follows the read-parity rule: see the AI Hub catalog, but
   // cannot toggle public visibility (write).
@@ -192,7 +192,7 @@
         setAgentLoading(true);
         const response = await getAgentsList(accessToken);
         let agents = response.agents;
         let agent_card_list = agents.map((agent: any) => ({
           agent_id: agent.agent_id,
           ...agent.agent_card_params,
           is_public: agent.litellm_params.is_public,
@@ -355,7 +355,7 @@
         try {
           const response = await getAgentsList(accessToken);
           let agents = response.agents;
           let agent_card_list = agents.map((agent: any) => ({
             agent_id: agent.agent_id,
             ...agent.agent_card_params,
             is_public: agent.is_public,
@@ -684,6 +684,12 @@
                       ))}
                     </div>
                   </div>
+                  {selectedModel.description && (
+                    <div className="col-span-2">
+                      <p className="font-medium">Description:</p>
+                      <p className="mt-1">{selectedModel.description}</p>
+                    </div>
+                  )}
                 </div>
               </div>
 

ui/litellm-dashboard/src/components/AIHub/ModelHubTableColumns.tsx

@@ -31,7 +31,8 @@
   supports_function_calling: boolean;
   supported_openai_params?: string[];
   is_public_model_group: boolean;
+  description?: string;
   [key: string]: any;
 }
 
 const formatCapabilityName = (key: string) =>

ui/litellm-dashboard/src/components/PublicModelHubTableColumns.tsx

@@ -25,7 +25,8 @@
   health_status?: string;
   health_response_time?: number;
   health_checked_at?: string;
+  description?: string;
   [key: string]: any;
 }
 
 export interface AgentCard {
@@ -53,7 +54,7 @@
     url: string;
   };
   documentationUrl?: string;
   [key: string]: any;
 }
 
 export interface MCPServerData {
@@ -67,9 +68,9 @@
   mcp_info: {
     server_name: string;
     description?: string;
     mcp_server_cost_info?: any;
   };
   [key: string]: any;
 }
 
 const formatCapabilityName = (key: string) =>
@@ -118,7 +119,7 @@
         return (
           <span key={provider} className="flex items-center gap-1 rounded-md bg-muted px-2 py-1 text-xs">
             {logo && (
               <img
                 src={logo}
                 alt={provider}
                 className="size-3 shrink-0 object-contain"

ui/litellm-dashboard/src/components/public_model_hub.tsx

@@ -68,7 +68,7 @@
   );
 }
 
 const PublicModelHub: React.FC<PublicModelHubProps> = ({ accessToken, isEmbedded = false }) => {
   const anchor = useComboboxAnchor();
   const [proxyConfigured, setProxyConfigured] = useState<boolean>(false);
   const [agentHubData, setAgentHubData] = useState<AgentCard[] | null>(null);
@@ -714,6 +714,12 @@
                           })}
                         </div>
                       </div>
+                      {selectedModel.description && (
+                        <div className="col-span-2">
+                          <p className="font-medium">Description:</p>
+                          <p className="mt-1">{selectedModel.description}</p>
+                        </div>
+                      )}
                     </div>
 
                     {/* Wildcard Routing Note */}