microsoft-agents-hosting-fastapi 0.7.0.dev0__tar.gz → 0.7.0.dev1__tar.gz

{microsoft_agents_hosting_fastapi-0.7.0.dev0 → microsoft_agents_hosting_fastapi-0.7.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-fastapi
-Version: 0.7.0.dev0
+Version: 0.7.0.dev1
 Summary: Integration library for Microsoft Agents with FastAPI
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -10,7 +10,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.7.0.dev0
+Requires-Dist: microsoft-agents-hosting-core==0.7.0.dev1
 Requires-Dist: fastapi>=0.104.0
 Dynamic: license-file
 Dynamic: requires-dist

{microsoft_agents_hosting_fastapi-0.7.0.dev0 → microsoft_agents_hosting_fastapi-0.7.0.dev1}/microsoft_agents/hosting/fastapi/__init__.py

@@ -5,7 +5,9 @@ from .cloud_adapter import CloudAdapter
 from .jwt_authorization_middleware import (
     JwtAuthorizationMiddleware,
 )
-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_fastapi-0.7.0.dev1/microsoft_agents/hosting/fastapi/channel_service_route_table.py

@@ -0,0 +1,148 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+from fastapi import APIRouter, Request, Response
+from fastapi.responses import JSONResponse
+
+from microsoft_agents.hosting.core import ChannelApiHandlerProtocol
+from microsoft_agents.hosting.core.http import ChannelServiceRoutes
+
+
+class FastApiRequestAdapter:
+    """Adapter for FastAPI requests to use with ChannelServiceRoutes."""
+
+    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 getattr(self._request.state, "claims_identity", None)
+
+    def get_path_param(self, name: str) -> str:
+        return self._request.path_params.get(name, "")
+
+
+def channel_service_route_table(
+    handler: ChannelApiHandlerProtocol, base_url: str = ""
+) -> APIRouter:
+    """Create FastAPI router for Channel Service API.
+
+    Args:
+        handler: The handler that implements the Channel API protocol.
+        base_url: Optional base URL prefix for all routes.
+
+    Returns:
+        APIRouter with all channel service routes.
+    """
+    router = APIRouter()
+    service_routes = ChannelServiceRoutes(handler, base_url)
+
+    @router.post(base_url + "/v3/conversations/{conversation_id}/activities")
+    async def send_to_conversation(conversation_id: str, request: Request):
+        result = await service_routes.send_to_conversation(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.post(
+        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
+    )
+    async def reply_to_activity(
+        conversation_id: str, activity_id: str, request: Request
+    ):
+        result = await service_routes.reply_to_activity(FastApiRequestAdapter(request))
+        return JSONResponse(content=result)
+
+    @router.put(
+        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
+    )
+    async def update_activity(conversation_id: str, activity_id: str, request: Request):
+        result = await service_routes.update_activity(FastApiRequestAdapter(request))
+        return JSONResponse(content=result)
+
+    @router.delete(
+        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
+    )
+    async def delete_activity(conversation_id: str, activity_id: str, request: Request):
+        await service_routes.delete_activity(FastApiRequestAdapter(request))
+        return Response(status_code=200)
+
+    @router.get(
+        base_url
+        + "/v3/conversations/{conversation_id}/activities/{activity_id}/members"
+    )
+    async def get_activity_members(
+        conversation_id: str, activity_id: str, request: Request
+    ):
+        result = await service_routes.get_activity_members(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.post(base_url + "/")
+    async def create_conversation(request: Request):
+        result = await service_routes.create_conversation(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.get(base_url + "/")
+    async def get_conversation(request: Request):
+        result = await service_routes.get_conversations(FastApiRequestAdapter(request))
+        return JSONResponse(content=result)
+
+    @router.get(base_url + "/v3/conversations/{conversation_id}/members")
+    async def get_conversation_members(conversation_id: str, request: Request):
+        result = await service_routes.get_conversation_members(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.get(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
+    async def get_conversation_member(
+        conversation_id: str, member_id: str, request: Request
+    ):
+        result = await service_routes.get_conversation_member(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.get(base_url + "/v3/conversations/{conversation_id}/pagedmembers")
+    async def get_conversation_paged_members(conversation_id: str, request: Request):
+        result = await service_routes.get_conversation_paged_members(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.delete(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
+    async def delete_conversation_member(
+        conversation_id: str, member_id: str, request: Request
+    ):
+        result = await service_routes.delete_conversation_member(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.post(base_url + "/v3/conversations/{conversation_id}/activities/history")
+    async def send_conversation_history(conversation_id: str, request: Request):
+        result = await service_routes.send_conversation_history(
+            FastApiRequestAdapter(request)
+        )
+        return JSONResponse(content=result)
+
+    @router.post(base_url + "/v3/conversations/{conversation_id}/attachments")
+    async def upload_attachment(conversation_id: str, request: Request):
+        result = await service_routes.upload_attachment(FastApiRequestAdapter(request))
+        return JSONResponse(content=result)
+
+    return router

microsoft_agents_hosting_fastapi-0.7.0.dev1/microsoft_agents/hosting/fastapi/cloud_adapter.py

@@ -0,0 +1,94 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+from typing import Optional
+
+from fastapi import Request, Response
+from fastapi.responses import JSONResponse
+
+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 FastApiRequestAdapter:
+    """Adapter to make FastAPI 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 getattr(self._request.state, "claims_identity", None)
+
+    def get_path_param(self, name: str) -> str:
+        return self._request.path_params.get(name, "")
+
+
+class CloudAdapter(HttpAdapterBase, AgentHttpAdapter):
+    """CloudAdapter for FastAPI web framework."""
+
+    def __init__(
+        self,
+        *,
+        connection_manager: Connections = None,
+        channel_service_client_factory: ChannelServiceClientFactoryBase = None,
+    ):
+        """
+        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 process(self, request: Request, agent: Agent) -> Optional[Response]:
+        """Process a FastAPI request.
+
+        Args:
+            request: The FastAPI request.
+            agent: The agent to handle the request.
+
+        Returns:
+            FastAPI Response object.
+        """
+        # Adapt request to protocol
+        adapted_request = FastApiRequestAdapter(request)
+
+        # Process using base implementation
+        http_response: HttpResponse = await self.process_request(adapted_request, agent)
+
+        # Convert HttpResponse to FastAPI Response
+        return self._to_fastapi_response(http_response)
+
+    @staticmethod
+    def _to_fastapi_response(http_response: HttpResponse) -> Response:
+        """Convert HttpResponse to FastAPI Response."""
+        if http_response.body is not None:
+            return JSONResponse(
+                content=http_response.body,
+                status_code=http_response.status_code,
+                headers=http_response.headers,
+            )
+        return Response(
+            status_code=http_response.status_code,
+            headers=http_response.headers,
+        )

{microsoft_agents_hosting_fastapi-0.7.0.dev0 → microsoft_agents_hosting_fastapi-0.7.0.dev1}/microsoft_agents_hosting_fastapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-hosting-fastapi
-Version: 0.7.0.dev0
+Version: 0.7.0.dev1
 Summary: Integration library for Microsoft Agents with FastAPI
 Author: Microsoft Corporation
 License-Expression: MIT
@@ -10,7 +10,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.7.0.dev0
+Requires-Dist: microsoft-agents-hosting-core==0.7.0.dev1
 Requires-Dist: fastapi>=0.104.0
 Dynamic: license-file
 Dynamic: requires-dist

microsoft_agents_hosting_fastapi-0.7.0.dev1/microsoft_agents_hosting_fastapi.egg-info/requires.txt

@@ -0,0 +1,2 @@
+microsoft-agents-hosting-core==0.7.0.dev1
+fastapi>=0.104.0

microsoft_agents_hosting_fastapi-0.7.0.dev0/microsoft_agents/hosting/fastapi/channel_service_route_table.py

@@ -1,205 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-import json
-from typing import List, Union, Type
-
-from fastapi import APIRouter, Request, Response, HTTPException, Depends
-from fastapi.responses import JSONResponse
-
-from microsoft_agents.activity import (
-    AgentsModel,
-    Activity,
-    AttachmentData,
-    ConversationParameters,
-    Transcript,
-)
-from microsoft_agents.hosting.core import ChannelApiHandlerProtocol
-
-
-async def deserialize_from_body(
-    request: Request, target_model: Type[AgentsModel]
-) -> AgentsModel:
-    content_type = request.headers.get("Content-Type", "")
-    if "application/json" in content_type:
-        body = await request.json()
-    else:
-        raise HTTPException(status_code=415, detail="Unsupported Media Type")
-
-    return target_model.model_validate(body)
-
-
-def get_serialized_response(
-    model_or_list: Union[AgentsModel, List[AgentsModel]],
-) -> JSONResponse:
-    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
-        ]
-
-    return JSONResponse(content=json_obj)
-
-
-def channel_service_route_table(
-    handler: ChannelApiHandlerProtocol, base_url: str = ""
-) -> APIRouter:
-    router = APIRouter()
-
-    @router.post(base_url + "/v3/conversations/{conversation_id}/activities")
-    async def send_to_conversation(conversation_id: str, request: Request):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_send_to_conversation(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            activity,
-        )
-
-        return get_serialized_response(result)
-
-    @router.post(
-        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
-    )
-    async def reply_to_activity(
-        conversation_id: str, activity_id: str, request: Request
-    ):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_reply_to_activity(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            activity_id,
-            activity,
-        )
-
-        return get_serialized_response(result)
-
-    @router.put(
-        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
-    )
-    async def update_activity(conversation_id: str, activity_id: str, request: Request):
-        activity = await deserialize_from_body(request, Activity)
-        result = await handler.on_update_activity(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            activity_id,
-            activity,
-        )
-
-        return get_serialized_response(result)
-
-    @router.delete(
-        base_url + "/v3/conversations/{conversation_id}/activities/{activity_id}"
-    )
-    async def delete_activity(conversation_id: str, activity_id: str, request: Request):
-        await handler.on_delete_activity(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            activity_id,
-        )
-
-        return Response(status_code=200)
-
-    @router.get(
-        base_url
-        + "/v3/conversations/{conversation_id}/activities/{activity_id}/members"
-    )
-    async def get_activity_members(
-        conversation_id: str, activity_id: str, request: Request
-    ):
-        result = await handler.on_get_activity_members(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            activity_id,
-        )
-
-        return get_serialized_response(result)
-
-    @router.post(base_url + "/")
-    async def create_conversation(request: Request):
-        conversation_parameters = await deserialize_from_body(
-            request, ConversationParameters
-        )
-        result = await handler.on_create_conversation(
-            getattr(request.state, "claims_identity", None), conversation_parameters
-        )
-
-        return get_serialized_response(result)
-
-    @router.get(base_url + "/")
-    async def get_conversation(request: Request):
-        # TODO: continuation token? conversation_id?
-        result = await handler.on_get_conversations(
-            getattr(request.state, "claims_identity", None), None
-        )
-
-        return get_serialized_response(result)
-
-    @router.get(base_url + "/v3/conversations/{conversation_id}/members")
-    async def get_conversation_members(conversation_id: str, request: Request):
-        result = await handler.on_get_conversation_members(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-        )
-
-        return get_serialized_response(result)
-
-    @router.get(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
-    async def get_conversation_member(
-        conversation_id: str, member_id: str, request: Request
-    ):
-        result = await handler.on_get_conversation_member(
-            getattr(request.state, "claims_identity", None),
-            member_id,
-            conversation_id,
-        )
-
-        return get_serialized_response(result)
-
-    @router.get(base_url + "/v3/conversations/{conversation_id}/pagedmembers")
-    async def get_conversation_paged_members(conversation_id: str, request: Request):
-        # TODO: continuation token? page size?
-        result = await handler.on_get_conversation_paged_members(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-        )
-
-        return get_serialized_response(result)
-
-    @router.delete(base_url + "/v3/conversations/{conversation_id}/members/{member_id}")
-    async def delete_conversation_member(
-        conversation_id: str, member_id: str, request: Request
-    ):
-        result = await handler.on_delete_conversation_member(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            member_id,
-        )
-
-        return get_serialized_response(result)
-
-    @router.post(base_url + "/v3/conversations/{conversation_id}/activities/history")
-    async def send_conversation_history(conversation_id: str, request: Request):
-        transcript = await deserialize_from_body(request, Transcript)
-        result = await handler.on_send_conversation_history(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            transcript,
-        )
-
-        return get_serialized_response(result)
-
-    @router.post(base_url + "/v3/conversations/{conversation_id}/attachments")
-    async def upload_attachment(conversation_id: str, request: Request):
-        attachment_data = await deserialize_from_body(request, AttachmentData)
-        result = await handler.on_upload_attachment(
-            getattr(request.state, "claims_identity", None),
-            conversation_id,
-            attachment_data,
-        )
-
-        return get_serialized_response(result)
-
-    return router

microsoft_agents_hosting_fastapi-0.7.0.dev0/microsoft_agents/hosting/fastapi/cloud_adapter.py

@@ -1,113 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-from traceback import format_exc
-from typing import Optional
-
-from fastapi import Request, Response, HTTPException
-from fastapi.responses import JSONResponse
-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 .agent_http_adapter import AgentHttpAdapter
-
-
-class CloudAdapter(ChannelServiceAdapter, AgentHttpAdapter):
-    def __init__(
-        self,
-        *,
-        connection_manager: Connections = None,
-        channel_service_client_factory: ChannelServiceClientFactoryBase = None,
-    ):
-        """
-        Initializes a new instance of the CloudAdapter class.
-
-        :param channel_service_client_factory: The factory to use to create the channel service client.
-        """
-
-        async def on_turn_error(context: TurnContext, error: Exception):
-            error_message = f"Exception caught : {error}"
-            print(format_exc())
-
-            await context.send_activity(MessageFactory.text(error_message))
-
-            # Send a trace activity
-            await context.send_trace_activity(
-                "OnTurnError Trace",
-                error_message,
-                "https://www.botframework.com/schemas/error",
-                "TurnError",
-            )
-
-        self.on_turn_error = on_turn_error
-
-        channel_service_client_factory = (
-            channel_service_client_factory
-            or RestChannelServiceClientFactory(connection_manager)
-        )
-
-        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
-            content_type = request.headers.get("Content-Type", "")
-            if "application/json" in content_type:
-                body = await request.json()
-            else:
-                raise HTTPException(status_code=415, detail="Unsupported Media Type")
-
-            activity: Activity = Activity.model_validate(body)
-
-            # default to anonymous identity with no claims
-            claims_identity: ClaimsIdentity = getattr(
-                request.state, "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 HTTPException(status_code=400, detail="Bad Request")
-
-            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 JSONResponse(
-                        content=invoke_response.body, status_code=invoke_response.status
-                    )
-
-                return Response(status_code=202)
-            except PermissionError:
-                raise HTTPException(status_code=401, detail="Unauthorized")
-        else:
-            raise HTTPException(status_code=405, detail="Method Not Allowed")

microsoft_agents_hosting_fastapi-0.7.0.dev0/microsoft_agents_hosting_fastapi.egg-info/requires.txt

@@ -1,2 +0,0 @@
-microsoft-agents-hosting-core==0.7.0.dev0
-fastapi>=0.104.0