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

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/app/typing_indicator.py

@@ -4,9 +4,9 @@ Licensed under the MIT License.
 """
 
 from __future__ import annotations
+
 import asyncio
 import logging
-
 from typing import Optional
 
 from microsoft_agents.hosting.core import TurnContext
@@ -18,61 +18,64 @@ 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, intervalSeconds=1) -> None:
-        self._intervalSeconds = intervalSeconds
-        self._task: Optional[asyncio.Task] = None
-        self._running: bool = False
-        self._lock = asyncio.Lock()
+    def __init__(self, context: TurnContext, interval_seconds: float = 10.0) -> None:
+        """Initializes a new instance of the TypingIndicator class.
 
-    async def start(self, context: TurnContext) -> None:
-        async with self._lock:
-            if self._running:
-                return
+        :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
 
-            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."""
+    async def _run(self) -> None:
+        """Sends typing indicators at regular intervals."""
+
+        running_task = self._task
         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)
+            while running_task is self._task:
+                await self._context.send_activity(Activity(type=ActivityTypes.typing))
+                await asyncio.sleep(self._interval)
         except asyncio.CancelledError:
-            logger.debug("Typing indicator loop cancelled")
+            # 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/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/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.dist-info → microsoft_agents_hosting_core-0.6.0.dev16.dist-info}/METADATA

@@ -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.dist-info → microsoft_agents_hosting_core-0.6.0.dev16.dist-info}/RECORD

@@ -16,12 +16,12 @@ microsoft_agents/hosting/core/_oauth/_flow_storage_client.py,sha256=1MLD8m_qw0jS
 microsoft_agents/hosting/core/_oauth/_oauth_flow.py,sha256=vgg_sQLYr83YA0F7aQ1K5j8vEATw7ZS151ODkpCGYAM,12211
 microsoft_agents/hosting/core/app/__init__.py,sha256=GZQdog7BBMA8uD9iaRMNeRJf12rJZB3bAKFAD8Y8dVo,1228
 microsoft_agents/hosting/core/app/_type_defs.py,sha256=b5VZFWnQ5ONUZMtFxw7Q-mbbxIUSJ7RXcCXjqdHwSQw,438
-microsoft_agents/hosting/core/app/agent_application.py,sha256=HEOYRgpT9iN_YRu8MbV--O8yoOiz3CquB9ZGjQ1_fX0,33996
+microsoft_agents/hosting/core/app/agent_application.py,sha256=iqcsLM4k_BWY0KKI1Ia-W11geuIHF8TP3mRc3D1eVF0,33984
 microsoft_agents/hosting/core/app/app_error.py,sha256=JgYBgv2EKe9Q2TFi5FeG_RneulBEa5SyBpWSF-duBzE,301
 microsoft_agents/hosting/core/app/app_options.py,sha256=P3XTFFuQCnEcHixfdmr5RPG-Wli4c1VSmCMRKVBBLsw,2792
 microsoft_agents/hosting/core/app/input_file.py,sha256=AEzVAnAPO1V7MWDI_uoZfcYY8Oog3XgvEpAeO-tATeY,1546
 microsoft_agents/hosting/core/app/query.py,sha256=lToDWFG7exUyPC5zxvna89013fDPKrUGOI8jyWFoUYk,328
-microsoft_agents/hosting/core/app/typing_indicator.py,sha256=L4zEqDHeu_0JmpDQwaB-j84TFLYzUAH0-tFUEfOxD0g,2442
+microsoft_agents/hosting/core/app/typing_indicator.py,sha256=2T9pmy0raz0Y84HMZ4taGL0q8iIEUxhQ2rQhQg9sV2I,2558
 microsoft_agents/hosting/core/app/_routes/__init__.py,sha256=faz05Hk5Z1IGIXUwXljohym0lzE8nW3CbTpXlE-VcB0,300
 microsoft_agents/hosting/core/app/_routes/_route.py,sha256=gs5XVi74H1wzDShpZd9ZXVDrREjricFYVPz10XrK06c,2669
 microsoft_agents/hosting/core/app/_routes/_route_list.py,sha256=fe1-wmFaJJqYkWFcbNhJ9OMH954TneQR0-uoxyKQVlU,874
@@ -76,9 +76,8 @@ microsoft_agents/hosting/core/connector/client/connector_client.py,sha256=9oF_x_
 microsoft_agents/hosting/core/connector/client/user_token_client.py,sha256=qxYxvdUcvYinCzaR4YiIucEEAb8TjYYtPsmXKZRbxv4,10536
 microsoft_agents/hosting/core/connector/teams/__init__.py,sha256=3ZMPGYyZ15EwvfQzfJJQy1J58oIt4InSxibl3BN6R54,100
 microsoft_agents/hosting/core/connector/teams/teams_connector_client.py,sha256=XGQDTYHrA_I9n9JlxGST5eesjsFhz2dnSaMSuyoFnKU,12676
-microsoft_agents/hosting/core/errors/__init__.py,sha256=2BiNgN84UxPl1Q1kZuQ_a36S7sIwvHE4H6MTmgp6cCk,481
-microsoft_agents/hosting/core/errors/error_message.py,sha256=UTEsUaIoISZjDjGgr-bwQqKmqA8AN1jE-cjN9U8921Y,2102
-microsoft_agents/hosting/core/errors/error_resources.py,sha256=41b2DM3aS_89MN6NHO3l6uqxjhBudgfU1uFQAteEpIQ,3904
+microsoft_agents/hosting/core/errors/__init__.py,sha256=kcfwDGDaopWfLyvYsNXM6j4cYt2oGKysjCRDezcVY0A,500
+microsoft_agents/hosting/core/errors/error_resources.py,sha256=_nyvPQaX3gpi9kziajVdzGWCzMa6JcTntK__zQJlGMo,3922
 microsoft_agents/hosting/core/state/__init__.py,sha256=yckKi1wg_86ng-DL9Q3R49QiWKvNjPkVNk6HClWgVrY,208
 microsoft_agents/hosting/core/state/agent_state.py,sha256=uboptWaC3VrSGTnXIzaO38XUqOT-ITW6EhJxuGMtKWs,13724
 microsoft_agents/hosting/core/state/state_property_accessor.py,sha256=kpiNnzkZ6el-oRITRbRkk1Faa_CPFxpJQdvSGxIJP70,1392
@@ -94,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.dev11.dist-info/licenses/LICENSE,sha256=ws_MuBL-SCEBqPBFl9_FqZkaaydIJmxHrJG2parhU4M,1141
-microsoft_agents_hosting_core-0.6.0.dev11.dist-info/METADATA,sha256=yd85NaZ-vgi3his-UEveuHuCad0QFQZQDKXWN9yliMk,9244
-microsoft_agents_hosting_core-0.6.0.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microsoft_agents_hosting_core-0.6.0.dev11.dist-info/top_level.txt,sha256=lWKcT4v6fTA_NgsuHdNvuMjSrkiBMXohn64ApY7Xi8A,17
-microsoft_agents_hosting_core-0.6.0.dev11.dist-info/RECORD,,
+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/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]}...')"