microsoft-agents-hosting-core 1.7.0.dev4__tar.gz → 1.7.0.dev6__tar.gz

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.7.0.dev4
+Version: 1.7.0.dev6
 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==1.7.0.dev4
+Requires-Dist: microsoft-agents-activity==1.7.0.dev6
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: python-dotenv>=1.1.1
@@ -215,7 +215,7 @@ ADAPTER = CloudAdapter(connection_manager=CONNECTION_MANAGER)
 AUTHORIZATION = Authorization(STORAGE, CONNECTION_MANAGER, **agents_sdk_config)
 
 AGENT_APP = AgentApplication[TurnState](
-    storage=STORAGE, adapter=ADAPTER, authorization=AUTHORIZATION, **agents_sdk_config
+    storage=STORAGE, authorization=AUTHORIZATION, **agents_sdk_config
 )
 
 @AGENT_APP.activity("message")
@@ -226,6 +226,7 @@ async def on_message(context: TurnContext, state: TurnState):
 
 start_server(
     agent_application=AGENT_APP,
+    adapter=ADAPTER,
     auth_configuration=CONNECTION_MANAGER.get_default_connection_configuration(),
 )
 ```

microsoft_agents_hosting_core-1.7.0.dev6/VERSION.txt

@@ -0,0 +1 @@
+1.7.0.dev6

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/microsoft_agents/hosting/core/app/agent_application.py

@@ -7,6 +7,8 @@ from __future__ import annotations
 
 import asyncio
 import logging
+import warnings
+
 from contextlib import nullcontext
 from copy import copy
 from functools import partial
@@ -82,10 +84,10 @@ class AgentApplication(Agent, Generic[StateT]):
     _adaptive_card: AdaptiveCard
     _auth: Authorization
     _proactive: Proactive | None = None
+    _turn_error_handlers: list[Callable[[TurnContext, Exception], Awaitable[None]]]
     _internal_before_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]]
     _internal_after_turn: list[Callable[[TurnContext, StateT], Awaitable[bool]]]
     _route_list: _RouteList[StateT]
-    _error: Callable[[TurnContext, Exception], Awaitable[None]] | None = None
     _turn_state_factory: Callable[[], StateT] | None = None
     _connection_manager: Connections
 
@@ -111,6 +113,7 @@ class AgentApplication(Agent, Generic[StateT]):
         """
         self._adaptive_card = AdaptiveCard(self)
         self._route_list = _RouteList[StateT]()
+        self._turn_error_handlers = []
         self._internal_before_turn = []
         self._internal_after_turn = []
 
@@ -137,6 +140,14 @@ class AgentApplication(Agent, Generic[StateT]):
 
         self._options = options
 
+        if self._options.adapter:
+            warnings.warn(
+                "AgentApplication.adapter is obsolete and will be removed in a future release.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        self._adapter = self._options.adapter
+
         if not self._options.storage:
             logger.error(
                 "ApplicationOptions.storage is required and was not configured.",
@@ -147,9 +158,7 @@ class AgentApplication(Agent, Generic[StateT]):
                 """)
         self._storage = self._options.storage
 
-        if options.long_running_messages and (
-            not options.adapter or not options.bot_app_id
-        ):
+        if options.long_running_messages and not options.bot_app_id:
             logger.error(
                 "ApplicationOptions.long_running_messages requires an adapter and bot_app_id.",
                 stack_info=True,
@@ -159,9 +168,6 @@ class AgentApplication(Agent, Generic[StateT]):
                 no adapter or `bot_app_id` was configured.
                 """)
 
-        if options.adapter:
-            self._adapter = options.adapter
-
         self._turn_state_factory = (
             options.turn_state_factory
             or kwargs.get("turn_state_factory", None)
@@ -220,11 +226,14 @@ class AgentApplication(Agent, Generic[StateT]):
         return self._connection_manager
 
     @property
+    @deprecated(
+        "AgentApplication.adapter is deprecated and will be removed in a future release."
+    )
     def adapter(self) -> ChannelServiceAdapter:
         """
-        The bot's adapter.
+        The application's channel service adapter.
 
-        :return: The channel service adapter for the bot.
+        :return: The channel service adapter for the application.
         :rtype: :class:`microsoft_agents.hosting.core.channel_service_adapter.ChannelServiceAdapter`
         :raises ApplicationError: If the adapter is not configured.
         """
@@ -800,13 +809,7 @@ class AgentApplication(Agent, Generic[StateT]):
         """
 
         logger.debug(f"Registering the error handler {func.__name__} ")
-        self._error = func
-
-        if self._adapter:
-            logger.debug(
-                f"Registering for adapter {self._adapter.__class__.__name__} the error handler {func.__name__} "
-            )
-            self._adapter.on_turn_error = func
+        self._turn_error_handlers.append(func)
 
         return func
 
@@ -884,11 +887,7 @@ class AgentApplication(Agent, Generic[StateT]):
                     if await self._run_after_turn_middleware(context, turn_state):
                         await turn_state.save(context)
                     return
-        except ApplicationError as err:
-            logger.error(
-                f"An application error occurred in the AgentApplication: {err}",
-                exc_info=True,
-            )
+        except Exception as err:
             await self._on_error(context, err)
 
     def _remove_mentions(self, context: TurnContext):
@@ -899,39 +898,6 @@ class AgentApplication(Agent, Generic[StateT]):
         ):
             context.activity.text = context.remove_recipient_mention(context.activity)
 
-    @staticmethod
-    @deprecated(
-        "Use `load_configuration_from_env` from `microsoft_agents.activity` instead."
-    )
-    def parse_env_vars_configuration(vars: dict[str, Any]) -> dict:
-        """
-        Parses environment variables and returns a dictionary with the relevant configuration.
-
-        :param vars: Dictionary of environment variable names and values.
-        :type vars: dict[str, Any]
-        :return: Parsed configuration dictionary with nested structure.
-        :rtype: dict
-        """
-        result = {}
-        for key, value in vars.items():
-            levels = key.split("__")
-            current_level = result
-            last_level = None
-            for next_level in levels:
-                if next_level not in current_level:
-                    current_level[next_level] = {}
-                last_level = current_level
-                current_level = current_level[next_level]
-            logger.debug(f"Using environment variable '{key}'")
-            last_level[levels[-1]] = value
-
-        return {
-            "AGENT_APPLICATION": result["AGENT_APPLICATION"],
-            "COPILOT_STUDIO_AGENT": result["COPILOT_STUDIO_AGENT"],
-            "CONNECTIONS": result["CONNECTIONS"],
-            "CONNECTIONS_MAP": result["CONNECTIONS_MAP"],
-        }
-
     async def _initialize_state(self, context: TurnContext) -> StateT:
         if self._turn_state_factory:
             logger.debug("Using custom turn state factory")
@@ -1034,17 +1000,18 @@ class AgentApplication(Agent, Generic[StateT]):
         self, context: TurnContext, func: Callable[[TurnContext], Awaitable]
     ):
         if (
-            self._adapter
+            context.adapter
             and ActivityTypes.message == context.activity.type
             and self._options.long_running_messages
+            and context.identity is not None
         ):
             logger.debug(
                 f"Starting long running call for context: {context.activity.id} with function: {func.__name__}"
             )
-            return await self._adapter.continue_conversation(
-                reference=context.get_conversation_reference(context.activity),
+            return await context.adapter.continue_conversation_with_claims(
+                claims_identity=context.identity,
+                continuation_activity=context.activity,
                 callback=func,
-                bot_app_id=self.options.bot_app_id,
             )
 
         return await func(context)
@@ -1064,7 +1031,7 @@ class AgentApplication(Agent, Generic[StateT]):
 
         async def __replay(act: Activity):
 
-            await self._adapter.continue_conversation_with_claims(
+            await context.adapter.continue_conversation_with_claims(
                 context.identity,
                 act,
                 __replay_turn,
@@ -1104,16 +1071,21 @@ class AgentApplication(Agent, Generic[StateT]):
 
         return
 
-    async def _on_error(self, context: TurnContext, err: ApplicationError) -> None:
-        if self._error:
-            logger.info(
-                f"Calling error handler {self._error.__name__} for error: {err}"
-            )
-            return await self._error(context, err)
+    async def _on_error(self, context: TurnContext, err: Exception) -> None:
+        """Handle errors that occur during a turn in the AgentApplication.
+
+        :param context: The turn context in which the error occurred.
+        :param err: The exception that occurred.
+        """
 
         logger.error(
             f"An error occurred in the AgentApplication: {err}",
             exc_info=True,
         )
-        logger.error(err)
-        raise err
+
+        for err_func in self._turn_error_handlers:
+            logger.info(f"Calling error handler {err_func.__name__} for error: {err}")
+            await err_func(context, err)
+
+        if not self._turn_error_handlers:
+            raise err

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/microsoft_agents/hosting/core/authorization/claims_identity.py

@@ -1,8 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import warnings
-
 from typing import Any
 
 from .authentication_constants import AuthenticationConstants
@@ -16,35 +14,26 @@ class ClaimsIdentity:
 
     claims: dict[str, Any]
     authentication_type: str | None
-    security_token: str | None  # deprecated, will be removed in future versions
+    security_token: str | None
 
     def __init__(
         self,
         claims: dict[str, Any] | None = None,
-        is_authenticated: bool | None = None,
         authentication_type: str | None = None,
         security_token: str | None = None,
     ):
         """Creates a new instance of the ClaimsIdentity class.
 
         :param claims: A dictionary of claims associated with the identity.
-        :param is_authenticated: A boolean indicating whether the identity is authenticated. (Deprecated)
         :param authentication_type: A string representing the type of authentication used.
         :param security_token: The security token associated with the identity.
         """
         if claims is None:
             claims = {}
         self.claims = claims
-        if is_authenticated is not None:
-            warnings.warn(
-                "The 'is_authenticated' parameter is deprecated and will be removed in future versions.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
 
         self.authentication_type = authentication_type
         self.security_token = security_token
-        self._is_authenticated = is_authenticated
 
     def get_claim_value(self, claim_type: str) -> Any:
         """Gets the value of a specific claim type from the claims dictionary.
@@ -62,25 +51,6 @@ class ClaimsIdentity:
             or self.authentication_type.lower() == "anonymous"
         ) and not self.claims
 
-    @property
-    def is_authenticated(self) -> bool:
-        """Returns True if the identity is authenticated, otherwise False."""
-        warnings.warn(
-            "The 'is_authenticated' property is deprecated and will be removed in future versions.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return bool(self.claims)
-
-    @is_authenticated.setter
-    def is_authenticated(self, value: bool) -> None:
-        """(Deprecated). This is now a no-op."""
-        warnings.warn(
-            "The 'is_authenticated' property is deprecated and will be removed in future versions.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
     def get_app_id(self) -> str | None:
         """
         Gets the AppId from the current ClaimsIdentity.

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/microsoft_agents/hosting/core/card_factory.py

@@ -160,6 +160,3 @@ class CardFactory:
             )
 
         return card.to_attachment()
-
-    # Deprecated alias; use microsoft_agents.activity.ContentTypes instead.
-    content_types: type[ContentTypes] = ContentTypes

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/microsoft_agents_hosting_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-core
-Version: 1.7.0.dev4
+Version: 1.7.0.dev6
 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==1.7.0.dev4
+Requires-Dist: microsoft-agents-activity==1.7.0.dev6
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: isodate>=0.6.1
 Requires-Dist: python-dotenv>=1.1.1
@@ -215,7 +215,7 @@ ADAPTER = CloudAdapter(connection_manager=CONNECTION_MANAGER)
 AUTHORIZATION = Authorization(STORAGE, CONNECTION_MANAGER, **agents_sdk_config)
 
 AGENT_APP = AgentApplication[TurnState](
-    storage=STORAGE, adapter=ADAPTER, authorization=AUTHORIZATION, **agents_sdk_config
+    storage=STORAGE, authorization=AUTHORIZATION, **agents_sdk_config
 )
 
 @AGENT_APP.activity("message")
@@ -226,6 +226,7 @@ async def on_message(context: TurnContext, state: TurnState):
 
 start_server(
     agent_application=AGENT_APP,
+    adapter=ADAPTER,
     auth_configuration=CONNECTION_MANAGER.get_default_connection_configuration(),
 )
 ```

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/microsoft_agents_hosting_core.egg-info/requires.txt

