typesafe-sdk 0.7.2__tar.gz → 0.7.4__tar.gz

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: typesafe-sdk
-Version: 0.7.2
+Version: 0.7.4
 Summary: Python SDK for TypeSafe AI API.
 Keywords: typesafe,sdk,api,ai
 Author: TypeSafe AI
@@ -25,9 +25,11 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: httpx2>=2.0.0
+Requires-Dist: packaging>=24.0
 Requires-Dist: pydantic>=2.12.0
 Requires-Dist: pydantic-core>=2.41.1
 Requires-Dist: tenacity>=9.0.0
+Requires-Dist: truststore>=0.10.0 ; sys_platform != 'emscripten'
 Requires-Dist: typing-extensions>=4.13.0
 Requires-Dist: httpx2[http2]>=2.0.0 ; extra == 'http2'
 Maintainer: Daniel Gafni

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "typesafe-sdk"
-version = "0.7.2"
+version = "0.7.4"
 description = "Python SDK for TypeSafe AI API."
 readme = "README.md"
 license = "MIT"
@@ -33,9 +33,11 @@ classifiers = [
 ]
 dependencies = [
     "httpx2>=2.0.0",
+    "packaging>=24.0",
     "pydantic>=2.12.0",
     "pydantic-core>=2.41.1",
     "tenacity>=9.0.0",
+    "truststore>=0.10.0 ; sys_platform != 'emscripten'",
     "typing-extensions>=4.13.0",
 ]
 
@@ -78,7 +80,7 @@ docs = [
     "ruff>=0.16.6",
     "zensical>=0.0.60",
 ]
-codegen = ["datamodel-code-generator>=0.79.0"]
+codegen = ["datamodel-code-generator>=0.81.0"]
 
 [tool.pytest.ini_options]
 addopts = "-vv -ra --capture=tee-sys -p no:tach"

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "typesafe-sdk"
-version = "0.7.2"
+version = "0.7.4"
 description = "Python SDK for TypeSafe AI API."
 readme = "README.md"
 license = "MIT"
@@ -34,9 +34,12 @@ classifiers = [
 ]
 dependencies = [
     "httpx2>=2.0.0",
+    "packaging>=24.0",
     "pydantic>=2.12.0",
     "pydantic-core>=2.41.1",
     "tenacity>=9.0.0",
+    # TODO: bump constraint once https://github.com/sethmlarson/truststore/pull/219 is released
+    "truststore>=0.10.0 ; sys_platform != 'emscripten'",
     "typing-extensions>=4.13.0",
 ]
 
@@ -74,7 +77,7 @@ docs = [
     "zensical>=0.0.60",
 ]
 codegen = [
-    "datamodel-code-generator>=0.79.0",
+    "datamodel-code-generator>=0.81.0",
 ]
 
 [tool.pytest.ini_options]

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/client/aio/client.py

@@ -1,15 +1,18 @@
 """Asynchronous API client."""
 
+import ssl
+import threading
 from collections.abc import Mapping
 from functools import cached_property
 from types import TracebackType
-from typing import overload
+from typing import Any, overload
 
 import httpx2
+from packaging.version import Version
 from typing_extensions import Self
 
 from typesafe_sdk._core.client.aio.models import AsyncModels
-from typesafe_sdk._core.config import Config
+from typesafe_sdk._core.config import DEFAULT_LIMITS, Config
 from typesafe_sdk._core.endpoints import prepare_system_one
 from typesafe_sdk._core.json_types import JSONContent, JSONValue
 from typesafe_sdk._core.question_types import Question
@@ -18,6 +21,28 @@ from typesafe_sdk._core.retry import RetryPolicy, build_tenacity_async
 from typesafe_sdk._core.transport import Request, ResponseT, send_async
 
 
