chore: clean up naming (#126)

njbrake · web-flow · commit 8f86ce67e7f9 · 2025-08-11T13:53:48.000-04:00
diff --git a/src/any_llm/provider.py b/src/any_llm/provider.py
@@ -148,8 +148,11 @@ def get_provider_metadata(cls) -> dict[str, str | bool]:
         }
 
     @abstractmethod
-    def _make_api_call(
-        self, model: str, messages: list[dict[str, Any]], **kwargs: Any
+    def completion(
+        self,
+        model: str,
+        messages: list[dict[str, Any]],
+        **kwargs: Any,
     ) -> ChatCompletion | Iterator[ChatCompletionChunk]:
         """This method is designed to make the API call to the provider.
 
@@ -164,14 +167,6 @@ def _make_api_call(
         msg = "Subclasses must implement this method"
         raise NotImplementedError(msg)
 
-    def completion(
-        self,
-        model: str,
-        messages: list[dict[str, Any]],
-        **kwargs: Any,
-    ) -> ChatCompletion | Iterator[ChatCompletionChunk]:
-        return self._make_api_call(model, messages, **kwargs)
-
     async def acompletion(
         self,
         model: str,
diff --git a/src/any_llm/providers/anthropic/anthropic.py b/src/any_llm/providers/anthropic/anthropic.py
@@ -62,7 +62,7 @@ def _stream_completion(
             for event in anthropic_stream:
                 yield _create_openai_chunk_from_anthropic_chunk(event)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/aws/aws.py b/src/any_llm/providers/aws/aws.py
@@ -52,7 +52,7 @@ def _check_aws_credentials(self) -> None:
         if credentials is None and bedrock_api_key is None:
             raise MissingApiKeyError(provider_name=self.PROVIDER_NAME, env_var_name=self.ENV_API_KEY_NAME)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/azure/azure.py b/src/any_llm/providers/azure/azure.py
@@ -84,7 +84,7 @@ def _stream_completion(
         for chunk in azure_stream:
             yield _create_openai_chunk_from_azure_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/cerebras/cerebras.py b/src/any_llm/providers/cerebras/cerebras.py
@@ -61,7 +61,7 @@ def _stream_completion(
                 msg = f"Unsupported chunk type: {type(chunk)}"
                 raise ValueError(msg)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/cohere/cohere.py b/src/any_llm/providers/cohere/cohere.py
@@ -50,7 +50,7 @@ def _stream_completion(
         for chunk in cohere_stream:
             yield _create_openai_chunk_from_cohere_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/deepseek/deepseek.py b/src/any_llm/providers/deepseek/deepseek.py
@@ -16,7 +16,7 @@ class DeepseekProvider(BaseOpenAIProvider):
 
     SUPPORTS_EMBEDDING = False  # DeepSeek doesn't host an embedding model
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
@@ -29,4 +29,4 @@ def _make_api_call(
                 kwargs["response_format"] = {"type": "json_object"}
                 messages = modified_messages
 
-        return super()._make_api_call(model, messages, **kwargs)
+        return super().completion(model, messages, **kwargs)
diff --git a/src/any_llm/providers/fireworks/fireworks.py b/src/any_llm/providers/fireworks/fireworks.py
@@ -40,7 +40,7 @@ def _stream_completion(
         for chunk in response_generator:
             yield _create_openai_chunk_from_fireworks_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/google/google.py b/src/any_llm/providers/google/google.py
@@ -82,7 +82,7 @@ def embedding(
 
         return _create_openai_embedding_response_from_google(model, result)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/groq/groq.py b/src/any_llm/providers/groq/groq.py
@@ -59,7 +59,7 @@ def _stream_completion(
         for chunk in stream:
             yield _create_openai_chunk_from_groq_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/huggingface/huggingface.py b/src/any_llm/providers/huggingface/huggingface.py
@@ -51,7 +51,7 @@ def _stream_completion(
         for chunk in response:
             yield _create_openai_chunk_from_huggingface_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/mistral/mistral.py b/src/any_llm/providers/mistral/mistral.py
@@ -50,7 +50,7 @@ def _stream_completion(
 
             yield _create_openai_chunk_from_mistral_chunk(event)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/ollama/ollama.py b/src/any_llm/providers/ollama/ollama.py
@@ -72,7 +72,7 @@ def _stream_completion(
         for chunk in response:
             yield _create_openai_chunk_from_ollama_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/openai/base.py b/src/any_llm/providers/openai/base.py
@@ -107,7 +107,7 @@ def _convert_chunk(chunk: OpenAIChatCompletionChunk) -> ChatCompletionChunk:
 
         return (_convert_chunk(chunk) for chunk in response)
 
-    def _make_api_call(
+    def completion(
         self, model: str, messages: list[dict[str, Any]], **kwargs: Any
     ) -> ChatCompletion | Iterator[ChatCompletionChunk]:
         """Make the API call to OpenAI-compatible service."""
diff --git a/src/any_llm/providers/together/together.py b/src/any_llm/providers/together/together.py
@@ -52,7 +52,7 @@ def _stream_completion(
         for chunk in response:
             yield _create_openai_chunk_from_together_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/src/any_llm/providers/watsonx/watsonx.py b/src/any_llm/providers/watsonx/watsonx.py
@@ -47,7 +47,7 @@ def _stream_completion(
         for chunk in response_stream:
             yield _convert_streaming_chunk(chunk)
 
-    def _make_api_call(
+    def completion(
         self,
         model: str,
         messages: list[dict[str, Any]],
diff --git a/tests/unit/providers/test_anthropic_provider.py b/tests/unit/providers/test_anthropic_provider.py
@@ -27,7 +27,7 @@ def test_anthropic_client_created_with_api_key_and_api_base() -> None:
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key, api_base=custom_endpoint))
-        provider._make_api_call("model-id", [{"role": "user", "content": "Hello"}])
+        provider.completion("model-id", [{"role": "user", "content": "Hello"}])
 
         mock_anthropic.assert_called_once_with(api_key=api_key, base_url=custom_endpoint)
 
@@ -38,13 +38,13 @@ def test_anthropic_client_created_without_api_base() -> None:
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call("model-id", [{"role": "user", "content": "Hello"}])
+        provider.completion("model-id", [{"role": "user", "content": "Hello"}])
 
         mock_anthropic.assert_called_once_with(api_key=api_key, base_url=None)
 
 
-def test_make_api_call_with_system_message() -> None:
-    """Test that _make_api_call correctly processes a system message."""
+def testcompletion_with_system_message() -> None:
+    """Test that completion correctly processes a system message."""
     api_key = "test-api-key"
     model = "model-id"
     messages = [
@@ -54,7 +54,7 @@ def test_make_api_call_with_system_message() -> None:
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call(model, messages)
+        provider.completion(model, messages)
 
         mock_anthropic.return_value.messages.create.assert_called_once_with(
             model=model,
@@ -64,8 +64,8 @@ def test_make_api_call_with_system_message() -> None:
         )
 
 
-def test_make_api_call_with_multiple_system_messages() -> None:
-    """Test that _make_api_call concatenates multiple system messages."""
+def testcompletion_with_multiple_system_messages() -> None:
+    """Test that completion concatenates multiple system messages."""
     api_key = "test-api-key"
     model = "model-id"
     messages = [
@@ -76,7 +76,7 @@ def test_make_api_call_with_multiple_system_messages() -> None:
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call(model, messages)
+        provider.completion(model, messages)
 
         mock_anthropic.return_value.messages.create.assert_called_once_with(
             model=model,
@@ -86,16 +86,16 @@ def test_make_api_call_with_multiple_system_messages() -> None:
         )
 
 
-def test_make_api_call_with_kwargs() -> None:
-    """Test that _make_api_call passes kwargs to the Anthropic client."""
+def testcompletion_with_kwargs() -> None:
+    """Test that completion passes kwargs to the Anthropic client."""
     api_key = "test-api-key"
     model = "model-id"
     messages = [{"role": "user", "content": "Hello"}]
     kwargs = {"temperature": 0.5, "max_tokens": 100}
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call(model, messages, **kwargs)
+        provider.completion(model, messages, **kwargs)
 
         mock_anthropic.return_value.messages.create.assert_called_once_with(
             model=model,
@@ -104,16 +104,16 @@ def test_make_api_call_with_kwargs() -> None:
         )
 
 
-def test_make_api_call_with_tool_choice_required() -> None:
-    """Test that _make_api_call correctly processes tool_choice='required'."""
+def testcompletion_with_tool_choice_required() -> None:
+    """Test that completion correctly processes tool_choice='required'."""
     api_key = "test-api-key"
     model = "model-id"
     messages = [{"role": "user", "content": "Hello"}]
     kwargs = {"tool_choice": "required"}
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call(model, messages, **kwargs)
+        provider.completion(model, messages, **kwargs)
 
         expected_kwargs = {"tool_choice": {"type": "any", "disable_parallel_tool_use": False}}
 
@@ -126,16 +126,16 @@ def test_make_api_call_with_tool_choice_required() -> None:
 
 
 @pytest.mark.parametrize("parallel_tool_calls", [True, False])
-def test_make_api_call_with_tool_choice_and_parallel_tool_calls(parallel_tool_calls: bool) -> None:
-    """Test that _make_api_call correctly processes tool_choice and parallel_tool_calls."""
+def testcompletion_with_tool_choice_and_parallel_tool_calls(parallel_tool_calls: bool) -> None:
+    """Test that completion correctly processes tool_choice and parallel_tool_calls."""
     api_key = "test-api-key"
     model = "model-id"
     messages = [{"role": "user", "content": "Hello"}]
     kwargs = {"tool_choice": "auto", "parallel_tool_calls": parallel_tool_calls}
 
     with mock_anthropic_provider() as mock_anthropic:
         provider = AnthropicProvider(ApiConfig(api_key=api_key))
-        provider._make_api_call(model, messages, **kwargs)
+        provider.completion(model, messages, **kwargs)
 
         expected_kwargs = {"tool_choice": {"type": "auto", "disable_parallel_tool_use": not parallel_tool_calls}}
 
diff --git a/tests/unit/providers/test_aws_provider.py b/tests/unit/providers/test_aws_provider.py
@@ -30,7 +30,7 @@ def test_boto3_client_created_with_api_base() -> None:
 
     with mock_aws_provider(region) as mock_boto3_client:
         provider = AwsProvider(ApiConfig(api_base=custom_endpoint, api_key="test_key"))
-        provider._make_api_call("model-id", [{"role": "user", "content": "Hello"}])
+        provider.completion("model-id", [{"role": "user", "content": "Hello"}])
 
         mock_boto3_client.assert_called_once_with("bedrock-runtime", endpoint_url=custom_endpoint, region_name=region)
 
@@ -41,7 +41,7 @@ def test_boto3_client_created_without_api_base() -> None:
 
     with mock_aws_provider(region) as mock_boto3_client:
         provider = AwsProvider(ApiConfig(api_key="test_key"))
-        provider._make_api_call("model-id", [{"role": "user", "content": "Hello"}])
+        provider.completion("model-id", [{"role": "user", "content": "Hello"}])
 
         mock_boto3_client.assert_called_once_with("bedrock-runtime", endpoint_url=None, region_name=region)
 
diff --git a/tests/unit/providers/test_azure_provider.py b/tests/unit/providers/test_azure_provider.py
@@ -45,7 +45,7 @@ def test_azure_with_api_key_and_api_base() -> None:
     messages = [{"role": "user", "content": "Hello"}]
     with mock_azure_provider() as (mock_client, mock_convert_response, mock_chat_client):
         provider = AzureProvider(ApiConfig(api_key=api_key, api_base=custom_endpoint))
-        provider._make_api_call("model-id", messages)
+        provider.completion("model-id", messages)
 
         # Verify ChatCompletionsClient was created with correct parameters
         mock_chat_client.assert_called_once()
@@ -69,7 +69,7 @@ def test_azure_with_tools() -> None:
     tool_choice = "auto"
     with mock_azure_provider() as (mock_client, mock_convert_response, mock_chat_client):
         provider = AzureProvider(ApiConfig(api_key=api_key, api_base=custom_endpoint))
-        provider._make_api_call("model-id", messages, tools=tools, tool_choice=tool_choice)
+        provider.completion("model-id", messages, tools=tools, tool_choice=tool_choice)
 
         # Verify the complete method was called with correct parameters including tools
         mock_client.complete.assert_called_once_with(
@@ -99,7 +99,7 @@ def test_azure_streaming() -> None:
         mock_openai_chunk2 = MagicMock()
         mock_stream_completion.return_value = [mock_openai_chunk1, mock_openai_chunk2]
 
-        result = provider._make_api_call("model-id", messages, stream=True)
+        result = provider.completion("model-id", messages, stream=True)
 
         # Verify _stream_completion was called
         assert mock_stream_completion.call_count == 1
diff --git a/tests/unit/providers/test_cohere_provider.py b/tests/unit/providers/test_cohere_provider.py
@@ -17,7 +17,7 @@ def test_response_format_raises_for_non_streaming() -> None:
     provider = _mk_provider()
 
     with pytest.raises(UnsupportedParameterError):
-        provider._make_api_call(
+        provider.completion(
             model="model-id",
             messages=[{"role": "user", "content": "Hello"}],
             response_format={"type": "json_object"},
@@ -28,7 +28,7 @@ def test_stream_and_response_format_combination_raises() -> None:
     provider = _mk_provider()
 
     with pytest.raises(UnsupportedParameterError):
-        provider._make_api_call(
+        provider.completion(
             model="model-id",
             messages=[{"role": "user", "content": "Hello"}],
             stream=True,
@@ -40,7 +40,7 @@ def test_parallel_tool_calls_raises() -> None:
     provider = _mk_provider()
 
     with pytest.raises(UnsupportedParameterError):
-        provider._make_api_call(
+        provider.completion(
             model="model-id",
             messages=[{"role": "user", "content": "Hello"}],
             parallel_tool_calls=False,
diff --git a/tests/unit/providers/test_google_provider.py b/tests/unit/providers/test_google_provider.py
diff --git a/tests/unit/providers/test_huggingface_provider.py b/tests/unit/providers/test_huggingface_provider.py
diff --git a/tests/unit/providers/test_watsonx_provider.py b/tests/unit/providers/test_watsonx_provider.py