@@ -1,4 +1,4 @@
-microsoft-agents-activity==1.7.0.dev4
+microsoft-agents-activity==1.7.0.dev6
 pyjwt>=2.10.1
 isodate>=0.6.1
 python-dotenv>=1.1.1

{microsoft_agents_hosting_core-1.7.0.dev4 → microsoft_agents_hosting_core-1.7.0.dev6}/readme.md

@@ -186,7 +186,7 @@ ADAPTER = CloudAdapter(connection_manager=CONNECTION_MANAGER)
 AUTHORIZATION = Authorization(STORAGE, CONNECTION_MANAGER, **agents_sdk_config)
 
 AGENT_APP = AgentApplication[TurnState](
-    storage=STORAGE, adapter=ADAPTER, authorization=AUTHORIZATION, **agents_sdk_config
+    storage=STORAGE, authorization=AUTHORIZATION, **agents_sdk_config
 )
 
 @AGENT_APP.activity("message")
@@ -197,6 +197,7 @@ async def on_message(context: TurnContext, state: TurnState):
 
 start_server(
     agent_application=AGENT_APP,
+    adapter=ADAPTER,
     auth_configuration=CONNECTION_MANAGER.get_default_connection_configuration(),
 )
 ```

microsoft_agents_hosting_core-1.7.0.dev4/VERSION.txt

@@ -1 +0,0 @@
-1.7.0.dev4