Merge branch 'main' into dependabot/uv/uv-0.11.6

Author: gwharris7

libraries/microsoft-agents-a365-notifications/microsoft_agents_a365/notifications/agent_notification.py

@@ -426,6 +426,121 @@ async def handle_user_deleted(context, state, notification):
         """
         return self.on_lifecycle_notification(AgentLifecycleEvent.USERDELETED, **kwargs)
 
+    def on_user_undeleted(
+        self, **kwargs: Any
+    ) -> Callable[[AgentHandler], Callable[[TurnContext, TurnState], Awaitable[None]]]:
+        """Register a handler for user un-deletion lifecycle events.
+
+        This is a convenience decorator that registers a handler specifically for
+        agentic user identity un-deletion events.
+
+        Args:
+            **kwargs: Additional keyword arguments passed to the app's add_route method.
+
+        Returns:
+            A decorator function that registers the handler with the application.
+
+        Example:
+            ```python
+            @notifications.on_user_undeleted()
+            async def handle_user_undeleted(context, state, notification):
+                print("Agentic user identity un-deleted")
+            ```
+        """
+        return self.on_lifecycle_notification(AgentLifecycleEvent.USERUNDELETED, **kwargs)
+
+    def on_user_updated(
+        self, **kwargs: Any
+    ) -> Callable[[AgentHandler], Callable[[TurnContext, TurnState], Awaitable[None]]]:
+        """Register a handler for user updated lifecycle events.
+
+        This is a convenience decorator that registers a handler specifically for
+        agentic user identity updated events.
+
+        Args:
+            **kwargs: Additional keyword arguments passed to the app's add_route method.
+
+        Returns:
+            A decorator function that registers the handler with the application.
+
+        Example:
+            ```python
+            @notifications.on_user_updated()
+            async def handle_user_updated(context, state, notification):
+                print("Agentic user identity updated")
+            ```
+        """
+        return self.on_lifecycle_notification(AgentLifecycleEvent.USERUPDATED, **kwargs)
+
+    def on_user_manager_updated(
+        self, **kwargs: Any
+    ) -> Callable[[AgentHandler], Callable[[TurnContext, TurnState], Awaitable[None]]]:
+        """Register a handler for user manager updated lifecycle events.
+
+        This is a convenience decorator that registers a handler specifically for
+        agentic user manager updated events.
+
+        Args:
+            **kwargs: Additional keyword arguments passed to the app's add_route method.
+
+        Returns:
+            A decorator function that registers the handler with the application.
+
+        Example:
+            ```python
+            @notifications.on_user_manager_updated()
+            async def handle_user_manager_updated(context, state, notification):
+                print("Agentic user manager updated")
+            ```
+        """
+        return self.on_lifecycle_notification(AgentLifecycleEvent.USERMANAGERUPDATED, **kwargs)
+
+    def on_user_enabled(
+        self, **kwargs: Any
+    ) -> Callable[[AgentHandler], Callable[[TurnContext, TurnState], Awaitable[None]]]:
+        """Register a handler for user enabled lifecycle events.
+
+        This is a convenience decorator that registers a handler specifically for
+        agentic user enabled events.
+
+        Args:
+            **kwargs: Additional keyword arguments passed to the app's add_route method.
+
+        Returns:
+            A decorator function that registers the handler with the application.
+
+        Example:
+            ```python
+            @notifications.on_user_enabled()
+            async def handle_user_enabled(context, state, notification):
+                print("Agentic user enabled")
+            ```
+        """
+        return self.on_lifecycle_notification(AgentLifecycleEvent.USERENABLED, **kwargs)
+
+    def on_user_disabled(
+        self, **kwargs: Any
+    ) -> Callable[[AgentHandler], Callable[[TurnContext, TurnState], Awaitable[None]]]:
+        """Register a handler for user disabled lifecycle events.
+
+        This is a convenience decorator that registers a handler specifically for
+        agentic user disabled events.
+
+        Args:
+            **kwargs: Additional keyword arguments passed to the app's add_route method.
+
+        Returns:
+            A decorator function that registers the handler with the application.
+
+        Example:
+            ```python
+            @notifications.on_user_disabled()
+            async def handle_user_disabled(context, state, notification):
+                print("Agentic user disabled")
+            ```
+        """
+        return self.on_lifecycle_notification(AgentLifecycleEvent.USERDISABLED, **kwargs)
+
     @staticmethod
     def _normalize_subchannel(value: str | AgentSubChannel | None) -> str:
         """Normalize a subchannel value to a lowercase string.

libraries/microsoft-agents-a365-notifications/microsoft_agents_a365/notifications/models/agent_lifecycle_event.py

