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

Refactor/remove azure client

Author: John-Lin

README.md

@@ -9,7 +9,7 @@ See also: [agentic-telegram-bot](https://github.com/John-Lin/agentic-telegram-bo
 - Channel @mention and DM support
 - Thread-aware conversations (follow-ups stay in the same thread)
 - Connects to any MCP server via `servers_config.json`
-- Supports OpenAI, Azure OpenAI, and OpenAI-compatible proxy endpoints
+- Supports OpenAI and OpenAI-compatible endpoints (including Azure OpenAI v1 API)
 - Per-conversation history with automatic truncation
 
 ## Install Dependencies
@@ -43,20 +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) or another OpenAI-compatible endpoint:
 
 ```
-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"
-```
-
-If you are using an OpenAI-compatible proxy:
-
-```
-export OPENAI_PROXY_BASE_URL="https://my-proxy.example.com/v1"
-export OPENAI_PROXY_API_KEY=""
 ```
 
 Optional HTTP proxy for outbound requests:

bot/agent.py

@@ -11,7 +11,7 @@
 from agents.mcp import MCPServerStdio
 from agents.mcp import MCPServerStreamableHttp
 from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
-from openai import AsyncAzureOpenAI
+from agents.models.openai_responses import OpenAIResponsesModel
 from openai import AsyncOpenAI
 
 DEFAULT_INSTRUCTIONS = (
@@ -28,32 +28,23 @@
 MCP_SESSION_TIMEOUT_SECONDS = 30.0
 
 
-def _get_model() -> OpenAIChatCompletionsModel:
+def _get_model() -> OpenAIResponsesModel | OpenAIChatCompletionsModel:
     """Create an OpenAI model from environment variables.
 
-    Client selection priority:
-    1. Azure OpenAI — when both AZURE_OPENAI_API_KEY and AZURE_OPENAI_ENDPOINT are set.
-    2. OpenAI-compatible proxy — when OPENAI_PROXY_BASE_URL is set.
-    3. Default OpenAI — falls back to standard AsyncOpenAI (reads OPENAI_API_KEY).
+    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
     """
     model_name = os.getenv("OPENAI_MODEL", "gpt-5.4")
+    api_type = os.getenv("OPENAI_API_TYPE", "responses")
+    client = AsyncOpenAI()
 
-    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"),
-        )
-    elif os.getenv("OPENAI_PROXY_BASE_URL"):
-        client = AsyncOpenAI(
-            base_url=os.environ["OPENAI_PROXY_BASE_URL"],
-            api_key=os.getenv("OPENAI_PROXY_API_KEY") or os.getenv("OPENAI_API_KEY", ""),
-        )
-    else:
-        client = AsyncOpenAI()
-
-    return OpenAIChatCompletionsModel(model=model_name, openai_client=client)
+    if api_type == "chat_completions":
+        return OpenAIChatCompletionsModel(model=model_name, openai_client=client)
+    return OpenAIResponsesModel(model=model_name, openai_client=client)
 
 
 class OpenAIAgent:

tests/test_agent.py

@@ -5,7 +5,8 @@
 
 import pytest
 from agents.models.interface import Model
-from openai import AsyncAzureOpenAI
+from agents.models.openai_chatcompletions import OpenAIChatCompletionsModel
+from agents.models.openai_responses import OpenAIResponsesModel
 
 from bot.agent import DEFAULT_INSTRUCTIONS
 from bot.agent import MAX_TURNS
@@ -162,56 +163,30 @@ def _call_get_model(self, env_vars: dict):
         with patch.dict("os.environ", env_vars, clear=True):
             return agent_module._get_model()
 
-    def test_azure_path_when_both_key_and_endpoint_set(self):
-        env = {
-            "AZURE_OPENAI_API_KEY": "test-azure-key",
-            "AZURE_OPENAI_ENDPOINT": "https://my-resource.openai.azure.com",
-        }
-        model = self._call_get_model(env)
-        assert isinstance(model._client, AsyncAzureOpenAI)
-
-    def test_azure_key_without_endpoint_does_not_use_azure(self):
-        """When AZURE_OPENAI_API_KEY is set but AZURE_OPENAI_ENDPOINT is missing,
-        should NOT enter the Azure path (and should not crash)."""
-        env = {
-            "AZURE_OPENAI_API_KEY": "test-azure-key",
-            "OPENAI_API_KEY": "fallback-key",
-        }
+    def test_custom_model_name(self):
+        env = {"OPENAI_MODEL": "gpt-5.2", "OPENAI_API_KEY": "test-key"}
         model = self._call_get_model(env)
-        assert not isinstance(model._client, AsyncAzureOpenAI)
+        assert model.model == "gpt-5.2"
 
-    def test_proxy_path_uses_base_url(self):
-        env = {
-            "OPENAI_PROXY_BASE_URL": "https://my-proxy.example.com/v1",
-            "OPENAI_PROXY_API_KEY": "proxy-key",
-        }
-        model = self._call_get_model(env)
-        assert not isinstance(model._client, AsyncAzureOpenAI)
-        assert str(model._client.base_url).rstrip("/") == "https://my-proxy.example.com/v1"
-
-    def test_proxy_path_without_api_key_uses_openai_key(self):
-        """Proxy base URL set but no proxy API key — should fall back to OPENAI_API_KEY."""
-        env = {
-            "OPENAI_PROXY_BASE_URL": "https://my-proxy.example.com/v1",
-            "OPENAI_API_KEY": "fallback-key",
-        }
+    def test_default_model_name(self):
+        env = {"OPENAI_API_KEY": "test-key"}
         model = self._call_get_model(env)
-        assert str(model._client.base_url).rstrip("/") == "https://my-proxy.example.com/v1"
+        assert model.model == "gpt-5.4"
 
-    def test_default_path_uses_vanilla_openai(self):
+    def test_returns_responses_model_by_default(self):
         env = {"OPENAI_API_KEY": "test-key"}
         model = self._call_get_model(env)
-        assert not isinstance(model._client, AsyncAzureOpenAI)
+        assert isinstance(model, OpenAIResponsesModel)
 
-    def test_custom_model_name(self):
-        env = {"OPENAI_MODEL": "gpt-5.2", "OPENAI_API_KEY": "test-key"}
+    def test_returns_chat_completions_model_when_api_type_set(self):
+        env = {"OPENAI_API_KEY": "test-key", "OPENAI_API_TYPE": "chat_completions"}
         model = self._call_get_model(env)
-        assert model.model == "gpt-5.2"
+        assert isinstance(model, OpenAIChatCompletionsModel)
 
-    def test_default_model_name(self):
-        env = {"OPENAI_API_KEY": "test-key"}
+    def test_returns_chat_completions_when_api_type_set(self):
+        env = {"OPENAI_API_KEY": "test-key", "OPENAI_API_TYPE": "chat_completions"}
         model = self._call_get_model(env)
-        assert model.model == "gpt-5.4"
+        assert isinstance(model, OpenAIChatCompletionsModel)
 
 
 class TestFromDict: