Skip to content

Commit 9bb827e

Browse files
committed
Changes from Francia plus fix
1 parent 0f310be commit 9bb827e

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

src/backend/v3/common/services/foundry_service.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from typing import Any, Dict, List
21
import logging
32
import re
4-
from azure.ai.projects.aio import AIProjectClient
3+
from typing import Any, Dict, List
4+
55
#from git import List
66
import aiohttp
7+
from azure.ai.projects.aio import AIProjectClient
78
from common.config.app_config import config
89

910

@@ -54,7 +55,7 @@ async def list_model_deployments(self) -> List[Dict[str, Any]]:
5455

5556
try:
5657
# Get Azure Management API token (not Cognitive Services token)
57-
token = config.get_access_token()
58+
token = await config.get_access_token()
5859

5960
# Extract Azure OpenAI resource name from endpoint URL
6061
openai_endpoint = config.AZURE_OPENAI_ENDPOINT

src/backend/v3/config/settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self):
3434
# Create credential
3535
self.credential = config.get_azure_credentials()
3636

37-
def create_chat_completion_service(self, use_reasoning_model: bool=False):
37+
async def create_chat_completion_service(self, use_reasoning_model: bool=False):
3838
"""Create Azure Chat Completion service."""
3939
model_name = (
4040
self.reasoning_model if use_reasoning_model else self.standard_model
@@ -43,7 +43,7 @@ def create_chat_completion_service(self, use_reasoning_model: bool=False):
4343
return AzureChatCompletion(
4444
deployment_name=model_name,
4545
endpoint=self.endpoint,
46-
ad_token_provider=config.get_access_token(),
46+
ad_token_provider= await config.get_access_token(),
4747
)
4848

4949
def create_execution_settings(self):

src/backend/v3/magentic_agents/reasoning_agent.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
import os
33

44
from azure.identity import DefaultAzureCredential as SyncDefaultAzureCredential
5+
from common.config.app_config import config
56
from semantic_kernel import Kernel
67
from semantic_kernel.agents import ChatCompletionAgent # pylint: disable=E0611
78
from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion
89
from semantic_kernel.connectors.azure_ai_search import AzureAISearchCollection
910
from v3.magentic_agents.common.lifecycle import MCPEnabledBase
1011
from v3.magentic_agents.models.agent_models import MCPConfig, SearchConfig
1112
from v3.magentic_agents.reasoning_search import ReasoningSearch
12-
from common.config.app_config import config
13+
1314

1415
class ReasoningAgentTemplate(MCPEnabledBase):
1516
"""
@@ -41,7 +42,7 @@ async def _after_open(self) -> None:
4142
chat = AzureChatCompletion(
4243
deployment_name=self._model_deployment_name,
4344
endpoint=self._openai_endpoint,
44-
ad_token_provider=config.get_access_token()
45+
ad_token_provider= await config.get_access_token()
4546
)
4647
self.kernel.add_service(chat)
4748

src/backend/v3/orchestration/orchestration_manager.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from typing import List, Optional
99

1010
from azure.identity import DefaultAzureCredential as SyncDefaultAzureCredential
11+
from common.config.app_config import config
1112
from common.models.messages_kernel import TeamConfiguration
1213
from semantic_kernel.agents.orchestration.magentic import MagenticOrchestration
1314
from semantic_kernel.agents.runtime import InProcessRuntime
@@ -20,7 +21,6 @@
2021
streaming_agent_response_callback)
2122
from v3.config.settings import (config, connection_config, current_user_id,
2223
orchestration_config)
23-
from common.config.app_config import config
2424
from v3.magentic_agents.magentic_agent_factory import MagenticAgentFactory
2525
from v3.orchestration.human_approval_manager import \
2626
HumanApprovalMagenticManager
@@ -44,15 +44,20 @@ async def init_orchestration(cls, agents: List, user_id: str = None)-> MagenticO
4444
temperature=0.1
4545
)
4646

47+
credential = SyncDefaultAzureCredential()
4748

49+
def get_token():
50+
token = credential.get_token("https://cognitiveservices.azure.com/.default")
51+
return token.token
52+
4853
# 1. Create a Magentic orchestration with Azure OpenAI
4954
magentic_orchestration = MagenticOrchestration(
5055
members=agents,
5156
manager=HumanApprovalMagenticManager(
5257
chat_completion_service=AzureChatCompletion(
5358
deployment_name=config.AZURE_OPENAI_DEPLOYMENT_NAME,
5459
endpoint=config.AZURE_OPENAI_ENDPOINT,
55-
ad_token_provider=config.get_access_token()
60+
ad_token_provider=get_token # Use token provider function
5661
),
5762
execution_settings=execution_settings
5863
),

0 commit comments

Comments
 (0)