ogc-na 0.3.47__py3-none-any.whl → 0.3.49__py3-none-any.whl

ogc/na/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.47'
-__version_tuple__ = version_tuple = (0, 3, 47)
+__version__ = version = '0.3.49'
+__version_tuple__ = version_tuple = (0, 3, 49)

ogc/na/annotate_schema.py

@@ -117,6 +117,7 @@ from __future__ import annotations
 
 import argparse
 import csv
+import copy
 import dataclasses
 import json
 import logging
@@ -723,24 +724,29 @@ class ContextBuilder:
                     self.visited_properties[full_property_path_str] = prop_context['@id']
                     self._missed_properties[full_property_path_str] = False
                     if prop_context['@id'] == '@nest':
-                        process_subschema(prop_val, from_schema, onto_context, full_property_path)
+                        merge_contexts(onto_context, process_subschema(prop_val, from_schema, full_property_path))
                     else:
-                        process_subschema(prop_val, from_schema, prop_context['@context'], full_property_path)
+                        merge_contexts(prop_context['@context'],
+                                       process_subschema(prop_val, from_schema, full_property_path))
                     if prop not in onto_context or isinstance(onto_context[prop], str):
                         onto_context[prop] = prop_context
                     else:
                         merge_contexts(onto_context[prop], prop_context)
                 else:
-                    process_subschema(prop_val, from_schema, onto_context, full_property_path)
+                    merge_contexts(onto_context, process_subschema(prop_val, from_schema, full_property_path))
 
         imported_prefixes: dict[str | Path, dict[str, str]] = {}
         imported_extra_terms: dict[str | Path, dict[str, str]] = {}
 
-        def process_subschema(subschema: dict, from_schema: ReferencedSchema, onto_context: dict,
-                              schema_path: list[str]) -> dict | None:
+        cached_schema_contexts = {}
+
+        def process_subschema(subschema: dict, from_schema: ReferencedSchema,
+                              schema_path: list[str]) -> dict:
+
+            onto_context = {}
 
             if not isinstance(subschema, dict):
-                return None
+                return {}
 
             if subschema.get(ANNOTATION_BASE):
                 onto_context['@base'] = subschema[ANNOTATION_BASE]
@@ -753,33 +759,25 @@ class ContextBuilder:
                 processed_refs.add(ref_path_str)
                 referenced_schema = self.schema_resolver.resolve_schema(ref, from_schema)
                 if referenced_schema:
-                    process_subschema(referenced_schema.subschema, referenced_schema, onto_context,
-                                      schema_path)
+                    ref_ctx = copy.deepcopy(cached_schema_contexts.get(ref_path_str))
+                    if ref_ctx is None:
+                        ref_ctx = process_subschema(referenced_schema.subschema, referenced_schema, schema_path)
+                    merge_contexts(onto_context, ref_ctx)
 
             for i in ('allOf', 'anyOf', 'oneOf'):
                 l = subschema.get(i)
                 if isinstance(l, list):
                     for idx, sub_subschema in enumerate(l):
-                        process_subschema(sub_subschema, from_schema, onto_context,
-                                          schema_path)
+                        merge_contexts(onto_context, process_subschema(sub_subschema, from_schema, schema_path))
 
             for i in ('prefixItems', 'items', 'contains', 'then', 'else', 'additionalProperties'):
                 l = subschema.get(i)
                 if isinstance(l, dict):
-                    process_subschema(l, from_schema, onto_context, schema_path)
+                    merge_contexts(onto_context, process_subschema(l, from_schema, schema_path))
 
             for pp_k, pp in subschema.get('patternProperties', {}).items():
                 if isinstance(pp, dict):
-                    process_subschema(pp, from_schema, onto_context, schema_path + [pp_k])
-
-            for p in ('definitions', '$defs'):
-                defs = subschema.get(p)
-                if defs and isinstance(defs, dict):
-                    for entry_key, entry in defs.items():
-                        def_path = schema_path + [entry_key]
-                        def_path_str = f"{from_schema.location}#{'/'.join(def_path)}"
-                        if def_path_str not in processed_refs:
-                            process_subschema(entry, from_schema, onto_context, def_path)
+                    merge_contexts(onto_context, process_subschema(pp, from_schema, schema_path + [pp_k]))
 
             if ANNOTATION_EXTRA_TERMS in subschema:
                 for extra_term, extra_term_context in subschema[ANNOTATION_EXTRA_TERMS].items():
@@ -806,7 +804,10 @@ class ContextBuilder:
                 if isinstance(sub_prefixes, dict):
                     prefixes.update({k: v for k, v in sub_prefixes.items() if k not in prefixes})
 