+def _ssl_context() -> ssl.SSLContext:
+    """httpx2's default SSL context, with `wrap_bio()` serialized on affected truststore versions.
+
+    AnyIO calls `wrap_bio()` from worker threads, and truststore<=0.10.4 reconfigures the shared
+    context there without a lock, which can abort the interpreter (sethmlarson/truststore#221).
+    """
+    ctx = httpx2.create_ssl_context()
+    import truststore  # noqa: PLC0415 - Unavailable on emscripten; httpx2 imports it lazily too.
+
+    if not isinstance(ctx, truststore.SSLContext) or Version(truststore.__version__) > Version("0.10.4"):
+        return ctx
+    wrap_bio = ctx.wrap_bio
+    lock = threading.Lock()
+
+    def locked_wrap_bio(*args: Any, **kwargs: Any) -> ssl.SSLObject:
+        with lock:
+            return wrap_bio(*args, **kwargs)
+
+    ctx.wrap_bio = locked_wrap_bio
+    return ctx
+
+
 class AsyncTypeSafeClient:
     def __init__(
         self,
@@ -91,7 +116,11 @@ class AsyncTypeSafeClient:
             timeout = http_client.timeout
         self._config = Config.resolve(api_key, base_url, model, timeout, headers)
         self._retry = build_tenacity_async(retry)
-        self._http_client = httpx2.AsyncClient(timeout=self._config.timeout, transport=transport) if http_client is None else http_client
+        self._http_client = (
+            httpx2.AsyncClient(timeout=self._config.timeout, limits=DEFAULT_LIMITS, transport=transport, verify=_ssl_context())
+            if http_client is None
+            else http_client
+        )
 
     @cached_property
     def models(self) -> AsyncModels:
@@ -170,7 +199,8 @@ class AsyncTypeSafeClient:
             name and model and token usage details when no custom model is supplied.
 
         Raises:
-            TypeSafeError: Questions are empty or a score question's criteria list is empty.
+            TypeSafeError: State is `None`, questions are empty, a score or choice question has no criteria,
+                or a noul question has neither instructions nor criteria.
             TypeSafeAPIError: The server returns an unsuccessful HTTP response after any retries.
             TypeSafeAPIConnectionError: The request cannot connect or times out after any retries.
             TypeSafeAPIResponseValidationError: The response body does not match the response model.

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/client/sync/client.py

@@ -9,7 +9,7 @@ import httpx2
 from typing_extensions import Self
 
 from typesafe_sdk._core.client.sync.models import Models
-from typesafe_sdk._core.config import Config
+from typesafe_sdk._core.config import DEFAULT_LIMITS, Config
 from typesafe_sdk._core.endpoints import prepare_system_one
 from typesafe_sdk._core.json_types import JSONContent, JSONValue
 from typesafe_sdk._core.question_types import Question
@@ -84,7 +84,9 @@ class TypeSafeClient:
             timeout = http_client.timeout
         self._config = Config.resolve(api_key, base_url, model, timeout, headers)
         self._retry = build_tenacity(retry)
-        self._http_client = httpx2.Client(timeout=self._config.timeout, transport=transport) if http_client is None else http_client
+        self._http_client = (
+            httpx2.Client(timeout=self._config.timeout, limits=DEFAULT_LIMITS, transport=transport) if http_client is None else http_client
+        )
 
     @cached_property
     def models(self) -> Models:
@@ -162,7 +164,8 @@ class TypeSafeClient:
             name and model and token usage details when no custom model is supplied.
 
         Raises:
-            TypeSafeError: Questions are empty or a score question's criteria list is empty.
+            TypeSafeError: State is `None`, questions are empty, a score or choice question has no criteria,
+                or a noul question has neither instructions nor criteria.
             TypeSafeAPIError: The server returns an unsuccessful HTTP response after any retries.
             TypeSafeAPIConnectionError: The request cannot connect or times out after any retries.
             TypeSafeAPIResponseValidationError: The response body does not match the response model.

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/config.py

@@ -17,6 +17,10 @@ from typesafe_sdk.constants import (
     DEFAULT_TIMEOUT,
 )
 
+# httpx2 keeps only 20 idle connections for 5 s by default, so bursts beyond that reopen connections with new TLS
+# handshakes. Keep every pooled connection; the API reuses idle connections for far longer than 30 s.
+DEFAULT_LIMITS = httpx2.Limits(max_connections=100, max_keepalive_connections=100, keepalive_expiry=30.0)
+
 
 def _resolve_string(value: str | None, env: str, default: str = "") -> str:
     """Resolve an explicit string or a stripped environment value, falling back to a default."""

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/endpoints.py

@@ -7,6 +7,7 @@ import httpx2
 
 from typesafe_sdk._core.config import Config
 from typesafe_sdk._core.constants import MODELS_PATH, SYSTEM_ONE_PATH
+from typesafe_sdk._core.errors import TypeSafeError
 from typesafe_sdk._core.json_types import JSONContent, JSONValue
 from typesafe_sdk._core.question_types import Question
 from typesafe_sdk._core.questions import normalize_questions
@@ -24,6 +25,8 @@ def prepare_system_one(
     headers: Mapping[str, str] | None,
     response_type: type[ResponseT],
 ) -> Request[ResponseT]:
+    if state is None:
+        raise TypeSafeError("State is required.")
     body: dict[str, Any] = {
         "state": state,
         "model": config.default_model if model is None else model,

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/json.py

@@ -23,7 +23,8 @@ def _fallback(value: object) -> object:
 
 
 def serialize(value: object) -> bytes:
-    return to_json(value, fallback=_fallback)
+    # JSON has no NaN/Infinity tokens; emit them as the strings "NaN"/"Infinity"/"-Infinity" instead.
+    return to_json(value, fallback=_fallback, inf_nan_mode="strings")
 
 
 def deserialize(content: bytes) -> Any:

{typesafe_sdk-0.7.2 → typesafe_sdk-0.7.4}/src/typesafe_sdk/_core/question_types.py

@@ -1,9 +1,9 @@
 """Question objects and raw input models."""
 
 from collections.abc import Mapping, Sequence
-from typing import Any, Literal, TypeAlias
+from typing import TYPE_CHECKING, Any, Literal, TypeAlias, overload
 
-from pydantic import BaseModel, ConfigDict, model_serializer
+from pydantic import BaseModel, ConfigDict, Field, model_serializer
 from pydantic.functional_serializers import SerializerFunctionWrapHandler
 from typing_extensions import NotRequired, TypedDict
 
@@ -23,6 +23,16 @@ class NoulCriteria(TypedDict, total=False, closed=True):
     """Description of the no outcome as text, a JSON object, or an array; `None` leaves it undescribed."""
 
 
+class _DescribedTrue(TypedDict, closed=True):
+    true: JSONContent
+    false: NotRequired[JSONContent | None]
+
+
+class _DescribedFalse(TypedDict, closed=True):
+    true: NotRequired[JSONContent | None]
+    false: JSONContent
+
+
 class NoulModel(TypedDict, closed=True):
     """A yes/no question dictionary with `type="noul"`.
 
@@ -31,9 +41,9 @@ class NoulModel(TypedDict, closed=True):
 
     type: Literal["noul"]
     instructions: NotRequired[JSONContent | None]
-    """The question to ask, expressed as text, a JSON object, or an array; optional."""
+    """The question to ask, expressed as text, a JSON object, or an array; optional when `criteria` describes an outcome."""
     criteria: NotRequired[NoulCriteria | None]
-    """Optional descriptions of the yes and no outcomes."""
+    """Optional descriptions of the yes and no outcomes; required when `instructions` is `None`."""
 
 
 class ChoiceModel(TypedDict, closed=True):
@@ -46,7 +56,7 @@ class ChoiceModel(TypedDict, closed=True):
     instructions: NotRequired[JSONContent | None]
     """The question to ask, expressed as text, a JSON object, or an array; optional."""
     criteria: Mapping[str, JSONContent | None]
-    """Labels mapped to text, object, or array descriptions, or `None` for undescribed labels."""
+    """A nonempty mapping of labels to text, object, or array descriptions, or `None` for undescribed labels."""
 
 
 class ScoreModel(TypedDict, closed=True):
@@ -82,9 +92,17 @@ class Noul(_Question, wire.NoulQuestion):
 
     type: Literal["noul"] = "noul"
     instructions: JSONContent | None = None  # pyrefly: ignore[bad-override-mutable-attribute]
-    """The question to ask, expressed as text, a JSON object, or an array; optional."""
+    """The question to ask, expressed as text, a JSON object, or an array; optional when `criteria` describes an outcome."""
     criteria: NoulCriteria | None = None  # pyrefly: ignore[bad-override-mutable-attribute]
-    """Optional descriptions of the yes and no outcomes."""
+    """Optional descriptions of the yes and no outcomes; required when `instructions` is `None`."""
+
+    if TYPE_CHECKING:
+        # Require instructions or at least one described outcome.
+        @overload
+        def __init__(self, *, type: Literal["noul"] = ..., instructions: JSONContent, criteria: NoulCriteria | None = ...) -> None: ...
+        @overload
+        def __init__(self, *, type: Literal["noul"] = ..., instructions: None = ..., criteria: _DescribedTrue | _DescribedFalse) -> None: ...
+        def __init__(self, **data: Any) -> None: ...
 
 
 class Choice(_Question, wire.ChoiceQuestion):
@@ -95,7 +113,7 @@ class Choice(_Question, wire.ChoiceQuestion):
 
     type: Literal["choice"] = "choice"
     criteria: Mapping[str, JSONContent | None]  # pyrefly: ignore[bad-override-mutable-attribute]
-    """Labels mapped to text, object, or array descriptions, or `None` for undescribed labels."""
+    """A nonempty mapping of labels to text, object, or array descriptions, or `None` for undescribed labels."""
     instructions: JSONContent | None = None  # pyrefly: ignore[bad-override-mutable-attribute]
     """The question to ask, expressed as text, a JSON object, or an array; optional."""
 
@@ -107,7 +125,7 @@ class Score(_Question, wire.ScoreQuestion):
     """
 
     type: Literal["score"] = "score"
-    criteria: Sequence[JSONContent]  # pyrefly: ignore[bad-override-mutable-attribute]
+    criteria: Sequence[JSONContent] = Field(min_length=1)  # pyrefly: ignore[bad-override-mutable-attribute]
     """A nonempty, ordered list of text, object, or array descriptions, one per score from zero."""
     instructions: JSONContent | None = None  # pyrefly: ignore[bad-override-mutable-attribute]
     """The question to ask, expressed as text, a JSON object, or an array; optional."""

typesafe_sdk-0.7.4/src/typesafe_sdk/_core/questions.py

@@ -0,0 +1,49 @@
+"""Question validation before JSON encoding."""
+
+from collections.abc import Mapping, Sequence
+
+from typesafe_sdk._core.errors import TypeSafeError
+from typesafe_sdk._core.json_types import JSONContent
+from typesafe_sdk._core.question_types import Choice, Noul, Question, Score
+
+
+def normalize_questions(questions: Mapping[str, Question]) -> dict[str, Question]:
+    if not questions:
+        raise TypeSafeError("At least one question is required.")
+    for name, question in questions.items():
+        if isinstance(question, Choice):
+            _validate_choice_criteria(name, question.criteria)
+        elif isinstance(question, Noul):
+            _validate_noul(name, question.instructions, question.criteria)
+        elif not isinstance(question, Score):
+            if not isinstance(question, dict) or not isinstance(question.get("type"), str) or not question["type"]:
+                raise TypeSafeError(f'Question "{name}" must be a question object or a dictionary with a nonempty string "type".')
+            if question["type"] in ("choice", "score") and "criteria" not in question:
+                raise TypeSafeError(f'Question "{name}" requires "criteria".')
+            if question["type"] == "score":
+                _validate_score_criteria(name, question["criteria"])
+            elif question["type"] == "choice":
+                _validate_choice_criteria(name, question["criteria"])
+            elif question["type"] == "noul":
+                _validate_noul(name, question.get("instructions"), question.get("criteria"))
+    return dict(questions)
+
+
+def _validate_score_criteria(name: str, criteria: Sequence[JSONContent]) -> None:
+    """Reject a score question with no criteria; at least one score is required."""
+    if not criteria:
+        raise TypeSafeError(f'Score question "{name}" has no criteria; at least one score is required.')
+
+
+def _validate_choice_criteria(name: str, criteria: Mapping[str, JSONContent | None]) -> None:
+    """Reject a choice question with no criteria; at least one choice is required."""
+    if not criteria:
+        raise TypeSafeError(f'Choice question "{name}" has no criteria; at least one choice is required.')
+
+
+def _validate_noul(name: str, instructions: object, criteria: object) -> None:
+    """Reject a noul question with non-object criteria or with neither instructions nor a described outcome."""
+    if criteria is not None and not isinstance(criteria, Mapping):
+        raise TypeSafeError(f'Noul question "{name}" criteria must be an object.')
+    if instructions is None and not (isinstance(criteria, Mapping) and any(value is not None for value in criteria.values())):
+        raise TypeSafeError(f'Noul question "{name}" has neither instructions nor criteria; at least one is required.')

typesafe_sdk-0.7.2/src/typesafe_sdk/_core/questions.py

@@ -1,29 +0,0 @@
-"""Question validation before JSON encoding."""
-
-from collections.abc import Mapping, Sequence
-
-from typesafe_sdk._core.errors import TypeSafeError
-from typesafe_sdk._core.json_types import JSONContent
-from typesafe_sdk._core.question_types import Choice, Noul, Question, Score
-
-
-def normalize_questions(questions: Mapping[str, Question]) -> dict[str, Question]:
-    if not questions:
-        raise TypeSafeError("At least one question is required.")
-    for name, question in questions.items():
-        if isinstance(question, Score):
-            _validate_score_criteria(name, question.criteria)
-        elif not isinstance(question, (Noul, Choice)):
-            if not isinstance(question, dict) or not isinstance(question.get("type"), str) or not question["type"]:
-                raise TypeSafeError(f'Question "{name}" must be a question object or a dictionary with a nonempty string "type".')
-            if question["type"] in ("choice", "score") and "criteria" not in question:
-                raise TypeSafeError(f'Question "{name}" requires "criteria".')
-            if question["type"] == "score":
-                _validate_score_criteria(name, question["criteria"])
-    return dict(questions)
-
-
-def _validate_score_criteria(name: str, criteria: Sequence[JSONContent]) -> None:
-    """Reject a score question with no criteria; at least one score is required."""
-    if not criteria:
-        raise TypeSafeError(f'Score question "{name}" has no criteria; at least one score is required.')