microsoft-agents-hosting-core 0.4.0.dev14__tar.gz → 0.4.0.dev16__tar.gz

{microsoft_agents_hosting_core-0.4.0.dev14 → microsoft_agents_hosting_core-0.4.0.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.4.0.dev14
+Version: 0.4.0.dev16
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 Project-URL: Homepage, https://github.com/microsoft/Agents
@@ -8,7 +8,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
-Requires-Dist: microsoft-agents-activity==0.4.0.dev14
+Requires-Dist: microsoft-agents-activity==0.4.0.dev16
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: azure-core>=1.30.0

{microsoft_agents_hosting_core-0.4.0.dev14 → microsoft_agents_hosting_core-0.4.0.dev16}/microsoft_agents/hosting/core/channel_service_adapter.py

@@ -213,21 +213,21 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         claims_identity = self.create_claims_identity(agent_app_id)
         claims_identity.claims[AuthenticationConstants.SERVICE_URL_CLAIM] = service_url
 
-        # 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(
-                claims_identity
-            )
-        )
-
         # Create a turn context and run the pipeline.
         context = self._create_turn_context(
             claims_identity,
             None,
-            user_token_client,
             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(
@@ -264,22 +264,21 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         callback: Callable[[TurnContext], Awaitable],
     ):
 
-        # 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(
-                claims_identity
-            )
-        )
-
         # Create a turn context and run the pipeline.
         context = self._create_turn_context(
             claims_identity,
             audience,
-            user_token_client,
             callback,
             activity=continuation_activity,
         )
 
+        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(
@@ -338,22 +337,22 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         ):
             use_anonymous_auth_callback = True
 
-        # Create a UserTokenClient instance for the OAuth flow.
-        user_token_client: UserTokenClient = (
-            await self._channel_service_client_factory.create_user_token_client(
-                claims_identity, use_anonymous_auth_callback
-            )
-        )
-
         # Create a turn context and run the pipeline.
         context = self._create_turn_context(
             claims_identity,
             outgoing_audience,
-            user_token_client,
             callback,
             activity=activity,
         )
 
+        # Create a UserTokenClient instance for the OAuth flow.
+        user_token_client: UserTokenClient = (
+            await self._channel_service_client_factory.create_user_token_client(
+                context, claims_identity, use_anonymous_auth_callback
+            )
+        )
+        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(
@@ -425,14 +424,12 @@ class ChannelServiceAdapter(ChannelAdapter, ABC):
         self,
         claims_identity: ClaimsIdentity,
         oauth_scope: str,
-        user_token_client: UserTokenClientBase,
         callback: Callable[[TurnContext], Awaitable],
         activity: Optional[Activity] = None,
     ) -> TurnContext:
         context = TurnContext(self, activity, claims_identity)
 
         context.turn_state[self.AGENT_IDENTITY_KEY] = claims_identity
