microsoft-agents-hosting-core 0.6.0.dev11__tar.gz → 0.6.0.dev16__tar.gz

{microsoft_agents_hosting_core-0.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.6.0.dev11
+Version: 0.6.0.dev16
 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.dev11
+Requires-Dist: microsoft-agents-activity==0.6.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.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/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.6.0.dev16/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.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/microsoft_agents/hosting/core/errors/__init__.py

@@ -8,7 +8,8 @@ This module provides centralized error messages with error codes and help URLs
 following the pattern established in the C# SDK.
 """
 
-from .error_message import ErrorMessage
+from microsoft_agents.activity.errors import ErrorMessage
+
 from .error_resources import ErrorResources
 
 # Singleton instance

{microsoft_agents_hosting_core-0.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/microsoft_agents/hosting/core/errors/error_resources.py

@@ -9,7 +9,7 @@ Error codes are in the range -63000 to -63999 for hosting errors.
 General/validation errors are in the range -66000 to -66999.
 """
 
-from .error_message import ErrorMessage
+from microsoft_agents.activity.errors import ErrorMessage
 
 
 class ErrorResources:

{microsoft_agents_hosting_core-0.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/microsoft_agents_hosting_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.6.0.dev11
+Version: 0.6.0.dev16
 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.dev11
+Requires-Dist: microsoft-agents-activity==0.6.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.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/microsoft_agents_hosting_core.egg-info/SOURCES.txt

@@ -81,7 +81,6 @@ microsoft_agents/hosting/core/connector/client/user_token_client.py
 microsoft_agents/hosting/core/connector/teams/__init__.py
 microsoft_agents/hosting/core/connector/teams/teams_connector_client.py
 microsoft_agents/hosting/core/errors/__init__.py
-microsoft_agents/hosting/core/errors/error_message.py
 microsoft_agents/hosting/core/errors/error_resources.py
 microsoft_agents/hosting/core/state/__init__.py
 microsoft_agents/hosting/core/state/agent_state.py

{microsoft_agents_hosting_core-0.6.0.dev11 → microsoft_agents_hosting_core-0.6.0.dev16}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==0.6.0.dev11
+microsoft-agents-activity==0.6.0.dev16
 pyjwt>=2.10.1
 isodate>=0.6.1
 azure-core>=1.30.0

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

@@ -1,78 +0,0 @@
-"""
-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.
-    """
-
-    def __init__(self, intervalSeconds=1) -> None:
-        self._intervalSeconds = intervalSeconds
-        self._task: Optional[asyncio.Task] = None
-        self._running: bool = False
-        self._lock = asyncio.Lock()
-
-    async def start(self, context: TurnContext) -> None:
-        async with self._lock:
-            if self._running:
-                return
-
-            logger.debug(
-                f"Starting typing indicator with interval: {self._intervalSeconds} seconds"
-            )
-            self._running = True
-            self._task = asyncio.create_task(self._typing_loop(context))
-
-    async def stop(self) -> None:
-        async with self._lock:
-            if not self._running:
-                return
-
-            logger.debug("Stopping typing indicator")
-            self._running = False
-            task = self._task
-            self._task = None
-
-        # Cancel outside the lock to avoid blocking
-        if task and not task.done():
-            task.cancel()
-            try:
-                await task
-            except asyncio.CancelledError:
-                pass
-
-    async def _typing_loop(self, context: TurnContext):
-        """Continuously send typing indicators at the specified interval."""
-        try:
-            while True:
-                # Check running status under lock
-                async with self._lock:
-                    if not self._running:
-                        break
-
-                try:
-                    logger.debug("Sending typing activity")
-                    await context.send_activity(Activity(type=ActivityTypes.typing))
-                except Exception as e:
-                    logger.error(f"Error sending typing activity: {e}")
-                    async with self._lock:
-                        self._running = False
-                    break
-
-                await asyncio.sleep(self._intervalSeconds)
-        except asyncio.CancelledError:
-            logger.debug("Typing indicator loop cancelled")

microsoft_agents_hosting_core-0.6.0.dev11/microsoft_agents/hosting/core/errors/error_message.py

@@ -1,64 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-"""
-ErrorMessage class for formatting error messages with error codes and help URLs.
-"""
-
-
-class ErrorMessage:
-    """
-    Represents a formatted error message with error code and help URL.
-
-    This class formats error messages according to the Microsoft Agents SDK pattern:
-    - Original error message
-    - Error Code: [negative number]
-    - Help URL: https://aka.ms/M365AgentsErrorCodes/#[error_code]
-    """
-
-    def __init__(
-        self,
-        message_template: str,
-        error_code: int,
-    ):
-        """
-        Initialize an ErrorMessage.
-
-        :param message_template: The error message template (may include format placeholders)
-        :type message_template: str
-        :param error_code: The error code (should be negative)
-        :type error_code: int
-        """
-        self.message_template = message_template
-        self.error_code = error_code
-        self.base_url = "https://aka.ms/M365AgentsErrorCodes"
-
-    def format(self, *args, **kwargs) -> str:
-        """
-        Format the error message with the provided arguments.
-
-        :param args: Positional arguments for string formatting
-        :param kwargs: Keyword arguments for string formatting
-        :return: Formatted error message with error code and help URL
-        :rtype: str
-        """
-        # Format the main message
-        if args or kwargs:
-            message = self.message_template.format(*args, **kwargs)
-        else:
-            message = self.message_template
-
-        # Append error code and help URL
-        return (
-            f"{message}\n\n"
-            f"Error Code: {self.error_code}\n"
-            f"Help URL: {self.base_url}/#{self.error_code}"
-        )
-
-    def __str__(self) -> str:
-        """Return the formatted error message without any arguments."""
-        return self.format()
-
-    def __repr__(self) -> str:
-        """Return a representation of the ErrorMessage."""
-        return f"ErrorMessage(code={self.error_code}, message='{self.message_template[:50]}...')"