fix: cover Unicode configuration boundaries

Author: CometAPI

scripts/check_workflows.py

@@ -21,7 +21,7 @@
 RELEASE_PLEASE_LOCK_JSONPATH = "$.package[?(@.name.value == 'cometapi')].version"
 RELEASE_PLEASE_ACTION_SHA = "5c625bfb5d1ff62eadeeb3772007f7f66fdcf071"
 RELEASE_PLEASE_BRIDGE_VERSION = "0.1.0-alpha.1"
-RELEASE_PLEASE_STABLE_VERSION_PATTERN = re.compile(r"0\.1\.(?:0|[1-9]\d*)")
+RELEASE_PLEASE_STABLE_VERSION_PATTERN = re.compile(r"0\.1\.(?:0|[1-9][0-9]*)")
 RELEASE_PLEASE_VERIFY_COMMAND = """\
 test -n "$EXPECTED_TAG"
 test -n "$EXPECTED_SHA"

src/cometapi/_config.py

@@ -12,13 +12,23 @@
 _T = TypeVar("_T")
 
 
+def _strip_configuration_whitespace(value: str) -> str:
+    start = 0
+    end = len(value)
+    while start < end and (value[start].isspace() or value[start] == "\ufeff"):
+        start += 1
+    while end > start and (value[end - 1].isspace() or value[end - 1] == "\ufeff"):
+        end -= 1
+    return value[start:end]
+
+
 def resolve_api_key(api_key: _T | None) -> _T | str:
     """Resolve an explicit API key before consulting ``COMETAPI_KEY``."""
     if api_key is not None and not isinstance(api_key, str):
         return api_key
 
     resolved = api_key if api_key is not None else os.environ.get("COMETAPI_KEY")
-    normalized = resolved.strip() if resolved is not None else ""
+    normalized = _strip_configuration_whitespace(resolved) if resolved is not None else ""
     if not normalized:
         raise OpenAIError(
             "The CometAPI API key must be provided with the api_key client option "
@@ -31,12 +41,14 @@ def resolve_base_url(base_url: _T | None) -> _T | str:
     """Resolve an explicit base URL before environment and default values."""
     if base_url is not None:
         if isinstance(base_url, str):
-            normalized = base_url.strip()
+            normalized = _strip_configuration_whitespace(base_url)
             if not normalized:
                 raise OpenAIError("The CometAPI base_url client option must not be empty.")
             return normalized
         return base_url
 
     environment_url = os.environ.get("COMETAPI_BASE_URL")
-    normalized = environment_url.strip() if environment_url is not None else ""
+    normalized = (
+        _strip_configuration_whitespace(environment_url) if environment_url is not None else ""
+    )
     return normalized or DEFAULT_BASE_URL

tests/test_client.py

@@ -46,7 +46,7 @@ def test_missing_key_raises_official_error_without_secret(
 
 
 @pytest.mark.parametrize("client_type", [CometAPI, AsyncCometAPI])
-@pytest.mark.parametrize("api_key", ["", "   "])
+@pytest.mark.parametrize("api_key", ["", "   ", "\ufeff", " \ufeff\t"])
 def test_explicit_blank_key_does_not_fall_back_to_environment(
     client_type: type[CometAPI] | type[AsyncCometAPI],
     api_key: str,
@@ -61,11 +61,13 @@ def test_explicit_blank_key_does_not_fall_back_to_environment(
 
 
 @pytest.mark.parametrize("client_type", [CometAPI, AsyncCometAPI])
+@pytest.mark.parametrize("environment_key", [" \t ", "\ufeff", " \ufeff\t"])
 def test_whitespace_environment_key_is_treated_as_missing(
     client_type: type[CometAPI] | type[AsyncCometAPI],
+    environment_key: str,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setenv("COMETAPI_KEY", " \t ")
+    monkeypatch.setenv("COMETAPI_KEY", environment_key)
     monkeypatch.setenv("OPENAI_API_KEY", "upstream-environment-key")
 
     with pytest.raises(OpenAIError) as caught:
@@ -93,7 +95,11 @@ def test_explicit_sync_key_is_trimmed() -> None:
     router = ContractRouter()
     http_client = sync_http_client(router)
 
-    with CometAPI(api_key=f"  {API_KEY}\t", base_url=BASE_URL, http_client=http_client) as client:
+    with CometAPI(
+        api_key=f" \ufeff{API_KEY}\ufeff\t",
+        base_url=BASE_URL,
+        http_client=http_client,
+    ) as client:
         client.models.list()
 
     assert router.requests[0].headers["authorization"] == f"Bearer {API_KEY}"
@@ -123,7 +129,7 @@ async def test_explicit_async_key_is_trimmed() -> None:
     http_client = async_http_client(router)
 
     async with AsyncCometAPI(
-        api_key=f"  {API_KEY}\t",
+        api_key=f" \ufeff{API_KEY}\ufeff\t",
         base_url=BASE_URL,
         http_client=http_client,
     ) as client:
@@ -171,7 +177,7 @@ def test_explicit_base_url_takes_precedence_over_environment(
 
 
 @pytest.mark.parametrize("client_type", [CometAPI, AsyncCometAPI])
-@pytest.mark.parametrize("base_url", ["", "   "])
+@pytest.mark.parametrize("base_url", ["", "   ", "\ufeff", " \ufeff\t"])
 def test_explicit_blank_base_url_does_not_fall_back_to_environment(
     client_type: type[CometAPI] | type[AsyncCometAPI],
     base_url: str,
@@ -184,7 +190,7 @@ def test_explicit_blank_base_url_does_not_fall_back_to_environment(
 
 
 def test_explicit_sync_string_base_url_is_trimmed() -> None:
-    client = CometAPI(api_key=API_KEY, base_url=f"  {BASE_URL}\t")
+    client = CometAPI(api_key=API_KEY, base_url=f" \ufeff{BASE_URL}\ufeff\t")
     try:
         assert str(client.base_url) == f"{BASE_URL}/"
     finally:
@@ -248,10 +254,12 @@ def test_default_base_url_is_used_when_no_override_exists(
         client.close()
 
 
+@pytest.mark.parametrize("environment_url", [" \t ", "\ufeff", " \ufeff\t"])
 def test_whitespace_environment_base_url_uses_cometapi_default(
+    environment_url: str,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setenv("COMETAPI_BASE_URL", " \t ")
+    monkeypatch.setenv("COMETAPI_BASE_URL", environment_url)
     monkeypatch.setenv("OPENAI_BASE_URL", "https://upstream.example.test/v1")
 
     client = CometAPI(api_key=API_KEY)
@@ -262,10 +270,12 @@ def test_whitespace_environment_base_url_uses_cometapi_default(
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize("environment_url", [" \t ", "\ufeff", " \ufeff\t"])
 async def test_async_whitespace_environment_base_url_uses_cometapi_default(
+    environment_url: str,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    monkeypatch.setenv("COMETAPI_BASE_URL", " \t ")
+    monkeypatch.setenv("COMETAPI_BASE_URL", environment_url)
     monkeypatch.setenv("OPENAI_BASE_URL", "https://upstream.example.test/v1")
 
     client = AsyncCometAPI(api_key=API_KEY)

tests/test_release_workflow.py

@@ -1017,7 +1017,10 @@ def test_release_please_config_accepts_stable_maintenance_cleanup(version: str)
     )
 
 
-@pytest.mark.parametrize("version", ["0.1.01", "0.1.1-alpha.1", "0.2.0", "1.0.0"])
+@pytest.mark.parametrize(
+    "version",
+    ["0.1.01", "0.1.1-alpha.1", "0.1.1\u0662", "0.1.1\uff12", "0.2.0", "1.0.0"],
+)
 def test_release_please_config_rejects_versions_outside_stable_maintenance(
     version: str,
 ) -> None: