pytest-jsonschema-snapshot 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

pytest_jsonschema_snapshot/__init__.py

@@ -8,5 +8,5 @@ pytest-typed-schema-shot
 
 from .core import SchemaShot
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"
 __all__ = ["SchemaShot"]

pytest_jsonschema_snapshot/core.py

@@ -13,10 +13,17 @@ if TYPE_CHECKING:
     from jsonschema_diff import JsonSchemaDiff
 
 import pytest
+from genschema import Converter, PseudoArrayHandler
+from genschema.comparators import (
+    DeleteElement,
+    FormatComparator,
+    RequiredComparator,
+    SchemaVersionComparator,
+)
 from jsonschema import FormatChecker, ValidationError, validate
 
 from .stats import GLOBAL_STATS
-from .tools import JsonToSchemaConverter, NameMaker
+from .tools import NameMaker
 
 
 class SchemaShot:
@@ -54,6 +61,17 @@ class SchemaShot:
         self.snapshot_dir: Path = root_dir / snapshot_dir_name
         self.used_schemas: Set[str] = set()
 
+        self.conv = Converter(
+            pseudo_handler=PseudoArrayHandler(),
+            base_of="anyOf",
+        )
+        self.conv.register(FormatComparator())
+        self.conv.register(RequiredComparator())
+        # self.conv.register(EmptyComparator())
+        self.conv.register(SchemaVersionComparator())
+        self.conv.register(DeleteElement())
+        self.conv.register(DeleteElement("isPseudoArray"))
+
         self.logger = logging.getLogger(__name__)
         # добавляем вывод в stderr
         handler = logging.StreamHandler()
@@ -144,11 +162,9 @@ class SchemaShot:
 
         real_name = self._process_name(name)
 
-        builder = JsonToSchemaConverter(
-            format_mode=self.format_mode  # type: ignore[arg-type]
-        )  # , examples=self.examples_limit)
-        builder.add_object(data)
-        current_schema = builder.to_schema()
+        self.conv.clear_data()
+        self.conv.add_schema(data)
+        current_schema = self.conv.run()
 
         real_name, status = self._base_match(data, current_schema, real_name)
 
@@ -234,12 +250,11 @@ class SchemaShot:
             schema_updated = False
 
             def merge_schemas(old: dict, new: dict) -> dict:
-                builder = JsonToSchemaConverter(
-                    format_mode=self.format_mode  # type: ignore[arg-type]
-                )  # , examples=self.examples_limit)
-                builder.add_schema(old)
-                builder.add_schema(new)
-                return builder.to_schema()
+                self.conv.clear_data()
+                self.conv.add_schema(old)
+                self.conv.add_schema(new)
+                result = self.conv.run()
+                return result
 
             if existing_schema != current_schema:  # есть отличия
                 if (self.update_mode or self.reset_mode) and self.update_actions.get("update"):

pytest_jsonschema_snapshot/stats.py

@@ -80,51 +80,61 @@ class SchemaStats:
 
         return "\n".join(parts)
 
+    def _iter_schemas(self, names: List[str]) -> Generator[tuple[str, Optional[str]], None, None]:
+        """
+        Iterates over schema displays: (display, schema_key)
+        - display: string to display (may have " + original")
+        - schema_key: file name of the schema (<name>.schema.json) to find diffs,
+          or None if it's not a schema.
+        Preserves the original list order: merging happens at .schema.json
+        position; skips .json if paired with schema.
+        """
+        names = list(names)  # order matters
+        schema_sfx = ".schema.json"
+        json_sfx = ".json"
+
+        # sets of bases
+        # bases_with_schema = {n[: -len(schema_sfx)] for n in names if n.endswith(schema_sfx)}
+        bases_with_original = {
+            n[: -len(json_sfx)]
+            for n in names
+            if n.endswith(json_sfx) and not n.endswith(schema_sfx)
+        }
+
+        for n in names:
+            if n.endswith(schema_sfx):
+                base = n[: -len(schema_sfx)]
+                if base in bases_with_original:
+                    yield f"{n} + original", n  # display, schema_key
+                else:
+                    yield n, n
+            # if .json, skip if paired
+            # if other, yield n, n (but assume all are .json or .schema.json)
+
+    def _iter_only_originals(self, names: List[str]) -> Generator[str, None, None]:
+        """
+        Iterates over only unpaired .json files, in the order they appear.
+        """
+        names = list(names)  # order matters
+        schema_sfx = ".schema.json"
+        json_sfx = ".json"
+
+        bases_with_schema = {n[: -len(schema_sfx)] for n in names if n.endswith(schema_sfx)}
+
+        for n in names:
+            if n.endswith(json_sfx) and not n.endswith(schema_sfx):
+                base = n[: -len(json_sfx)]
+                if base not in bases_with_schema:
+                    yield n
+
     def print_summary(self, terminalreporter: pytest.TerminalReporter, update_mode: bool) -> None:
         """
         Prints schema summary to pytest terminal output.
         Pairs of "<name>.schema.json" + "<name>.json" are merged into one line:
         "<name>.schema.json + original" (if original is present).
+        Unpaired .json are shown in separate "only originals" sections.
         """
 
-        def _iter_merged(names: List[str]) -> Generator[tuple[str, Optional[str]], None, None]:
-            """
-            Iterates over (display, schema_key):
-            - display: string to display (may have " + original")
-            - schema_key: file name of the schema (<name>.schema.json) to find diffs,
-                or None if it's not a schema.
-            Preserves the original list order: merging happens at .schema.json
-            position; single .json outputs are left as is.
-            """
-            names = list(names)  # порядок важен
-            schema_sfx = ".schema.json"
-            json_sfx = ".json"
-
-            # множество баз, где имеются схемы/оригиналы
-            bases_with_schema = {n[: -len(schema_sfx)] for n in names if n.endswith(schema_sfx)}
-            bases_with_original = {
-                n[: -len(json_sfx)]
-                for n in names
-                if n.endswith(json_sfx) and not n.endswith(schema_sfx)
-            }
-
-            for n in names:
-                if n.endswith(schema_sfx):
-                    base = n[: -len(schema_sfx)]
-                    if base in bases_with_original:
-                        yield f"{n} + original", n  # display, schema_key
-                    else:
-                        yield n, n
-                elif n.endswith(json_sfx) and not n.endswith(schema_sfx):
-                    base = n[: -len(json_sfx)]
-                    # если есть парная схема — .json не выводим отдельно
-                    if base in bases_with_schema:
-                        continue
-                    yield n, None
-                else:
-                    # на всякий случай — прочие имена
-                    yield n, n
-
         if not self.has_any_info():
             return
 
@@ -132,52 +142,82 @@ class SchemaStats:
 
         # Created
         if self.created:
-            terminalreporter.write_line(f"Created schemas ({len(self.created)}):", green=True)
-            for display, _key in _iter_merged(self.created):
-                terminalreporter.write_line(f"  - {display}", green=True)
+            schemas = list(self._iter_schemas(self.created))
+            only_originals = list(self._iter_only_originals(self.created))
+            if schemas:
+                terminalreporter.write_line(f"Created schemas ({len(schemas)}):", green=True)
+                for display, _key in schemas:
+                    terminalreporter.write_line(f"  - {display}", green=True)
+            if only_originals:
+                terminalreporter.write_line(
+                    f"Created only originals ({len(only_originals)}):", green=True
+                )
+                for display in only_originals:
+                    terminalreporter.write_line(f"  - {display}", green=True)
 
         # Updated
         if self.updated:
