Merge pull request #14 from John-Lin/refactor/remove-azure-client

Refactor/remove azure client

Author: John-Lin

README.md

@@ -43,13 +43,12 @@ export OPENAI_API_KEY=""
 export OPENAI_MODEL="gpt-5.4"
 ```
 
-If you are using Azure OpenAI, set these instead:
+If you are using Azure OpenAI (v1 API), set these instead:
 
 ```
-export AZURE_OPENAI_API_KEY=""
-export AZURE_OPENAI_ENDPOINT="https://<myopenai>.azure.com/"
+export OPENAI_API_KEY=""
+export OPENAI_BASE_URL="https://<resource-name>.openai.azure.com/openai/v1/"
 export OPENAI_MODEL="gpt-5.4"
-export OPENAI_API_VERSION="2025-03-01-preview"
 ```
 
 ## MCP Server Configuration (Optional)

bot/agents.py

@@ -12,7 +12,7 @@
 from agents.mcp import MCPServerStreamableHttp
 from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
 from agents.models.openai_responses import OpenAIResponsesModel
-from openai import AsyncAzureOpenAI
+from agents.tracing import set_tracing_disabled
 from openai import AsyncOpenAI
 
 DEFAULT_INSTRUCTIONS = (
@@ -25,26 +25,22 @@
 MAX_TURNS = 10
 MCP_SESSION_TIMEOUT_SECONDS = 30.0
 
+set_tracing_disabled(True)
+
 
 def _get_model() -> OpenAIResponsesModel | OpenAIChatCompletionsModel:
     """Create an OpenAI model from environment variables.
 
+    Uses the standard OpenAI client, which works with both OpenAI and
+    Azure OpenAI v1 API (via OPENAI_BASE_URL + OPENAI_API_KEY).
+
     OPENAI_API_TYPE controls which API the model uses:
       - "responses" (default): OpenAI Responses API — recommended by the SDK
-      - "chat_completions": Chat Completions API — use for Azure OpenAI or compatible providers
+      - "chat_completions": Chat Completions API
     """
     model_name = os.getenv("OPENAI_MODEL", "gpt-5.4")
     api_type = os.getenv("OPENAI_API_TYPE", "responses")
-
-    client: AsyncOpenAI
-    if os.getenv("AZURE_OPENAI_API_KEY") and os.getenv("AZURE_OPENAI_ENDPOINT"):
-        client = AsyncAzureOpenAI(
-            api_key=os.environ["AZURE_OPENAI_API_KEY"],
-            azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
-            api_version=os.getenv("OPENAI_API_VERSION", "2025-04-01-preview"),
-        )
-    else:
-        client = AsyncOpenAI()
+    client = AsyncOpenAI()
 
     if api_type == "chat_completions":
         return OpenAIChatCompletionsModel(model=model_name, openai_client=client)

tests/test_agents.py

@@ -22,59 +22,22 @@ def _mock_model(monkeypatch):
 
 
 class TestGetModel:
-    def test_uses_azure_when_both_azure_env_vars_present(self, monkeypatch):
-        monkeypatch.setenv("AZURE_OPENAI_API_KEY", "azure-key")
-        monkeypatch.setenv("AZURE_OPENAI_ENDPOINT", "https://my.azure.com")
-        monkeypatch.delenv("OPENAI_API_VERSION", raising=False)
-
-        with patch("bot.agents.AsyncAzureOpenAI") as mock_azure, patch("bot.agents.AsyncOpenAI") as mock_openai:
-            mock_azure.return_value = MagicMock()
-            _get_model()
-            mock_azure.assert_called_once()
-            mock_openai.assert_not_called()
-
-    def test_uses_standard_openai_when_only_api_key_set(self, monkeypatch):
-        monkeypatch.setenv("AZURE_OPENAI_API_KEY", "azure-key")
-        monkeypatch.delenv("AZURE_OPENAI_ENDPOINT", raising=False)
-
-        with patch("bot.agents.AsyncAzureOpenAI") as mock_azure, patch("bot.agents.AsyncOpenAI") as mock_openai:
-            mock_openai.return_value = MagicMock()
-            _get_model()
-            mock_openai.assert_called_once()
-            mock_azure.assert_not_called()
-
-    def test_uses_standard_openai_when_no_azure_vars(self, monkeypatch):
-        monkeypatch.delenv("AZURE_OPENAI_API_KEY", raising=False)
-        monkeypatch.delenv("AZURE_OPENAI_ENDPOINT", raising=False)
-
-        with patch("bot.agents.AsyncAzureOpenAI") as mock_azure, patch("bot.agents.AsyncOpenAI") as mock_openai:
-            mock_openai.return_value = MagicMock()
-            _get_model()
-            mock_openai.assert_called_once()
-            mock_azure.assert_not_called()
-
     def test_returns_responses_model_by_default(self, monkeypatch):
         monkeypatch.delenv("OPENAI_API_TYPE", raising=False)
-        monkeypatch.delenv("AZURE_OPENAI_API_KEY", raising=False)
-        monkeypatch.delenv("AZURE_OPENAI_ENDPOINT", raising=False)
 
         with patch("bot.agents.AsyncOpenAI", return_value=MagicMock()):
             model = _get_model()
         assert isinstance(model, OpenAIResponsesModel)
 
     def test_returns_responses_model_when_api_type_is_responses(self, monkeypatch):
         monkeypatch.setenv("OPENAI_API_TYPE", "responses")
-        monkeypatch.delenv("AZURE_OPENAI_API_KEY", raising=False)
-        monkeypatch.delenv("AZURE_OPENAI_ENDPOINT", raising=False)
 
         with patch("bot.agents.AsyncOpenAI", return_value=MagicMock()):
             model = _get_model()
         assert isinstance(model, OpenAIResponsesModel)
 
     def test_returns_chat_completions_model_when_api_type_is_chat_completions(self, monkeypatch):
         monkeypatch.setenv("OPENAI_API_TYPE", "chat_completions")
-        monkeypatch.delenv("AZURE_OPENAI_API_KEY", raising=False)
-        monkeypatch.delenv("AZURE_OPENAI_ENDPOINT", raising=False)
 
         with patch("bot.agents.AsyncOpenAI", return_value=MagicMock()):
             model = _get_model()