microsoft-agents-hosting-core 0.5.3__tar.gz → 0.6.0__tar.gz

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/PKG-INFO

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

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/microsoft_agents/hosting/core/__init__.py

@@ -82,6 +82,9 @@ from .storage.store_item import StoreItem
 from .storage import Storage
 from .storage.memory_storage import MemoryStorage
 
+# Error Resources
+from .errors import error_resources, ErrorMessage, ErrorResources
+
 
 # Define the package's public interface
 __all__ = [
@@ -148,4 +151,7 @@ __all__ = [
     "MemoryStorage",
     "AgenticUserAuthorization",
     "Authorization",
+    "error_resources",
+    "ErrorMessage",
+    "ErrorResources",
 ]

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/microsoft_agents/hosting/core/app/agent_application.py

@@ -683,8 +683,8 @@ class AgentApplication(Agent, Generic[StateT]):
         try:
             if context.activity.type != ActivityTypes.typing:
                 if self._options.start_typing_timer:
-                    typing = TypingIndicator()
-                    await typing.start(context)
+                    typing = TypingIndicator(context)
+                    typing.start()
 
             self._remove_mentions(context)
 
@@ -733,7 +733,7 @@ class AgentApplication(Agent, Generic[StateT]):
             await self._on_error(context, err)
         finally:
             if typing:
-                await typing.stop()
+                typing.stop()
 
     def _remove_mentions(self, context: TurnContext):
         if (

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/microsoft_agents/hosting/core/app/state/state.py

@@ -109,7 +109,7 @@ class State(dict[str, StoreItem], ABC):
         data = self.copy()
         del data["__key__"]
 
-        logger.info(f"Saving state {self.__key__}")
+        logger.info("Saving state %s", self.__key__)
         await storage.delete(self.__deleted__)
         await storage.write(
             {

microsoft_agents_hosting_core-0.6.0/microsoft_agents/hosting/core/app/typing_indicator.py

@@ -0,0 +1,81 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+from typing import Optional
+
+from microsoft_agents.hosting.core import TurnContext
+from microsoft_agents.activity import Activity, ActivityTypes
+
+logger = logging.getLogger(__name__)
+
+
+class TypingIndicator:
+    """
+    Encapsulates the logic for sending "typing" activity to the user.
+
+    Scoped to a single turn of conversation with the user.
+    """
+
+    def __init__(self, context: TurnContext, interval_seconds: float = 10.0) -> None:
+        """Initializes a new instance of the TypingIndicator class.
+
+        :param context: The turn context.
+        :param interval_seconds: The interval in seconds between typing indicators.
+        """
+        if interval_seconds <= 0:
+            raise ValueError("interval_seconds must be greater than 0")
+        self._context: TurnContext = context
+        self._interval: float = interval_seconds
+        self._task: Optional[asyncio.Task[None]] = None
+
+    async def _run(self) -> None:
+        """Sends typing indicators at regular intervals."""
+
+        running_task = self._task
+        try:
+            while running_task is self._task:
+                await self._context.send_activity(Activity(type=ActivityTypes.typing))
+                await asyncio.sleep(self._interval)
+        except asyncio.CancelledError:
+            # Task was cancelled, exit gracefully
+            pass
+
+    def start(self) -> None:
+        """Starts sending typing indicators."""
+
+        if self._task is not None:
+            logger.warning(
+                "Typing indicator is already running for conversation %s",
+                self._context.activity.conversation.id,
+            )
+            return
+
+        logger.debug(
+            "Starting typing indicator with interval: %s seconds in conversation %s",
+            self._interval,
+            self._context.activity.conversation.id,
+        )
+        self._task = asyncio.create_task(self._run())
+
+    def stop(self) -> None:
+        """Stops sending typing indicators."""
+
+        if self._task is None:
+            logger.warning(
+                "Typing indicator is not running for conversation %s",
+                self._context.activity.conversation.id,
+            )
+            return
+
+        logger.debug(
+            "Stopping typing indicator for conversation %s",
+            self._context.activity.conversation.id,
+        )
+        self._task.cancel()
+        self._task = None

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/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-0.5.3 → microsoft_agents_hosting_core-0.6.0}/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-0.5.3 → microsoft_agents_hosting_core-0.6.0}/microsoft_agents/hosting/core/connector/client/connector_client.py

@@ -74,11 +74,13 @@ class AttachmentsOperations(AttachmentsBase):
 
         url = f"v3/attachments/{attachment_id}"
 
-        logger.info(f"Getting attachment info for ID: {attachment_id}")
+        logger.info("Getting attachment info for ID: %s", attachment_id)
         async with self.client.get(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting attachment info: {response.status}", stack_info=True
+                    "Error getting attachment info: %s",
+                    response.status,
+                    stack_info=True,
                 )
                 response.raise_for_status()
 
@@ -108,11 +110,13 @@ class AttachmentsOperations(AttachmentsBase):
 
         url = f"v3/attachments/{attachment_id}/views/{view_id}"
 
-        logger.info(f"Getting attachment for ID: {attachment_id}, View ID: {view_id}")
+        logger.info(
+            "Getting attachment for ID: %s, View ID: %s", attachment_id, view_id
+        )
         async with self.client.get(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting attachment: {response.status}", stack_info=True
+                    "Error getting attachment: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -143,12 +147,12 @@ class ConversationsOperations(ConversationsBase):
         )
 
         logger.info(
-            f"Getting conversations with continuation token: {continuation_token}"
+            "Getting conversations with continuation token: %s", continuation_token
         )
         async with self.client.get("v3/conversations", params=params) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting conversations: {response.status}", stack_info=True
+                    "Error getting conversations: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -170,9 +174,9 @@ class ConversationsOperations(ConversationsBase):
             "v3/conversations",
             json=body.model_dump(by_alias=True, exclude_unset=True, mode="json"),
         ) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error creating conversation: {response.status}", stack_info=True
+                    "Error creating conversation: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -201,7 +205,10 @@ class ConversationsOperations(ConversationsBase):
         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}"
