chtypes 2.0.0.dev4__py3-none-any.whl → 2.0.0.dev5__py3-none-any.whl

chtypes/__init__.py

@@ -48,6 +48,7 @@ from importlib.metadata import version as _package_version
 
 from ._abi2._vocab import (
     EXPORT_NONE,
+    DeclinedLayer,
     DeclinedTier,
     DefaultKind,
     DiscoverQueryParam,
@@ -156,6 +157,7 @@ __all__ = [
     "ChtypesError",
     "Column",
     "Computed",
+    "DeclinedLayer",
     "DeclinedSetting",
     "DeclinedTier",
     "DefaultKind",

chtypes/_abi2/_decls.py

@@ -1,4 +1,4 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """The Python binding's generated ABI v2 layer: ctypes signatures, the handle
 classes, the two-phase resolve functions and invoke_by_name(), the test-only
 dispatcher the conformance suite drives from tests/fixtures/abi-v2/cases.json.
@@ -19,7 +19,7 @@ from dataclasses import dataclass, field
 from . import _errmap
 
 CHS_ABI_VERSION = 2
-CHS_ABI_FINGERPRINT = "sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72"
+CHS_ABI_FINGERPRINT = "sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4"
 
 # The description's stability: "unstable" while this generation is being
 # designed, so CHS_ABI_FINGERPRINT moves with every change, and "locked" after

chtypes/_abi2/_errmap.py

@@ -1,4 +1,4 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """spec/abi-v2/sdk.json's error-mapping tables, as references to the
 public classes (python/src/chtypes/errors.py, re-exported by
 python/src/chtypes/_abi2/_errors.py). Only the MAPPING is generated: the

chtypes/_abi2/_vocab.py

@@ -1,8 +1,8 @@
-# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:28c7445ce6b5c6d0ae33177fd60eb7b3b5654a966c842b8d812aea622824dc72) — DO NOT EDIT  # noqa: E501
+# GENERATED by scripts/abi-v1/gen.py --major 2 from spec/abi-v2/abi.json (CHS_ABI_FINGERPRINT sha256:d60a681ea0e249ab9e2c83b50640ad9cef040261ddf61805106c93e2c68774e4) — DO NOT EDIT  # noqa: E501
 """The Python binding's generated vocabularies, from spec/abi-v2/abi.json: the C
 enums (`Format`, `Status`), the document vocabularies (`Outcome`, `FilterOutcome`,
-`Verdict`, `DefaultKind`, `MergeReason`, `DeclinedTier`, `Reason`, `Source`,
-`DiscoverQueryParam`) with the facts the description attaches to each value
+`Verdict`, `DefaultKind`, `MergeReason`, `DeclinedTier`, `DeclinedLayer`, `Reason`,
+`Source`, `DiscoverQueryParam`) with the facts the description attaches to each value
 (`Format.ch_name`, `Reason` lossy, `Source` is_stored, `Verdict.answered`), and the
 `DocFlags` groups. No other file in this package keeps a copy of any of it.
 
@@ -250,7 +250,7 @@ class MergeReason(StrEnum):
 
 
 class DeclinedTier(StrEnum):
-    """The WHERE-settings tier of a setting a server profile sets and this build's
+    """The WHERE-settings tier of a setting a settings layer sets and this build's
     filters do not honor in a WHERE, as a `DeclinedSetting` reports it."""
 
     PREDICATE = "predicate"
@@ -274,6 +274,31 @@ class DeclinedTier(StrEnum):
         return cls(text)
 
 
+class DeclinedLayer(StrEnum):
+    """The settings layer a `DeclinedSetting` comes from, the highest one that sets
+    the name: `defaults`, `server` or `schema`, lowest first."""
+
+    DEFAULTS = "defaults"
+    SERVER = "server"
+    SCHEMA = "schema"
+
+    @classmethod
+    def _missing_(cls, value: object) -> DeclinedLayer | None:
+        return _unknown_str(cls, value)
+
+    @property
+    def known(self) -> bool:
+        """Whether the description lists this value: False for exactly the unknown(n)
+        member an unlisted value reads as (rule r3)."""
+        return type(self)._value2member_map_.get(self._value_) is self
+
+    @classmethod
+    def of(cls, text: str) -> DeclinedLayer:
+        """Map a document's spelling. One the description does not list is kept as
+        this vocabulary's unknown(n) member, carrying it (rule r3)."""
+        return cls(text)
+
+
 class DiscoverQueryParam(StrEnum):
     """A query parameter of the SQL `discover_query` returns, which the caller binds
     when it runs the query."""
@@ -441,6 +466,7 @@ DESCRIBED_VOCABULARIES: Final[dict[str, type]] = {
     "discover_query_param": DiscoverQueryParam,
     "default_kind": DefaultKind,
     "declined_tier": DeclinedTier,
+    "declined_layer": DeclinedLayer,
 }
 
 

chtypes/_decode.py

@@ -29,6 +29,7 @@ from collections.abc import Callable, Mapping
 from typing import Any
 
 from ._abi2._vocab import (
+    DeclinedLayer,
     DeclinedTier,
     DefaultKind,
     FilterOutcome,
@@ -504,10 +505,11 @@ def _string_map(obj: Mapping[str, Any], key: str, where: str) -> dict[str, str]
 
 
 def _declined_setting(obj: dict[str, Any], where: str) -> DeclinedSetting:
-    # An unlisted tier is its unknown(n): kept, never a failure (rule r3).
+    # An unlisted tier or layer is its unknown(n): kept, never a failure (rule r3).
     return DeclinedSetting(
         name=_name(obj, "name", where),
         tier=DeclinedTier.of(_text(obj, "tier", where)),
+        layer=DeclinedLayer.of(_text(obj, "layer", where)),
     )
 
 
@@ -516,9 +518,6 @@ def _server(obj: dict[str, Any], where: str) -> SchemaServer:
         timezone=_text(obj, "timezone", where),
         settings=_string_map(obj, "settings", where) or {},
         macros=_string_map(obj, "macros", where),
-        filter_declined_settings=_objects(
-            obj, "filter_declined_settings", where, _declined_setting
-        ),
     )
 
 
@@ -546,6 +545,10 @@ def decode_schema_description(raw: bytes) -> SchemaDescription:
             if replicated is None
             else _replicated(_obj(replicated, where, "replicated"), f"{where}.replicated")
         ),
+        # Over every layer known at schema compile, with or without a server.
+        filter_declined_settings=_objects(
+            obj, "filter_declined_settings", where, _declined_setting
+        ),
     )
 
 

