Users/axsuarez/teams (#36)

* WIP Teams models with pydantic

* Teams models WIP

* Teams models WIP

* Teams models WIP

* Teams models replace BaseModel

* Teams connector Client WIP

* Teams connector client WIP

* New connector testing pending

* ConnectorClient working single tenant

* TeamsActivityHandler WIP

* Testing teams sample

* Teams sample WIP

* Messaging extensions working, TeamsInfo bugfixing

* Most TeamsInfo working

* teams handler formatting

* UserTokenClient Refactor

* UserTokenClient Refactor - formatting

* Cleaning teams sample and bugfixing

* Removing unused class

Author: axelsrz

.devcontainer/devcontainer.json

@@ -0,0 +1,8 @@
+{
+	"image": "mcr.microsoft.com/devcontainers/universal:2",
+	"features": {
+		"ghcr.io/roul/devcontainer-features/mise-python:1": {
+            "version": "3.9"
+        }
+	}
+}

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/activity_handler.py

@@ -84,8 +84,9 @@ async def on_turn(
             if invoke_response and not turn_context.turn_state.get(
                 ActivityTypes.invoke_response
             ):
+                response = invoke_response.model_dump(by_alias=True, exclude_none=True)
                 await turn_context.send_activity(
-                    Activity(value=invoke_response, type=ActivityTypes.invoke_response)
+                    Activity(value=response, type=ActivityTypes.invoke_response)
                 )
         elif turn_context.activity.type == ActivityTypes.end_of_conversation:
             await self.on_end_of_conversation_activity(turn_context)

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/basic_oauth_flow.py

@@ -18,7 +18,7 @@
     TurnContextProtocol as TurnContext,
 )
 from microsoft.agents.storage import StoreItem
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel
 
 from .message_factory import MessageFactory
 from .card_factory import CardFactory

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/channel_service_adapter.py

@@ -39,7 +39,6 @@
 
 class ChannelServiceAdapter(ChannelAdapter, ABC):
     _AGENT_CONNECTOR_CLIENT_KEY = "ConnectorClient"
-    _INVOKE_RESPONSE_KEY = "ChannelServiceAdapter.InvokeResponse"
 
     def __init__(self, channel_service_client_factory: ChannelServiceClientFactoryBase):
         super().__init__()
@@ -87,18 +86,15 @@ async def send_activities(
                     response = await connector_client.conversations.reply_to_activity(
                         activity.conversation.id,
                         activity.reply_to_id,
-                        activity.model_dump(by_alias=True, exclude_unset=True),
+                        activity,
                     )
                 else:
                     response = (
                         await connector_client.conversations.send_to_conversation(
                             activity.conversation.id,
-                            activity.model_dump(by_alias=True, exclude_unset=True),
+                            activity,
                         )
                     )
-            # TODO: The connector client is not casting the response but returning the JSON, need to fix it appropiatly
-            if not isinstance(response, ResourceResponse):
-                response = ResourceResponse.model_validate(response)
             response = response or ResourceResponse(id=activity.id or "")
 
             responses.append(response)
@@ -455,12 +451,12 @@ def _process_turn_results(self, context: TurnContext) -> InvokeResponse:
         # Handle Invoke scenarios where the agent will return a specific body and return code.
         if context.activity.type == ActivityTypes.invoke:
             activity_invoke_response: Activity = context.turn_state.get(
-                self._INVOKE_RESPONSE_KEY
+                self.INVOKE_RESPONSE_KEY
             )
             if not activity_invoke_response:
                 return InvokeResponse(status=HTTPStatus.NOT_IMPLEMENTED)
 
-            return activity_invoke_response.value
+            return InvokeResponse.model_validate(activity_invoke_response.value)
 
         # No body to return
         return None

libraries/Builder/microsoft-agents-builder/microsoft/agents/builder/rest_channel_service_client_factory.py

@@ -6,11 +6,12 @@
     ClaimsIdentity,
     Connections,
 )
+from microsoft.agents.authorization import AccessTokenProviderBase
 from microsoft.agents.connector import (
     ConnectorClientBase,
-    ConnectorClient,
     UserTokenClient,
 )
+from microsoft.agents.connector.teams import TeamsConnectorClient
 
 from .channel_service_client_factory_base import ChannelServiceClientFactoryBase
 
@@ -46,17 +47,19 @@ async def create_connector_client(
                 "RestChannelServiceClientFactory.create_connector_client: audience can't be None or Empty"
             )
 
-        token_provider = (
+        token_provider: AccessTokenProviderBase = (
             self._connections.get_token_provider(claims_identity, service_url)
             if not use_anonymous
             else self._ANONYMOUS_TOKEN_PROVIDER
         )
 
-        return ConnectorClient(
+        token = await token_provider.get_access_token(
+            audience, scopes or [f"{audience}/.default"]
+        )
+
+        return TeamsConnectorClient(
             endpoint=service_url,
-            credential_token_provider=token_provider,
-            credential_resource_url=audience,
-            credential_scopes=scopes,
+            token=token,
         )
 
     async def create_user_token_client(

libraries/Client/microsoft-agents-connector/microsoft/agents/connector/client/__init__.py

@@ -0,0 +1,4 @@
+from .connector_client import ConnectorClient
+from .user_token_client import UserTokenClient
+
+__all__ = ["ConnectorClient", "UserTokenClient"]