microsoft-agents-hosting-core 1.10.0.dev7__tar.gz → 1.10.0.dev8__tar.gz

{microsoft_agents_hosting_core-1.10.0.dev7/microsoft_agents_hosting_core.egg-info → microsoft_agents_hosting_core-1.10.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.10.0.dev7
+Version: 1.10.0.dev8
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==1.10.0.dev7
+Requires-Dist: microsoft-agents-activity==1.10.0.dev8
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: python-dotenv>=1.1.1

microsoft_agents_hosting_core-1.10.0.dev8/VERSION.txt

@@ -0,0 +1 @@
+1.10.0.dev8

{microsoft_agents_hosting_core-1.10.0.dev7 → microsoft_agents_hosting_core-1.10.0.dev8}/microsoft_agents/hosting/core/channel_service_adapter.py

@@ -264,56 +264,64 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
 
         use_anonymous_auth_callback = claims_identity.allow_anonymous
 
-        # Create the connector client to use for outbound requests.
-        connector_client = (
-            await self._channel_service_client_factory.create_connector_client(
-                None,
-                claims_identity,
-                service_url,
-                audience,
-                use_anonymous=use_anonymous_auth_callback,
-            )
-        )
+        async with AsyncExitStack() as cleanup:
 
-        # Make the actual create conversation call using the connector.
-        create_conversation_result = (
-            await connector_client.conversations.create_conversation(
-                conversation_parameters
+            # Create the connector client to use for outbound requests.
+            connector_client = (
+                await self._channel_service_client_factory.create_connector_client(
+                    None,
+                    claims_identity,
+                    service_url,
+                    audience,
+                    use_anonymous=use_anonymous_auth_callback,
+                )
             )
-        )
 
-        # Create the create activity to communicate the results to the application.
-        create_activity = self._create_create_activity(
-            create_conversation_result, channel_id, service_url, conversation_parameters
-        )
+            # Make the actual create conversation call using the connector.
+            try:
+                create_conversation_result = (
+                    await connector_client.conversations.create_conversation(
+                        conversation_parameters
+                    )
+                )
+            except BaseException:
+                await connector_client.close()
+                raise
+
+            # Create the create activity to communicate the results to the application.
+            create_activity = self._create_create_activity(
+                create_conversation_result,
+                channel_id,
+                service_url,
+                conversation_parameters,
+            )
 
-        # Create a turn context and run the pipeline.
-        context = self._create_turn_context(
-            claims_identity,
-            None,
-            create_activity,
-        )
-        context.services.set(ConnectorClientBase, connector_client)
-        context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
-            connector_client  # for back-compat
-        )
+            # Create a turn context and run the pipeline.
+            context = self._create_turn_context(
+                claims_identity,
+                None,
+                create_activity,
+            )
+            cleanup.push_async_callback(context._aclose)
+            cleanup.push_async_callback(connector_client.close)
 
-        # Create a UserTokenClient instance for the application to use. (For example, in the OAuthPrompt.)
-        user_token_client = (
-            await self._channel_service_client_factory.create_user_token_client(
-                context, claims_identity, use_anonymous_auth_callback
+            context.services.set(ConnectorClientBase, connector_client)
+            context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
+                connector_client  # for back-compat
             )
-        )
-        context.services.set(UserTokenClientBase, user_token_client)
-        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
-            user_token_client  # for back-compat
-        )
 
-        # Run the pipeline and release resources in reverse registration order.
-        async with AsyncExitStack() as cleanup:
-            cleanup.push_async_callback(context._aclose)
+            # Create a UserTokenClient instance for the application to use. (For example, in the OAuthPrompt.)
+            user_token_client = (
+                await self._channel_service_client_factory.create_user_token_client(
+                    context, claims_identity, use_anonymous_auth_callback
+                )
+            )
             cleanup.push_async_callback(user_token_client.close)
-            cleanup.push_async_callback(connector_client.close)
+
+            context.services.set(UserTokenClientBase, user_token_client)
+            context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
+                user_token_client  # for back-compat
+            )
             await self.run_pipeline(context, callback)
 
     async def process_proactive(
@@ -326,43 +334,45 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
 
         use_anonymous_auth_callback = claims_identity.allow_anonymous
 
-        # Create a turn context and run the pipeline.
-        context = self._create_turn_context(
-            claims_identity,
-            audience,
-            activity=continuation_activity,
-        )
-
-        user_token_client = (
-            await self._channel_service_client_factory.create_user_token_client(
-                context, claims_identity, use_anonymous_auth_callback
-            )
-        )
-        context.services.set(UserTokenClientBase, user_token_client)
-        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
-            user_token_client  # for back-compat
-        )
+        async with AsyncExitStack() as cleanup:
 
-        # Create the connector client to use for outbound requests.
-        connector_client = (
-            await self._channel_service_client_factory.create_connector_client(
-                context,
+            # Create a turn context and run the pipeline.
+            context = self._create_turn_context(
                 claims_identity,
-                continuation_activity.service_url,
                 audience,
-                use_anonymous=use_anonymous_auth_callback,
+                activity=continuation_activity,
             )
-        )
-        context.services.set(ConnectorClientBase, connector_client)
-        context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
-            connector_client  # for back-compat
-        )
-
-        # Run the pipeline and release resources in reverse registration order.
-        async with AsyncExitStack() as cleanup:
             cleanup.push_async_callback(context._aclose)
