chtypes 2.0.0.dev4__tar.gz → 2.0.0.dev5__tar.gz

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev5}/CHANGELOG.md

@@ -8,15 +8,39 @@ The four bindings in this repository are released together and give one answer,
 
 ### Added
 
+- Every settings layer's filter-declined settings, in one list (ABI v2; moves the dev fingerprint; #588): `SchemaDescription.filter_declined_settings`, a tuple of `DeclinedSetting`, decoded from `schema_description`'s new required top-level `filter_declined_settings`, over every layer known at schema compile (`setup`'s defaults as the compile captured them, the server profile, and the schema's own settings). `DeclinedSetting` gains `layer`, the highest layer that sets the name, from the new `DeclinedLayer` vocabulary (`DEFAULTS`, `SERVER`, `SCHEMA`, and its unknown(n)). One entry per name, ordered by layer and then by name bytes, as the library writes it; the binding sorts nothing.
+- `Schema.describe` raises the library's `CHS_REJECTED` with ch_code 306 (TOO_DEEP_RECURSION), a `SchemaError`, for a deep input the server's stack check refuses (ABI v2: `chs_schema_describe` now lists `CHS_REJECTED`).
 - The server's filter-declined settings (ABI v2; moves the dev fingerprint): `SchemaServer.filter_declined_settings`, a tuple of `DeclinedSetting` (`name`, `tier`), decoded from `schema_description`'s new required `server.filter_declined_settings`, with the new `DeclinedTier` vocabulary (`PREDICATE`, `PREDICATE_UNFLIPPED`, `RESULT_CONTENT`, and its unknown(n)). `compile_filter` on a schema whose server lists any is the library's `CHS_DECLINED`, an `UnsupportedError` carrying its message; a filter's own settings other than `session_timezone` are no longer declined at compile, and a declined one is named at evaluation instead.
 - The v2 spec states that a filter verdict counts only when the evaluation's outcome is `ok`: over a body a server would not accept, every verdict is `d`.
 - The v2 spec publishes the WHERE-affecting settings lists (`spec/abi-v2/where-settings/`) with the consumer rule.
 - The v2 spec publishes the filter decline-reasons catalog (`spec/abi-v2/declines/`).
