Merge branch 'main' into mehak/streaming

Author: MehakBindra

packages/a2aprotocol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "microsoft-teams-a2a"
-version = "2.0.0a3"
+version = "2.0.0a4"
 description = "plugin that enables your teams agent to be used as an a2a agent"
 authors = [{ name = "Microsoft", email = "[email protected]" }]
 readme = "README.md"

packages/ai/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "microsoft-teams-ai"
-version = "2.0.0a3"
+version = "2.0.0a4"
 description = "package to handle interacting with ai or llms"
 authors = [{ name = "Microsoft", email = "[email protected]" }]
 readme = "README.md"

packages/api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "microsoft-teams-api"
-version = "2.0.0a3"
+version = "2.0.0a4"
 description = "API package for Microsoft Teams"
 readme = "README.md"
 repository = "https://github.com/microsoft/teams.py"

packages/api/src/microsoft/teams/api/models/messaging_extension/__init__.py

@@ -6,6 +6,7 @@
 from .messaging_extension_action import MessagingExtensionAction
 from .messaging_extension_action_response import MessagingExtensionActionResponse
 from .messaging_extension_attachment import MessagingExtensionAttachment
+from .messaging_extension_attachment_layout import MessagingExtensionAttachmentLayout
 from .messaging_extension_parameter import MessagingExtensionParameter
 from .messaging_extension_query import MessagingExtensionQuery, MessagingExtensionQueryOptions
 from .messaging_extension_response import MessagingExtensionResponse
@@ -17,6 +18,7 @@
     "MessagingExtensionAction",
     "MessagingExtensionActionResponse",
     "MessagingExtensionAttachment",
+    "MessagingExtensionAttachmentLayout",
     "MessagingExtensionParameter",
     "MessagingExtensionQuery",
     "MessagingExtensionQueryOptions",

packages/api/src/microsoft/teams/api/models/messaging_extension/messaging_extension_attachment_layout.py

@@ -0,0 +1,13 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+
+from enum import Enum
+
+
+class MessagingExtensionAttachmentLayout(str, Enum):
+    """Enum for messaging extension attachment layout types."""
+
+    LIST = "list"
+    GRID = "grid"

packages/api/src/microsoft/teams/api/models/messaging_extension/messaging_extension_result.py

@@ -8,9 +8,9 @@
 from typing import List, Optional
 
 from ...models.activity import Activity as ActivityBase
-from ..attachment.attachment_layout import AttachmentLayout
 from ..custom_base_model import CustomBaseModel
 from .messaging_extension_attachment import MessagingExtensionAttachment
+from .messaging_extension_attachment_layout import MessagingExtensionAttachmentLayout
 from .messaging_extension_result_type import MessagingExtensionResultType
 from .messaging_extension_suggested_action import MessagingExtensionSuggestedAction
 