+
+            user_token_client = (
+                await self._channel_service_client_factory.create_user_token_client(
+                    context, claims_identity, use_anonymous_auth_callback
+                )
+            )
             cleanup.push_async_callback(user_token_client.close)
+
+            context.services.set(UserTokenClientBase, user_token_client)
+            context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
+                user_token_client  # for back-compat
+            )
+
+            # Create the connector client to use for outbound requests.
+            connector_client = (
+                await self._channel_service_client_factory.create_connector_client(
+                    context,
+                    claims_identity,
+                    continuation_activity.service_url,
+                    audience,
+                    use_anonymous=use_anonymous_auth_callback,
+                )
+            )
             cleanup.push_async_callback(connector_client.close)
+
+            context.services.set(ConnectorClientBase, connector_client)
+            context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
+                connector_client  # for back-compat
+            )
+
             await self.run_pipeline(context, callback)
 
     def _resolve_if_connector_client_is_needed(self, activity: Activity) -> bool:
@@ -416,51 +426,52 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
 
         use_anonymous_auth_callback = claims_identity.allow_anonymous
 
-        # Create a turn context and run the pipeline.
-        context = self._create_turn_context(
-            claims_identity,
-            outgoing_audience,
-            activity=activity,
-        )
+        async with AsyncExitStack() as cleanup:
 
-        # Create a UserTokenClient instance for the OAuth flow.
-        user_token_client = (
-            await self._channel_service_client_factory.create_user_token_client(
-                context, claims_identity, use_anonymous_auth_callback
+            # Create a turn context and run the pipeline.
+            context = self._create_turn_context(
+                claims_identity,
+                outgoing_audience,
+                activity=activity,
             )
-        )
-        context.services.set(UserTokenClientBase, user_token_client)
-        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
-            user_token_client  # for back-compat
-        )
+            cleanup.push_async_callback(context._aclose)
 
-        # Create the connector client to use for outbound requests.
-        connector_client: ConnectorClientBase | None = None
-        if self._resolve_if_connector_client_is_needed(activity):
-            connector_client = (
-                await self._channel_service_client_factory.create_connector_client(
-                    context,
-                    claims_identity,
-                    activity.service_url,
-                    outgoing_audience,
-                    scopes,
-                    use_anonymous_auth_callback,
+            # Create a UserTokenClient instance for the OAuth flow.
+            user_token_client = (
+                await self._channel_service_client_factory.create_user_token_client(
+                    context, claims_identity, use_anonymous_auth_callback
                 )
             )
-            context.services.set(ConnectorClientBase, connector_client)
-            context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
-                connector_client  # for back-compat
+            cleanup.push_async_callback(user_token_client.close)
+
+            context.services.set(UserTokenClientBase, user_token_client)
+            context.turn_state[self.USER_TOKEN_CLIENT_KEY] = (
+                user_token_client  # for back-compat
             )
 
-        async with AsyncExitStack() as cleanup:
-            cleanup.push_async_callback(context._aclose)
-            cleanup.push_async_callback(user_token_client.close)
-            if connector_client:
+            # Create the connector client to use for outbound requests.
+            connector_client: ConnectorClientBase | None = None
+            if self._resolve_if_connector_client_is_needed(activity):
+                connector_client = (
+                    await self._channel_service_client_factory.create_connector_client(
+                        context,
+                        claims_identity,
+                        activity.service_url,
+                        outgoing_audience,
+                        scopes,
+                        use_anonymous_auth_callback,
+                    )
+                )
                 cleanup.push_async_callback(connector_client.close)
+
+                context.services.set(ConnectorClientBase, connector_client)
+                context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = (
+                    connector_client  # for back-compat
+                )
             await self.run_pipeline(context, callback)
 
-        # If there are any results they will have been left on the TurnContext.
-        return self._process_turn_results(context)
+            # If there are any results they will have been left on the TurnContext.
+            return self._process_turn_results(context)
 
     def create_claims_identity(self, agent_app_id: str = "") -> ClaimsIdentity:
         """

{microsoft_agents_hosting_core-1.10.0.dev7 → microsoft_agents_hosting_core-1.10.0.dev8/microsoft_agents_hosting_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.10.0.dev7
+Version: 1.10.0.dev8
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -15,7 +15,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==1.10.0.dev7
+Requires-Dist: microsoft-agents-activity==1.10.0.dev8
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: python-dotenv>=1.1.1

{microsoft_agents_hosting_core-1.10.0.dev7 → microsoft_agents_hosting_core-1.10.0.dev8}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==1.10.0.dev7
+microsoft-agents-activity==1.10.0.dev8
 pyjwt>=2.10.1
 isodate>=0.6.1
 python-dotenv>=1.1.1

microsoft_agents_hosting_core-1.10.0.dev7/VERSION.txt

@@ -1 +0,0 @@
-1.10.0.dev7