ccs-llmconnector 1.1.1__py3-none-any.whl → 1.1.4__py3-none-any.whl

llmconnector/types.py

@@ -1,49 +1,67 @@
-from __future__ import annotations
-
-from pathlib import Path
-from typing import Optional, Sequence, TypedDict, Union
-
-ImageInput = Union[str, Path]
-
-
-class Message(TypedDict):
-    role: str
-    content: str
-
-
-MessageSequence = Sequence[Message]
-
-
-class RequestOptions(TypedDict, total=False):
-    request_id: str
-    timeout_s: float
-    max_retries: int
-    retry_backoff_s: float
-    reasoning_effort: str
-    max_tokens: int
-    images: Sequence[ImageInput]
-    messages: MessageSequence
-
-
-def normalize_messages(
-    *,
-    prompt: Optional[str],
-    messages: Optional[MessageSequence],
-) -> list[Message]:
-    result: list[Message] = []
-    if messages:
-        for message in messages:
-            role = message.get("role")
-            content = message.get("content")
-            if not isinstance(role, str) or not role:
-                raise ValueError("message role must be a non-empty string")
-            if content is None:
-                content = ""
-            if not isinstance(content, str):
-                raise ValueError("message content must be a string")
-            result.append({"role": role, "content": content})
-
-    if prompt:
-        result.append({"role": "user", "content": prompt})
-
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Optional, Sequence, TypedDict, Union
+
+ImageInput = Union[str, Path]
+EmbeddingVector = list[float]
+
+
+class Message(TypedDict):
+    role: str
+    content: str
+
+
+MessageSequence = Sequence[Message]
+
+
+class RequestOptions(TypedDict, total=False):
+    request_id: str
+    timeout_s: float
+    max_retries: int
+    retry_backoff_s: float
+    reasoning_effort: str
+    max_tokens: int
+    images: Sequence[ImageInput]
+    messages: MessageSequence
+
+
+@dataclass(frozen=True)
+class TokenUsage:
+    input_tokens: int | None = None
+    output_tokens: int | None = None
+    total_tokens: int | None = None
+
+
+@dataclass(frozen=True)
+class LLMResponse:
+    text: str
+    usage: TokenUsage | None = None
+    provider: str | None = None
+    model: str | None = None
+    raw: Any | None = None
+
+
+def normalize_messages(
+    *,
+    prompt: Optional[str],
+    messages: Optional[MessageSequence],
+) -> list[Message]:
+    result: list[Message] = []
+    if messages:
+        for message in messages:
+            role = message.get("role")
+            content = message.get("content")
+            if not isinstance(role, str) or not role:
+                raise ValueError("message role must be a non-empty string")
+            if content is None:
+                content = ""
+            if not isinstance(content, str):
+                raise ValueError("message content must be a string")
+            result.append({"role": role, "content": content})
+
+    if prompt:
+        result.append({"role": "user", "content": prompt})
+
     return result

llmconnector/utils.py

