pytest-jsonschema-snapshot 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

pytest_jsonschema_snapshot/__init__.py

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

pytest_jsonschema_snapshot/core.py

@@ -233,6 +233,14 @@ 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()
+
             if existing_schema != current_schema:  # есть отличия
                 if (self.update_mode or self.reset_mode) and self.update_actions.get("update"):
                     # обновляем файл
@@ -246,12 +254,7 @@ class SchemaShot:
                             json.dump(current_schema, f, indent=2, ensure_ascii=False)
                         self.logger.warning(f"Schema `{name}` updated (reset).\n\n{differences}")
                     elif self.update_mode and not self.reset_mode:
-                        builder = JsonToSchemaConverter(
-                            format_mode=self.format_mode  # type: ignore[arg-type]
-                        )  # , examples=self.examples_limit)
-                        builder.add_schema(existing_schema)
-                        builder.add_schema(current_schema)
-                        merged_schema = builder.to_schema()
+                        merged_schema = merge_schemas(existing_schema, current_schema)
 
                         differences = self.differ.compare(
                             dict(existing_schema), merged_schema
@@ -268,9 +271,9 @@ class SchemaShot:
                         )
                     schema_updated = True
                 elif data is not None:
-                    differences = self.differ.compare(
-                        dict(existing_schema), current_schema
-                    ).render()
+                    merged_schema = merge_schemas(existing_schema, current_schema)
+
+                    differences = self.differ.compare(dict(existing_schema), merged_schema).render()
                     GLOBAL_STATS.add_uncommitted(schema_path.name, differences)
 
                     # только валидируем по старой схеме
@@ -293,9 +296,9 @@ class SchemaShot:
                         format_checker=FormatChecker(),
                     )
                 except ValidationError as e:
-                    differences = self.differ.compare(
-                        dict(existing_schema), current_schema
-                    ).render()
+                    merged_schema = merge_schemas(existing_schema, current_schema)
+
+                    differences = self.differ.compare(dict(existing_schema), merged_schema).render()
                     pytest.fail(f"\n\n{differences}\n\nValidation error in `{name}`: {e.message}")
 
             return name, schema_updated

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-0.2.2.dist-info → pytest_jsonschema_snapshot-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-jsonschema-snapshot
-Version: 0.2.2
+Version: 0.2.4
 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
@@ -58,6 +58,7 @@ Description-Content-Type: text/markdown
 [![PyPI - Package Version](https://img.shields.io/pypi/v/pytest-jsonschema-snapshot?color=blue)](https://pypi.org/project/pytest-jsonschema-snapshot/)
 [![License](https://img.shields.io/badge/license-MIT-blue)](LICENSE)
 [![BlackCode](https://img.shields.io/badge/code%20style-black-black)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 [![mypy](https://img.shields.io/badge/type--checked-mypy-blue?logo=python)](https://mypy.readthedocs.io/en/stable/index.html)
 [![Discord](https://img.shields.io/discord/792572437292253224?label=Discord&labelColor=%232c2f33&color=%237289da)](https://discord.gg/UnJnGHNbBp)
 [![Telegram](https://img.shields.io/badge/Telegram-24A1DE)](https://t.me/miskler_dev)

{pytest_jsonschema_snapshot-0.2.2.dist-info → pytest_jsonschema_snapshot-0.2.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
-pytest_jsonschema_snapshot/__init__.py,sha256=5TgaOzEtd_zql5fMk737SJ342QjH3l3atIBWuko_20g,385
-pytest_jsonschema_snapshot/core.py,sha256=vkS_aD8L2iqCQF9pGMlE63EuUFRC9sZSsrLQ2waLuEI,11852
+pytest_jsonschema_snapshot/__init__.py,sha256=rUBgKVh7nCLEwfO0XZS-TewnM5eTXpBEI7NaC5p4qLg,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/stats.py,sha256=BfhfMoSkRq6Q8BwhVfrpcFl5TP9OzpgpLwnKf1Kslkw,9593
 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.2.dist-info/METADATA,sha256=81-o1vJwGBWxE_neIz7kT6LS-Dw8PRxZSWURWzUHW9E,7657
-pytest_jsonschema_snapshot-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_jsonschema_snapshot-0.2.2.dist-info/entry_points.txt,sha256=eJ1x4TMmhcc8YtM7IoCsUJO4-rLeTrGy8tPgkrojjKs,58
-pytest_jsonschema_snapshot-0.2.2.dist-info/licenses/LICENSE,sha256=1HRFdSzlJ4BtHv6U7tZun3iCArjbCnm5NUowE9hZpNs,1071
-pytest_jsonschema_snapshot-0.2.2.dist-info/RECORD,,
+pytest_jsonschema_snapshot-0.2.4.dist-info/METADATA,sha256=iiGeO3N83BH1griTvads-RUawss1rw_9NIlFEdK6mkM,7795
+pytest_jsonschema_snapshot-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pytest_jsonschema_snapshot-0.2.4.dist-info/entry_points.txt,sha256=eJ1x4TMmhcc8YtM7IoCsUJO4-rLeTrGy8tPgkrojjKs,58
+pytest_jsonschema_snapshot-0.2.4.dist-info/licenses/LICENSE,sha256=1HRFdSzlJ4BtHv6U7tZun3iCArjbCnm5NUowE9hZpNs,1071
+pytest_jsonschema_snapshot-0.2.4.dist-info/RECORD,,