subschema 0.0.2__tar.gz → 0.0.3__tar.gz

{subschema-0.0.2 → subschema-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subschema
-Version: 0.0.2
+Version: 0.0.3
 Summary: A conservative JSON Schema subschema prover
 Project-URL: Homepage, https://github.com/ArakawaHenri/subschema
 Project-URL: Repository, https://github.com/ArakawaHenri/subschema

{subschema-0.0.2 → subschema-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "subschema"
-version = "0.0.2"
+version = "0.0.3"
 description = "A conservative JSON Schema subschema prover"
 readme = "README.md"
 requires-python = ">=3.12"

{subschema-0.0.2 → subschema-0.0.3}/src/subschema/api.py

@@ -15,7 +15,7 @@ from subschema.dialects import (
     validate_supported_keywords,
 )
 from subschema.kernel.contracts import ProofBudgets, ProofOptions
-from subschema.kernel.disjointness import schemas_are_disjoint
+from subschema.kernel.disjointness import schema_is_empty_exact, schemas_are_disjoint
 from subschema.kernel.engine import ProofEngine
 from subschema.kernel.json_data import ensure_json_value
 from subschema.kernel.normalization import normalize_boolean_schemas
@@ -202,12 +202,16 @@ def is_empty(
         timeout_ms=timeout_ms,
     )
     empty_schema = empty_schema_for_dialect(resolved_dialect)
-    return ProofEngine.for_schemas(
+    engine = ProofEngine.for_schemas(
         schema,
         empty_schema,
         dialect=resolved_dialect,
         options=options,
-    ).is_subschema_bool(schema, empty_schema)
+    )
+    exact_empty = schema_is_empty_exact(schema, engine.context)
+    if exact_empty.status != "unsupported":
+        return exact_empty.as_bool(resolved_dialect)
+    return engine.is_subschema_bool(schema, empty_schema)
 
 
 def is_disjoint(

{subschema-0.0.2 → subschema-0.0.3}/src/subschema/kernel/context.py

@@ -5,7 +5,7 @@ Proof context, policy, and budget state for the kernel.
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import subschema.kernel.driver as proof_driver
 from subschema.dialects import Dialect
@@ -17,9 +17,6 @@ from subschema.kernel.contracts import (
 )
 from subschema.kernel.values import stable_key
 
-if TYPE_CHECKING:
-    from subschema.kernel.evaluation import EvaluationExpression
-
 _EXPENSIVE_PROOF_WORK_LABELS: dict[ExpensiveProofKind, str] = {
     "array_product": "array product",
     "branch_product": "branch expansion",
@@ -36,9 +33,7 @@ class ProofContext:
     dialect: Dialect
     options: ProofOptions = field(default_factory=ProofOptions)
     subproof_cache: dict[tuple[Any, ...], ProofResult] = field(default_factory=dict)
-    evaluation_expression_cache: dict[tuple[Any, ...], EvaluationExpression] = field(
-        default_factory=dict
-    )
+    cache: dict[tuple[object, ...], object] = field(default_factory=dict)
     work_meter: ProofWorkMeter = field(init=False)
 
     def __post_init__(self) -> None:
@@ -72,6 +67,15 @@ class ProofContext:
             stable_key(rhs),
         )
 
+    def cache_get(self, namespace: str, key: tuple[Any, ...]) -> object | None:
+        return self.cache.get(self._cache_key(namespace, key))
+
+    def cache_set(self, namespace: str, key: tuple[Any, ...], value: object) -> None:
+        self.cache[self._cache_key(namespace, key)] = value
+
+    def _cache_key(self, namespace: str, key: tuple[Any, ...]) -> tuple[object, ...]:
+        return (namespace, *(_cache_key_part(part) for part in key))
+
     def consume_branch_expansion(self, reason: str) -> ProofResult | None:
         return self.spend_work(1, "branch expansion", reason)
 
@@ -132,3 +136,11 @@ class ProofContext:
         from subschema.kernel.projection import ProjectionEngine
 
         return ProjectionEngine(self).finite_join_projection(lhs, rhs)
+
+
+def _cache_key_part(part: Any) -> object:
+    try:
+        hash(part)
+    except TypeError:
+        return stable_key(part)
+    return part