Move all ModelClient classes into client module.

api/chat/_stream.py

@@ -18,7 +18,7 @@
     from ollama import ChatResponse
     from openai.types.chat import ChatCompletionChunk
     from openai import AsyncStream
-    from api.openai_client import OpenAIClient
+    from api.clients import OpenAIClient
 
 MODEL_CFG = dict[str, str | int | float]
 
@@ -106,7 +106,7 @@ def __init__(self, *, model: str, model_config: MODEL_CFG):
         if not OPENROUTER_API_KEY:
             logger.warning("OPENROUTER_API_KEY not configured, but continuing with request")
             # We'll let the OpenRouterClient handle this and return a friendly error message
-        from api.openrouter_client import OpenRouterClient
+        from api.clients import OpenRouterClient
 
         self.client = OpenRouterClient()
         self.model_kwargs = {
@@ -185,7 +185,7 @@ def __init__(self, *, model: str, model_config: MODEL_CFG):
         super().__init__(model=model, model_config=model_config)
 
     def _build_client(self):
-        from api.openai_client import OpenAIClient
+        from api.clients import OpenAIClient
         return OpenAIClient()
 
 
@@ -198,7 +198,7 @@ class AzureChatStreamer(_OpenAICompatStreamer):
     )
 
     def _build_client(self):
-        from api.azureai_client import AzureAIClient
+        from api.clients import AzureAIClient
         return AzureAIClient()
 
 
@@ -217,7 +217,7 @@ def __init__(self, *, model: str, model_config: MODEL_CFG):
         super().__init__(model=model, model_config=model_config)
 
     def _build_client(self):
-        from api.litellm_client import LiteLLMClient
+        from api.clients import LiteLLMClient
         return LiteLLMClient()
 
 
@@ -232,7 +232,7 @@ def __init__(self, *, model: str, model_config: MODEL_CFG):
         if not AWS_ACCESS_KEY_ID or not AWS_SECRET_ACCESS_KEY:
             logger.warning("AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY not configured, but continuing with request")
             # We'll let the BedrockClient handle this and return an error message
-        from api.bedrock_client import BedrockClient
+        from api.clients import BedrockClient
 
         self.client = BedrockClient()
         self.model_kwargs = {"model": model}
@@ -267,7 +267,7 @@ class DashScopeChatStreamer(ChatStreamer):
     )
 
     def __init__(self, *, model: str, model_config: MODEL_CFG):
-        from api.dashscope_client import DashscopeClient
+        from api.clients import DashscopeClient
 
         self.client = DashscopeClient()
         self.model_kwargs = {

api/clients/__init__.py

@@ -0,0 +1,27 @@
+"""Unify Adalflow compatible clients to here.
+Any patches and additional clients could be applied or imported in this module.
+"""
+
+from .google_embedder import GoogleEmbedderClient
+from .bedrock import BedrockClient
+from .dashscope import DashscopeClient
+from .ollama import OllamaClient
+from .litellm import LiteLLMClient
+from .openrouter import OpenRouterClient
+from adalflow.components.model_client import (
+    AzureAIClient,
+    OpenAIClient,
+    GoogleGenAIClient,
+)
+
+__all__ = [
+    "AzureAIClient",
+    "BedrockClient",
+    "DashscopeClient",
+    "GoogleEmbedderClient",
+    "GoogleGenAIClient",
+    "LiteLLMClient",
+    "OllamaClient",
+    "OpenAIClient",
+    "OpenRouterClient",
+]

api/litellm_client.py → api/clients/litellm.py

@@ -2,7 +2,7 @@
 from typing import Optional, Callable
 from openai import AsyncOpenAI, OpenAI
 
-from api.openai_client import OpenAIClient
+from adalflow.components.model_client.openai_client import OpenAIClient
 
 
 class LiteLLMClient(OpenAIClient):

api/config.py

@@ -7,15 +7,17 @@
 
 logger = logging.getLogger(__name__)
 
-from api.openai_client import OpenAIClient
-from api.litellm_client import LiteLLMClient
-from api.openrouter_client import OpenRouterClient
-from api.bedrock_client import BedrockClient
-from api.google_embedder_client import GoogleEmbedderClient
-from api.azureai_client import AzureAIClient
-from api.dashscope_client import DashscopeClient
-from api.ollama_client import OllamaClient
-from adalflow import GoogleGenAIClient
+from api.clients import (
+    LiteLLMClient,
+    OpenRouterClient,
+    BedrockClient,
+    GoogleGenAIClient,
+    GoogleEmbedderClient,
+    AzureAIClient,
+    DashscopeClient,
+    OpenAIClient,
+    OllamaClient,
+)
 
 # Get API keys from environment variables
 OPENAI_API_KEY = os.environ.get('OPENAI_API_KEY')