microsoft-agents-hosting-core 0.6.0.dev16__py3-none-any.whl → 0.6.1__py3-none-any.whl

microsoft_agents/hosting/core/app/oauth/_sign_in_state.py

@@ -7,35 +7,27 @@ from __future__ import annotations
 
 from typing import Optional
 
+from pydantic import BaseModel
+
 from microsoft_agents.activity import Activity
 
 from ...storage._type_aliases import JSON
 from ...storage import StoreItem
 
 
-class _SignInState(StoreItem):
+class _SignInState(BaseModel, StoreItem):
     """Store item for sign-in state, including tokens and continuation activity.
 
     Used to cache tokens and keep track of activities during single and
     multi-turn sign-in flows.
     """
 
-    def __init__(
-        self,
-        active_handler_id: str,
-        continuation_activity: Optional[Activity] = None,
-    ) -> None:
-        self.active_handler_id = active_handler_id
-        self.continuation_activity = continuation_activity
+    active_handler_id: str
+    continuation_activity: Optional[Activity] = None
 
     def store_item_to_json(self) -> JSON:
-        return {
-            "active_handler_id": self.active_handler_id,
-            "continuation_activity": self.continuation_activity,
-        }
+        return self.model_dump(mode="json", exclude_unset=True, by_alias=True)
 
     @staticmethod
     def from_json_to_store_item(json_data: JSON) -> _SignInState:
-        return _SignInState(
-            json_data["active_handler_id"], json_data.get("continuation_activity")
-        )
+        return _SignInState.model_validate(json_data)

microsoft_agents/hosting/core/channel_service_adapter.py

@@ -262,28 +262,12 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         claims_identity = self.create_claims_identity(agent_app_id)
         claims_identity.claims[AuthenticationConstants.SERVICE_URL_CLAIM] = service_url
 
-        # Create a turn context and run the pipeline.
-        context = self._create_turn_context(
-            claims_identity,
-            None,
-            callback,
-        )
-
-        # Create a UserTokenClient instance for the application to use. (For example, in the OAuthPrompt.)
-        user_token_client: UserTokenClient = (
-            await self._channel_service_client_factory.create_user_token_client(
-                context, claims_identity
-            )
-        )
-        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = user_token_client
-
         # Create the connector client to use for outbound requests.
         connector_client: ConnectorClient = (
             await self._channel_service_client_factory.create_connector_client(
-                context, claims_identity, service_url, audience
+                None, claims_identity, service_url, audience
             )
         )
-        context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = connector_client
 
         # Make the actual create conversation call using the connector.
         create_conversation_result = (
@@ -297,7 +281,22 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
             create_conversation_result, channel_id, service_url, conversation_parameters
         )
 
-        context.activity = create_activity
+        # Create a turn context and run the pipeline.
+        context = self._create_turn_context(
+            claims_identity,
+            None,
+            callback,
+            create_activity,
+        )
+        context.turn_state[self._AGENT_CONNECTOR_CLIENT_KEY] = connector_client
+
+        # Create a UserTokenClient instance for the application to use. (For example, in the OAuthPrompt.)
+        user_token_client: UserTokenClient = (
+            await self._channel_service_client_factory.create_user_token_client(
+                context, claims_identity
+            )
+        )
+        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = user_token_client
 
         # Run the pipeline
         await self.run_pipeline(context, callback)

microsoft_agents/hosting/core/channel_service_client_factory_base.py

