ogc-na 0.3.50__py3-none-any.whl → 0.3.51__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.50'
-__version_tuple__ = version_tuple = (0, 3, 50)
+__version__ = version = '0.3.51'
+__version_tuple__ = version_tuple = (0, 3, 51)

ogc/na/annotate_schema.py

@@ -143,6 +143,7 @@ ANNOTATION_ID = f'{ANNOTATION_PREFIX}id'
 ANNOTATION_PREFIXES = f'{ANNOTATION_PREFIX}prefixes'
 ANNOTATION_EXTRA_TERMS = f'{ANNOTATION_PREFIX}extra-terms'
 ANNOTATION_BASE = f'{ANNOTATION_PREFIX}base'
+ANNOTATION_VOCAB = f'{ANNOTATION_PREFIX}vocab'
 
 ANNOTATION_IGNORE_EXPAND = [ANNOTATION_CONTEXT, ANNOTATION_EXTRA_TERMS, ANNOTATION_PREFIXES]
 
@@ -233,7 +234,7 @@ class SchemaResolver:
         return location, fragment
 
     def resolve_schema(self, ref: str | Path, from_schema: ReferencedSchema | None = None,
-                       force_contents: dict | None = None) -> ReferencedSchema | None:
+                       force_contents: dict | str | None = None) -> ReferencedSchema | None:
         chain = from_schema.chain + [from_schema] if from_schema else []
         try:
             schema_source, fragment = self.resolve_ref(ref, from_schema)
@@ -253,9 +254,14 @@ class SchemaResolver:
                                         ref=ref,
                                         is_json=from_schema.is_json)
 
-            contents, is_json = self.load_contents(schema_source)
             if force_contents:
-                contents = force_contents
+                is_json = False
+                if isinstance(force_contents, str):
+                    contents = load_yaml(content=force_contents)
+                else:
+                    contents = force_contents
+            else:
+                contents, is_json = self.load_contents(schema_source)
             if fragment:
                 return ReferencedSchema(location=schema_source, fragment=fragment,
                                         subschema=SchemaResolver._get_branch(contents, fragment),
@@ -640,6 +646,10 @@ class SchemaAnnotator:
 
         process_subschema(schema, [context], resolved_schema)
 
+        for key in ('@base', '@vocab'):
+            if context.get(key):
+                schema[f"{ANNOTATION_PREFIX}{key[1:]}"] = context[key]
+
         if prefixes:
             schema[ANNOTATION_PREFIXES] = prefixes
 
@@ -655,9 +665,10 @@ class ContextBuilder:
     Builds a JSON-LD context from a set of annotated JSON schemas.
     """
 
-    def __init__(self, location: Path | str = None,
+    def __init__(self, location: Path | str,
                  compact: bool = True,
                  schema_resolver: SchemaResolver = None,
+                 contents: dict | str | None = None,
                  version=1.1):
         """
         :param location: file or URL load the annotated schema from
@@ -673,19 +684,20 @@ class ContextBuilder:
 
         self.visited_properties: dict[str, str | None] = {}
         self._missed_properties: dict[str, Any] = {}  # Dict instead of set to keep order of insertion
-        context = self._build_context(self.location, compact)
+        context = self._build_context(self.location, compact, contents=contents)
         if context:
             context['@version'] = version
         self.context = {'@context': context}
 
     def _build_context(self, schema_location: str | Path,
-                       compact: bool = True) -> dict:
+                       compact: bool = True,
+                       contents: dict | str | None = None) -> dict:
 
         parsed = self._parsed_schemas.get(schema_location)
         if parsed:
             return parsed
 
-        root_schema = self.schema_resolver.resolve_schema(schema_location)
+        root_schema = self.schema_resolver.resolve_schema(schema_location, force_contents=contents)
 
         prefixes = {}
 
@@ -753,8 +765,10 @@ class ContextBuilder:
             if not isinstance(subschema, dict):
                 return {}
 
