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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-jsonschema-snapshot
-Version: 0.2.2
+Version: 0.2.3
 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 → pytest_jsonschema_snapshot-0.2.3}/README.md

@@ -13,6 +13,7 @@
 [![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 → pytest_jsonschema_snapshot-0.2.3}/pytest_jsonschema_snapshot/__init__.py

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

{pytest_jsonschema_snapshot-0.2.2 → pytest_jsonschema_snapshot-0.2.3}/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