@@ -15,8 +15,18 @@ class AgentLifecycleEvent(str, Enum):
         USERWORKLOADONBOARDINGUPDATED: Event triggered when a user's workload
             onboarding status is updated.
         USERDELETED: Event triggered when an agentic user identity is deleted.
+        USERUNDELETED: Event triggered when an agentic user identity is un-deleted.
+        USERUPDATED: Event triggered when an agentic user identity is updated.
+        USERMANAGERUPDATED: Event triggered when an agentic user's manager is updated.
+        USERENABLED: Event triggered when an agentic user is enabled.
+        USERDISABLED: Event triggered when an agentic user is disabled.
     """
 
     USERCREATED = "agenticuseridentitycreated"
     USERWORKLOADONBOARDINGUPDATED = "agenticuserworkloadonboardingupdated"
-    USERDELETED = "agenticuseridentitydeleted"
+    USERDELETED = "agenticuserdeleted"
+    USERUNDELETED = "agenticuserundeleted"
+    USERUPDATED = "agenticuseridentityupdated"
+    USERMANAGERUPDATED = "agenticusermanagerupdated"
+    USERENABLED = "agenticuserenabled"
+    USERDISABLED = "agenticuserdisabled"

libraries/microsoft-agents-a365-observability-hosting/microsoft_agents_a365/observability/hosting/scope_helpers/utils.py

@@ -36,7 +36,7 @@ def get_caller_pairs(activity: Activity) -> Iterator[tuple[str, Any]]:
     frm = activity.from_property
     if not frm:
         return
-    yield USER_ID_KEY, frm.aad_object_id
+    yield USER_ID_KEY, frm.aad_object_id or frm.agentic_user_id or frm.id
     yield USER_NAME_KEY, frm.name
     yield USER_EMAIL_KEY, frm.agentic_user_id
 

tests/observability/hosting/scope_helpers/test_scope_helper_utils.py

@@ -83,6 +83,65 @@ def test_get_channel_pairs():
     assert (CHANNEL_LINK_KEY, None) in result
 
 
+def test_get_caller_pairs_non_teams_fallback_to_from_id():
+    """Test userId falls back to from.id when aad_object_id is None (non-Teams channel)."""
+    from_account = ChannelAccount(
+        id="from-id-123",
+        name="Non-Teams User",
+    )
+    activity = Activity(type="message", from_property=from_account)
+
+    result = list(get_caller_pairs(activity))
+
+    assert (USER_ID_KEY, "from-id-123") in result
+    assert (USER_NAME_KEY, "Non-Teams User") in result
+    assert (USER_EMAIL_KEY, None) in result
+
+
+def test_get_caller_pairs_a2a_fallback_to_agentic_user_id():
+    """Test userId falls back to agentic_user_id for A2A calls (no aad_object_id)."""
+    from_account = ChannelAccount(
+        id="from-id-456",
+        name="Agent Caller",
+        agentic_user_id="a2a-agent-guid",
+    )
+    activity = Activity(type="message", from_property=from_account)
+
+    result = list(get_caller_pairs(activity))
+
+    assert (USER_ID_KEY, "a2a-agent-guid") in result
+    assert (USER_EMAIL_KEY, "a2a-agent-guid") in result
+
+
+def test_get_caller_pairs_aad_object_id_wins_when_all_set():
+    """Test aad_object_id takes precedence when all identifiers are present."""
+    from_account = ChannelAccount(
+        id="from-id-789",
+        aad_object_id="aad-wins",
+        name="Full User",
+        agentic_user_id="agent-upn",
+    )
+    activity = Activity(type="message", from_property=from_account)
+
+    result = list(get_caller_pairs(activity))
+
+    assert (USER_ID_KEY, "aad-wins") in result
+    assert (USER_NAME_KEY, "Full User") in result
+    assert (USER_EMAIL_KEY, "agent-upn") in result
+
+
+def test_get_caller_pairs_a2a_guid_agentic_user_id():
+    """Test userId resolves to GUID AgenticUserId in A2A scenario."""
+    from_account = ChannelAccount(
+        id="29:1sH5NArUwkWAX",
+        name="Agent Caller",
+        agentic_user_id="bef730f4-d6f5-4ffb-b759-26ffa449ed7e",
+    )
+    activity = Activity(type="message", from_property=from_account)
+    result = list(get_caller_pairs(activity))
+    assert (USER_ID_KEY, "bef730f4-d6f5-4ffb-b759-26ffa449ed7e") in result
+
+
 def test_get_conversation_pairs():
     """Test get_conversation_pairs extracts conversation information."""
     conversation = ConversationAccount(id="conversation-123")