ogc-na 0.3.31__py3-none-any.whl → 0.3.33__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.31'
-__version_tuple__ = version_tuple = (0, 3, 31)
+__version__ = version = '0.3.33'
+__version_tuple__ = version_tuple = (0, 3, 33)

ogc/na/annotate_schema.py

@@ -335,6 +335,7 @@ def resolve_context(ctx: Path | str | dict | list, expand_uris=True) -> Resolved
         return ResolvedContext()
 
     prefixes = {}
+
     def expand_uri(curie, ctx_stack):
         if not expand_uris or not ctx_stack or not curie or curie[0] == '@':
             return curie
@@ -619,7 +620,7 @@ class ContextBuilder:
 
     def __init__(self, location: Path | str = None,
                  compact: bool = True, ref_mapper: Callable[[str], str] | None = None,
-                 version = 1.1):
+                 version=1.1):
         """
         :param location: file or URL load the annotated schema from
         :param compact: whether to compact the resulting context (remove redundancies, compact CURIEs)
@@ -663,8 +664,8 @@ class ContextBuilder:
             if subschema.get('type', 'object') != 'object':
                 return None
             for prop, prop_val in subschema.get('properties', {}).items():
-                full_property_path = schema_path + ['properties', prop]
-                full_property_path_str = f"{schema_path_str}/properties/{prop}"
+                full_property_path = schema_path + [prop]
+                full_property_path_str = f"{schema_path_str}/{prop}"
                 self.visited_properties[full_property_path_str] = None
                 if not isinstance(prop_val, dict):
                     continue
@@ -706,23 +707,23 @@ class ContextBuilder:
                 referenced_schema = self._resolver.resolve_schema(ref, from_schema)
                 if referenced_schema:
                     process_subschema(referenced_schema.subschema, referenced_schema, onto_context,
-                                                   schema_path + [f"$ref[{subschema['$ref']}]"])
+                                      schema_path)
 
             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 + [f"{i}[{idx}]"])
+                                          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 + [i])
+                    process_subschema(l, from_schema, onto_context, schema_path)
 
             for pp_k, pp in subschema.get('patternProperties', {}).items():
                 if isinstance(pp, dict):
-                    process_subschema(pp, from_schema, onto_context, schema_path + ['patternProperties', pp_k])
+                    process_subschema(pp, from_schema, onto_context, schema_path + [pp_k])
 
             if ANNOTATION_EXTRA_TERMS in subschema:
                 for extra_term, extra_term_context in subschema[ANNOTATION_EXTRA_TERMS].items():
@@ -840,8 +841,8 @@ class ContextBuilder:
 
 
 def dump_annotated_schema(schema: AnnotatedSchema, subdir: Path | str = 'annotated',
-                           root_dir: Path | str | None = None,
-                           output_fn_transform: Callable[[Path], Path] | None = None) -> None:
+                          root_dir: Path | str | None = None,
+                          output_fn_transform: Callable[[Path], Path] | None = None) -> None:
     """
     Creates a "mirror" directory (named `annotated` by default) with the resulting
     schemas annotated by a `SchemaAnnotator`.
@@ -941,6 +942,7 @@ def _main():
                 writer = csv.writer(stream, delimiter='\t')
                 writer.writerow(['path', '@id'])
                 writer.writerows(ctx_builder.visited_properties.items())
+
             if args.dump_visited == '-':
                 write_visited(sys.stdout)
             else:

{ogc_na-0.3.31.dist-info → ogc_na-0.3.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: ogc-na
-Version: 0.3.31
+Name: ogc_na
+Version: 0.3.33
 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.31.dist-info → ogc_na-0.3.33.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=bhEYrWy2EPGfW55r0auHlTI13JyXnFgvZ-r2iYCZ3RY,413
-ogc/na/annotate_schema.py,sha256=JNyjnvKvsiNP_CNhvOO_MWbxUV2Y3b3PRhfciS6jw-c,37752
+ogc/na/_version.py,sha256=gG4AF8AndLXa7wrzi690B4552VXo2Y4q__jjiGcfCHI,413
+ogc/na/annotate_schema.py,sha256=_4NnmW2JVADs8ni9xHFvCGfeD9Mw4dMD6tNq9GlGaQk,37625
 ogc/na/domain_config.py,sha256=C6ao37dbXEKv_K7WcfzQgI3H1Hr3c4-3p24hgl2oH54,13896
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/gsp.py,sha256=o_mwUG-FyDqLmA7Mx1eKkXqM7yX8BqxIwHuCS2eE1fo,5626
@@ -14,7 +14,7 @@ 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=XLy6FLewjjoDj6N4ZLVza2_rk6TVuMTwTleEMSbnRnc,1083
-ogc_na-0.3.31.dist-info/METADATA,sha256=EB_QJ6-lZLXEBCzoRIBoEoYrwhrrWxSQcmZ68e5f6Dg,3587
-ogc_na-0.3.31.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ogc_na-0.3.31.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.31.dist-info/RECORD,,
+ogc_na-0.3.33.dist-info/METADATA,sha256=BQKpLkCbUWe9PJB7RLX6Ywuh5WSK3_lc4nIQTAoHcXU,3587
+ogc_na-0.3.33.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ogc_na-0.3.33.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.33.dist-info/RECORD,,