pytest-jsonschema-snapshot 0.2.3__tar.gz → 0.2.5__tar.gz

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/PKG-INFO

@@ -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.3 → pytest_jsonschema_snapshot-0.2.5}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
   "Topic :: Utilities"
 ]
 dependencies = [
-  "genson",
+  "genschema",
   "pathvalidate",
   "jsonschema",
   "jsonschema-diff",

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/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-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/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-0.2.5/pytest_jsonschema_snapshot/stats.py

@@ -0,0 +1,225 @@
+"""
+Module for collecting and displaying statistics about schemas.
+"""
+
+from typing import Dict, Generator, List, Optional
+
+import pytest
+
+
+class SchemaStats:
+    """Class for collecting and displaying statistics about schemas"""
+
+    def __init__(self) -> None:
+        self.created: List[str] = []
+        self.updated: List[str] = []
+        self.updated_diffs: Dict[str, str] = {}  # schema_name -> diff
+        self.uncommitted: List[str] = []  # New category for uncommitted changes
+        self.uncommitted_diffs: Dict[str, str] = {}  # schema_name -> diff
+        self.deleted: List[str] = []
+        self.unused: List[str] = []
+
+    def add_created(self, schema_name: str) -> None:
+        """Adds created schema"""
+        self.created.append(schema_name)
+
+    def add_updated(self, schema_name: str, diff: Optional[str] = None) -> None:
+        """Adds updated schema"""
+        # Generate diff if both schemas are provided
+        if diff and diff.strip():
+            self.updated.append(schema_name)
+            self.updated_diffs[schema_name] = diff
+        else:
+            # If schemas are not provided, assume it was an update
+            self.updated.append(schema_name)
+
+    def add_uncommitted(self, schema_name: str, diff: Optional[str] = None) -> None:
+        """Adds schema with uncommitted changes"""
+        # Add only if there are real changes
+        if diff and diff.strip():
+            self.uncommitted.append(schema_name)
+            self.uncommitted_diffs[schema_name] = diff
+
+    def add_deleted(self, schema_name: str) -> None:
+        """Adds deleted schema"""
+        self.deleted.append(schema_name)
+
+    def add_unused(self, schema_name: str) -> None:
+        """Adds unused schema"""
+        self.unused.append(schema_name)
+
+    def has_changes(self) -> bool:
+        """Returns True if any schema has changes"""
+        return bool(self.created or self.updated or self.deleted)
+
+    def has_any_info(self) -> bool:
+        """Is there any information about schemas"""
+        return bool(self.created or self.updated or self.deleted or self.unused or self.uncommitted)
+
+    def __str__(self) -> str:
+        parts = []
+        if self.created:
+            parts.append(
+                f"Created schemas ({len(self.created)}): "
+                + ", ".join(f"`{s}`" for s in self.created)
+            )
+        if self.updated:
+            parts.append(
+                f"Updated schemas ({len(self.updated)}): "
+                + ", ".join(f"`{s}`" for s in self.updated)
+            )
+        if self.deleted:
+            parts.append(
+                f"Deleted schemas ({len(self.deleted)}): "
+                + ", ".join(f"`{s}`" for s in self.deleted)
+            )
+        if self.unused:
+            parts.append(
+                f"Unused schemas ({len(self.unused)}): " + ", ".join(f"`{s}`" for s in self.unused)
+            )
+
+        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.
+        """
+
+        if not self.has_any_info():
+            return
+
+        terminalreporter.write_sep("=", "Schema Summary")
+
+        # Created
+        if self.created:
+            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:
+            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 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("")  # separation
+            terminalreporter.write_line("Use --schema-update to commit these changes", cyan=True)
+
+        # Deleted
+        if self.deleted:
+            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 self._iter_schemas(self.unused):  # assuming schemas
+                terminalreporter.write_line(f"  - {display}")
+            terminalreporter.write_line("Use --schema-update to delete unused schemas", yellow=True)
+
+
+GLOBAL_STATS = SchemaStats()

pytest_jsonschema_snapshot-0.2.5/pytest_jsonschema_snapshot/tools/__init__.py

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

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/requirements.txt

@@ -1,4 +1,4 @@
-genson
+genschema
 pathvalidate
 jsonschema
 jsonschema-diff

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/TestDataClass.get_data.first.schema.json

@@ -1,15 +1,24 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "необязательная",
+    "обязательная",
+    "словарь"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "обязательная": {
-      "type": "string"
-    },
     "необязательная": {
       "type": "null"
     },
+    "обязательная": {
+      "type": "string"
+    },
     "словарь": {
       "type": "object",
+      "required": [
+        "ключ",
+        "число"
+      ],
       "properties": {
         "ключ": {
           "type": "string"
@@ -17,16 +26,7 @@
         "число": {
           "type": "integer"
         }
-      },
-      "required": [
-        "ключ",
-        "число"
-      ]
+      }
     }
-  },
-  "required": [
-    "необязательная",
-    "обязательная",
-    "словарь"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/TestDataClass.get_data.schema.json

@@ -1,15 +1,24 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "необязательная",
+    "обязательная",
+    "словарь"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "обязательная": {
-      "type": "string"
-    },
     "необязательная": {
       "type": "null"
     },
+    "обязательная": {
+      "type": "string"
+    },
     "словарь": {
       "type": "object",
+      "required": [
+        "ключ",
+        "число"
+      ],
       "properties": {
         "ключ": {
           "type": "string"
@@ -17,16 +26,7 @@
         "число": {
           "type": "integer"
         }
-      },
-      "required": [
-        "ключ",
-        "число"
-      ]
+      }
     }
-  },
-  "required": [
-    "необязательная",
-    "обязательная",
-    "словарь"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/array_formats_test.schema.json

@@ -1,19 +1,24 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "dates",
+    "emails",
+    "uuids"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "emails": {
+    "dates": {
       "type": "array",
       "items": {
         "type": "string",
-        "format": "email"
+        "format": "date"
       }
     },
-    "dates": {
+    "emails": {
       "type": "array",
       "items": {
         "type": "string",
-        "format": "date"
+        "format": "email"
       }
     },
     "uuids": {
@@ -23,10 +28,5 @@
         "format": "uuid"
       }
     }
-  },
-  "required": [
-    "dates",
-    "emails",
-    "uuids"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/date_test.schema.json

@@ -1,6 +1,10 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "birth_date",
+    "registration_date"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
     "birth_date": {
       "type": "string",
@@ -10,9 +14,5 @@
       "type": "string",
       "format": "date"
     }
-  },
-  "required": [
-    "birth_date",
-    "registration_date"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/datetime_test.schema.json

@@ -1,6 +1,10 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "created_at",
+    "updated_at"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
     "created_at": {
       "type": "string",
@@ -10,9 +14,5 @@
       "type": "string",
       "format": "date-time"
     }
-  },
-  "required": [
-    "created_at",
-    "updated_at"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/email_test.schema.json

@@ -1,18 +1,18 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "admin_email",
+    "user_email"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "user_email": {
+    "admin_email": {
       "type": "string",
       "format": "email"
     },
-    "admin_email": {
+    "user_email": {
       "type": "string",
       "format": "email"
     }
-  },
-  "required": [
-    "admin_email",
-    "user_email"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/get_data.first.schema.json

@@ -1,15 +1,24 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "необязательная",
+    "обязательная",
+    "словарь"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "обязательная": {
-      "type": "string"
-    },
     "необязательная": {
       "type": "null"
     },
+    "обязательная": {
+      "type": "string"
+    },
     "словарь": {
       "type": "object",
+      "required": [
+        "ключ",
+        "число"
+      ],
       "properties": {
         "ключ": {
           "type": "string"
@@ -17,16 +26,7 @@
         "число": {
           "type": "integer"
         }
-      },
-      "required": [
-        "ключ",
-        "число"
-      ]
+      }
     }
-  },
-  "required": [
-    "необязательная",
-    "обязательная",
-    "словарь"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/get_data.schema.json

@@ -1,15 +1,24 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "необязательная",
+    "обязательная",
+    "словарь"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "обязательная": {
-      "type": "string"
-    },
     "необязательная": {
       "type": "null"
     },
+    "обязательная": {
+      "type": "string"
+    },
     "словарь": {
       "type": "object",
+      "required": [
+        "ключ",
+        "число"
+      ],
       "properties": {
         "ключ": {
           "type": "string"
@@ -17,16 +26,7 @@
         "число": {
           "type": "integer"
         }
-      },
-      "required": [
-        "ключ",
-        "число"
-      ]
+      }
     }
-  },
-  "required": [
-    "необязательная",
-    "обязательная",
-    "словарь"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.3 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/ipv4_test.schema.json

@@ -1,18 +1,18 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "gateway",
+    "server_ip"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "server_ip": {
+    "gateway": {
       "type": "string",
       "format": "ipv4"
     },
-    "gateway": {
+    "server_ip": {
       "type": "string",
       "format": "ipv4"
     }
-  },
-  "required": [
-    "gateway",
-    "server_ip"
-  ]
+  }
 }