Merge branch 'main' into anticomputer/capi-cleanup

Author: anticomputer

src/seclab_taskflow_agent/__about__.py

@@ -1,3 +1,3 @@
 # SPDX-FileCopyrightText: GitHub, Inc.
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.0"
+__version__ = "0.3.0"

src/seclab_taskflow_agent/capi.py

@@ -14,6 +14,7 @@
 import json
 import logging
 import os
+from collections.abc import Mapping
 from dataclasses import dataclass, field
 from types import MappingProxyType
 from typing import Any
@@ -45,13 +46,17 @@ class APIProvider:
 
     name: str
     base_url: str
-    models_catalog: str = "models"
+    models_catalog: str = "/models"
     default_model: str = "gpt-4.1"
-    extra_headers: dict[str, str] = field(default_factory=dict)
+    extra_headers: Mapping[str, str] = field(default_factory=dict)
 
     def __post_init__(self) -> None:
+        # Ensure base_url ends with / so httpx URL.join() preserves the path
+        if self.base_url and not self.base_url.endswith("/"):
+            object.__setattr__(self, "base_url", self.base_url + "/")
         # Freeze mutable headers so singleton providers can't be mutated
-        object.__setattr__(self, "extra_headers", MappingProxyType(self.extra_headers))
+        if isinstance(self.extra_headers, dict):
+            object.__setattr__(self, "extra_headers", MappingProxyType(self.extra_headers))
 
     # -- response parsing -----------------------------------------------------
 
@@ -123,12 +128,13 @@ def check_tool_calls(self, _model: str, model_info: dict) -> bool:
     "models.github.ai": _GitHubModelsProvider(
         name="github-models",
         base_url="https://models.github.ai/inference",
-        models_catalog="catalog/models",
+        models_catalog="/catalog/models",
         default_model="openai/gpt-4.1",
     ),
     "api.openai.com": _OpenAIProvider(
         name="openai",
         base_url="https://api.openai.com/v1",
+        models_catalog="/v1/models",
         default_model="gpt-4.1",
     ),
 }

tests/test_api_endpoint_config.py

@@ -41,9 +41,9 @@ def test_api_endpoint_env_override(self):
 
     def test_provider_base_urls(self):
         """Test that providers resolve to expected base URLs."""
-        assert get_provider("https://models.github.ai/inference").base_url == "https://models.github.ai/inference"
-        assert get_provider("https://api.githubcopilot.com").base_url == "https://api.githubcopilot.com"
-        assert get_provider("https://api.openai.com/v1").base_url == "https://api.openai.com/v1"
+        assert get_provider("https://models.github.ai/inference").base_url == "https://models.github.ai/inference/"
+        assert get_provider("https://api.githubcopilot.com").base_url == "https://api.githubcopilot.com/"
+        assert get_provider("https://api.openai.com/v1").base_url == "https://api.openai.com/v1/"
 
     def test_unsupported_endpoint(self, monkeypatch):
         """Test that unsupported API endpoint falls back gracefully."""

tests/test_capi_extended.py

@@ -104,13 +104,13 @@ class TestGetProvider:
     def test_copilot_provider(self):
         p = get_provider("https://api.githubcopilot.com")
         assert p.name == "copilot"
-        assert p.base_url == "https://api.githubcopilot.com"
+        assert p.base_url == "https://api.githubcopilot.com/"
         assert "Copilot-Integration-Id" in p.extra_headers
 
     def test_github_models_provider(self):
         p = get_provider("https://models.github.ai/inference")
         assert p.name == "github-models"
-        assert p.models_catalog == "catalog/models"
+        assert p.models_catalog == "/catalog/models"
         assert p.default_model == "openai/gpt-4.1"
 
     def test_openai_provider(self):
@@ -121,5 +121,5 @@ def test_openai_provider(self):
     def test_custom_endpoint(self):
         p = get_provider("https://my-custom-llm.example.com/v1")
         assert p.name == "custom"
-        assert p.base_url == "https://my-custom-llm.example.com/v1"
+        assert p.base_url == "https://my-custom-llm.example.com/v1/"
         assert not p.extra_headers