genschema 0.1.0__tar.gz → 0.1.1__tar.gz

{genschema-0.1.0 → genschema-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genschema
-Version: 0.1.0
+Version: 0.1.1
 Summary: A library for comparing JSON and schemas and generate new
 Author-email: Miskler <mail@miskler.ru>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{genschema-0.1.0 → genschema-0.1.1}/genschema/__init__.py

@@ -2,4 +2,4 @@ from .pipeline import Converter
 from .pseudo_arrays import PseudoArrayHandler, PseudoArrayHandlerBase
 
 __all__ = ["Converter", "PseudoArrayHandler", "PseudoArrayHandlerBase"]
-__version__ = "0.1.0"
+__version__ = "0.1.1"

{genschema-0.1.0 → genschema-0.1.1}/genschema/cli.py

@@ -11,6 +11,7 @@ from .comparators import (
     EmptyComparator,
     FormatComparator,
     RequiredComparator,
+    SchemaVersionComparator,
 )
 
 console = Console()
@@ -52,6 +53,11 @@ Examples:
     parser.add_argument("--no-format", action="store_true", help="Disable FormatComparator.")
     parser.add_argument("--no-required", action="store_true", help="Disable RequiredComparator.")
     parser.add_argument("--no-empty", action="store_true", help="Disable EmptyComparator.")
+    parser.add_argument(
+        "--no-schema-version",
+        action="store_true",
+        help="Disable SchemaVersionComparator.",
+    )
     parser.add_argument(
         "--no-delete-element", action="store_true", help="Disable DeleteElement comparators."
     )
@@ -108,6 +114,8 @@ Examples:
     # Register comparators conditionally
     if not args.no_format:
         conv.register(FormatComparator())
+    if not args.no_schema_version:
+        conv.register(SchemaVersionComparator())
     if not args.no_required:
         conv.register(RequiredComparator())
     if not args.no_empty:

{genschema-0.1.0 → genschema-0.1.1}/genschema/comparators/__init__.py

@@ -4,6 +4,7 @@ from .flag import FlagMaker
 from .format import FormatComparator
 from .no_additional_prop import NoAdditionalProperties
 from .required import RequiredComparator
+from .schema_version import SchemaVersionComparator
 from .type import TypeComparator
 
 __all__ = [
@@ -14,4 +15,5 @@ __all__ = [
     "EmptyComparator",
     "NoAdditionalProperties",
     "DeleteElement",
+    "SchemaVersionComparator",
 ]

genschema-0.1.1/genschema/comparators/required.py

@@ -0,0 +1,57 @@
+import logging
+
+from .template import Comparator, ComparatorResult, ProcessingContext
+
+logger = logging.getLogger(__name__)
+
+
+class RequiredComparator(Comparator):
+    """
+    Компаратор для определения обязательных полей.
+    Устанавливает "required" на основе наличия ключей в JSON на текущем уровне.
+    """
+
+    def can_process(self, ctx: ProcessingContext, env: str, node: dict) -> bool:
+        # обрабатываем только объекты
+        return (
+            (node.get("type") == "object" and not node.get("isPseudoArray", False))
+            or node.get("type") is None
+            or not ctx.jsons
+        )
+
+    def process(self, ctx: ProcessingContext, env: str, node: dict) -> ComparatorResult:
+        required_sets: list[set[str]] = []
+
+        # Если есть хотя бы один JSON, который не является объектом,
+        # мы не можем корректно определить обязательные ключи.
+        if ctx.jsons and any(not isinstance(j.content, dict) for j in ctx.jsons):
+            return None, None
+
+        # ---------- из json ----------
+        objects = [j.content for j in ctx.jsons if isinstance(j.content, dict)]
+        if objects:
+            keys: set[str] = set()
+            for obj in objects:
+                keys.update(obj.keys())
+
+            required_from_json = {k for k in keys if all(k in obj for obj in objects)}
+            required_sets.append(required_from_json)
+
+        # ---------- из схем ----------
+        for schema in ctx.schemas:
+            content = schema.content
+            if not isinstance(content, dict):
+                continue
+            req = content.get("required")
+            if isinstance(req, list):
+                required_sets.append(set(req))
+
+        if not required_sets:
+            return None, None
+
+        # ---------- минимальное пересечение ----------
+        required = sorted(set.intersection(*required_sets))
+
+        if required:
+            return {"required": required}, None
+        return None, None

genschema-0.1.1/genschema/comparators/schema_version.py

@@ -0,0 +1,18 @@
+from .template import Comparator, ComparatorResult, ProcessingContext
+
+
+class SchemaVersionComparator(Comparator):
+    """
+    Компаратор для установки версии JSON Schema на верхнем уровне.
+    """
+
+    name = "schema_version"
+
+    def __init__(self, version: str = "https://json-schema.org/draft/2020-12/schema"):
+        self._version = version
+
+    def can_process(self, ctx: ProcessingContext, env: str, prev_result: dict) -> bool:
+        return env == "/" and "$schema" not in prev_result
+
+    def process(self, ctx: ProcessingContext, env: str, prev_result: dict) -> ComparatorResult:
+        return {"$schema": self._version}, None

{genschema-0.1.0 → genschema-0.1.1}/genschema/pipeline.py

@@ -57,6 +57,11 @@ class Converter:
         self._jsons.append(Resource(str(self._id), "json", j))
         self._id += 1
 
+    def clear_data(self) -> None:
+        self._id = 0
+        self._jsons = []
+        self._schemas = []
+
     def register(self, c: Comparator) -> None:
         if isinstance(c, TypeComparator):
             raise UserWarning(

{genschema-0.1.0 → genschema-0.1.1}/genschema.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: genschema
-Version: 0.1.0
+Version: 0.1.1
 Summary: A library for comparing JSON and schemas and generate new
 Author-email: Miskler <mail@miskler.ru>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{genschema-0.1.0 → genschema-0.1.1}/genschema.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ genschema/comparators/flag.py
 genschema/comparators/format.py
 genschema/comparators/no_additional_prop.py
 genschema/comparators/required.py
+genschema/comparators/schema_version.py
 genschema/comparators/template.py
 genschema/comparators/type.py
 tests/test_check_datasets.py

genschema-0.1.0/genschema/comparators/required.py

@@ -1,38 +0,0 @@
-import logging
-
-from .template import Comparator, ComparatorResult, ProcessingContext
-
-logger = logging.getLogger(__name__)
-
-
-class RequiredComparator(Comparator):
-    """
-    Компаратор для определения обязательных полей.
-    Устанавливает "required" на основе наличия ключей в JSON на текущем уровне.
-    """
-
-    def can_process(self, ctx: ProcessingContext, env: str, node: dict) -> bool:
-        # обрабатываем только объекты
-        return (
-            (node.get("type") == "object" and not node.get("isPseudoArray", False))
-            or node.get("type") is None
-            or not ctx.jsons
-        )
-
-    def process(self, ctx: ProcessingContext, env: str, node: dict) -> ComparatorResult:
-        # собираем все ключи в JSON на этом уровне
-        keys: set[str] = set()
-        for j in ctx.jsons:
-            if isinstance(j.content, dict):
-                keys.update(j.content.keys())
-
-        # определяем обязательные: ключи, которые есть во всех JSON
-        required = [
-            k
-            for k in sorted(keys)
-            if all(isinstance(j.content, dict) and k in j.content for j in ctx.jsons)
-        ]
-
-        if required:
-            return {"required": required}, None
-        return None, None