Skip to content

Commit 8b6a170

Browse files
updated code to fix int tests
1 parent bd8786c commit 8b6a170

6 files changed

Lines changed: 13 additions & 15 deletions

File tree

.github/workflows/python-integration-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
100100
AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
101101
AZURE_OPENAI_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
102-
AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__EMBEDDINGDEPLOYMENTNAME }}
102+
AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME }}
103103
AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
104104
AZURE_OPENAI_API_VERSION: ${{ vars.AZUREOPENAI__APIVERSION || '2024-12-01-preview' }}
105105
defaults:
@@ -251,8 +251,8 @@ jobs:
251251
--retries 2 --retry-delay 5
252252
253253
# Azure AI integration tests
254-
python-tests-azure-ai:
255-
name: Python Integration Tests - Azure AI
254+
python-tests-foundry:
255+
name: Python Integration Tests - Foundry
256256
runs-on: ubuntu-latest
257257
environment: integration
258258
timeout-minutes: 60

.github/workflows/python-merge-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
AZURE_OPENAI_CHAT_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__CHATDEPLOYMENTNAME }}
199199
AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
200200
AZURE_OPENAI_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__RESPONSESDEPLOYMENTNAME }}
201-
AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: ${{ vars.AZUREOPENAI__EMBEDDINGDEPLOYMENTNAME }}
201+
AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME: ${{ vars.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME }}
202202
AZURE_OPENAI_ENDPOINT: ${{ vars.AZUREOPENAI__ENDPOINT }}
203203
AZURE_OPENAI_API_VERSION: ${{ vars.AZUREOPENAI__APIVERSION || '2024-12-01-preview' }}
204204
defaults:
@@ -389,8 +389,8 @@ jobs:
389389
fail-on-empty: false
390390
title: Functions integration test results
391391

392-
python-tests-azure-ai:
393-
name: Python Tests - Azure AI
392+
python-tests-foundry:
393+
name: Python Integration Tests - Foundry
394394
needs: paths-filter
395395
if: >
396396
github.event_name != 'pull_request' &&

python/packages/openai/agent_framework_openai/_chat_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@ def __init__(
431431
env_file_encoding=env_file_encoding,
432432
openai_model_fields=("responses_model", "model"),
433433
azure_deployment_fields=("responses_deployment_name", "deployment_name"),
434+
responses_mode=True,
434435
)
435436

436437
self.client = client

python/packages/openai/agent_framework_openai/_chat_completion_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484

8585
logger = logging.getLogger("agent_framework.openai")
8686

87-
DEFAULT_AZURE_OPENAI_CHAT_COMPLETION_API_VERSION = "2024-10-21"
87+
DEFAULT_AZURE_OPENAI_CHAT_COMPLETION_API_VERSION = "2024-12-01-preview"
8888

8989
ResponseModelBoundT = TypeVar("ResponseModelBoundT", bound=BaseModel)
9090
ResponseModelT = TypeVar("ResponseModelT", bound=BaseModel | None, default=None)

python/packages/openai/agent_framework_openai/_shared.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def load_openai_service_settings(
194194
env_file_encoding: str | None,
195195
openai_model_fields: Sequence[OpenAIModelSettingName] = ("model",),
196196
azure_deployment_fields: Sequence[AzureDeploymentSettingName] = ("deployment_name",),
197+
responses_mode: bool = False,
197198
) -> tuple[dict[str, Any], AsyncOpenAI, bool]:
198199
"""Load OpenAI settings, including Azure OpenAI aliases.
199200
@@ -298,7 +299,10 @@ def load_openai_service_settings(
298299
return azure_settings, client, True # type: ignore[return-value]
299300
client_args["default_headers"] = merged_headers
300301
if endpoint := azure_settings.get("endpoint"):
301-
client_args["azure_endpoint"] = endpoint
302+
if responses_mode:
303+
client_args["base_url"] = f"{endpoint.rstrip('/')}/openai/v1/"
304+
else:
305+
client_args["azure_endpoint"] = endpoint
302306
if base_url := azure_settings.get("base_url"):
303307
client_args["base_url"] = base_url
304308
if api_key := azure_settings.get("api_key"):

python/packages/openai/tests/openai/test_openai_chat_client_azure.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
)
3232

3333

34-
def _get_azure_responses_deployment_name() -> str:
35-
return os.getenv("AZURE_OPENAI_RESPONSES_DEPLOYMENT_NAME") or os.environ["AZURE_OPENAI_DEPLOYMENT_NAME"]
36-
37-
3834
class OutputStruct(BaseModel):
3935
"""A structured output for testing purposes."""
4036

@@ -51,10 +47,7 @@ def _create_azure_openai_chat_client(
5147
api_key if api_key is not None else None if credential is not None else os.environ["AZURE_OPENAI_API_KEY"]
5248
)
5349
return OpenAIChatClient(
54-
model=_get_azure_responses_deployment_name(),
5550
api_key=resolved_api_key,
56-
azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
57-
api_version=os.getenv("AZURE_OPENAI_API_VERSION"),
5851
credential=credential,
5952
)
6053

0 commit comments

Comments
 (0)