-            if subschema.get(ANNOTATION_BASE):
-                onto_context['@base'] = subschema[ANNOTATION_BASE]
+            for key in (ANNOTATION_BASE, ANNOTATION_VOCAB):
+                top_level_value = subschema.get(key)
+                if top_level_value:
+                    onto_context[f"@{key[len(ANNOTATION_PREFIX):]}"] = top_level_value
 
             read_properties(subschema, from_schema, onto_context, schema_path)
 

ogc/na/ingest_json.py

@@ -686,7 +686,7 @@ def process(input_files: str | Path | Sequence[str | Path],
     if isinstance(input_files, str) or not isinstance(input_files, Sequence):
         input_files = (input_files,)
     if batch:
-        logger.info("Input files: %s", input_files)
+        logger.info("Input files: %s", [str(x) for x in input_files])
         remaining_fn: deque = deque()
         for input_file in input_files:
             if isinstance(input_file, str):
@@ -735,6 +735,8 @@ def process(input_files: str | Path | Sequence[str | Path],
                     logger.warning("Error processing JSON/JSON-LD file, skipping: %s", getattr(e, 'msg', str(e)))
                 else:
                     raise
+            except Exception as e:
+                raise IOError(f'Error processing input file {fn}') from e
     else:
         for input_file in input_files:
             try:

{ogc_na-0.3.50.dist-info → ogc_na-0.3.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ogc_na
-Version: 0.3.50
+Version: 0.3.51
 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.50.dist-info → ogc_na-0.3.51.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=Q_8itBEQeZ4Dn-RIGV0jcZENPIzgmwUxTcLo6vNpPcc,413
-ogc/na/annotate_schema.py,sha256=PFBC1wzo-jiWllKhdSSfU6MS6LyaZmt0pxpAu87_FgQ,41254
+ogc/na/_version.py,sha256=60Ia3PnFN2AmmKgfCNYmpAMQrUrLW-QEC6i_cVC4Jw8,413
+ogc/na/annotate_schema.py,sha256=e6bOIJ05oVqwugWUUuBOQ8P9QL4GKRCE1PKua9kSHRs,41920
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/gsp.py,sha256=KGa2G9i8kPefYTHNPUDoXnNyF7Tiwt8K__Ew_Qa7eeg,6048
-ogc/na/ingest_json.py,sha256=V_hZmU8veM6YqARjh8jy50dyhVCcjLLpjdXH6duTL_Y,35503
+ogc/na/ingest_json.py,sha256=Vcf1WyUQv3N_fUNGd1Npq88gkOg3uJFj1BHXdq7lkHE,35630
 ogc/na/models.py,sha256=nGV8EALtXvmBtkUbu0FA4KOgwNUqQGWIDuMo7UGOKP8,652
 ogc/na/profile.py,sha256=T7nesbm7azF2ijF60UenJnQQKjIgJlnJ3pUbGT5nYgM,16511
 ogc/na/provenance.py,sha256=h7UtUb1wW_9MfEim0fjcqkHd0BYmpXqyE1ADzL9AH7I,5551
@@ -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=9qYjp_w5JLInFM48zB15IYH9eTafjp1Aqd_8kfuW3aA,2074
-ogc_na-0.3.50.dist-info/METADATA,sha256=48l6MgeDMdvsVxOed4gBRnBLpknpt6FK4kzQWx-KMuo,3829
-ogc_na-0.3.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-ogc_na-0.3.50.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.50.dist-info/RECORD,,
+ogc_na-0.3.51.dist-info/METADATA,sha256=G0WhEyLCwCgNIdvIqo4pQap__Yaftecxp-qt2yb82gY,3829
+ogc_na-0.3.51.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+ogc_na-0.3.51.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.51.dist-info/RECORD,,

{ogc_na-0.3.50.dist-info → ogc_na-0.3.51.dist-info}/WHEEL

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