genschema 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

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/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/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/comparators/required.py

@@ -20,18 +20,37 @@ class RequiredComparator(Comparator):
         )
 
     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)
-        ]
+        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

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/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.dist-info → genschema-0.1.1.dist-info}/METADATA

@@ -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.dist-info → genschema-0.1.1.dist-info}/RECORD

@@ -1,21 +1,22 @@
-genschema/__init__.py,sha256=H7eaAUZ84m4YkaNoyShpLFrz9Q6SBiroapHkRXNY_zs,197
-genschema/cli.py,sha256=bY-Tz7HIDsbFNMmyZFG2RNmmySeyFbe51LVKUXW29cI,4839
+genschema/__init__.py,sha256=Qvo40v51zgw2HepkC16dAn0hUJQEV8XSd8OqH0YrTv8,197
+genschema/cli.py,sha256=DkQoIoS4k7TlADBrmrufqiRKyg8lDBge4eGeTP_zn_Q,5092
 genschema/node.py,sha256=gHyAk1tdN2vmRA5ajiWPdPKjxZf2Qo9ju9yHev5d2tA,348
-genschema/pipeline.py,sha256=EzmTT7dDistfkzNYvk-rhWTQI-8-T4Am0fkRG2nxDyo,10756
+genschema/pipeline.py,sha256=SYYWQt_nN9xqYKNFgvW0lTsyxTh74dVCYZMouet5NTs,10864
 genschema/pseudo_arrays.py,sha256=IZzqxUFeomUM8Qum6pOyP2mJK_wUYMm7MbHqHA12qxw,618
 genschema/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-genschema/comparators/__init__.py,sha256=vngXaIcgXywvL05EnAMHpB67cx6ci3rGWUY3Vhxd_LM,449
+genschema/comparators/__init__.py,sha256=nedNLZJtfc4iyXz-WC_4n9gHDbJYtUTnEqtaQMZrf60,532
 genschema/comparators/delete_element.py,sha256=U3VWam-1t98pUewAj9cISasEUGMq6HAtQzHp4cekt7o,773
 genschema/comparators/empty.py,sha256=sNTXMPbVEFJPgN02gyZg4dK_dY3IUKg8FIlTzFhmPSw,1982
 genschema/comparators/flag.py,sha256=9EWlcWSqmDSaekflSo7nQRY-VowFMO99s_n4TlbA-P0,539
 genschema/comparators/format.py,sha256=XDQ5jtAq2uTOhDDj2i728iKDPuIUIJ7WjDRJJ-H9S0E,3554
 genschema/comparators/no_additional_prop.py,sha256=9iD_Fm1WGxeZ4NJfVT4p9whY_U6dK1qeQxgW7--vvjc,1331
-genschema/comparators/required.py,sha256=fcC_aPysXd9pDlDYb1258PBcJ3hDq5d3QxMn2dZKhWU,1420
+genschema/comparators/required.py,sha256=Yx8KqDQQiVUe4eFgxDB3vJCM61xuabMNEnjQEbmjau0,2197
+genschema/comparators/schema_version.py,sha256=cp8S9-aAkBOQo1djmNk39M8bbAtwd9hY71ktKfMhiEA,683
 genschema/comparators/template.py,sha256=tAA0RZNL5j9_5JhaxcnqA7TikGOkGo5SP4nr7lMULls,753
 genschema/comparators/type.py,sha256=4KUQAHIVuXk3vh4JK_UO4XxGCaZrCMNQ74REz9czK68,2113
-genschema-0.1.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-genschema-0.1.0.dist-info/METADATA,sha256=jx6J07thY0WvnH9tmkpH1dCgpIKmxkYMnl3AFXkp5FU,49422
-genschema-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-genschema-0.1.0.dist-info/entry_points.txt,sha256=AAVGovHs-ANlz7GjTufSGXFcdq4BKOAmHDerlX74j_E,49
-genschema-0.1.0.dist-info/top_level.txt,sha256=4oD4zKc8OyD8n_g_3pjvk_KHVXEtnJ9Azdq33I5n6u8,10
-genschema-0.1.0.dist-info/RECORD,,
+genschema-0.1.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+genschema-0.1.1.dist-info/METADATA,sha256=NsGZWeC4R2EXC4yF25GQB8stZ6SJfAKd4oQ_eg6Hf_E,49422
+genschema-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+genschema-0.1.1.dist-info/entry_points.txt,sha256=AAVGovHs-ANlz7GjTufSGXFcdq4BKOAmHDerlX74j_E,49
+genschema-0.1.1.dist-info/top_level.txt,sha256=4oD4zKc8OyD8n_g_3pjvk_KHVXEtnJ9Azdq33I5n6u8,10
+genschema-0.1.1.dist-info/RECORD,,