@@ -1,78 +1,78 @@
-from __future__ import annotations
-
-import asyncio
-import logging
-import time
-from typing import Awaitable, Callable, TypeVar
-
-T = TypeVar("T")
-logger = logging.getLogger(__name__)
-
-
-def clamp_retries(max_retries: int | None) -> int:
-    if max_retries is None:
-        return 0
-    if max_retries < 0:
-        return 0
-    return max_retries
-
-
-def compute_delay(attempt: int, retry_backoff_s: float) -> float:
-    return retry_backoff_s * (2**attempt)
-
-
-def run_with_retries(
-    *,
-    func: Callable[[], T],
-    max_retries: int,
-    retry_backoff_s: float,
-    request_id: str | None = None,
-) -> T:
-    attempt = 0
-    while True:
-        try:
-            return func()
-        except Exception as exc:
-            if attempt >= max_retries:
-                raise
-            delay = compute_delay(attempt, retry_backoff_s)
-            logger.warning(
-                "Retrying LLM request: attempt=%d delay=%.2fs request_id=%s error=%s",
-                attempt + 1,
-                delay,
-                request_id,
-                exc,
-            )
-            time.sleep(delay)
-            attempt += 1
-
-
-async def run_with_retries_async(
-    *,
-    func: Callable[[], Awaitable[T]],
-    max_retries: int,
-    retry_backoff_s: float,
-    request_id: str | None = None,
-) -> T:
-    attempt = 0
-    while True:
-        try:
-            return await func()
-        except Exception as exc:
-            if attempt >= max_retries:
-                raise
-            delay = compute_delay(attempt, retry_backoff_s)
-            logger.warning(
-                "Retrying LLM request (async): attempt=%d delay=%.2fs request_id=%s error=%s",
-                attempt + 1,
-                delay,
-                request_id,
-                exc,
-            )
-            await asyncio.sleep(delay)
-            attempt += 1
-
-
-async def run_sync_in_thread(func: Callable[[], T]) -> T:
-    loop = asyncio.get_running_loop()
+from __future__ import annotations
+
+import asyncio
+import logging
+import time
+from typing import Awaitable, Callable, TypeVar
+
+T = TypeVar("T")
+logger = logging.getLogger(__name__)
+
+
+def clamp_retries(max_retries: int | None) -> int:
+    if max_retries is None:
+        return 0
+    if max_retries < 0:
+        return 0
+    return max_retries
+
+
+def compute_delay(attempt: int, retry_backoff_s: float) -> float:
+    return retry_backoff_s * (2**attempt)
+
+
+def run_with_retries(
+    *,
+    func: Callable[[], T],
+    max_retries: int,
+    retry_backoff_s: float,
+    request_id: str | None = None,
+) -> T:
+    attempt = 0
+    while True:
+        try:
+            return func()
+        except Exception as exc:
+            if attempt >= max_retries:
+                raise
+            delay = compute_delay(attempt, retry_backoff_s)
+            logger.warning(
+                "Retrying LLM request: attempt=%d delay=%.2fs request_id=%s error=%s",
+                attempt + 1,
+                delay,
+                request_id,
+                exc,
+            )
+            time.sleep(delay)
+            attempt += 1
+
+
+async def run_with_retries_async(
+    *,
+    func: Callable[[], Awaitable[T]],
+    max_retries: int,
+    retry_backoff_s: float,
+    request_id: str | None = None,
+) -> T:
+    attempt = 0
+    while True:
+        try:
+            return await func()
+        except Exception as exc:
+            if attempt >= max_retries:
+                raise
+            delay = compute_delay(attempt, retry_backoff_s)
+            logger.warning(
+                "Retrying LLM request (async): attempt=%d delay=%.2fs request_id=%s error=%s",
+                attempt + 1,
+                delay,
+                request_id,
+                exc,
+            )
+            await asyncio.sleep(delay)
+            attempt += 1
+
+
+async def run_sync_in_thread(func: Callable[[], T]) -> T:
+    loop = asyncio.get_running_loop()
     return await loop.run_in_executor(None, func)

ccs_llmconnector-1.1.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-ccs_llmconnector-1.1.1.dist-info/licenses/LICENSE,sha256=rPcz2YmBB9VUWZTLJcRO_B4jKDpqmGRYi2eSI-unysg,1083
-llmconnector/__init__.py,sha256=w68d7BCkhjjqMaOG9VDkPoYR4PNbv8NJqGmAV_Vyn6g,1358
-llmconnector/anthropic_client.py,sha256=hGFZlUQ4yAs_H8StxWzHAYmqwgNT6lGI4yW8UmKhtm8,13260
-llmconnector/client.py,sha256=2rhDpcBKKbQ1kGp7-Bk8ci_VVe9DEEvBf9nH4hKwg3w,13849
-llmconnector/client_cli.py,sha256=ojLPNJ14lFycsLWtEMtdGpV033v2-23qPMuWqFlnySA,11463
-llmconnector/gemini_client.py,sha256=_XPy6C5WQeuP_GY2eb3dy4DMFX9Oj8DRhb9u7XA5TfI,19155
-llmconnector/grok_client.py,sha256=uicZI28-vw7go677zZB5MTkw5aqWp2UP_GaguNUU99o,11254
-llmconnector/openai_client.py,sha256=wvrEFzltg8PctM2DcNZ_7qmRPpF-CB8WQek6iYoRvR4,11051
-llmconnector/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-llmconnector/types.py,sha256=JhXKjKncdUB2yPd-bqjOUnl-4Wgs6GIleDMChmwPW8w,1287
-llmconnector/utils.py,sha256=Tw6wQLh7Cjk6igLJ-MnYGSSPJBUGl5-7R1xB0Aj7o8Y,2047
-ccs_llmconnector-1.1.1.dist-info/METADATA,sha256=k4esAN7SCw583miw_IqV9sehyt0GGcgGylpLLPAL35s,17001
-ccs_llmconnector-1.1.1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-ccs_llmconnector-1.1.1.dist-info/entry_points.txt,sha256=eFvLY3nHAG_QhaKlemhhK7echfezW0KiMdSNMZOStLc,60
-ccs_llmconnector-1.1.1.dist-info/top_level.txt,sha256=Doer7TAUsN8UXQfPHPNsuBXVNCz2uV-Q0v4t4fwv_MM,13
-ccs_llmconnector-1.1.1.dist-info/RECORD,,