python-voiceio 0.3.0__tar.gz → 0.3.1__tar.gz

{python_voiceio-0.3.0/python_voiceio.egg-info → python_voiceio-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-voiceio
-Version: 0.3.0
+Version: 0.3.1
 Summary: Speak → text, locally, instantly.
 Author: Hugo Montenegro
 License-Expression: MIT

{python_voiceio-0.3.0 → python_voiceio-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-voiceio"
-version = "0.3.0"
+version = "0.3.1"
 description = "Speak → text, locally, instantly."
 readme = "README.md"
 license = "MIT"

{python_voiceio-0.3.0 → python_voiceio-0.3.1/python_voiceio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-voiceio
-Version: 0.3.0
+Version: 0.3.1
 Summary: Speak → text, locally, instantly.
 Author: Hugo Montenegro
 License-Expression: MIT

{python_voiceio-0.3.0 → python_voiceio-0.3.1}/tests/test_llm_api.py

@@ -6,7 +6,7 @@ import urllib.error
 from unittest.mock import MagicMock, patch
 
 from voiceio.config import AutocorrectConfig
-from voiceio.llm_api import chat, check_api_key, resolve_api_key
+from voiceio.llm_api import chat, check_api_key, detect_provider, resolve_api_key
 
 
 def _mock_response(data: dict) -> MagicMock:
@@ -116,3 +116,61 @@ def test_check_empty_key():
     cfg = _cfg(api_key="")
     with patch.dict("os.environ", {}, clear=True):
         assert check_api_key(cfg) is False
+
+
+# ── Anthropic native API ────────────────────────────────────────────────
+
+
+@patch("urllib.request.urlopen")
+def test_chat_anthropic_native(mock_urlopen):
+    mock_urlopen.return_value = _mock_response({
+        "content": [{"type": "text", "text": "Fixed text."}]
+    })
+    cfg = _cfg(base_url="https://api.anthropic.com/v1")
+    result = chat(cfg, "system prompt", "user message")
+    assert result == "Fixed text."
+
+    req = mock_urlopen.call_args[0][0]
+    assert req.get_header("X-api-key") == "test-key"
+    assert req.get_header("Anthropic-version") == "2023-06-01"
+    assert "Authorization" not in dict(req.header_items())
+    body = json.loads(req.data)
+    assert body["system"] == "system prompt"
+    assert body["messages"] == [{"role": "user", "content": "user message"}]
+    assert "/messages" in req.full_url
+
+
+@patch("urllib.request.urlopen")
+def test_check_api_key_anthropic(mock_urlopen):
+    mock_urlopen.return_value = _mock_response({
+        "content": [{"type": "text", "text": ""}]
+    })
+    cfg = _cfg(base_url="https://api.anthropic.com/v1")
+    assert check_api_key(cfg, "sk-ant-test") is True
+    req = mock_urlopen.call_args[0][0]
+    assert "/messages" in req.full_url
+
+
+# ── detect_provider ─────────────────────────────────────────────────────
+
+
+def test_detect_openrouter():
+    base_url, model = detect_provider("sk-or-abc123")
+    assert "openrouter" in base_url
+    assert "claude" in model
+
+
+def test_detect_anthropic():
+    base_url, model = detect_provider("sk-ant-abc123")
+    assert "anthropic.com" in base_url
+    assert "claude" in model
+
+
+def test_detect_openai():
+    base_url, model = detect_provider("sk-proj-abc123")
+    assert "openai.com" in base_url
+
+
+def test_detect_unknown_defaults_openrouter():
+    base_url, _ = detect_provider("unknown-key-format")
+    assert "openrouter" in base_url

python_voiceio-0.3.1/voiceio/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.1"

python_voiceio-0.3.1/voiceio/llm_api.py

@@ -0,0 +1,183 @@
+"""Multi-provider chat completions API client.
+
+Supports OpenRouter, OpenAI, Anthropic (native Messages API), Together, Groq,
+local Ollama (via /v1/chat/completions), etc. Zero dependencies beyond stdlib.
+"""
+from __future__ import annotations
+
+import json
+import logging
+import os
+import urllib.error
+import urllib.request
+
+from voiceio.config import AutocorrectConfig
+
+log = logging.getLogger(__name__)
+
+
+def _is_anthropic(base_url: str) -> bool:
+    """Check if the base URL points to Anthropic's native API."""
+    return "api.anthropic.com" in base_url
+
+
+def resolve_api_key(cfg: AutocorrectConfig) -> str:
+    """Resolve API key from config or environment variables."""
+    if cfg.api_key:
+        return cfg.api_key
+    # Check common env vars in priority order
+    for var in ("OPENROUTER_API_KEY", "OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
+        val = os.environ.get(var, "")
+        if val:
+            return val
+    return ""
+
+
+def _anthropic_request(
+    base_url: str,
+    model: str,
+    system: str,
+    messages: list[dict],
+    api_key: str,
+    max_tokens: int,
+    timeout: float,
+) -> str | None:
+    """Send a request using Anthropic's native Messages API."""
+    url = f"{base_url}/messages"
+
+    body: dict = {
+        "model": model,
+        "max_tokens": max_tokens,
+        "messages": messages,
+    }
+    if system:
+        body["system"] = system
+
+    headers = {
+        "Content-Type": "application/json",
+        "x-api-key": api_key,
+        "anthropic-version": "2023-06-01",
+    }
+
+    req = urllib.request.Request(
+        url, data=json.dumps(body).encode(), headers=headers, method="POST",
+    )
+    with urllib.request.urlopen(req, timeout=timeout) as resp:
+        data = json.loads(resp.read())
+    # Anthropic returns content as a list of blocks
+    blocks = data.get("content", [])
+    text = "".join(b.get("text", "") for b in blocks if b.get("type") == "text")
+    return text.strip() or None
+
+
+def _openai_request(
+    base_url: str,
+    model: str,
+    system: str,
+    messages: list[dict],
+    api_key: str,
+    max_tokens: int,
+    timeout: float,
+) -> str | None:
+    """Send a request using the OpenAI chat completions format."""
+    url = f"{base_url}/chat/completions"
+
+    all_messages = []
+    if system:
+        all_messages.append({"role": "system", "content": system})
+    all_messages.extend(messages)
+
+    body = {
+        "model": model,
+        "max_tokens": max_tokens,
+        "messages": all_messages,
+    }
+
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {api_key}",
+    }
+
+    req = urllib.request.Request(
+        url, data=json.dumps(body).encode(), headers=headers, method="POST",
+    )
+    with urllib.request.urlopen(req, timeout=timeout) as resp:
+        data = json.loads(resp.read())
+    return data["choices"][0]["message"]["content"].strip()
+
+
+def chat(
+    cfg: AutocorrectConfig,
+    system: str,
+    user_message: str,
+    *,
+    api_key: str = "",
+    max_tokens: int = 2048,
+) -> str | None:
+    """Send a chat completion request. Returns response text or None on failure.
+
+    Automatically detects Anthropic's native API vs OpenAI-compatible format
+    based on the configured base_url.
+    """
+    key = api_key or resolve_api_key(cfg)
+    if not key:
+        return None
+
+    base_url = cfg.base_url.rstrip("/")
+    messages = [{"role": "user", "content": user_message}]
+
+    try:
+        if _is_anthropic(base_url):
+            return _anthropic_request(
+                base_url, cfg.model, system, messages, key, max_tokens, cfg.timeout_secs,
+            )
+        return _openai_request(
+            base_url, cfg.model, system, messages, key, max_tokens, cfg.timeout_secs,
+        )
+    except urllib.error.HTTPError as e:
+        body_text = ""
+        try:
+            body_text = e.read().decode()[:200]
+        except Exception:
+            pass
+        log.warning("API request failed (HTTP %d): %s", e.code, body_text)
+        return None
+    except Exception as e:
+        log.warning("API request failed: %s", e)
+        return None
+
+
+def detect_provider(api_key: str) -> tuple[str, str]:
+    """Detect provider from API key prefix. Returns (base_url, model)."""
+    if api_key.startswith("sk-or-"):
+        return "https://openrouter.ai/api/v1", "anthropic/claude-sonnet-4"
+    if api_key.startswith("sk-ant-"):
+        return "https://api.anthropic.com/v1", "claude-sonnet-4-20250514"
+    if api_key.startswith(("sk-proj-", "sk-")):
+        return "https://api.openai.com/v1", "gpt-4o-mini"
+    # Default to OpenRouter (works with most keys)
+    return "https://openrouter.ai/api/v1", "anthropic/claude-sonnet-4"
+
+
+def check_api_key(cfg: AutocorrectConfig, api_key: str = "") -> bool:
+    """Validate an API key with a minimal request."""
+    key = api_key or resolve_api_key(cfg)
+    if not key:
+        return False
+
+    base_url = cfg.base_url.rstrip("/")
+    messages = [{"role": "user", "content": "hi"}]
+
+    try:
+        if _is_anthropic(base_url):
+            _anthropic_request(base_url, cfg.model, "", messages, key, 1, 10)
+        else:
+            _openai_request(base_url, cfg.model, "", messages, key, 1, 10)
+        return True
+    except urllib.error.HTTPError as e:
+        if e.code == 401:
+            return False
+        # Other errors (rate limit, etc.) mean the key itself is valid
+        return e.code != 403
+    except Exception:
+        return False

python_voiceio-0.3.0/voiceio/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"

python_voiceio-0.3.0/voiceio/llm_api.py

@@ -1,130 +0,0 @@
-"""OpenAI-compatible chat completions API client.
-
-Supports any provider: OpenRouter, OpenAI, Anthropic, Together, Groq,
-local Ollama (via /v1/chat/completions), etc. Zero dependencies beyond stdlib.
-"""
-from __future__ import annotations
-
-import json
-import logging
-import os
-import urllib.error
-import urllib.request
-
-from voiceio.config import AutocorrectConfig
-
-log = logging.getLogger(__name__)
-
-
-def resolve_api_key(cfg: AutocorrectConfig) -> str:
-    """Resolve API key from config or environment variables."""
-    if cfg.api_key:
-        return cfg.api_key
-    # Check common env vars in priority order
-    for var in ("OPENROUTER_API_KEY", "OPENAI_API_KEY", "ANTHROPIC_API_KEY"):
-        val = os.environ.get(var, "")
-        if val:
-            return val
-    return ""
-
-
-def chat(
-    cfg: AutocorrectConfig,
-    system: str,
-    user_message: str,
-    *,
-    api_key: str = "",
-    max_tokens: int = 2048,
-) -> str | None:
-    """Send a chat completion request. Returns response text or None on failure.
-
-    Uses the OpenAI /v1/chat/completions format, which is supported by
-    OpenRouter, OpenAI, Anthropic, Together, Groq, Ollama, and others.
-    """
-    key = api_key or resolve_api_key(cfg)
-    if not key:
-        return None
-
-    base_url = cfg.base_url.rstrip("/")
-    url = f"{base_url}/chat/completions"
-
-    body = {
-        "model": cfg.model,
-        "max_tokens": max_tokens,
-        "messages": [
-            {"role": "system", "content": system},
-            {"role": "user", "content": user_message},
-        ],
-    }
-
-    payload = json.dumps(body).encode()
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f"Bearer {key}",
-    }
-
-    try:
-        req = urllib.request.Request(url, data=payload, headers=headers, method="POST")
-        with urllib.request.urlopen(req, timeout=cfg.timeout_secs) as resp:
-            data = json.loads(resp.read())
-        return data["choices"][0]["message"]["content"].strip()
-    except urllib.error.HTTPError as e:
-        body_text = ""
-        try:
-            body_text = e.read().decode()[:200]
-        except Exception:
-            pass
-        log.warning("API request failed (HTTP %d): %s", e.code, body_text)
-        return None
-    except Exception as e:
-        log.warning("API request failed: %s", e)
-        return None
-
-
-def detect_provider(api_key: str) -> tuple[str, str]:
-    """Detect provider from API key prefix. Returns (base_url, model)."""
-    if api_key.startswith("sk-or-"):
-        return "https://openrouter.ai/api/v1", "anthropic/claude-sonnet-4"
-    if api_key.startswith("sk-ant-"):
-        return "https://api.anthropic.com/v1", "claude-sonnet-4-20250514"
-    if api_key.startswith(("sk-proj-", "sk-")):
-        return "https://api.openai.com/v1", "gpt-4o-mini"
-    # Default to OpenRouter (works with most keys)
-    return "https://openrouter.ai/api/v1", "anthropic/claude-sonnet-4"
-
-
-def check_api_key(cfg: AutocorrectConfig, api_key: str = "") -> bool:
-    """Validate an API key with a minimal request."""
-    key = api_key or resolve_api_key(cfg)
-    if not key:
-        return False
-
-    base_url = cfg.base_url.rstrip("/")
-    url = f"{base_url}/chat/completions"
-
-    body = {
-        "model": cfg.model,
-        "max_tokens": 1,
-        "messages": [{"role": "user", "content": "hi"}],
-    }
-
-    try:
-        req = urllib.request.Request(
-            url,
-            data=json.dumps(body).encode(),
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {key}",
-            },
-            method="POST",
-        )
-        with urllib.request.urlopen(req, timeout=10) as resp:
-            resp.read()
-        return True
-    except urllib.error.HTTPError as e:
-        if e.code == 401:
-            return False
-        # Other errors (rate limit, etc.) mean the key itself is valid
-        return e.code != 403
-    except Exception:
-        return False