microsoft-agents-a365-observability-hosting 0.2.1.dev45__tar.gz → 0.2.1.dev46__tar.gz

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-hosting
-Version: 0.2.1.dev45
+Version: 0.2.1.dev46
 Summary: Hosting components for Agent 365 observability
 Author-email: Microsoft <support@microsoft.com>
 License: MIT

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/microsoft_agents_a365/observability/hosting/middleware/output_logging_middleware.py

@@ -14,22 +14,14 @@ from microsoft_agents_a365.observability.core.agent_details import AgentDetails
 from microsoft_agents_a365.observability.core.constants import (
     CHANNEL_LINK_KEY,
     CHANNEL_NAME_KEY,
-    GEN_AI_CONVERSATION_ID_KEY,
-    GEN_AI_EXECUTION_TYPE_KEY,
-    USER_EMAIL_KEY,
-    USER_ID_KEY,
-    USER_NAME_KEY,
 )
-from microsoft_agents_a365.observability.core.models.caller_details import CallerDetails
 from microsoft_agents_a365.observability.core.models.response import Response
+from microsoft_agents_a365.observability.core.models.user_details import UserDetails
+from microsoft_agents_a365.observability.core.request import Request
+from microsoft_agents_a365.observability.core.span_details import SpanDetails
 from microsoft_agents_a365.observability.core.spans_scopes.output_scope import OutputScope
-from microsoft_agents_a365.observability.core.tenant_details import TenantDetails
 from microsoft_agents_a365.observability.core.utils import extract_context_from_headers
 
-from ..scope_helpers.utils import (
-    get_execution_type_pair,
-)
-
 logger = logging.getLogger(__name__)
 
 # TurnState key for the parent trace context (W3C traceparent string).
@@ -52,28 +44,21 @@ def _derive_agent_details(context: TurnContext) -> AgentDetails | None:
     return AgentDetails(
         agent_id=activity.get_agentic_instance_id() or "",
         agent_name=getattr(recipient, "name", None),
-        agent_auid=getattr(recipient, "aad_object_id", None),
-        agent_upn=activity.get_agentic_user(),
+        agentic_user_id=getattr(recipient, "aad_object_id", None),
+        agentic_user_email=activity.get_agentic_user(),
         agent_description=getattr(recipient, "role", None),
         tenant_id=getattr(recipient, "tenant_id", None),
     )
 
 
-def _derive_tenant_details(context: TurnContext) -> TenantDetails | None:
-    """Derive tenant details from the activity recipient."""
-    tenant_id = getattr(getattr(context.activity, "recipient", None), "tenant_id", None)
-    return TenantDetails(tenant_id=tenant_id) if tenant_id else None
-
-
-def _derive_caller_details(context: TurnContext) -> CallerDetails | None:
-    """Derive caller identity details from the activity from property."""
+def _derive_user_details(context: TurnContext) -> UserDetails | None:
+    """Derive user identity details from the activity from property."""
     frm = getattr(context.activity, "from_property", None)
     if not frm:
         return None
-    return CallerDetails(
-        caller_id=getattr(frm, "aad_object_id", None),
-        caller_upn=getattr(frm, "agentic_user_id", None),
-        caller_name=getattr(frm, "name", None),
+    return UserDetails(
+        user_id=getattr(frm, "aad_object_id", None),
+        user_name=getattr(frm, "name", None),
     )
 
 
@@ -99,14 +84,6 @@ def _derive_channel(
     return {"name": channel_name, "link": sub_channel}
 
 
-def _derive_execution_type(context: TurnContext) -> str | None:
-    """Derive execution type from the activity."""
-    pairs = list(get_execution_type_pair(context.activity))
-    if pairs:
-        return pairs[0][1]
-    return None
-
-
 class OutputLoggingMiddleware:
     """Middleware that creates :class:`OutputScope` spans for outgoing messages.
 
@@ -123,26 +100,22 @@ class OutputLoggingMiddleware:
         logic: Callable[[TurnContext], Awaitable],
     ) -> None:
         agent_details = _derive_agent_details(context)
-        tenant_details = _derive_tenant_details(context)
 
-        if not agent_details or not tenant_details:
+        if not agent_details:
             await logic()
             return
 
-        caller_details = _derive_caller_details(context)
+        user_details = _derive_user_details(context)
         conversation_id = _derive_conversation_id(context)
         channel = _derive_channel(context)
-        execution_type = _derive_execution_type(context)
 
         context.on_send_activities(
             self._create_send_handler(
                 context,
                 agent_details,
-                tenant_details,
-                caller_details,
+                user_details,
                 conversation_id,
                 channel,
-                execution_type,
             )
         )
 
@@ -152,11 +125,9 @@ class OutputLoggingMiddleware:
         self,
         turn_context: TurnContext,
         agent_details: AgentDetails,
-        tenant_details: TenantDetails,
-        caller_details: CallerDetails | None,
+        user_details: UserDetails | None,
         conversation_id: str | None,
         channel: dict[str, str | None],
-        execution_type: str | None,
     ) -> Callable:
         """Create a send handler that wraps outgoing messages in OutputScope spans.
 
@@ -187,24 +158,24 @@ class OutputLoggingMiddleware:
                     A365_PARENT_TRACEPARENT_KEY,
                 )
 
+            request = Request(
+                conversation_id=conversation_id,
+            )
+
+            span_details = SpanDetails(parent_context=parent_context) if parent_context else None
+
             output_scope = OutputScope.start(
-                agent_details=agent_details,
-                tenant_details=tenant_details,
+                request=request,
                 response=Response(messages=messages),
-                parent_context=parent_context,
+                agent_details=agent_details,
+                user_details=user_details,
+                span_details=span_details,
             )
 
             # Set additional attributes on the scope
-            output_scope.set_tag_maybe(GEN_AI_CONVERSATION_ID_KEY, conversation_id)
-            output_scope.set_tag_maybe(GEN_AI_EXECUTION_TYPE_KEY, execution_type)
             output_scope.set_tag_maybe(CHANNEL_NAME_KEY, channel.get("name"))
             output_scope.set_tag_maybe(CHANNEL_LINK_KEY, channel.get("link"))
 
-            if caller_details:
-                output_scope.set_tag_maybe(USER_ID_KEY, caller_details.caller_id)
-                output_scope.set_tag_maybe(USER_EMAIL_KEY, caller_details.caller_upn)
-                output_scope.set_tag_maybe(USER_NAME_KEY, caller_details.caller_name)
-
             try:
                 await send_next()
             except Exception as error:

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/microsoft_agents_a365/observability/hosting/scope_helpers/populate_baggage.py

@@ -13,7 +13,6 @@ from .utils import (
     get_caller_pairs,
     get_channel_pairs,
     get_conversation_pairs,
-    get_execution_type_pair,
     get_target_agent_pairs,
     get_tenant_id_pair,
 )
@@ -24,7 +23,6 @@ def _iter_all_pairs(turn_context: TurnContext) -> Iterator[tuple[str, Any]]:
     if not activity:
         return
     yield from get_caller_pairs(activity)
-    yield from get_execution_type_pair(activity)
     yield from get_target_agent_pairs(activity)
     yield from get_tenant_id_pair(activity)
     yield from get_channel_pairs(activity)

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/microsoft_agents_a365/observability/hosting/scope_helpers/populate_invoke_agent_scope.py

@@ -11,7 +11,6 @@ from .utils import (
     get_caller_pairs,
     get_channel_pairs,
     get_conversation_pairs,
-    get_execution_type_pair,
     get_target_agent_pairs,
     get_tenant_id_pair,
 )
@@ -36,7 +35,6 @@ def populate(scope: InvokeAgentScope, turn_context: TurnContext) -> InvokeAgentS
     activity = turn_context.activity
 
     scope.record_attributes(get_caller_pairs(activity))
-    scope.record_attributes(get_execution_type_pair(activity))
     scope.record_attributes(get_target_agent_pairs(activity))
     scope.record_attributes(get_tenant_id_pair(activity))
     scope.record_attributes(get_channel_pairs(activity))

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/microsoft_agents_a365/observability/hosting/scope_helpers/utils.py

@@ -14,13 +14,11 @@ from microsoft_agents_a365.observability.core.constants import (
     GEN_AI_AGENT_NAME_KEY,
     GEN_AI_CONVERSATION_ID_KEY,
     GEN_AI_CONVERSATION_ITEM_LINK_KEY,
-    GEN_AI_EXECUTION_TYPE_KEY,
     TENANT_ID_KEY,
     USER_EMAIL_KEY,
     USER_ID_KEY,
     USER_NAME_KEY,
 )
-from microsoft_agents_a365.observability.core.execution_type import ExecutionType
 
 AGENT_ROLE = "agenticUser"
 
@@ -43,19 +41,6 @@ def get_caller_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     yield USER_EMAIL_KEY, frm.agentic_user_id
 
 
-def get_execution_type_pair(activity: Activity) -> Iterator[tuple[str, Any]]:
-    frm = activity.from_property
-    rec = activity.recipient
-    is_agentic_caller = _is_agentic(frm)
-    is_agentic_recipient = _is_agentic(rec)
-    exec_type = (
-        ExecutionType.AGENT_TO_AGENT.value
-        if (is_agentic_caller and is_agentic_recipient)
-        else ExecutionType.HUMAN_TO_AGENT.value
-    )
-    yield GEN_AI_EXECUTION_TYPE_KEY, exec_type
-
-
 def get_target_agent_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     rec = activity.recipient
     if not rec:

{microsoft_agents_a365_observability_hosting-0.2.1.dev45 → microsoft_agents_a365_observability_hosting-0.2.1.dev46}/microsoft_agents_a365_observability_hosting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-hosting
-Version: 0.2.1.dev45
+Version: 0.2.1.dev46
 Summary: Hosting components for Agent 365 observability
 Author-email: Microsoft <support@microsoft.com>
 License: MIT