+            "Replying to activity: %s in conversation: %s. Activity type is %s",
+            activity_id,
+            conversation_id,
+            body.type,
         )
 
         async with self.client.post(
@@ -212,15 +219,16 @@ class ConversationsOperations(ConversationsBase):
         ) as response:
             result = await response.json() if response.content_length else {}
 
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error replying to activity: {result or response.status}",
+                    "Error replying to activity: %s",
+                    result or response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
 
             logger.info(
-                f"Reply to conversation/activity: {result.get('id')}, {activity_id}"
+                "Reply to conversation/activity: %s, %s", result.get("id"), activity_id
             )
 
         return ResourceResponse.model_validate(result)
@@ -246,15 +254,19 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/activities"
 
         logger.info(
-            f"Sending to conversation: {conversation_id}. Activity type is {body.type}"
+            "Sending to conversation: %s. Activity type is %s",
+            conversation_id,
+            body.type,
         )
         async with self.client.post(
             url,
             json=body.model_dump(by_alias=True, exclude_unset=True, mode="json"),
         ) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error sending to conversation: {response.status}", stack_info=True
+                    "Error sending to conversation: %s",
+                    response.status,
+                    stack_info=True,
                 )
                 response.raise_for_status()
 
@@ -283,15 +295,18 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 
         logger.info(
-            f"Updating activity: {activity_id} in conversation: {conversation_id}. Activity type is {body.type}"
+            "Updating activity: %s in conversation: %s. Activity type is %s",
+            activity_id,
+            conversation_id,
+            body.type,
         )
         async with self.client.put(
             url,
             json=body.model_dump(by_alias=True, exclude_unset=True),
         ) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error updating activity: {response.status}", stack_info=True
+                    "Error updating activity: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -316,12 +331,14 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}"
 
         logger.info(
-            f"Deleting activity: {activity_id} from conversation: {conversation_id}"
+            "Deleting activity: %s from conversation: %s",
+            activity_id,
+            conversation_id,
         )
         async with self.client.delete(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error deleting activity: {response.status}", stack_info=True
+                    "Error deleting activity: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -354,12 +371,14 @@ class ConversationsOperations(ConversationsBase):
         }
 
         logger.info(
-            f"Uploading attachment to conversation: {conversation_id}, Attachment name: {body.name}"
+            "Uploading attachment to conversation: %s, Attachment name: %s",
+            conversation_id,
+            body.name,
         )
         async with self.client.post(url, json=attachment_dict) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error uploading attachment: {response.status}", stack_info=True
+                    "Error uploading attachment: %s", response.status, stack_info=True
                 )
                 response.raise_for_status()
 
@@ -385,11 +404,14 @@ class ConversationsOperations(ConversationsBase):
         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}")