-        process_subschema(root_schema.subschema, root_schema, own_context, [])
+            cached_schema_contexts[f"{from_schema.location}#{from_schema.fragment}"] = onto_context
+            return onto_context
+
+        merge_contexts(own_context, process_subschema(root_schema.subschema, root_schema, []))
 
         for imported_et in imported_extra_terms.values():
             for term, v in imported_et.items():
@@ -853,10 +854,13 @@ class ContextBuilder:
                     if isinstance(term_value, dict) and '@context' in term_value:
                         if not term_value['@context']:
                             del term_value['@context']
+                            changed = True
                         else:
                             while True:
                                 if not compact_branch(term_value['@context'], child_context_stack):
                                     break
+                                else:
+                                    changed = True
 
                     if context_stack:
                         for ctx in context_stack:
@@ -890,7 +894,9 @@ class ContextBuilder:
                         elif '@context' in term_value:
                             compact_uris(term_value['@context'], child_context_stack)
 
-            compact_branch(own_context)
+            while True:
+                if not compact_branch(own_context):
+                    break
             compact_uris(own_context)
 
         self._parsed_schemas[schema_location] = own_context

ogc/na/util.py

@@ -310,6 +310,9 @@ def git_status(repo_path: str | Path = '.'):
 
 
 def merge_contexts(a: dict, b: dict, fix_nest=True) -> dict[str, Any]:
+    '''
+    Merges two JSON-lD contexts, updating the first one passed to this function (and returning it).
+    '''
     if not b:
         return a
     if not a:

{ogc_na-0.3.47.dist-info → ogc_na-0.3.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ogc_na
-Version: 0.3.47
+Version: 0.3.49
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 Project-URL: Homepage, https://github.com/opengeospatial/ogc-na-tools/

{ogc_na-0.3.47.dist-info → ogc_na-0.3.49.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=MU1To0oLGMljUY5xtLtnFwxvNZIg8MhRIqWxqn6vDSQ,413
-ogc/na/annotate_schema.py,sha256=1W0gS190-s1f9cnmjzPakM82YB15aBYCHl1mmy2SehM,41052
+ogc/na/_version.py,sha256=TsNmNGuKIPd5pF6DeDUV5CEoCXDMqjLzL1EZreVDEAw,413
+ogc/na/annotate_schema.py,sha256=SdaZYNooPeaomLTzOvMIhHs8LLUfOj7hZnNEM_IknT8,41187
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/gsp.py,sha256=KGa2G9i8kPefYTHNPUDoXnNyF7Tiwt8K__Ew_Qa7eeg,6048
@@ -9,12 +9,12 @@ ogc/na/models.py,sha256=nGV8EALtXvmBtkUbu0FA4KOgwNUqQGWIDuMo7UGOKP8,652
 ogc/na/profile.py,sha256=T7nesbm7azF2ijF60UenJnQQKjIgJlnJ3pUbGT5nYgM,16511
 ogc/na/provenance.py,sha256=h7UtUb1wW_9MfEim0fjcqkHd0BYmpXqyE1ADzL9AH7I,5551
 ogc/na/update_vocabs.py,sha256=joLZxhpBJja5GvaBnt0aHQStKETOCIh5PotUxmJsOHs,18180
-ogc/na/util.py,sha256=r-cwqxqVVH1oXWsWuobTvXFGUVCqwlalN97b85nUN4U,11951
+ogc/na/util.py,sha256=Ztju3g1YuguUDbk4n2RJfCrl_IIzNAj7linfy24T6VA,12067
 ogc/na/validation.py,sha256=5xjHH55NZKM8HtUk8XgVzm8W5ZlZY00u_qsWfXK_8dM,3732
 ogc/na/input_filters/__init__.py,sha256=AhE7n_yECwxFKwOM3Jc0ft96TtF5i_Z-fHrS4HYOjaE,1179
 ogc/na/input_filters/csv.py,sha256=nFfB1XQF_QApcGGzMqEvzD_b3pBtCtsfUECsZ9UGE6s,2616
 ogc/na/input_filters/xml.py,sha256=9qYjp_w5JLInFM48zB15IYH9eTafjp1Aqd_8kfuW3aA,2074
-ogc_na-0.3.47.dist-info/METADATA,sha256=t22dnhWzSyECXYG8MiMqXAiTv3Hk-TYJGxV6mNN9MUY,3829
-ogc_na-0.3.47.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-ogc_na-0.3.47.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.47.dist-info/RECORD,,
+ogc_na-0.3.49.dist-info/METADATA,sha256=utM52i7eBc66GDtIj58CbYtQiOyUUF_QECuBGcD5ZXo,3829
+ogc_na-0.3.49.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+ogc_na-0.3.49.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.49.dist-info/RECORD,,

{ogc_na-0.3.47.dist-info → ogc_na-0.3.49.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any