-            terminalreporter.write_line(f"Updated schemas ({len(self.updated)}):", yellow=True)
-            for display, key in _iter_merged(self.updated):
-                terminalreporter.write_line(f"  - {display}", yellow=True)
-                # Показываем diff, если он есть под ключом схемы (.schema.json)
-                if key and key in self.updated_diffs:
-                    terminalreporter.write_line("    Changes:", yellow=True)
-                    for line in self.updated_diffs[key].split("\n"):
-                        if line.strip():
-                            terminalreporter.write_line(f"      {line}")
-                    terminalreporter.write_line("")  # разделение
-                elif key:
-                    terminalreporter.write_line(
-                        "    (Schema unchanged - no differences detected)", cyan=True
-                    )
+            schemas = list(self._iter_schemas(self.updated))
+            only_originals = list(self._iter_only_originals(self.updated))
+            if schemas:
+                terminalreporter.write_line(f"Updated schemas ({len(schemas)}):", yellow=True)
+                for display, key in schemas:
+                    terminalreporter.write_line(f"  - {display}", yellow=True)
+                    # Show diff if available for schema
+                    if key and key in self.updated_diffs:
+                        diff = self.updated_diffs[key]
+                        if diff.strip():
+                            terminalreporter.write_line("    Changes:", yellow=True)
+                            for line in diff.split("\n"):
+                                if line.strip():
+                                    terminalreporter.write_line(f"      {line}")
+                            terminalreporter.write_line("")  # separation
+                        else:
+                            terminalreporter.write_line(
+                                "    (Schema unchanged - no differences detected)", cyan=True
+                            )
+            if only_originals:
+                terminalreporter.write_line(
+                    f"Updated only originals ({len(only_originals)}):", yellow=True
+                )
+                for display in only_originals:
+                    terminalreporter.write_line(f"  - {display}", yellow=True)
 
         # Uncommitted
         if self.uncommitted:
             terminalreporter.write_line(
                 f"Uncommitted minor updates ({len(self.uncommitted)}):", bold=True
             )
-            for display, key in _iter_merged(self.uncommitted):
+            for display, key in self._iter_schemas(self.uncommitted):  # assuming mostly schemas
                 terminalreporter.write_line(f"  - {display}", cyan=True)
+                # Show diff if available
                 if key and key in self.uncommitted_diffs:
                     terminalreporter.write_line("    Detected changes:", cyan=True)
                     for line in self.uncommitted_diffs[key].split("\n"):
                         if line.strip():
                             terminalreporter.write_line(f"      {line}")
-                    terminalreporter.write_line("")  # разделение
+                    terminalreporter.write_line("")  # separation
             terminalreporter.write_line("Use --schema-update to commit these changes", cyan=True)
 
         # Deleted
         if self.deleted:
-            terminalreporter.write_line(f"Deleted schemas ({len(self.deleted)}):", red=True)
-            for display, _key in _iter_merged(self.deleted):
-                terminalreporter.write_line(f"  - {display}", red=True)
-
-        # Unused (только если не update_mode)
+            schemas = list(self._iter_schemas(self.deleted))
+            only_originals = list(self._iter_only_originals(self.deleted))
+            if schemas:
+                terminalreporter.write_line(f"Deleted schemas ({len(schemas)}):", red=True)
+                for display, _key in schemas:
+                    terminalreporter.write_line(f"  - {display}", red=True)
+            if only_originals:
+                terminalreporter.write_line(
+                    f"Deleted only originals ({len(only_originals)}):", red=True
+                )
+                for display in only_originals:
+                    terminalreporter.write_line(f"  - {display}", red=True)
+
+        # Unused (only if not update_mode)
         if self.unused and not update_mode:
             terminalreporter.write_line(f"Unused schemas ({len(self.unused)}):")
-            for display, _key in _iter_merged(self.unused):
+            for display, _key in self._iter_schemas(self.unused):  # assuming schemas
                 terminalreporter.write_line(f"  - {display}")
             terminalreporter.write_line("Use --schema-update to delete unused schemas", yellow=True)
 

