microsoft-agents-hosting-core 0.5.0.dev11__tar.gz → 0.5.0.dev19__tar.gz

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/PKG-INFO

@@ -1,16 +1,21 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.5.0.dev11
+Version: 0.5.0.dev19
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/microsoft/Agents
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==0.5.0.dev11
+Requires-Dist: microsoft-agents-activity==0.5.0.dev19
 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.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents/hosting/core/app/agent_application.py

@@ -93,7 +93,6 @@ class AgentApplication(Agent, Generic[StateT]):
         :param kwargs: Additional configuration parameters.
         :type kwargs: Any
         """
-        self.typing = TypingIndicator()
         self._route_list = _RouteList[StateT]()
 
         configuration = kwargs
@@ -659,9 +658,12 @@ class AgentApplication(Agent, Generic[StateT]):
         await self._start_long_running_call(context, self._on_turn)
 
     async def _on_turn(self, context: TurnContext):
+        typing = None
         try:
             if context.activity.type != ActivityTypes.typing:
-                await self._start_typing(context)
+                if self._options.start_typing_timer:
+                    typing = TypingIndicator()
+                    await typing.start(context)
 
             self._remove_mentions(context)
 
@@ -709,11 +711,8 @@ class AgentApplication(Agent, Generic[StateT]):
             )
             await self._on_error(context, err)
         finally:
-            self.typing.stop()
-
-    async def _start_typing(self, context: TurnContext):
-        if self._options.start_typing_timer:
-            await self.typing.start(context)
+            if typing:
+                await typing.stop()
 
     def _remove_mentions(self, context: TurnContext):
         if (

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents/hosting/core/app/oauth/_handlers/agentic_user_authorization.py

@@ -118,20 +118,20 @@ class AgenticUserAuthorization(_AuthorizationHandler):
             connection = self._connection_manager.get_token_provider(
                 context.identity, "agentic"
             )
-        upn = context.activity.get_agentic_user()
+        agentic_user_id = context.activity.get_agentic_user()
         agentic_instance_id = context.activity.get_agentic_instance_id()
-        if not upn or not agentic_instance_id:
+        if not agentic_user_id or not agentic_instance_id:
             logger.error(
-                "Unable to retrieve agentic user token: missing UPN or agentic instance ID. UPN: %s, Agentic Instance ID: %s",
-                upn,
+                "Unable to retrieve agentic user token: missing agentic user Id or agentic instance Id. agentic_user_id: %s, Agentic Instance ID: %s",
+                agentic_user_id,
                 agentic_instance_id,
             )
             raise ValueError(
-                f"Unable to retrieve agentic user token: missing UPN or agentic instance ID. UPN: {upn}, Agentic Instance ID: {agentic_instance_id}"
+                f"Unable to retrieve agentic user token: missing agentic User Id or agentic instance Id. agentic_user_id: {agentic_user_id}, Agentic Instance ID: {agentic_instance_id}"
             )
 
         token = await connection.get_agentic_user_token(
-            agentic_instance_id, upn, scopes
+            agentic_instance_id, agentic_user_id, scopes
         )
         return TokenResponse(token=token) if token else TokenResponse()
 

microsoft_agents_hosting_core-0.5.0.dev19/microsoft_agents/hosting/core/app/typing_indicator.py

@@ -0,0 +1,79 @@
+"""
+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")
+            raise

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents/hosting/core/authorization/access_token_provider_base.py

@@ -43,6 +43,6 @@ class AccessTokenProviderBase(Protocol):
         raise NotImplementedError()
 
     async def get_agentic_user_token(
-        self, agent_app_instance_id: str, upn: str, scopes: list[str]
+        self, agent_app_instance_id: str, agentic_user_id: str, scopes: list[str]
     ) -> Optional[str]:
         raise NotImplementedError()

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents/hosting/core/authorization/anonymous_token_provider.py

@@ -33,6 +33,6 @@ class AnonymousTokenProvider(AccessTokenProviderBase):
         return "", ""
 
     async def get_agentic_user_token(
-        self, agent_app_instance_id: str, upn: str, scopes: list[str]
+        self, agent_app_instance_id: str, agentic_user_id: str, scopes: list[str]
     ) -> Optional[str]:
         return ""

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents/hosting/core/authorization/jwt_token_validator.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+import asyncio
 import logging
 import jwt
 
@@ -16,10 +17,10 @@ class JwtTokenValidator:
     def __init__(self, configuration: AgentAuthConfiguration):
         self.configuration = configuration
 
-    def validate_token(self, token: str) -> ClaimsIdentity:
+    async def validate_token(self, token: str) -> ClaimsIdentity:
 
         logger.debug("Validating JWT token.")
-        key = self._get_public_key_or_secret(token)
+        key = await self._get_public_key_or_secret(token)
         decoded_token = jwt.decode(
             token,
             key=key,
@@ -39,7 +40,7 @@ class JwtTokenValidator:
         logger.debug("Returning anonymous claims identity.")
         return ClaimsIdentity({}, False, authentication_type="Anonymous")
 
-    def _get_public_key_or_secret(self, token: str) -> PyJWK:
+    async def _get_public_key_or_secret(self, token: str) -> PyJWK:
         header = get_unverified_header(token)
         unverified_payload: dict = decode(token, options={"verify_signature": False})
 
@@ -50,5 +51,6 @@ class JwtTokenValidator:
         )
         jwks_client = PyJWKClient(jwksUri)
 
-        key = jwks_client.get_signing_key(header["kid"])
+        key = await asyncio.to_thread(jwks_client.get_signing_key, header["kid"])
+
         return key

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents_hosting_core.egg-info/PKG-INFO

@@ -1,16 +1,21 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 0.5.0.dev11
+Version: 0.5.0.dev19
 Summary: Core library for Microsoft Agents
 Author: Microsoft Corporation
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/microsoft/Agents
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: microsoft-agents-activity==0.5.0.dev11
+Requires-Dist: microsoft-agents-activity==0.5.0.dev19
 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.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/microsoft_agents_hosting_core.egg-info/requires.txt

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

{microsoft_agents_hosting_core-0.5.0.dev11 → microsoft_agents_hosting_core-0.5.0.dev19}/pyproject.toml

@@ -13,6 +13,11 @@ license-files = ["LICENSE"]
 requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 

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

@@ -1,55 +0,0 @@
-"""
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the MIT License.
-"""
-
-from __future__ import annotations
-import logging
-
-from threading import Timer
-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.
-    """
-
-    _interval: int
-    _timer: Optional[Timer] = None
-
-    def __init__(self, interval=1000) -> None:
-        self._interval = interval
-
-    async def start(self, context: TurnContext) -> None:
-        if self._timer is not None:
-            return
-
-        logger.debug(f"Starting typing indicator with interval: {self._interval} ms")
-        func = self._on_timer(context)
-        self._timer = Timer(self._interval, func)
-        self._timer.start()
-        await func()
-
-    def stop(self) -> None:
-        if self._timer:
-            logger.debug("Stopping typing indicator")
-            self._timer.cancel()
-            self._timer = None
-
-    def _on_timer(self, context: TurnContext):
-        async def __call__():
-            try:
-                logger.debug("Sending typing activity")
-                await context.send_activity(Activity(type=ActivityTypes.typing))
-            except Exception as e:
-                # TODO: Improve when adding logging
-                logger.error(f"Error sending typing activity: {e}")
-                self.stop()
-
-        return __call__