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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-jsonschema-snapshot
-Version: 0.2.4
+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.4 → 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.4 → 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.4"
+__version__ = "0.2.5"
 __all__ = ["SchemaShot"]

{pytest_jsonschema_snapshot-0.2.4 → 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/tools/__init__.py

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

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

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

{pytest_jsonschema_snapshot-0.2.4 → 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.4 → 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.4 → 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.4 → 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.4 → 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.4 → 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.4 → 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.4 → 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.4 → 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"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.4 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/mixed_formats_test.schema.json

@@ -1,38 +1,38 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "birth_date",
+    "created_at",
+    "email",
+    "id",
+    "ip_address",
+    "website"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "id": {
-      "type": "string",
-      "format": "uuid"
-    },
-    "email": {
+    "birth_date": {
       "type": "string",
-      "format": "email"
+      "format": "date"
     },
     "created_at": {
       "type": "string",
       "format": "date-time"
     },
-    "birth_date": {
+    "email": {
       "type": "string",
-      "format": "date"
+      "format": "email"
     },
-    "website": {
+    "id": {
       "type": "string",
-      "format": "uri"
+      "format": "uuid"
     },
     "ip_address": {
       "type": "string",
       "format": "ipv4"
+    },
+    "website": {
+      "type": "string",
+      "format": "uri"
     }
-  },
-  "required": [
-    "birth_date",
-    "created_at",
-    "email",
-    "id",
-    "ip_address",
-    "website"
-  ]
+  }
 }

{pytest_jsonschema_snapshot-0.2.4 → pytest_jsonschema_snapshot-0.2.5}/tests/usage/__snapshots__/regular_strings_test.schema.json

@@ -1,20 +1,20 @@
 {
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
+  "required": [
+    "description",
+    "name",
+    "status"
+  ],
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
   "properties": {
-    "name": {
+    "description": {
       "type": "string"
     },
-    "description": {
+    "name": {
       "type": "string"
     },
     "status": {
       "type": "string"
     }
-  },
-  "required": [
-    "description",
-    "name",
-    "status"
-  ]
+  }
 }