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

pytest_jsonschema_snapshot/__init__.py

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

pytest_jsonschema_snapshot/core.py

@@ -233,24 +233,33 @@ class SchemaShot:
             # --- схема уже была: сравнение и валидация --------------------------------
             schema_updated = False
 
-            if existing_schema != current_schema:  # есть отличия
-                differences = self.differ.compare(dict(existing_schema), current_schema).render()
+            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"):
-                    GLOBAL_STATS.add_updated(schema_path.name, differences)
-
                     # обновляем файл
                     if self.reset_mode and not self.update_mode:
+                        differences = self.differ.compare(
+                            dict(existing_schema), current_schema
+                        ).render()
+                        GLOBAL_STATS.add_updated(schema_path.name, differences)
+
                         with open(schema_path, "w", encoding="utf-8") as f:
                             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
+                        ).render()
+                        GLOBAL_STATS.add_updated(schema_path.name, differences)
 
                         with open(schema_path, "w", encoding="utf-8") as f:
                             json.dump(merged_schema, f, indent=2, ensure_ascii=False)
@@ -262,6 +271,9 @@ class SchemaShot:
                         )
                     schema_updated = True
                 elif data is not None:
+                    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)
 
                     # только валидируем по старой схеме
@@ -284,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-0.2.1.dist-info → pytest_jsonschema_snapshot-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-jsonschema-snapshot
-Version: 0.2.1
+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.1.dist-info → pytest_jsonschema_snapshot-0.2.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytest_jsonschema_snapshot/__init__.py,sha256=A3cUmyPftYWT68KRDu3V6WNGuIKdkqCtxYQS3eyPwbk,385
-pytest_jsonschema_snapshot/core.py,sha256=951wNZ6BiVToaK8l-l5hgj8WPePBTSK5bDZqFOAZztg,11399
+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
@@ -8,8 +8,8 @@ pytest_jsonschema_snapshot/tools/name_maker.py,sha256=tqss8NCGSo2aQX_-RkCJzy3NJx
 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.1.dist-info/METADATA,sha256=sKa-GvRU2__0rk-bOFpPhaIT7_gnZvkJX15AWRvkkl4,7657
-pytest_jsonschema_snapshot-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_jsonschema_snapshot-0.2.1.dist-info/entry_points.txt,sha256=eJ1x4TMmhcc8YtM7IoCsUJO4-rLeTrGy8tPgkrojjKs,58
-pytest_jsonschema_snapshot-0.2.1.dist-info/licenses/LICENSE,sha256=1HRFdSzlJ4BtHv6U7tZun3iCArjbCnm5NUowE9hZpNs,1071
-pytest_jsonschema_snapshot-0.2.1.dist-info/RECORD,,
+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,,