ogc-na 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

ogc/na/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.3'
-__version_tuple__ = version_tuple = (0, 4, 3)
+__version__ = version = '0.4.5'
+__version_tuple__ = version_tuple = (0, 4, 5)
 
 __commit_id__ = commit_id = None

ogc/na/annotate_schema.py

@@ -559,8 +559,8 @@ class SchemaAnnotator:
                             elif ':' not in prop_id and prop_id not in JSON_LD_KEYWORDS:
                                 result['@id'] = f"{vocab}{prop_id}"
                         return result
-                elif isinstance(vocab, str):
-                    return {'@id': f"{ctx['@vocab']}{prop}"}
+            if vocab != UNDEFINED and isinstance(vocab, str):
+                return {'@id': f"{vocab}{prop}"}
 
         def process_properties(obj: dict, context_stack: list[dict[str, Any]],
                                from_schema: ReferencedSchema, level) -> Iterable[str]:
@@ -824,8 +824,6 @@ class ContextBuilder:
                 if top_level_value:
                     onto_context[f"@{key[len(ANNOTATION_PREFIX):]}"] = top_level_value
 
-            read_properties(subschema, from_schema, onto_context, schema_path)
-
             if '$ref' in subschema:
                 ref = subschema['$ref']
                 ref_path_str = f"{from_schema.location}{ref}"
@@ -860,6 +858,8 @@ class ContextBuilder:
                                                   for k, v in extra_term_context.items()}
                         onto_context[extra_term] = extra_term_context
 
+            read_properties(subschema, from_schema, onto_context, schema_path)
+
             if from_schema:
                 current_ref = f"{from_schema.location}{from_schema.ref}"
                 if current_ref not in imported_prefixes:

{ogc_na-0.4.3.dist-info → ogc_na-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogc_na
-Version: 0.4.3
+Version: 0.4.5
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 License-Expression: Apache-2.0

{ogc_na-0.4.3.dist-info → ogc_na-0.4.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=bmI9ViMEsJ1Rjce-6ExwiNh2B7sZKTyBkze4k8NsTrU,704
-ogc/na/annotate_schema.py,sha256=MYXYzmFDua0DjOxccmGTAFHDS3T7U01jNv-u001ytj4,44584
+ogc/na/_version.py,sha256=4nCeAo6j-wL_OKq7GV7I-Pvif2nNPnyKifWxv88z0Y4,704
+ogc/na/annotate_schema.py,sha256=QgBeFYpE5cBRe8YVrKPdcJj2S4eKNEhmzSwcBQq9U2c,44589
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/exceptions.py,sha256=cwvnq79ih90T9lfwJww0zOx_QwuICaUvlo3Mc8m8ouA,85
@@ -16,8 +16,8 @@ ogc/na/input_filters/__init__.py,sha256=AhE7n_yECwxFKwOM3Jc0ft96TtF5i_Z-fHrS4HYO
 ogc/na/input_filters/csv.py,sha256=nFfB1XQF_QApcGGzMqEvzD_b3pBtCtsfUECsZ9UGE6s,2616
 ogc/na/input_filters/xlsx.py,sha256=X9EpFgC9WwHQD8iUJRGdaDYfgiLKjXPdhTVhDmNPAQ0,2730
 ogc/na/input_filters/xml.py,sha256=9qYjp_w5JLInFM48zB15IYH9eTafjp1Aqd_8kfuW3aA,2074
-ogc_na-0.4.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ogc_na-0.4.3.dist-info/METADATA,sha256=kdSKsp_WMZhKj6lKJAg85TnyPf7sXzHVvfuGRij2bPA,3917
-ogc_na-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ogc_na-0.4.3.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.4.3.dist-info/RECORD,,
+ogc_na-0.4.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ogc_na-0.4.5.dist-info/METADATA,sha256=1ZqCMdhvmIWLv9wquPSJRUycQBrCRMLk1KhHWSh0nqo,3917
+ogc_na-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ogc_na-0.4.5.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.4.5.dist-info/RECORD,,