microsoft-agents-hosting-aiohttp 0.6.0.dev17__py3-none-any.whl → 0.7.0__py3-none-any.whl

microsoft_agents/hosting/aiohttp/__init__.py

@@ -6,7 +6,9 @@ from .jwt_authorization_middleware import (
     jwt_authorization_middleware,
     jwt_authorization_decorator,
 )
-from .app.streaming import (
+
+# Import streaming utilities from core for backward compatibility
+from microsoft_agents.hosting.core.app.streaming import (
     Citation,
     CitationUtil,
     StreamingResponse,

microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py

@@ -3,8 +3,7 @@
 
 import asyncio
 import logging
-from typing import List, Optional, Callable, Literal, TYPE_CHECKING
-from dataclasses import dataclass
+from typing import List, Optional, Callable, Literal
 
 from microsoft_agents.activity import (
     Activity,

microsoft_agents/hosting/aiohttp/channel_service_route_table.py

@@ -1,102 +1,81 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 import json
-from typing import List, Union, Type
 
 from aiohttp.web import RouteTableDef, Request, Response
 
-from microsoft_agents.activity import (
-    AgentsModel,
-    Activity,
-    AttachmentData,
-    ConversationParameters,
-    Transcript,
-)
 from microsoft_agents.hosting.core import ChannelApiHandlerProtocol
+from microsoft_agents.hosting.core.http import ChannelServiceRoutes
 
 
-async def deserialize_from_body(
-    request: Request, target_model: Type[AgentsModel]
-) -> Activity:
-    if "application/json" in request.headers["Content-Type"]:
-        body = await request.json()
-    else:
-        return Response(status=415)
+class AiohttpRequestAdapter:
+    """Adapter for aiohttp requests to use with ChannelServiceRoutes."""
 
-    return target_model.model_validate(body)
+    def __init__(self, request: Request):
+        self._request = request
 
+    @property
+    def method(self) -> str:
+        return self._request.method
 
-def get_serialized_response(
-    model_or_list: Union[AgentsModel, List[AgentsModel]],
-) -> Response:
-    if isinstance(model_or_list, AgentsModel):
-        json_obj = model_or_list.model_dump(
-            mode="json", exclude_unset=True, by_alias=True
-        )
-    else:
-        json_obj = [
-            model.model_dump(mode="json", exclude_unset=True, by_alias=True)
-            for model in model_or_list
-        ]
+    @property
+    def headers(self):
+        return self._request.headers
+
+    async def json(self):
+        return await self._request.json()
+
+    def get_claims_identity(self):
+        return self._request.get("claims_identity")
 
-    return Response(body=json.dumps(json_obj), content_type="application/json")
+    def get_path_param(self, name: str) -> str:
+        return self._request.match_info[name]
 
 
 def channel_service_route_table(
     handler: ChannelApiHandlerProtocol, base_url: str = ""
 ) -> RouteTableDef:
-    # pylint: disable=unused-variable
+    """Create aiohttp route table for Channel Service API.
+
+    Args:
+        handler: The handler that implements the Channel API protocol.
+        base_url: Optional base URL prefix for all routes.
+
+    Returns:
+        RouteTableDef with all channel service routes.
+    """
     routes = RouteTableDef()
+    service_routes = ChannelServiceRoutes(handler, base_url)
+
+    def json_response(data: dict) -> Response:
+        return Response(body=json.dumps(data), content_type="application/json")
 
     @routes.post(base_url + "/v3/conversations/{conversation_id}/activities")
     async def send_to_conversation(request: Request):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_send_to_conversation(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            activity,
+        result = await service_routes.send_to_conversation(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.post(
         base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
     )
     async def reply_to_activity(request: Request):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_reply_to_activity(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            request.match_info["activity_id"],
-            activity,
-        )
-
-        return get_serialized_response(result)
+        result = await service_routes.reply_to_activity(AiohttpRequestAdapter(request))
+        return json_response(result)
 
     @routes.put(
         base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
     )
     async def update_activity(request: Request):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_update_activity(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            request.match_info["activity_id"],
-            activity,
-        )
-
-        return get_serialized_response(result)
+        result = await service_routes.update_activity(AiohttpRequestAdapter(request))
+        return json_response(result)
 
     @routes.delete(
         base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
     )
     async def delete_activity(request: Request):
-        await handler.on_delete_activity(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            request.match_info["activity_id"],
-        )
-
+        await service_routes.delete_activity(AiohttpRequestAdapter(request))
         return Response()
 
     @routes.get(
@@ -104,91 +83,61 @@ def channel_service_route_table(
         + "/v3/conversations/{conversation_id}/activities/{activity_id}/members"
     )
     async def get_activity_members(request: Request):
-        result = await handler.on_get_activity_members(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            request.match_info["activity_id"],
+        result = await service_routes.get_activity_members(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.post(base_url + "/")
     async def create_conversation(request: Request):
-        conversation_parameters = deserialize_from_body(request, ConversationParameters)
-        result = await handler.on_create_conversation(
-            request.get("claims_identity"), conversation_parameters
+        result = await service_routes.create_conversation(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.get(base_url + "/")
     async def get_conversation(request: Request):
-        # TODO: continuation token? conversation_id?
-        result = await handler.on_get_conversations(
-            request.get("claims_identity"), None
-        )
-
-        return get_serialized_response(result)
+        result = await service_routes.get_conversations(AiohttpRequestAdapter(request))
+        return json_response(result)
 
     @routes.get(base_url + "/v3/conversations/{conversation_id}/members")
     async def get_conversation_members(request: Request):
-        result = await handler.on_get_conversation_members(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
+        result = await service_routes.get_conversation_members(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.get(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
     async def get_conversation_member(request: Request):
-        result = await handler.on_get_conversation_member(
-            request.get("claims_identity"),
-            request.match_info["member_id"],
-            request.match_info["conversation_id"],
+        result = await service_routes.get_conversation_member(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.get(base_url + "/v3/conversations/{conversation_id}/pagedmembers")
     async def get_conversation_paged_members(request: Request):
-        # TODO: continuation token? page size?
-        result = await handler.on_get_conversation_paged_members(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
+        result = await service_routes.get_conversation_paged_members(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.delete(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
     async def delete_conversation_member(request: Request):
-        result = await handler.on_delete_conversation_member(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            request.match_info["member_id"],
+        result = await service_routes.delete_conversation_member(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.post(base_url + "/v3/conversations/{conversation_id}/activities/history")
     async def send_conversation_history(request: Request):
-        transcript = deserialize_from_body(request, Transcript)
-        result = await handler.on_send_conversation_history(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            transcript,
+        result = await service_routes.send_conversation_history(
+            AiohttpRequestAdapter(request)
         )
-
-        return get_serialized_response(result)
+        return json_response(result)
 
     @routes.post(base_url + "/v3/conversations/{conversation_id}/attachments")
     async def upload_attachment(request: Request):
-        attachment_data = deserialize_from_body(request, AttachmentData)
-        result = await handler.on_upload_attachment(
-            request.get("claims_identity"),
-            request.match_info["conversation_id"],
-            attachment_data,
-        )
-
-        return get_serialized_response(result)
+        result = await service_routes.upload_attachment(AiohttpRequestAdapter(request))
+        return json_response(result)
 
     return routes

microsoft_agents/hosting/aiohttp/cloud_adapter.py

@@ -1,39 +1,47 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-from traceback import format_exc
 from typing import Optional
 
-from aiohttp.web import (
-    Request,
-    Response,
-    json_response,
-    HTTPBadRequest,
-    HTTPMethodNotAllowed,
-    HTTPUnauthorized,
-    HTTPUnsupportedMediaType,
-)
-from microsoft_agents.hosting.core import error_resources
-from microsoft_agents.hosting.core.authorization import (
-    ClaimsIdentity,
-    Connections,
-)
-from microsoft_agents.activity import (
-    Activity,
-    DeliveryModes,
-)
-from microsoft_agents.hosting.core import (
-    Agent,
-    ChannelServiceAdapter,
-    ChannelServiceClientFactoryBase,
-    MessageFactory,
-    RestChannelServiceClientFactory,
-    TurnContext,
+from aiohttp.web import Request, Response, json_response
+
+from microsoft_agents.hosting.core import Agent
+from microsoft_agents.hosting.core.authorization import Connections
+from microsoft_agents.hosting.core.http import (
+    HttpAdapterBase,
+    HttpResponse,
 )
+from microsoft_agents.hosting.core import ChannelServiceClientFactoryBase
 
 from .agent_http_adapter import AgentHttpAdapter
 
 
-class CloudAdapter(ChannelServiceAdapter, AgentHttpAdapter):
+class AiohttpRequestAdapter:
+    """Adapter to make aiohttp Request compatible with HttpRequestProtocol."""
+
+    def __init__(self, request: Request):
+        self._request = request
+
+    @property
+    def method(self) -> str:
+        return self._request.method
+
+    @property
+    def headers(self):
+        return self._request.headers
+
+    async def json(self):
+        return await self._request.json()
+
+    def get_claims_identity(self):
+        return self._request.get("claims_identity")
+
+    def get_path_param(self, name: str) -> str:
+        return self._request.match_info[name]
+
+
+class CloudAdapter(HttpAdapterBase, AgentHttpAdapter):
+    """CloudAdapter for aiohttp web framework."""
+
     def __init__(
         self,
         *,
@@ -43,77 +51,43 @@ class CloudAdapter(ChannelServiceAdapter, AgentHttpAdapter):
         """
         Initializes a new instance of the CloudAdapter class.
 
+        :param connection_manager: Optional connection manager for OAuth.
         :param channel_service_client_factory: The factory to use to create the channel service client.
         """
+        super().__init__(
+            connection_manager=connection_manager,
+            channel_service_client_factory=channel_service_client_factory,
+        )
 
-        async def on_turn_error(context: TurnContext, error: Exception):
-            error_message = f"Exception caught : {error}"
-            print(format_exc())
+    async def process(self, request: Request, agent: Agent) -> Optional[Response]:
+        """Process an aiohttp request.
 
-            await context.send_activity(MessageFactory.text(error_message))
+        Args:
+            request: The aiohttp request.
+            agent: The agent to handle the request.
 
-            # Send a trace activity
-            await context.send_trace_activity(
-                "OnTurnError Trace",
-                error_message,
-                "https://www.botframework.com/schemas/error",
-                "TurnError",
+        Returns:
+            aiohttp Response object.
+        """
+        # Adapt request to protocol
+        adapted_request = AiohttpRequestAdapter(request)
+
+        # Process using base implementation
+        http_response: HttpResponse = await self.process_request(adapted_request, agent)
+
+        # Convert HttpResponse to aiohttp Response
+        return self._to_aiohttp_response(http_response)
+
+    @staticmethod
+    def _to_aiohttp_response(http_response: HttpResponse) -> Response:
+        """Convert HttpResponse to aiohttp Response."""
+        if http_response.body is not None:
+            return json_response(
+                data=http_response.body,
+                status=http_response.status_code,
+                headers=http_response.headers,
             )
-
-        self.on_turn_error = on_turn_error
-
-        channel_service_client_factory = (
-            channel_service_client_factory
-            or RestChannelServiceClientFactory(connection_manager)
+        return Response(
+            status=http_response.status_code,
+            headers=http_response.headers,
         )
-
-        super().__init__(channel_service_client_factory)
-
-    async def process(self, request: Request, agent: Agent) -> Optional[Response]:
-        if not request:
-            raise TypeError(str(error_resources.RequestRequired))
-        if not agent:
-            raise TypeError(str(error_resources.AgentRequired))
-
-        if request.method == "POST":
-            # Deserialize the incoming Activity
-            if "application/json" in request.headers["Content-Type"]:
-                body = await request.json()
-            else:
-                raise HTTPUnsupportedMediaType()
-
-            activity: Activity = Activity.model_validate(body)
-
-            # default to anonymous identity with no claims
-            claims_identity: ClaimsIdentity = request.get(
-                "claims_identity", ClaimsIdentity({}, False)
-            )
-
-            # A POST request must contain an Activity
-            if (
-                not activity.type
-                or not activity.conversation
-                or not activity.conversation.id
-            ):
-                raise HTTPBadRequest
-
-            try:
-                # Process the inbound activity with the agent
-                invoke_response = await self.process_activity(
-                    claims_identity, activity, agent.on_turn
-                )
-
-                if (
-                    activity.type == "invoke"
-                    or activity.delivery_mode == DeliveryModes.expect_replies
-                ):
-                    # Invoke and ExpectReplies cannot be performed async, the response must be written before the calling thread is released.
-                    return json_response(
-                        data=invoke_response.body, status=invoke_response.status
-                    )
-
-                return Response(status=202)
-            except PermissionError:
-                raise HTTPUnauthorized
-        else:
-            raise HTTPMethodNotAllowed

{microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info → microsoft_agents_hosting_aiohttp-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-aiohttp
-Version: 0.6.0.dev17
+Version: 0.7.0
 Summary: Integration library for Microsoft Agents with aiohttp
 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-hosting-core==0.6.0.dev17
+Requires-Dist: microsoft-agents-hosting-core==0.7.0
 Requires-Dist: aiohttp>=3.11.11
 Dynamic: license-file
 Dynamic: requires-dist
@@ -39,11 +39,29 @@ This library is part of the **Microsoft 365 Agents SDK for Python** - a comprehe
     <th style="width:20%">Date</th>
     <th style="width:60%">Release Notes</th>
   </tr>
+  <tr>
+    <td>0.6.1</td>
+    <td>2025-12-01</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v061">
+        0.6.1 Release Notes
+      </a>
+    </td>
+  </tr>
+  <tr>
+    <td>0.6.0</td>
+    <td>2025-11-18</td>
+    <td>
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v060">
+        0.6.0 Release Notes
+      </a>
+    </td>
+  </tr>
   <tr>
     <td>0.5.0</td>
     <td>2025-10-22</td>
     <td>
-      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md">
+      <a href="https://github.com/microsoft/Agents-for-python/blob/main/changelog.md#microsoft-365-agents-sdk-for-python---release-notes-v050">
         0.5.0 Release Notes
       </a>
     </td>

{microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info → microsoft_agents_hosting_aiohttp-0.7.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-microsoft_agents/hosting/aiohttp/__init__.py,sha256=MiCeImORsTFi9V2n-MIWJA53GzroDd-54G_UoH_5U0Y,664
+microsoft_agents/hosting/aiohttp/__init__.py,sha256=WMrEQvFHm9m0iGU2XBLD6QHYYjYVcCCTjM25jQ_rczk,760
 microsoft_agents/hosting/aiohttp/_start_agent_process.py,sha256=RqKjQrYGRlzp05ssropmKCwI7T4j-glQP1zJtuOHBI0,950
 microsoft_agents/hosting/aiohttp/agent_http_adapter.py,sha256=U6GQVPPj-Vi2Kan8i2LDrRtU-M9FpfXUzFqzOqvVYoI,444
-microsoft_agents/hosting/aiohttp/channel_service_route_table.py,sha256=3JNmK63j0ELgqUAtqsOXFjajhRTMgf29cIGwLCDwnLE,6745
-microsoft_agents/hosting/aiohttp/cloud_adapter.py,sha256=UzSoZPGNI9VVY9vQx5E6BMgJAa0x2UUmuW2JGEiX9bc,3882
+microsoft_agents/hosting/aiohttp/channel_service_route_table.py,sha256=Ln-wVWqAwHAlcKHoRnVjki4dDaYKMs_LsdbUGvmomiI,5141
+microsoft_agents/hosting/aiohttp/cloud_adapter.py,sha256=J4ebzfE5iZKYPuYlema_j1DkzLQvB_TEa9ke8f0YSe0,2949
 microsoft_agents/hosting/aiohttp/jwt_authorization_middleware.py,sha256=26r7lK-umiohc5H7mC-m0yeHr-Tq7DoALO1ea0pi714,2327
 microsoft_agents/hosting/aiohttp/app/__init__.py,sha256=TioskqZet16twXOsI3X2snyLzmuyeKNtN2dySD1Xw7s,253
 microsoft_agents/hosting/aiohttp/app/streaming/__init__.py,sha256=G_VGmQ0m6TkHZsHjRV5HitaCOt2EBEjENIoBYabJMqM,292
 microsoft_agents/hosting/aiohttp/app/streaming/citation.py,sha256=ZGaMUOWxxoMplwRrkFsjnK7Z12V6rT5odE7qZCu-mP8,498
 microsoft_agents/hosting/aiohttp/app/streaming/citation_util.py,sha256=c95c3Y3genmFc0vSXppPaD1-ShFohAV1UABZnyJS_BQ,2478
-microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py,sha256=JSJfoQ1ARn-rWKHAABO2dA4soyRR2F8435mj0qioGKQ,14187
-microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info/licenses/LICENSE,sha256=ws_MuBL-SCEBqPBFl9_FqZkaaydIJmxHrJG2parhU4M,1141
-microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info/METADATA,sha256=rUnZUC9ttdjo69DUGYFVCplcZCdBnnBlEoYyuoeMXhA,8380
-microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info/top_level.txt,sha256=lWKcT4v6fTA_NgsuHdNvuMjSrkiBMXohn64ApY7Xi8A,17
-microsoft_agents_hosting_aiohttp-0.6.0.dev17.dist-info/RECORD,,
+microsoft_agents/hosting/aiohttp/app/streaming/streaming_response.py,sha256=PzbqiZuLO1cCsOXsO9ZUt8IckZTheTPahi078o-H2hE,14138
+microsoft_agents_hosting_aiohttp-0.7.0.dist-info/licenses/LICENSE,sha256=ws_MuBL-SCEBqPBFl9_FqZkaaydIJmxHrJG2parhU4M,1141
+microsoft_agents_hosting_aiohttp-0.7.0.dist-info/METADATA,sha256=iHdR9_30TS3gA95ZxaCLvrE3ctV7XLD4b7GlQucz7sU,8945
+microsoft_agents_hosting_aiohttp-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+microsoft_agents_hosting_aiohttp-0.7.0.dist-info/top_level.txt,sha256=lWKcT4v6fTA_NgsuHdNvuMjSrkiBMXohn64ApY7Xi8A,17
+microsoft_agents_hosting_aiohttp-0.7.0.dist-info/RECORD,,