-        context.turn_state[self.USER_TOKEN_CLIENT_KEY] = user_token_client
         context.turn_state[self.AGENT_CALLBACK_HANDLER_KEY] = callback
         context.turn_state[self.CHANNEL_SERVICE_FACTORY_KEY] = (
             self._channel_service_client_factory

{microsoft_agents_hosting_core-0.4.0.dev14 → microsoft_agents_hosting_core-0.4.0.dev16}/microsoft_agents/hosting/core/channel_service_client_factory_base.py

@@ -6,12 +6,14 @@ from microsoft_agents.hosting.core.connector import (
     ConnectorClientBase,
     UserTokenClientBase,
 )
+from microsoft_agents.hosting.core.turn_context import TurnContext
 
 
 class ChannelServiceClientFactoryBase(Protocol):
     @abstractmethod
     async def create_connector_client(
         self,
+        context: TurnContext,
         claims_identity: ClaimsIdentity,
         service_url: str,
         audience: str,
@@ -32,7 +34,10 @@ class ChannelServiceClientFactoryBase(Protocol):
 
     @abstractmethod
     async def create_user_token_client(
-        self, claims_identity: ClaimsIdentity, use_anonymous: bool = False
+        self,
+        context: TurnContext,
+        claims_identity: ClaimsIdentity,
+        use_anonymous: bool = False,
     ) -> UserTokenClientBase:
         """
         Creates the appropriate UserTokenClientBase instance.

{microsoft_agents_hosting_core-0.4.0.dev14 → microsoft_agents_hosting_core-0.4.0.dev16}/microsoft_agents/hosting/core/connector/client/connector_client.py

@@ -122,8 +122,12 @@ class AttachmentsOperations(AttachmentsBase):
 
 class ConversationsOperations(ConversationsBase):
 
-    def __init__(self, client: ClientSession):
+    def __init__(self, client: ClientSession, **kwargs):
         self.client = client
+        self._max_conversation_id_length = kwargs.get("max_conversation_id_length", 200)
+
+    def _normalize_conversation_id(self, conversation_id: str) -> str:
+        return conversation_id[: self._max_conversation_id_length]
 
     async def get_conversations(
         self, continuation_token: Optional[str] = None
@@ -193,11 +197,16 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and activityId are required")
 
+        print("\n*3")
+        print(conversation_id)
+        print("\n*3")
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 
         logger.info(
             f"Replying to activity: {activity_id} in conversation: {conversation_id}. Activity type is {body.type}"
         )
+
         async with self.client.post(
             url,
             json=body.model_dump(
@@ -216,7 +225,8 @@ class ConversationsOperations(ConversationsBase):
             logger.info(
                 f"Reply to conversation/activity: {result.get('id')}, {activity_id}"
             )
-            return ResourceResponse.model_validate(result)
+
+        return ResourceResponse.model_validate(result)
 
     async def send_to_conversation(
         self, conversation_id: str, body: Activity
@@ -235,6 +245,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId is required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities"
 
         logger.info(
@@ -271,6 +282,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and activityId are required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 
         logger.info(
@@ -303,6 +315,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and activityId are required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 
         logger.info(
@@ -332,6 +345,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId is required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/attachments"
 
         # Convert the AttachmentData to a dictionary
@@ -371,6 +385,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId is required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/members"
 
         logger.info(f"Getting conversation members for conversation: {conversation_id}")
@@ -402,6 +417,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and memberId are required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/members/{member_id}"
 
         logger.info(
@@ -434,6 +450,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and memberId are required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/members/{member_id}"
 
         logger.info(
@@ -464,6 +481,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId and activityId are required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}/members"
 
         logger.info(
@@ -507,6 +525,7 @@ class ConversationsOperations(ConversationsBase):
         if continuation_token is not None:
             params["continuationToken"] = continuation_token
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/pagedmembers"
 
         logger.info(
@@ -540,6 +559,7 @@ class ConversationsOperations(ConversationsBase):
             )
             raise ValueError("conversationId is required")
 
+        conversation_id = self._normalize_conversation_id(conversation_id)
         url = f"v3/conversations/{conversation_id}/activities/history"
 
         logger.info(f"Sending conversation history to conversation: {conversation_id}")

microsoft_agents_hosting_core-0.4.0.dev16/microsoft_agents/hosting/core/rest_channel_service_client_factory.py

@@ -0,0 +1,159 @@
+from typing import Optional
+import logging
+
+from microsoft_agents.activity import RoleTypes
+from microsoft_agents.hosting.core.authorization import (
+    AuthenticationConstants,
+    AnonymousTokenProvider,
+    ClaimsIdentity,
+    Connections,
+)
+from microsoft_agents.hosting.core.authorization import AccessTokenProviderBase
+from microsoft_agents.hosting.core.connector import ConnectorClientBase
+from microsoft_agents.hosting.core.connector.client import UserTokenClient
+from microsoft_agents.hosting.core.connector.teams import TeamsConnectorClient
+
+from .channel_service_client_factory_base import ChannelServiceClientFactoryBase
+from .turn_context import TurnContext
+
+logger = logging.getLogger(__name__)
+
+
+class RestChannelServiceClientFactory(ChannelServiceClientFactoryBase):
+    _ANONYMOUS_TOKEN_PROVIDER = AnonymousTokenProvider()
+
+    def __init__(
+        self,
+        connection_manager: Connections,
+        token_service_endpoint=AuthenticationConstants.AGENTS_SDK_OAUTH_URL,
+        token_service_audience=AuthenticationConstants.AGENTS_SDK_SCOPE,
+    ) -> None:
+        self._connection_manager = connection_manager
+        self._token_service_endpoint = token_service_endpoint
+        self._token_service_audience = token_service_audience
+
+    async def _get_agentic_token(self, context: TurnContext, service_url: str) -> str:
+        logger.info(
+            "Creating connector client for agentic request to service_url: %s",
+            service_url,
+        )
+
+        if not context.identity:
+            raise ValueError("context.identity is required for agentic activities")
+
+        connection = self._connection_manager.get_token_provider(
+            context.identity, service_url
+        )
+        if not hasattr(connection, "_msal_configuration"):
+            raise TypeError(
+                "Connection does not support MSAL configuration for agentic token retrieval"
+            )
+
+        if connection._msal_configuration.ALT_BLUEPRINT_ID:
+            logger.debug(
+                "Using alternative blueprint ID for agentic token retrieval: %s",
+                connection._msal_configuration.ALT_BLUEPRINT_ID,
+            )
+            connection = self._connection_manager.get_connection(
+                connection._msal_configuration.ALT_BLUEPRINT_ID
+            )
+
+        agent_instance_id = context.activity.get_agentic_instance_id()
+        if not agent_instance_id:
+            raise ValueError("Agent instance ID is required for agentic identity role")
+
+        if context.activity.recipient.role == RoleTypes.agentic_identity:
+            token, _ = await connection.get_agentic_instance_token(agent_instance_id)
+        else:
+            agentic_user = context.activity.get_agentic_user()
+            if not agentic_user:
+                raise ValueError("Agentic user is required for agentic user role")
+            token = await connection.get_agentic_user_token(
+                agent_instance_id,
+                agentic_user,
+                [AuthenticationConstants.APX_PRODUCTION_SCOPE],
+            )
+
+        if not token:
+            raise ValueError("Failed to obtain token for agentic activity")
+        return token
+
+    async def create_connector_client(
+        self,
+        context: TurnContext,
+        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 service_url:
+            raise TypeError(
+                "RestChannelServiceClientFactory.create_connector_client: service_url can't be None or Empty"
+            )
+        if not audience:
+            raise TypeError(
+                "RestChannelServiceClientFactory.create_connector_client: audience can't be None or Empty"
+            )
+
+        if context.activity.is_agentic_request():
+            token = await self._get_agentic_token(context, service_url)
+        else:
+            token_provider: AccessTokenProviderBase = (
+                self._connection_manager.get_token_provider(
+                    claims_identity, service_url
+                )
+                if not use_anonymous
+                else self._ANONYMOUS_TOKEN_PROVIDER
+            )
+
+            token = await token_provider.get_access_token(
+                audience, scopes or [f"{audience}/.default"]
+            )
+
+        return TeamsConnectorClient(
+            endpoint=service_url,
+            token=token,
+        )
+
+    async def create_user_token_client(
+        self,
+        context: TurnContext,
+        claims_identity: ClaimsIdentity,
+        use_anonymous: bool = False,
+    ) -> UserTokenClient:
+        """Create a UserTokenClient for the given context and claims identity.
+
+        :param context: The TurnContext for the current turn of conversation.
+        :param claims_identity: The ClaimsIdentity of the user.
+        :param use_anonymous: Whether to use an anonymous token provider.
+        """
+        if not context or not claims_identity:
+            raise ValueError("context and claims_identity are required")
+
+        if use_anonymous:
+            return UserTokenClient(endpoint=self._token_service_endpoint, token="")
+
+        if context.activity.is_agentic_request():
+            token = await self._get_agentic_token(context, self._token_service_endpoint)
+        else:
+            scopes = [f"{self._token_service_audience}/.default"]
+
+            token_provider = self._connection_manager.get_token_provider(
+                claims_identity, self._token_service_endpoint
+            )
+
+            token = await token_provider.get_access_token(
+                self._token_service_audience, scopes
+            )
+
+        if not token:
+            logger.error("Failed to obtain token for user token client")
+            raise ValueError("Failed to obtain token for user token client")
+
+        return UserTokenClient(
+            endpoint=self._token_service_endpoint,
+            token=token,
+        )

{microsoft_agents_hosting_core-0.4.0.dev14 → microsoft_agents_hosting_core-0.4.0.dev16}/microsoft_agents/hosting/core/storage/__init__.py

@@ -7,8 +7,10 @@ from .transcript_logger import (
     ConsoleTranscriptLogger,
     TranscriptLoggerMiddleware,
     FileTranscriptLogger,
+    PagedResult,
 )
 from .transcript_store import TranscriptStore
+from .transcript_file_store import FileTranscriptStore
 
 __all__ = [
     "StoreItem",
@@ -21,4 +23,6 @@ __all__ = [
     "TranscriptLoggerMiddleware",
     "TranscriptStore",
     "FileTranscriptLogger",
+    "FileTranscriptStore",
+    "PagedResult",
 ]