@@ -20,7 +20,7 @@ class MessagingExtensionResult(CustomBaseModel):
     Messaging extension result
     """
 
-    attachment_layout: Optional[AttachmentLayout] = None
+    attachment_layout: Optional[MessagingExtensionAttachmentLayout] = None
     "Hint for how to deal with multiple attachments."
 
     type: Optional[MessagingExtensionResultType] = None

packages/apps/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "microsoft-teams-apps"
-version = "2.0.0a3"
+version = "2.0.0a4"
 description = "The app package for a Microsoft Teams agent"
 authors = [{ name = "Microsoft", email = "[email protected]" }]
 readme = "README.md"

packages/apps/src/microsoft/teams/apps/__init__.py

@@ -5,7 +5,6 @@
 
 from . import auth, contexts, events, plugins
 from .app import App
-from .app_tokens import AppTokens
 from .auth import *  # noqa: F403
 from .contexts import *  # noqa: F403
 from .events import *  # noqa: F401, F403
@@ -16,7 +15,7 @@
 from .routing import ActivityContext
 
 # Combine all exports from submodules
-__all__: list[str] = ["App", "AppOptions", "HttpPlugin", "HttpStream", "ActivityContext", "AppTokens"]
+__all__: list[str] = ["App", "AppOptions", "HttpPlugin", "HttpStream", "ActivityContext"]
 __all__.extend(auth.__all__)
 __all__.extend(events.__all__)
 __all__.extend(plugins.__all__)

packages/apps/src/microsoft/teams/apps/app.py

@@ -21,7 +21,6 @@
     ConversationAccount,
     ConversationReference,
     Credentials,
-    JsonWebToken,
     MessageActivityInput,
     TokenCredentials,
 )
@@ -32,7 +31,6 @@
 from .app_oauth import OauthHandlers
 from .app_plugins import PluginProcessor
 from .app_process import ActivityProcessor
-from .app_tokens import AppTokens
 from .auth import TokenValidator
 from .auth.remote_function_jwt_middleware import remote_function_jwt_validation
 from .container import Container
@@ -45,20 +43,20 @@
     get_event_type_from_signature,
     is_registered_event,
 )
-from .graph_token_manager import GraphTokenManager
 from .http_plugin import HttpPlugin
 from .options import AppOptions, InternalAppOptions
 from .plugins import PluginBase, PluginStartEvent, get_metadata
 from .routing import ActivityHandlerMixin, ActivityRouter
 from .routing.activity_context import ActivityContext
+from .token_manager import TokenManager
 
 version = importlib.metadata.version("microsoft-teams-apps")
 
 F = TypeVar("F", bound=Callable[..., Any])
 FCtx = TypeVar("FCtx", bound=Callable[[FunctionContext[Any]], Any])
 load_dotenv(find_dotenv(usecwd=True))
 
-USER_AGENT = f"teams.py[app]/{version}"
+USER_AGENT = f"teams.py[apps]/{version}"
 
 
 class App(ActivityHandlerMixin):
@@ -83,22 +81,26 @@ def __init__(self, **options: Unpack[AppOptions]):
         self._events = EventEmitter[EventType]()
         self._router = ActivityRouter()
 
-        self._tokens = AppTokens()
         self.credentials = self._init_credentials()
 
+        self._token_manager = TokenManager(
+            http_client=self.http_client,
+            credentials=self.credentials,
+            logger=self.log,
+            default_connection_name=self.options.default_connection_name,
+        )
+
         self.container = Container()
         self.container.set_provider("id", providers.Object(self.id))
-        self.container.set_provider("name", providers.Object(self.name))
         self.container.set_provider("credentials", providers.Object(self.credentials))
-        self.container.set_provider("bot_token", providers.Callable(lambda: self.tokens.bot))
-        self.container.set_provider("graph_token", providers.Callable(lambda: self.tokens.graph))
+        self.container.set_provider("bot_token", providers.Factory(lambda: self._get_or_get_bot_token))
         self.container.set_provider("logger", providers.Object(self.log))
         self.container.set_provider("storage", providers.Object(self.storage))
         self.container.set_provider(self.http_client.__class__.__name__, providers.Factory(lambda: self.http_client))
 
         self.api = ApiClient(
             "https://smba.trafficmanager.net/teams",
-            self.http_client.clone(ClientOptions(token=lambda: self.tokens.bot)),
+            self.http_client.clone(ClientOptions(token=self._get_or_get_bot_token)),
         )
 
         plugins: List[PluginBase] = list(self.options.plugins)
@@ -125,20 +127,14 @@ def __init__(self, **options: Unpack[AppOptions]):
         self._running = False
 
         # initialize all event, activity, and plugin processors
-        self.graph_token_manager = GraphTokenManager(
-            api_client=self.api,
-            credentials=self.credentials,
-            logger=self.log,
-        )
         self.activity_processor = ActivityProcessor(
             self._router,
             self.log,
             self.id,
             self.storage,
             self.options.default_connection_name,
             self.http_client,
-            self.tokens,
-            self.graph_token_manager,
+            self._token_manager,
         )
         self.event_manager = EventManager(self._events, self.activity_processor)
         self.activity_processor.event_manager = self.event_manager
@@ -169,11 +165,6 @@ def is_running(self) -> bool:
         """Whether the app is currently running."""
         return self._running
 
-    @property
-    def tokens(self) -> AppTokens:
-        """Current authentication tokens."""
-        return self._tokens
-
     @property
     def logger(self) -> Logger:
         """The logger instance used by the app."""
@@ -191,17 +182,10 @@ def router(self) -> ActivityRouter:
 
     @property
     def id(self) -> Optional[str]:
-        """The app's ID from tokens."""
-        return (
-            self._tokens.bot.app_id if self._tokens.bot else self._tokens.graph.app_id if self._tokens.graph else None
-        )
-
-    @property
-    def name(self) -> Optional[str]:
-        """The app's name from tokens."""
-        return getattr(self._tokens.bot, "app_display_name", None) or getattr(
-            self._tokens.graph, "app_display_name", None
-        )
+        """The app's ID from credentials."""
+        if not self.credentials:
+            return None
+        return self.credentials.client_id
 
     async def start(self, port: Optional[int] = None) -> None:
         """
@@ -220,9 +204,6 @@ async def start(self, port: Optional[int] = None) -> None:
         self._port = port or int(os.getenv("PORT", "3978"))
 
         try:
-            await self._refresh_tokens(force=True)
-            self._running = True
-
             for plugin in self.plugins:
                 # Inject the dependencies
                 self._plugin_processor.inject(plugin)
@@ -234,6 +215,7 @@ async def on_http_ready() -> None:
                 self.log.info("Teams app started successfully")
                 assert self._port is not None, "Port must be set before emitting start event"
                 self._events.emit("start", StartEvent(port=self._port))
+                self._running = True
 
             self.http.on_ready_callback = on_http_ready
 
@@ -280,13 +262,13 @@ async def on_http_stopped() -> None:
     async def send(self, conversation_id: str, activity: str | ActivityParams | AdaptiveCard):
         """Send an activity proactively."""
 
-        if self.id is None or self.name is None:
+        if self.id is None:
             raise ValueError("app not started")
 
         conversation_ref = ConversationReference(
             channel_id="msteams",
             service_url=self.api.service_url,
-            bot=Account(id=self.id, name=self.name, role="bot"),
+            bot=Account(id=self.id, role="bot"),
             conversation=ConversationAccount(id=conversation_id, conversation_type="personal"),
         )
 
@@ -326,65 +308,6 @@ def _init_credentials(self) -> Optional[Credentials]:
 
         return None
 
-    async def _refresh_tokens(self, force: bool = False) -> None:
-        """Refresh bot and graph tokens."""
-        await asyncio.gather(self._refresh_bot_token(force), self._refresh_graph_token(force), return_exceptions=True)
-
-    async def _refresh_bot_token(self, force: bool = False) -> None:
-        """Refresh the bot authentication token."""
-        if not self.credentials:
-            self.log.warning("No credentials provided, skipping bot token refresh")
-            return
-
-        if not force and self._tokens.bot and not self._tokens.bot.is_expired():
-            return
-
-        if self._tokens.bot:
-            self.log.debug("Refreshing bot token")
-
-        try:
-            token_response = await self.api.bots.token.get(self.credentials)
-            self._tokens.bot = JsonWebToken(token_response.access_token)
-            self.log.debug("Bot token refreshed successfully")
-
-        except Exception as error:
-            self.log.error(f"Failed to refresh bot token: {error}")
-
-            self._events.emit("error", ErrorEvent(error, context={"method": "_refresh_bot_token"}))
-            raise
-
-    async def _refresh_graph_token(self, force: bool = False) -> None:
-        """Refresh the Graph API token."""
-        if not self.credentials:
-            self.log.warning("No credentials provided, skipping graph token refresh")
-            return
-
-        if not force and self._tokens.graph and not self._tokens.graph.is_expired():
-            return
-
-        if self._tokens.graph:
-            self.log.debug("Refreshing graph token")
-
-        try:
-            # Use GraphTokenManager for tenant-aware token management
-            tenant_id = self.credentials.tenant_id if self.credentials else None
-            token = await self.graph_token_manager.get_token(tenant_id)
-
-            if token:
-                self._tokens.graph = token
-                self.log.debug("Graph token refreshed successfully")
-
-                # Emit token acquired event
-                self._events.emit("token", {"type": "graph", "token": self._tokens.graph})
-            else:
-                self.log.debug("Failed to get graph token from GraphTokenManager")
-
-        except Exception as error:
-            self.log.error(f"Failed to refresh graph token: {error}")
-
-            self._events.emit("error", ErrorEvent(error, context={"method": "_refresh_graph_token"}))
-            raise
-
     @overload
     def event(self, func_or_event_type: F) -> F:
         """Register event handler with auto-detected type from function signature."""
@@ -521,7 +444,6 @@ async def endpoint(req: Request):
                 async def call_next(r: Request) -> Any:
                     ctx = FunctionContext(
                         id=self.id,
-                        name=self.name,
                         api=self.api,
                         http=self.http,
                         log=self.log,
@@ -541,3 +463,6 @@ async def call_next(r: Request) -> Any:
 
         # Named decoration: @app.func("name")
         return decorator
+
+    async def _get_or_get_bot_token(self):
+        return await self._token_manager.get_bot_token()