pytest_jsonschema_snapshot/tools/__init__.py

@@ -1,4 +1,3 @@
-from .genson_addon import JsonToSchemaConverter
 from .name_maker import NameMaker
 
-__all__ = ["JsonToSchemaConverter", "NameMaker"]
+__all__ = ["NameMaker"]

{pytest_jsonschema_snapshot-0.2.3.dist-info → pytest_jsonschema_snapshot-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-jsonschema-snapshot
-Version: 0.2.3
+Version: 0.2.5
 Summary: Pytest plugin for automatic JSON Schema generation and validation from examples
 Project-URL: Homepage, https://miskler.github.io/pytest-jsonschema-snapshot/basic/quick_start.html
 Project-URL: Repository, https://github.com/Miskler/pytest-jsonschema-snapshot
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Utilities
 Requires-Python: >=3.10
-Requires-Dist: genson
+Requires-Dist: genschema
 Requires-Dist: jsonschema
 Requires-Dist: jsonschema-diff
 Requires-Dist: pathvalidate

pytest_jsonschema_snapshot-0.2.5.dist-info/RECORD

@@ -0,0 +1,12 @@
+pytest_jsonschema_snapshot/__init__.py,sha256=o7yiVh_nbK13tO4NpaE25XW3J9V2YD7fkicByUdS-iM,385
+pytest_jsonschema_snapshot/core.py,sha256=fM8r8wD83litob2sheHb1jh8x8Nam4g8AnjGzk8TZ2o,12347
+pytest_jsonschema_snapshot/plugin.py,sha256=nvAfxtLSX_B5FzaWu7DfsiWRxFjxDvnQNNOhkRrRnbw,8677
+pytest_jsonschema_snapshot/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_jsonschema_snapshot/stats.py,sha256=BfhfMoSkRq6Q8BwhVfrpcFl5TP9OzpgpLwnKf1Kslkw,9593
+pytest_jsonschema_snapshot/tools/__init__.py,sha256=WeD2EVrQpKIoFW1s43QAqsJmartqZ3Irwckt814P1bs,59
+pytest_jsonschema_snapshot/tools/name_maker.py,sha256=tqss8NCGSo2aQX_-RkCJzy3NJx_TDA-xrn8qsblecf0,5799
+pytest_jsonschema_snapshot-0.2.5.dist-info/METADATA,sha256=QR0VvtvzFi6fDHtGUv_sNgSSUBSTw7ZJET_Ajd09IEE,7798
+pytest_jsonschema_snapshot-0.2.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pytest_jsonschema_snapshot-0.2.5.dist-info/entry_points.txt,sha256=eJ1x4TMmhcc8YtM7IoCsUJO4-rLeTrGy8tPgkrojjKs,58
+pytest_jsonschema_snapshot-0.2.5.dist-info/licenses/LICENSE,sha256=1HRFdSzlJ4BtHv6U7tZun3iCArjbCnm5NUowE9hZpNs,1071
+pytest_jsonschema_snapshot-0.2.5.dist-info/RECORD,,

{pytest_jsonschema_snapshot-0.2.3.dist-info → pytest_jsonschema_snapshot-0.2.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

pytest_jsonschema_snapshot/tools/genson_addon/__init__.py

@@ -1,3 +0,0 @@
-from .to_schema_converter import JsonToSchemaConverter
-
-__all__ = ["JsonToSchemaConverter"]

pytest_jsonschema_snapshot/tools/genson_addon/format_detector.py

@@ -1,52 +0,0 @@
-import re
-from typing import Optional
-
-
-class FormatDetector:
-    """Class for detecting string formats"""
-
-    # Regular expressions for various formats
-    EMAIL_PATTERN = re.compile(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
-    UUID_PATTERN = re.compile(
-        r"^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
-        re.I,
-    )
-    DATE_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}$")
-    DATETIME_PATTERN = re.compile(
-        r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:\d{2})$"
-    )
-    URI_PATTERN = re.compile(r"^https?://[^\s/$.?#].[^\s]*$", re.I)
-    IPV4_PATTERN = re.compile(
-        r"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}"
-        r"(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
-    )
-
-    @classmethod
-    def detect_format(cls, value: str) -> Optional[str]:
-        """
-        Detects the format of a string.
-
-        Args:
-            value: The string to analyze
-
-        Returns:
-            The name of the format or None if the format is not defined
-        """
-        if not isinstance(value, str) or not value:
-            return None
-
-        # Check formats from more specific to less specific
-        if cls.EMAIL_PATTERN.match(value):
-            return "email"
-        elif cls.UUID_PATTERN.match(value):
-            return "uuid"
-        elif cls.DATETIME_PATTERN.match(value):
-            return "date-time"
-        elif cls.DATE_PATTERN.match(value):
-            return "date"
-        elif cls.URI_PATTERN.match(value):
-            return "uri"
-        elif cls.IPV4_PATTERN.match(value):
-            return "ipv4"
-
-        return None

pytest_jsonschema_snapshot/tools/genson_addon/to_schema_converter.py

@@ -1,100 +0,0 @@
-"""Json → Schema with optional format handling.
-
-`format_mode` options
----------------------
-* ``"on"``   – detect formats and let validators assert them (default).
-* ``"off"``  – ignore formats entirely.
-* ``"safe"`` – keep the annotations but embed a ``$vocabulary`` block that
-                **disables** the draft‑2020‑12 *format‑assertion* vocabulary.
-                This makes every ``format`` purely informational, regardless
-                of validator settings.
-"""
-
-from typing import Any, Dict, Literal
-
-from genson import SchemaBuilder  # type: ignore[import-untyped]
-
-from .format_detector import FormatDetector
-
-_FormatMode = Literal["on", "off", "safe"]
-
-
-class JsonToSchemaConverter(SchemaBuilder):
-    """A thin wrapper around :class:`genson.SchemaBuilder`."""
-
-    # ------------------------------------------------------------------
-    # Construction
-    # ------------------------------------------------------------------
-    def __init__(
-        self,
-        schema_uri: str = "https://json-schema.org/draft/2020-12/schema",
-        *,
-        format_mode: _FormatMode = "on",
-    ):
-        super().__init__(schema_uri) if schema_uri else super().__init__()
-        if format_mode not in {"on", "off", "safe"}:
-            raise ValueError("format_mode must be 'on', 'off', or 'safe'.")
-        self._format_mode: _FormatMode = format_mode
-        self._format_cache: Dict[str, set[str]] = {}
-
-    # ------------------------------------------------------------------
-    # Public API (overrides)
-    # ------------------------------------------------------------------
-    def add_object(self, obj: Any, path: str = "root") -> None:
-        super().add_object(obj)
-        if self._format_mode != "off":
-            self._collect_formats(obj, path)
-
-    def to_schema(self) -> Dict[str, Any]:
-        schema = dict(super().to_schema())  # shallow‑copy
-
-        if self._format_mode != "off":
-            self._inject_formats(schema, "root")
-
-            if self._format_mode == "safe":
-                schema.setdefault(
-                    "$vocabulary",
-                    {
-                        "https://json-schema.org/draft/2020-12/vocab/core": True,
-                        "https://json-schema.org/draft/2020-12/vocab/applicator": True,
-                        "https://json-schema.org/draft/2020-12/vocab/format-annotation": True,
-                        "https://json-schema.org/draft/2020-12/vocab/format-assertion": False,
-                    },
-                )
-
-        return schema
-
-    # ------------------------------------------------------------------
-    # Internals
-    # ------------------------------------------------------------------
-    def _collect_formats(self, obj: Any, path: str) -> None:
-        if isinstance(obj, str):
-            fmt = FormatDetector.detect_format(obj)
-            if fmt:
-                self._format_cache.setdefault(path, set()).add(fmt)
-        elif isinstance(obj, dict):
-            for k, v in obj.items():
-                self._collect_formats(v, f"{path}.{k}")
-        elif isinstance(obj, (list, tuple)):
-            for i, item in enumerate(obj):
-                self._collect_formats(item, f"{path}[{i}]")
-
-    def _inject_formats(self, schema: Dict[str, Any], path: str) -> None:
-        t = schema.get("type")
-        if t == "string":
-            fmts = self._format_cache.get(path)
-            if fmts and len(fmts) == 1:
-                schema["format"] = next(iter(fmts))
-        elif t == "object" and "properties" in schema:
-            for name, subschema in schema["properties"].items():
-                self._inject_formats(subschema, f"{path}.{name}")
-        elif t == "array" and "items" in schema:
-            items_schema = schema["items"]
-            if isinstance(items_schema, dict):
-                self._inject_formats(items_schema, f"{path}[0]")
-            else:
-                for idx, subschema in enumerate(items_schema):
-                    self._inject_formats(subschema, f"{path}[{idx}]")
-        elif "anyOf" in schema:
-            for subschema in schema["anyOf"]:
-                self._inject_formats(subschema, path)

pytest_jsonschema_snapshot-0.2.3.dist-info/RECORD

@@ -1,15 +0,0 @@
-pytest_jsonschema_snapshot/__init__.py,sha256=v-YeeYwLr0JgBV0W2iNt8SEfBDFnP0TivliTh8btZYc,385
-pytest_jsonschema_snapshot/core.py,sha256=CoL_W-u6o3N7XDwv-MbePJiZaGX0LtGS6BLbj9MHROU,11995
-pytest_jsonschema_snapshot/plugin.py,sha256=nvAfxtLSX_B5FzaWu7DfsiWRxFjxDvnQNNOhkRrRnbw,8677
-pytest_jsonschema_snapshot/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_jsonschema_snapshot/stats.py,sha256=XGGzHY0ytMFOkFpnqNAK1DpV9iI0_fZPWrVvHFNFL3g,7943
-pytest_jsonschema_snapshot/tools/__init__.py,sha256=WMS6PdgMABBfTRhPGuoUOXB-R2PcqcadwH8pG1C6MFU,132
-pytest_jsonschema_snapshot/tools/name_maker.py,sha256=tqss8NCGSo2aQX_-RkCJzy3NJx_TDA-xrn8qsblecf0,5799
-pytest_jsonschema_snapshot/tools/genson_addon/__init__.py,sha256=nANkqHTaWTZPwBDztsnQvObHUZLSeHenJS--oWfep8c,92
-pytest_jsonschema_snapshot/tools/genson_addon/format_detector.py,sha256=Wc5pB_xstyr4OtjwJ2qqmV62xET63cN7Nb0gxkrYyW0,1636
-pytest_jsonschema_snapshot/tools/genson_addon/to_schema_converter.py,sha256=UdQIkZhMrTJNHwI1B1dv3aEwx41B1B_lLyr4KWiUpNY,4168
-pytest_jsonschema_snapshot-0.2.3.dist-info/METADATA,sha256=cMTeW3ydl2gg8dQHUqmsiLSa9l9ndSoQP5yUlzktOn4,7795
-pytest_jsonschema_snapshot-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_jsonschema_snapshot-0.2.3.dist-info/entry_points.txt,sha256=eJ1x4TMmhcc8YtM7IoCsUJO4-rLeTrGy8tPgkrojjKs,58
-pytest_jsonschema_snapshot-0.2.3.dist-info/licenses/LICENSE,sha256=1HRFdSzlJ4BtHv6U7tZun3iCArjbCnm5NUowE9hZpNs,1071
-pytest_jsonschema_snapshot-0.2.3.dist-info/RECORD,,