import fixes

Author: root

sdk/agentserver/azure-ai-agentserver-githubcopilot/azure/ai/agentserver/githubcopilot/_copilot_adapter.py

@@ -27,15 +27,8 @@
 from copilot import CopilotClient
 from copilot.generated.session_events import SessionEventType
 
-# These types move between SDK versions/platforms. Try multiple paths.
-try:
-    from copilot import PermissionRequestResult, ProviderConfig
-except ImportError:
-    try:
-        from copilot.types import PermissionRequestResult, ProviderConfig
-    except ImportError:
-        PermissionRequestResult = None
-        ProviderConfig = dict
+# Import types from copilot SDK
+from copilot.session import PermissionRequestResult, ProviderConfig
 
 from azure.ai.agentserver.core.constants import Constants
 from azure.ai.agentserver.core.logger import get_logger
@@ -302,9 +295,7 @@ async def agent_run(
         acl = self._acl
 
         def _perm_result(**kwargs):
-            if PermissionRequestResult is not None:
-                return PermissionRequestResult(**kwargs)
-            return kwargs
+            return PermissionRequestResult(**kwargs)
 
         def _on_permission(req, _ctx):
             kind = getattr(req, "kind", "unknown")
@@ -901,9 +892,7 @@ async def agent_run(self, context: AgentRunContext):
                 acl = self._acl
 
                 def _perm_result_boot(**kwargs):
-                    if PermissionRequestResult is not None:
-                        return PermissionRequestResult(**kwargs)
-                    return kwargs
+                    return PermissionRequestResult(**kwargs)
 
                 def _on_permission_boot(req, _ctx):
                     kind = getattr(req, "kind", "unknown")

sdk/agentserver/azure-ai-agentserver-githubcopilot/azure/ai/agentserver/githubcopilot/_tool_discovery.py

@@ -22,11 +22,7 @@
 
 import yaml
 
-try:
-    from copilot import Tool
-except ImportError:
-    # Copilot SDK renamed/moved Tool in some versions
-    Tool = None  # type: ignore
+from copilot.tools import Tool
 
 logger = logging.getLogger(__name__)