chtypes/_ocifetch/_channel.py

@@ -277,7 +277,11 @@ def visible(predicate: object, channel: Channel | None = None) -> bool:
 
 
 def ahead_of_registry(
-    alias_absent: bool, predicate: object, channel: Channel | None = None
+    alias_absent: bool,
+    predicate: object,
+    channel: Channel | None = None,
+    *,
+    cached_own_build: Callable[[], str | None] | None = None,
 ) -> None:
     """The dev channel's answer for an SDK whose fingerprint no published build
     carries yet (docs/guides/fetch-v1.md §3; public issue #578): when every base
@@ -287,11 +291,33 @@ def ahead_of_registry(
     build answers gets, naming both fingerprints. Nothing is installed and an
     install of that build is never reported, because the lookup this SDK opens
     through would refuse it. Returns in every other case: the alias answered,
-    the tag's build is this SDK's own, or the contract has no own fingerprint."""
+    the tag's build is this SDK's own, or the contract has no own fingerprint.
+
+    The expired alias with a usable cache (public issue #581): `cached_own_build`
+    looks up, through the filter open uses, the cache's verified record of this
+    SDK's OWN fingerprint for the request, and returns its build id ("" for a
+    record that names none) or None for no record. When there is one the
+    message grows by `_cached_own_suffix`; the code does not change."""
     channel = channel or active()
     if not alias_absent or visible(predicate, channel):
         return
-    raise ArtifactUnpublishedError(f"chtypes: {_ahead_message(channel.own_fingerprint, predicate)}")
+    message = _ahead_message(channel.own_fingerprint, predicate)
+    if cached_own_build is not None:
+        build = cached_own_build()
+        if build is not None:
+            message += _cached_own_suffix(build)
+    raise ArtifactUnpublishedError(f"chtypes: {message}")
+
+
+def _cached_own_suffix(build: str) -> str:
+    """The clause appended when the cache holds an own-fingerprint build: "; a
+    cached build for this fingerprint (build <id>) is still usable by open;
+    upgrade the SDK to get newer builds", the parenthesis dropped when the
+    record names no build."""
+    suffix = "; a cached build for this fingerprint"
+    if build:
+        suffix += f" (build {build})"
+    return suffix + " is still usable by open; upgrade the SDK to get newer builds"
 
 
 def _ahead_message(own: str, predicate: object) -> str:

chtypes/_ocifetch/_ensure.py

@@ -716,7 +716,11 @@ def _ensure_floating(
         # An install of another fingerprint's build, reached through the tag
         # because the registry has none at this SDK's own, is never reported
         # installed (public issue #578): refused before the cache is touched.
-        _channel.ahead_of_registry(alias_absent, existing_record.predicate)
+        _channel.ahead_of_registry(
+            alias_absent,
+            existing_record.predicate,
+            cached_own_build=lambda: _cached_own_build(roots, platform_key, request.spelling),
+        )
         # A NEWER build within the request, installed beside it, is still the
         # answer ("monotonic-warning", docs/guides/fetch-v1.md §9).
         newer = _newer_installed(
@@ -812,7 +816,11 @@ def _ensure_floating(
         # own fingerprint answered 404 on every base, and the tag's build is
         # signed for another. Refused from the signed statement, before the
         # layer is requested, so nothing is downloaded or installed.
-        _channel.ahead_of_registry(alias_absent, predicate)
+        _channel.ahead_of_registry(
+            alias_absent,
+            predicate,
+            cached_own_build=lambda: _cached_own_build(roots, platform_key, request.spelling),
+        )
     newer = _newer_installed(roots, platform_key, predicate, request.spelling)
     if newer is not None:
         newer_dir, newer_record, warning = newer
@@ -1235,6 +1243,25 @@ def with_notes(message: str, notes: Sequence[str]) -> str:
     return f"{message}. {' '.join(notes)}"
 
 
+def _cached_own_build(
+    roots: Sequence[Path], platform_key: str, request_spelling: str
+) -> str | None:
+    """The build id of the newest cached record of this SDK's OWN fingerprint
+    that answers the request (`resolve_installed`'s filter), "" when it names
+    none, or None when the cache holds no such record (public issue #581)."""
+    candidates = [
+        record
+        for _dir, record in list_verified_records(roots)
+        if record.platform == platform_key
+        and version_within_request(record.version, request_spelling)
+        and _channel.visible(record.predicate)
+    ]
+    if not candidates:
+        return None
+    best = max(candidates, key=lambda r: (spelling_components(r.version), r.build))
+    return best.build or ""
+
+
 def resolve_installed(request: Request, platform: str, options: Options) -> Resolved | None:
     """Cache-only: never touches the network (docs/guides/fetch-v1.md "The seam").
 

chtypes/results.py

@@ -14,7 +14,15 @@ from __future__ import annotations
 from collections.abc import Mapping
 from dataclasses import dataclass
 
-from ._abi2._vocab import DeclinedTier, DefaultKind, FilterOutcome, MergeReason, Outcome, Verdict
+from ._abi2._vocab import (
+    DeclinedLayer,
+    DeclinedTier,
+    DefaultKind,
+    FilterOutcome,
+    MergeReason,
+    Outcome,
+    Verdict,
+)
 
 __all__ = [
     "AtMergeEntry",
@@ -252,14 +260,17 @@ class Column:
 
 @dataclass(frozen=True, slots=True)
 class DeclinedSetting:
-    """One setting a server's profile sets that this build's filters do not honor
-    in a WHERE: an entry of the server's `filter_declined_settings` (ABI v2).
-    `name` is bytes (from `name` or `name_b64`). `tier` is the tier this build
-    line's WHERE-settings list gives it, a `DeclinedTier`; one the description
-    does not list is its unknown(n) member (rule r3)."""
+    """One setting the schema compiles under that this build's filters do not
+    honor in a WHERE: an entry of the schema description's
+    `filter_declined_settings` (ABI v2). `name` is bytes (from `name` or
+    `name_b64`). `tier` is the tier this build line's WHERE-settings list gives
+    it, a `DeclinedTier`, and `layer` the settings layer it comes from, the
+    highest one that sets the name, a `DeclinedLayer`; a value the description
+    does not list is its vocabulary's unknown(n) member (rule r3)."""
 
     name: bytes
     tier: DeclinedTier
+    layer: DeclinedLayer
 
 
 @dataclass(frozen=True, slots=True)
@@ -269,17 +280,11 @@ class SchemaServer:
     data-derived. `timezone` is the zone the schema's types bind: the profile's,
     or else the image zone. `settings` is the profile's settings (`{}` when it
     gave none). `macros` is None exactly when the profile carried no macros
-    (unknown), and a mapping, even an empty one, when it did (the complete set).
-    `filter_declined_settings` is the settings the profile sets that this
-    build's filters do not honor in a WHERE, in the profile's own order, empty
-    when it lists none: a schema on a server that lists any is one
-    `compile_filter` declines (`UnsupportedError`), and a consumer that streams
-    rows refuses such a tenant (spec/abi-v2/where-settings/README.md)."""
+    (unknown), and a mapping, even an empty one, when it did (the complete set)."""
 
     timezone: str
     settings: Mapping[str, str]
     macros: Mapping[str, str] | None
-    filter_declined_settings: tuple[DeclinedSetting, ...] = ()
 
 
 @dataclass(frozen=True, slots=True)
@@ -293,13 +298,22 @@ class SchemaReplicated:
 
 @dataclass(frozen=True, slots=True)
 class SchemaDescription:
-    """A schema's columns, in declared order, and the server it was compiled on.
-    `server` is None exactly when it was compiled without one; `replicated` is
-    None when the document carries none."""
+    """A schema's columns, in declared order, the server it was compiled on, and
+    the settings its filters decline. `server` is None exactly when it was
+    compiled without one; `replicated` is None when the document carries none.
+    `filter_declined_settings` is the settings the schema compiles under that
+    this build's filters do not honor in a WHERE, over every layer known at
+    schema compile (the defaults `setup` set, the server profile and the
+    schema's own settings), empty when it lists none: one entry per name, at
+    the highest layer that sets it, ordered by layer and then by name bytes, as
+    the library wrote it. A schema that lists any is one `compile_filter`
+    declines (`UnsupportedError`), and a consumer that streams rows refuses
+    such a tenant (spec/abi-v2/where-settings/README.md)."""
 
     columns: tuple[Column, ...]
     server: SchemaServer | None = None
     replicated: SchemaReplicated | None = None
+    filter_declined_settings: tuple[DeclinedSetting, ...] = ()
 
 
 @dataclass(frozen=True, slots=True)

{chtypes-2.0.0.dev4.dist-info → chtypes-2.0.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: chtypes
-Version: 2.0.0.dev4
+Version: 2.0.0.dev5
 Summary: Python binding for the chtypes artifacts: ClickHouse's own type system, per version, behind the frozen chs_* C ABI
 Project-URL: Homepage, https://github.com/wave-rf/chtypes
 Project-URL: Repository, https://github.com/wave-rf/chtypes

{chtypes-2.0.0.dev4.dist-info → chtypes-2.0.0.dev5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-chtypes/__init__.py,sha256=9xXEUgqnxJmAjUbz8X3coym4UyM01HShX7Lrds751VM,6177
+chtypes/__init__.py,sha256=SGE4VfnmW5NbOQSExtplVwFPhddBQHVJ38Yv-CUWJ0o,6217
 chtypes/__main__.py,sha256=XYGNTpTLXI1AUp7srvuNVv2SZAcfwLaXpoXRVInyhF4,14030
-chtypes/_decode.py,sha256=v5pdwphwAldVzgHg6saWsxqUFjMHqcMO-XOuDyuRVZg,22686
+chtypes/_decode.py,sha256=owtRPXVPtNOGzQzgb37Rki7iceMoua_k_VWY38RkaIo,22852
 chtypes/_ed25519.py,sha256=uwaAKWvgoc936e1ZfgLrtR47W87WWCL541kFaqBXrB0,4141
 chtypes/_guard.py,sha256=zTtwprCS0XvGWY7GDozo-IP6GwjMAWl-o-AjShdCSVI,1985
 chtypes/_input.py,sha256=i4OUmgmHxx618g0DVFYy8LmHhggfBT03NyMxH3ptZBI,6020
@@ -9,18 +9,18 @@ chtypes/errors.py,sha256=7gDi9Ij8yptrr9E0LZyA2XkeaFFVyZoQMVQjQj6mn0s,9936
 chtypes/library.py,sha256=G6DJFiRuv8--JARxfiSNEqeFLkafaMs_n9nG-IwoC74,17878
 chtypes/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chtypes/registry.py,sha256=Q3LR7wBs7Ggy_5xG_-0bZrTRgvRWJO5OJbD92ecUlt4,13786
-chtypes/results.py,sha256=OnxFUNyhlNeA2jwsMVAqYjKjmqguvKtWzrCwi7F6CFM,12123
+chtypes/results.py,sha256=gue7f4pqnpvXlSteYqhmqU1ZuAYCD7p4AgTiuYWpgYY,12591
 chtypes/_abi2/__init__.py,sha256=d3i7_iUDMFT1jg49vRQz1SMH6oseYZHUR0oPt6aSTiY,1042
-chtypes/_abi2/_decls.py,sha256=X88Ylb33Sw5iJjikVTfVzdgCfjGvKpn4F3mT0qAnD7I,38454
-chtypes/_abi2/_errmap.py,sha256=vNPgHFV742Px2aTyYqJez7I3qXRq80AOUcMqDvyPGFI,2886
+chtypes/_abi2/_decls.py,sha256=tGj_gOkMsw9fv8lWBXHUMn6dfYqpkta_nq1BhT6p4Dk,38454
+chtypes/_abi2/_errmap.py,sha256=BQ2Wgj8H3ukUQwCAKgUyAhs6xy5fDoYYLX1YZGdWEcA,2886
 chtypes/_abi2/_errors.py,sha256=wRE9M0oYtJz_9izQqpEBh5571M_1QzGWBoJ3pJTykWw,761
 chtypes/_abi2/_loader.py,sha256=VMWrbWMp9Uq3K-7a219lfqAmSmBlD2hcB6WDJgG8XG0,12514
-chtypes/_abi2/_vocab.py,sha256=rzbenqXqDoWZkvpjRw0UUBEkgWoOtE462QUGyCE3cTw,16516
+chtypes/_abi2/_vocab.py,sha256=6Ly15gQ1Vf3SP8hDSWCg1jnwVEURCBWSj9LZgv23xfA,17442
 chtypes/_ocifetch/__init__.py,sha256=enfPOKkqP4kqAKqckBGWXN1OQsiYo9ngDP-wzG0zn2I,1484
-chtypes/_ocifetch/_channel.py,sha256=2L-sSetXv4iF0mpsIX4-iTAhNbu9eY1IsGnb4WTptwM,17980
+chtypes/_ocifetch/_channel.py,sha256=8GqSNwuWaO3f4550N_DEsswqJu-0mWFAXbCB3ccFF9M,19108
 chtypes/_ocifetch/_constants.py,sha256=IZtAK3oxnCELZysvrzRozJkntxKSQllGjxod5No-Kco,5644
 chtypes/_ocifetch/_dsse.py,sha256=0RaFJaG1jhXr1uPfuHxm7yAn6viNzYhfCRUf-sW5SvQ,9333
-chtypes/_ocifetch/_ensure.py,sha256=GtuYJJXhL0TbUypx94OPr3BhnkrQoHuWjZdPYrvpLgw,62597
+chtypes/_ocifetch/_ensure.py,sha256=rI_xj0dccct7wMz0DwHoJTAB-yGVYFkLZ2Z0qRXuR30,63612
 chtypes/_ocifetch/_errors.py,sha256=TTYpwhvZ7MyD9Ssg5js8_YB8Fl30rYBPlENyAetqEbQ,7129
 chtypes/_ocifetch/_faults.py,sha256=HpoB9tJW7aLRiJdCFnspzkwhpFATZ6f6hGi49Mbfnhs,7609
 chtypes/_ocifetch/_goldens.py,sha256=8MicgeJSRd4WZkaEsdujRnOa7twQvbT-wfSMPZaD-ms,4191
@@ -31,8 +31,8 @@ chtypes/_ocifetch/_oci.py,sha256=UdA8QGTh1O27DBYRf5UxsevjgI52IecQlEf9IO6Y0A4,139
 chtypes/_ocifetch/_referrers.py,sha256=J2b4gN6vryz_IzYHxrd2Tp-tQO9Cz766rZtKgCVcKqA,6008
 chtypes/_ocifetch/_retired.py,sha256=MQ6nbWLJw50IZYY1VfM6AiCZ4BySK0GVkGVOtAXaq3Y,3060
 chtypes/_ocifetch/_unpack.py,sha256=Cn4-up63KL63L8pnkS5zwJ6VbbHPSigpCnmOdcHJ4RI,5609
-chtypes-2.0.0.dev4.dist-info/METADATA,sha256=xGAOsOpaNNPKh1cxhmBitwUrzSsCgiwBOqNltkBmWO0,11280
-chtypes-2.0.0.dev4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-chtypes-2.0.0.dev4.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
-chtypes-2.0.0.dev4.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-chtypes-2.0.0.dev4.dist-info/RECORD,,
+chtypes-2.0.0.dev5.dist-info/METADATA,sha256=42l-skEiDCQQ3VA7jXzokD7woNnMpYzZm-qVMw2vivc,11280
+chtypes-2.0.0.dev5.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+chtypes-2.0.0.dev5.dist-info/entry_points.txt,sha256=TdNcluWBR0VOt5mVFROsp-NiVPAdR3EHo0UsHlMC0r0,50
+chtypes-2.0.0.dev5.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+chtypes-2.0.0.dev5.dist-info/RECORD,,