+- The v2 spec's decline catalog has 49 entries, and it publishes the settings values a server refuses outright (`spec/abi-v2/where-settings/documented-pathological.tsv`).
+- The v2 spec's decline catalog follows the producer's batch 11: its `server-profile-setting` entry now covers every settings layer the schema compiles under (the id is unchanged), the evaluation-time setting entries name only the filter's own settings, and its `stack-depth` entry lists `chs_schema_describe`.
 - A `410 Gone` is a retired repository, and permanent (#571). Any request the fetch layer makes (a tag, an alias, a digest, a blob, `tags/list`, the referrers API or its fallback tag, after a redirect too) that answers `410` is now the new code `CHTYPES_SOURCE_RETIRED` (exit status 10), never retried and never sent to the next base, nor from the dev channel's alias to its tag. It was `CHTYPES_SOURCE_UNREACHABLE` (exit 3) with the registry's message dropped, and Go, Python and Rust moved on to the next base, so a mirror's 404 could hide the retirement. The error names the URL that answered and carries the registry's own message, with control and bidirectional-formatting characters removed and cut to 256 code points: Go `CodeSourceRetired` (`errors.Is(err, ErrSourceRetired)`), Python and TypeScript `SourceRetiredError`, Rust `Error::SourceRetired`. The rule is `docs/guides/fetch-v1.md` section 2, "A retired repository", and the `retired-410-*` and `list-tags-retired-410` conformance cases and one shared message table (`tests/fixtures/retired-message/cases.json`) hold all four bindings to it.
 - A 2.0.0-dev SDK prefers the newest build of its own fingerprint (#511). A version request resolves `<tag>--fp-<fingerprint>` first, the alias the staging dev registry serves beside every dev tag, with the binding's own generated ABI fingerprint, and the tag itself only when every base answers the alias 404; any other failure of the alias request is that failure, with no fallback, and an alias whose index lacks the platform is `CHTYPES_ARTIFACT_UNPUBLISHED`. The dev channel's cache lookups (the installed-build lookup a registry open makes first, the offline answer, and the monotonic rule of a fetch) now see only records whose signed `abi_fingerprint` is the SDK's own, so a newer build of another fingerprint, installed by another dev SDK in the shared cache, is never returned or kept over this one's own, and is never removed or rewritten. So a dev build of a newer fingerprint no longer strands an older dev SDK until its consumers upgrade. Trust is unchanged (the signed predicate and the load checks decide), a listing never shows an alias, nothing records one, `list` and `where` are unchanged, and there is no option: both steps are the dev channel's alone, and the v1 contract and every production channel never take them. The rule is `docs/guides/fetch-v1.md` section 3, and the `dev-alias-*`, `resolve-installed-dev-alias-*` and `list-tags-dev-alias` conformance cases hold all four bindings to it.
 
+### Changed
+
+- `compile_filter` is the library's `CHS_DECLINED`, `UnsupportedError`, on a schema whose `filter_declined_settings` is not empty from any layer, and its message names each setting and its layer (ABI v2, #588). A declined setting from the defaults or the schema's own settings now fails the compile, where it was named at evaluation before; a filter's own settings and an evaluation's are still named at evaluation.
+- **Enforcement gate lifted** for `26.3` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.7` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.8` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.9` on `linux-amd64`.
+- **Enforcement gate lifted** for `26.3` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.7` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.8` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.9` on `linux-arm64`.
+- **Enforcement gate lifted** for `26.7` on `darwin-arm64`.
+- **Enforcement gate lifted** for `26.8` on `darwin-arm64`.
+- **Enforcement gate lifted** for `26.9` on `darwin-arm64`.
+
+### Removed
+
+- `SchemaServer.filter_declined_settings` (a breaking change inside v2 dev, #588): the server member no longer carries the list. Read `SchemaDescription.filter_declined_settings`, whose `server`-layer entries are the profile's.
+
 ### Fixed
 
+- A 2.0.0-dev SDK whose own-fingerprint alias has expired, with a cached build of that fingerprint for the request, now says so in the `CHTYPES_ARTIFACT_UNPUBLISHED` message of `fetch` (#581): `; a cached build for this fingerprint (build <id>) is still usable by open; upgrade the SDK to get newer builds` is appended. The code, the exit status (4) and the cache are unchanged, and all four bindings give the same message (`fp-ahead-cached-own-fp`).
 - A 2.0.0-dev SDK whose fingerprint no published build carries yet now fails closed with a precise message (#578). When every base answers its own alias 404 and the tag names a build signed for another fingerprint, `fetch` is `CHTYPES_ARTIFACT_UNPUBLISHED` (exit status 4): `no published build for this SDK's fingerprint <own fp>; newest published on this channel is <fp> (build <id>)`. It used to install that build, or report it already installed, and the lookup at open then answered `CHTYPES_ARTIFACT_MISSING` with advice to run `fetch`: a loop with no pointer to the cause. Nothing is downloaded or installed and the cache is unchanged. An alias that answers, a tag at the SDK's own fingerprint and the v1 contract are unchanged. All four bindings run the same fetch conformance cases, `fp-ahead-*`, and the rule is `docs/guides/fetch-v1.md` section 3.
 
 ## [1.1.0] — 2026-10-06

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev5}/PKG-INFO

@@ -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 → chtypes-2.0.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chtypes"
-version = "2.0.0.dev4"
+version = "2.0.0.dev5"
 description = "Python binding for the chtypes artifacts: ClickHouse's own type system, per version, behind the frozen chs_* C ABI"
 readme = "README.md"
 license = "Apache-2.0"

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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-2.0.0.dev4 → chtypes-2.0.0.dev5}/src/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 → chtypes-2.0.0.dev5}/tests/abi2/test_public_server.py

@@ -14,6 +14,7 @@ import threading
 import pytest
 
 from chtypes import (
+    DeclinedLayer,
     DeclinedSetting,
     DeclinedTier,
     SchemaReplicated,
@@ -276,54 +277,95 @@ def test_a_malformed_server_or_replicated_member_is_an_internal_error(extra) ->
         _describe(**extra)
 
 
-_PROFILE = {
-    "timezone": "UTC",
-    "settings": {"final": "1", "aggregate_functions_null_for_empty": "1"},
-}
+_SERVER = {"timezone": "UTC", "settings": {"final": "1"}}
 
 
 def _declined(entries) -> tuple:
-    d = _describe(server={**_PROFILE, "filter_declined_settings": entries})
-    return d.server.filter_declined_settings
+    return _describe(filter_declined_settings=entries, server=_SERVER).filter_declined_settings
 
 
 def test_filter_declined_settings_empty_and_absent() -> None:
     # [] is present and empty; absent (a document of no build at this
     # fingerprint) reads as empty too. Neither is a failure.
     assert _declined([]) == ()
-    absent = _describe(server={"timezone": "UTC", "settings": {}})
-    assert absent.server.filter_declined_settings == ()
+    assert _describe(server=_SERVER).filter_declined_settings == ()
 
 
-def test_filter_declined_settings_in_profile_order_b64_and_an_unknown_tier() -> None:
+def test_filter_declined_settings_in_document_order_b64_and_unknown_values() -> None:
     got = _declined(
         [
-            {"name": "final", "tier": "result-content", "x_future": 1},
-            {"name": "aggregate_functions_null_for_empty", "tier": "predicate"},
-            {"name_b64": "eP95", "tier": "predicate-unflipped"},
-            {"name": "x_future_setting", "tier": "x_future_tier", "x_future_obj": {"a": [1]}},
+            {
+                "name": "aggregate_functions_null_for_empty",
+                "tier": "predicate",
+                "layer": "defaults",
+                "x_future": 1,
+            },
+            {"name": "final", "tier": "result-content", "layer": "server"},
+            {"name": "additional_result_filter", "tier": "result-content", "layer": "schema"},
+            {"name_b64": "eP95", "tier": "predicate-unflipped", "layer": "schema"},
+            {
+                "name": "x_future_setting",
+                "tier": "x_future_tier",
+                "layer": "x_future_layer",
+                "x_future_obj": {"a": [1]},
+            },
         ]
     )
+    # The document's own order, never re-sorted (here not name order).
     assert got == (
-        DeclinedSetting(b"final", DeclinedTier.RESULT_CONTENT),
-        DeclinedSetting(b"aggregate_functions_null_for_empty", DeclinedTier.PREDICATE),
-        DeclinedSetting(b"x\xffy", DeclinedTier.PREDICATE_UNFLIPPED),
-        DeclinedSetting(b"x_future_setting", DeclinedTier.of("x_future_tier")),
+        DeclinedSetting(
+            b"aggregate_functions_null_for_empty", DeclinedTier.PREDICATE, DeclinedLayer.DEFAULTS
+        ),
+        DeclinedSetting(b"final", DeclinedTier.RESULT_CONTENT, DeclinedLayer.SERVER),
+        DeclinedSetting(
+            b"additional_result_filter", DeclinedTier.RESULT_CONTENT, DeclinedLayer.SCHEMA
+        ),
+        DeclinedSetting(b"x\xffy", DeclinedTier.PREDICATE_UNFLIPPED, DeclinedLayer.SCHEMA),
+        DeclinedSetting(
+            b"x_future_setting",
+            DeclinedTier.of("x_future_tier"),
+            DeclinedLayer.of("x_future_layer"),
+        ),
+    )
+    # Rule r3: an unlisted tier or layer is kept as it came, as its unknown(n).
+    assert [e.tier.known for e in got] == [True, True, True, True, False]
+    assert [e.layer.known for e in got] == [True, True, True, True, False]
+    assert got[4].tier == "x_future_tier" and got[4].layer == "x_future_layer"
+
+
+def test_filter_declined_settings_without_a_server_and_the_removed_server_list() -> None:
+    # A schema with no server lists its own layers all the same.
+    d = _describe(
+        filter_declined_settings=[{"name": "final", "tier": "result-content", "layer": "schema"}]
+    )
+    assert d.server is None
+    assert d.filter_declined_settings == (
+        DeclinedSetting(b"final", DeclinedTier.RESULT_CONTENT, DeclinedLayer.SCHEMA),
+    )
+    # The removed server-level list is an unknown member now (rule r2): the
+    # top-level list is the one decoded.
+    d = _describe(
+        filter_declined_settings=[],
+        server={
+            **_SERVER,
+            "filter_declined_settings": [{"name": "final", "tier": "result-content"}],
+        },
+    )
+    assert d.filter_declined_settings == () and d.server == SchemaServer(
+        "UTC", {"final": "1"}, None
     )
-    # Rule r3: an unlisted tier is kept as it came, as its unknown(n).
-    assert [e.tier.known for e in got] == [True, True, True, False]
-    assert got[3].tier == "x_future_tier"
 
 
 @pytest.mark.parametrize(
     "entries",
     [
-        {"name": "final", "tier": "predicate"},
+        {"name": "final", "tier": "predicate", "layer": "server"},
         ["final"],
-        [{"name": "final", "name_b64": "ZmluYWw=", "tier": "predicate"}],
-        [{"tier": "predicate"}],
-        [{"name_b64": "*", "tier": "predicate"}],
-        [{"name": "final", "tier": 1}],
+        [{"name": "final", "name_b64": "ZmluYWw=", "tier": "predicate", "layer": "server"}],
+        [{"tier": "predicate", "layer": "server"}],
+        [{"name_b64": "*", "tier": "predicate", "layer": "server"}],
+        [{"name": "final", "tier": 1, "layer": "server"}],
+        [{"name": "final", "tier": "predicate", "layer": 2}],
     ],
 )
 def test_a_malformed_filter_declined_settings_is_an_internal_error(entries) -> None:

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev5}/tests/abi2/test_public_setup_cases.py

@@ -75,19 +75,20 @@ def _outcome(want: dict, error: BaseException | None) -> str:
 
 
 def _declined(described, want: list[dict]) -> str:
-    """What differs between a description's server `filter_declined_settings`
-    and a describe step's expectation; "" when none."""
-    if described.server is None:
-        return "the description carries no server"
-    got = described.server.filter_declined_settings
+    """What differs between a description's `filter_declined_settings` and a
+    describe step's expectation; "" when none."""
+    got = described.filter_declined_settings
     if len(got) != len(want):
         return f"filter_declined_settings has {len(got)} entries, want {len(want)}: {got!r}"
     for i, (g, w) in enumerate(zip(got, want, strict=True)):
         if g.name.hex() != w["name_hex"]:
             return f"entry {i}: name {g.name!r}, want hex {w['name_hex']}"
-        if g.tier != w["tier"] or g.tier.known != w["known"]:
-            want_tier = f"{w['tier']!r} (known {w['known']})"
+        if g.tier != w["tier"] or g.tier.known != w["tier_known"]:
+            want_tier = f"{w['tier']!r} (known {w['tier_known']})"
             return f"entry {i}: tier {g.tier!r} (known {g.tier.known}), want {want_tier}"
+        if g.layer != w["layer"] or g.layer.known != w["layer_known"]:
+            want_layer = f"{w['layer']!r} (known {w['layer_known']})"
+            return f"entry {i}: layer {g.layer!r} (known {g.layer.known}), want {want_layer}"
     return ""
 
 
@@ -195,9 +196,10 @@ def test_setup_case(
         if opened is not None:
             current = opened
         diff = _outcome(step["expect"], error)
-        if not diff and step["op"] == "describe":
+        if not diff and step["op"] == "describe" and step["expect"].get("ok"):
             # The list as this binding decoded it from the document the stub
-            # answered, never a value the case sets by hand.
+            # answered, never a value the case sets by hand. A describe the
+            # case expects to fail has no list.
             diff = _declined(described, step["declined"])
         if not diff and "rows_passed" in step and step["rows_passed"] != batch_rows_passed:
             diff = (

{chtypes-2.0.0.dev4 → chtypes-2.0.0.dev5}/uv.lock

@@ -74,7 +74,7 @@ wheels = [
 
 [[package]]
 name = "chtypes"
-version = "2.0.0.dev4"
+version = "2.0.0.dev5"
 source = { editable = "." }
 dependencies = [
     { name = "backports-zstd", marker = "python_full_version < '3.14'" },