@@ -16,7 +16,7 @@ class ChannelServiceClientFactoryBase(Protocol):
     @abstractmethod
     async def create_connector_client(
         self,
-        context: TurnContext,
+        context: TurnContext | None,
         claims_identity: ClaimsIdentity,
         service_url: str,
         audience: str,

microsoft_agents/hosting/core/rest_channel_service_client_factory.py

@@ -83,15 +83,15 @@ class RestChannelServiceClientFactory(ChannelServiceClientFactoryBase):
 
     async def create_connector_client(
         self,
-        context: TurnContext,
+        context: TurnContext | None,
         claims_identity: ClaimsIdentity,
         service_url: str,
         audience: str,
         scopes: Optional[list[str]] = None,
         use_anonymous: bool = False,
     ) -> ConnectorClientBase:
-        if not context or not claims_identity:
-            raise TypeError("context and claims_identity are required")
+        if not claims_identity:
+            raise TypeError("claims_identity is required")
         if not service_url:
             raise TypeError(
                 "RestChannelServiceClientFactory.create_connector_client: service_url can't be None or Empty"
@@ -101,7 +101,7 @@ class RestChannelServiceClientFactory(ChannelServiceClientFactoryBase):
                 "RestChannelServiceClientFactory.create_connector_client: audience can't be None or Empty"
             )
 
-        if context.activity.is_agentic_request():
+        if context and context.activity.is_agentic_request():
             token = await self._get_agentic_token(context, service_url)
         else:
             token_provider: AccessTokenProviderBase = (

{microsoft_agents_hosting_core-0.6.0.dev16.dist-info → microsoft_agents_hosting_core-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.6.0.dev16
+Version: 0.6.1
 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==0.6.0.dev16
+Requires-Dist: microsoft-agents-activity==0.6.1
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-0.6.0.dev16.dist-info → microsoft_agents_hosting_core-0.6.1.dist-info}/RECORD

@@ -4,11 +4,11 @@ microsoft_agents/hosting/core/agent.py,sha256=K8v84y8ULP7rbcMKg8LxaM3haAq7f1oHFC
 microsoft_agents/hosting/core/card_factory.py,sha256=UDmPEpOk2SpEr9ShN9Q0CiaI_GTD3qjHgkDMOWinW9I,6926
 microsoft_agents/hosting/core/channel_adapter.py,sha256=MqES9gHGS0nrKBR7u8zLQCsuIksl-hScZy_jg4LTTHo,10669
 microsoft_agents/hosting/core/channel_api_handler_protocol.py,sha256=RO59hiOYx7flQVWhX6VGvfpFPoKVkdT_la-7WhUl8UM,4506
-microsoft_agents/hosting/core/channel_service_adapter.py,sha256=jDzZkiRFO-sOD66MQV-Qsk4nmAxhMb_mSjGV6758rTY,20937
-microsoft_agents/hosting/core/channel_service_client_factory_base.py,sha256=ArMAUt84Kzq17Oyqz6o8HZrc01UqAAmNCSBTShv3rgk,1704
+microsoft_agents/hosting/core/channel_service_adapter.py,sha256=OTF1EFycfBv4sdX2Zt_jPzk80aRHjLhSv5DyU6CEc7Q,20919
+microsoft_agents/hosting/core/channel_service_client_factory_base.py,sha256=9LcpxiWMXmWAdGQt6lRzvY9ybF_5mGc5Focd1Z7f9MY,1711
 microsoft_agents/hosting/core/message_factory.py,sha256=F9QJBF4yBupHXxOW984ZzZomVEG57t9IUnTHwub-lX0,7822
 microsoft_agents/hosting/core/middleware_set.py,sha256=TBsBs4KwAfKyHlQTlG4bl1y5UjkBzeMDs5w7LNB-Bi4,2585
-microsoft_agents/hosting/core/rest_channel_service_client_factory.py,sha256=afLeWgLz9N417Egc_6LBfnYNiuuwTEcSBefeOvTQ_H4,6217
+microsoft_agents/hosting/core/rest_channel_service_client_factory.py,sha256=NY9Pj9-jR2Oq-Crqm7as41FsVX3PLWsM-JEw3RTjyhE,6208
 microsoft_agents/hosting/core/turn_context.py,sha256=muA8S4R6Xxja5it7DiFqr5J5zmttwDN-Mj5_SDdxZ4A,14874
 microsoft_agents/hosting/core/_oauth/__init__.py,sha256=sU1HsIXbETRYwnudtFc6GrNbM6C3oYjmruqXc6kIAFw,405
 microsoft_agents/hosting/core/_oauth/_flow_state.py,sha256=BQbXn0a3Fw4aozS-WSjL0Y7vEdb4eua1ZitSr0qZ6bE,2207
@@ -28,7 +28,7 @@ microsoft_agents/hosting/core/app/_routes/_route_list.py,sha256=fe1-wmFaJJqYkWFc
 microsoft_agents/hosting/core/app/_routes/route_rank.py,sha256=-UwmLMCtgLT2cWnWvLfE2puV0RuQfI2m3WyEvkBkSBg,324
 microsoft_agents/hosting/core/app/oauth/__init__.py,sha256=eHx-vmW2Ew8HULSfvAmV8F9TBXXLcTPsBe3XP4JEDdY,556
 microsoft_agents/hosting/core/app/oauth/_sign_in_response.py,sha256=H5VBX69WiYXGALzCDVnF_-Y0brbafbJgfF4mS2wZSr0,851
-microsoft_agents/hosting/core/app/oauth/_sign_in_state.py,sha256=lC2otIFcQthAZ8kqkYxV3wLBPOqzW9MRVUbdqQPtEdM,1159
+microsoft_agents/hosting/core/app/oauth/_sign_in_state.py,sha256=gtrLa_BgQq-yrTu8ItVwQ8fntfSKjlng2lCj6A8mCrc,897
 microsoft_agents/hosting/core/app/oauth/auth_handler.py,sha256=KyhEfpKtoVKcapOt4szpDdbgk_KSwXF46GGOeJrmsRI,3464
 microsoft_agents/hosting/core/app/oauth/authorization.py,sha256=_sdCZcZ7iciwTZqXTHFOK4vWWbCgSIDv3it30fzPI8w,18246
 microsoft_agents/hosting/core/app/oauth/_handlers/__init__.py,sha256=ZQuXF-IZrJv_hOgt-sdRFAUyIpRXaYqYBuyEJWJRcfU,376
@@ -93,8 +93,8 @@ microsoft_agents/hosting/core/storage/transcript_info.py,sha256=5VN32j99tshChAff
 microsoft_agents/hosting/core/storage/transcript_logger.py,sha256=_atDk3CJ05fIVMhlWGNa91IiM9bGLmOhasFko8Lxjhk,8237
 microsoft_agents/hosting/core/storage/transcript_memory_store.py,sha256=v1Ud9LSs8m5c9_Fa8i49SuAjw80dX1hDciqbRduDEOE,6444
 microsoft_agents/hosting/core/storage/transcript_store.py,sha256=ka74o0WvI5GhMZcFqSxVdamBhGzZcDZe6VNkG-sMy74,1944
-microsoft_agents_hosting_core-0.6.0.dev16.dist-info/licenses/LICENSE,sha256=ws_MuBL-SCEBqPBFl9_FqZkaaydIJmxHrJG2parhU4M,1141
-microsoft_agents_hosting_core-0.6.0.dev16.dist-info/METADATA,sha256=ncM6FbZU1KZIuVrVNUfQ4818ID5lnEmZDDoUD-8Fcyo,9244
-microsoft_agents_hosting_core-0.6.0.dev16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microsoft_agents_hosting_core-0.6.0.dev16.dist-info/top_level.txt,sha256=lWKcT4v6fTA_NgsuHdNvuMjSrkiBMXohn64ApY7Xi8A,17
-microsoft_agents_hosting_core-0.6.0.dev16.dist-info/RECORD,,
+microsoft_agents_hosting_core-0.6.1.dist-info/licenses/LICENSE,sha256=ws_MuBL-SCEBqPBFl9_FqZkaaydIJmxHrJG2parhU4M,1141
+microsoft_agents_hosting_core-0.6.1.dist-info/METADATA,sha256=Cku8bSwQI9yNi9JTXhWkKVEIOduKuh38p5Whdmo3nHU,9232
+microsoft_agents_hosting_core-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+microsoft_agents_hosting_core-0.6.1.dist-info/top_level.txt,sha256=lWKcT4v6fTA_NgsuHdNvuMjSrkiBMXohn64ApY7Xi8A,17
+microsoft_agents_hosting_core-0.6.1.dist-info/RECORD,,