+        logger.info(
+            "Getting conversation members for conversation: %s", conversation_id
+        )
         async with self.client.get(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting conversation members: {response.status}",
+                    "Error getting conversation members: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -418,12 +440,15 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/members/{member_id}"
 
         logger.info(
-            f"Getting conversation member: {member_id} from conversation: {conversation_id}"
+            "Getting conversation member: %s from conversation: %s",
+            member_id,
+            conversation_id,
         )
         async with self.client.get(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting conversation member: {response.status}",
+                    "Error getting conversation member: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -451,12 +476,15 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/members/{member_id}"
 
         logger.info(
-            f"Deleting conversation member: {member_id} from conversation: {conversation_id}"
+            "Deleting conversation member: %s from conversation: %s",
+            member_id,
+            conversation_id,
         )
         async with self.client.delete(url) as response:
-            if response.status >= 400 and response.status != 204:
+            if response.status >= 300:
                 logger.error(
-                    f"Error deleting conversation member: {response.status}",
+                    "Error deleting conversation member: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -482,12 +510,15 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/activities/{activity_id}/members"
 
         logger.info(
-            f"Getting activity members for conversation: {conversation_id}, Activity ID: {activity_id}"
+            "Getting activity members for conversation: %s, Activity ID: %s",
+            conversation_id,
+            activity_id,
         )
         async with self.client.get(url) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting activity members: {response.status}",
+                    "Error getting activity members: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -526,12 +557,16 @@ class ConversationsOperations(ConversationsBase):
         url = f"v3/conversations/{conversation_id}/pagedmembers"
 
         logger.info(
-            f"Getting paged members for conversation: {conversation_id}, Page Size: {page_size}, Continuation Token: {continuation_token}"
+            "Getting paged members for conversation: %s, Page Size: %s, Continuation Token: %s",
+            conversation_id,
+            page_size,
+            continuation_token,
         )
         async with self.client.get(url, params=params) as response:
-            if response.status >= 400:
+            if response.status >= 300:
                 logger.error(
-                    f"Error getting conversation paged members: {response.status}",
+                    "Error getting conversation paged members: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -559,15 +594,12 @@ class ConversationsOperations(ConversationsBase):
         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}")
+        logger.info("Sending conversation history to conversation: %s", conversation_id)
         async with self.client.post(url, json=body) as response:
-            if (
-                response.status >= 400
-                and response.status != 201
-                and response.status != 202
-            ):
+            if response.status >= 300:
                 logger.error(
-                    f"Error sending conversation history: {response.status}",
+                    "Error sending conversation history: %s",
+                    response.status,
                     stack_info=True,
                 )
                 response.raise_for_status()
@@ -602,7 +634,9 @@ class ConnectorClient(ConnectorClientBase):
             headers=headers,
         )
         logger.debug(
-            f"ConnectorClient initialized with endpoint: {endpoint} and headers: {headers}"
+            "ConnectorClient initialized with endpoint: %s and headers: %s",
+            endpoint,
+            headers,
         )
 
         if len(token) > 1:

{microsoft_agents_hosting_core-0.5.3 → microsoft_agents_hosting_core-0.6.0}/microsoft_agents/hosting/core/connector/client/user_token_client.py

@@ -53,13 +53,14 @@ class AgentSignIn(AgentSignInBase):
             params["finalRedirect"] = final_redirect
 
         logger.info(
-            f"AgentSignIn.get_sign_in_url(): Getting sign-in URL with params: {params}"
+            "AgentSignIn.get_sign_in_url(): Getting sign-in URL with params: %s",
+            params,
         )
         async with self.client.get(
             "api/agentsignin/getSignInUrl", params=params
         ) as response:
-            if response.status >= 400:
-                logger.error(f"Error getting sign-in URL: {response.status}")
+            if response.status >= 300:
+                logger.error("Error getting sign-in URL: %s", response.status)
                 response.raise_for_status()
 
             return await response.text()
@@ -89,13 +90,14 @@ class AgentSignIn(AgentSignInBase):
             params["finalRedirect"] = final_redirect
 
         logger.info(
-            f"AgentSignIn.get_sign_in_resource(): Getting sign-in resource with params: {params}"
+            "AgentSignIn.get_sign_in_resource(): Getting sign-in resource with params: %s",
+            params,
         )
         async with self.client.get(
             "api/botsignin/getSignInResource", params=params
         ) as response:
-            if response.status >= 400:
-                logger.error(f"Error getting sign-in resource: {response.status}")
+            if response.status >= 300:
+                logger.error("Error getting sign-in resource: %s", response.status)
                 response.raise_for_status()
 
             data = await response.json()
@@ -122,12 +124,10 @@ class UserToken(UserTokenBase):
         if code:
             params["code"] = code
 
-        logger.info(f"User_token.get_token(): Getting token with params: {params}")
+        logger.info("User_token.get_token(): Getting token with params: %s", params)
         async with self.client.get("api/usertoken/GetToken", params=params) as response:
-            if response.status == 404:
-                return TokenResponse(model_validate={})
-            if response.status >= 400:
-                logger.error(f"Error getting token: {response.status}")
+            if response.status >= 300:
+                logger.error("Error getting token: %s", response.status)
                 response.raise_for_status()
 
             data = await response.json()
@@ -179,12 +179,12 @@ class UserToken(UserTokenBase):
         if channel_id:
             params["channelId"] = channel_id
 
-        logger.info(f"Getting AAD tokens with params: {params} and body: {body}")
+        logger.info("Getting AAD tokens with params: %s and body: %s", params, body)
         async with self.client.post(
             "api/usertoken/GetAadTokens", params=params, json=body
         ) as response:
-            if response.status >= 400:
-                logger.error(f"Error getting AAD tokens: {response.status}")
+            if response.status >= 300:
+                logger.error("Error getting AAD tokens: %s", response.status)
                 response.raise_for_status()
 
             data = await response.json()
@@ -203,12 +203,12 @@ class UserToken(UserTokenBase):
         if channel_id:
             params["channelId"] = channel_id
 
-        logger.info(f"Signing out user {user_id} with params: {params}")
+        logger.info("Signing out user %s with params: %s", user_id, params)
         async with self.client.delete(
             "api/usertoken/SignOut", params=params
         ) as response:
-            if response.status >= 400 and response.status != 204:
-                logger.error(f"Error signing out: {response.status}")
+            if response.status >= 300:
+                logger.error("Error signing out: %s", response.status)
                 response.raise_for_status()
 
     async def get_token_status(
@@ -224,12 +224,12 @@ class UserToken(UserTokenBase):
         if include:
             params["include"] = include
 
-        logger.info(f"Getting token status for user {user_id} with params: {params}")
+        logger.info("Getting token status for user %s with params: %s", user_id, params)
         async with self.client.get(
             "api/usertoken/GetTokenStatus", params=params
         ) as response:
-            if response.status >= 400:
-                logger.error(f"Error getting token status: {response.status}")
+            if response.status >= 300:
+                logger.error("Error getting token status: %s", response.status)
                 response.raise_for_status()
 
             data = await response.json()
@@ -248,12 +248,12 @@ class UserToken(UserTokenBase):
             "channelId": channel_id,
         }
 
-        logger.info(f"Exchanging token with params: {params} and body: {body}")
+        logger.info("Exchanging token with params: %s and body: %s", params, body)
         async with self.client.post(
             "api/usertoken/exchange", params=params, json=body
         ) as response:
-            if response.status >= 400 and response.status != 404:
-                logger.error(f"Error exchanging token: {response.status}")
+            if response.status >= 300:
+                logger.error("Error exchanging token: %s", response.status)
                 response.raise_for_status()
 
             data = await response.json()
@@ -289,7 +289,9 @@ class UserTokenClient(UserTokenClientBase):
             headers=headers,
         )
         logger.debug(
-            f"Creating UserTokenClient with endpoint: {endpoint} and headers: {headers}"
+            "Creating UserTokenClient with endpoint: %s and headers: %s",
+            endpoint,
+            headers,
         )
 
         if len(token) > 1:

microsoft_agents_hosting_core-0.6.0/microsoft_agents/hosting/core/errors/__init__.py

@@ -0,0 +1,18 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+"""
+Error resources for Microsoft Agents SDK.
+
+This module provides centralized error messages with error codes and help URLs
+following the pattern established in the C# SDK.
+"""
+
+from microsoft_agents.activity.errors import ErrorMessage
+
+from .error_resources import ErrorResources
+
+# Singleton instance
+error_resources = ErrorResources()
+
+__all__ = ["ErrorMessage", "ErrorResources", "error_resources"]