ogc-na 0.3.52__py3-none-any.whl → 0.3.54__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.52'
-__version_tuple__ = version_tuple = (0, 3, 52)
+__version__ = version = '0.3.54'
+__version_tuple__ = version_tuple = (0, 3, 54)

ogc/na/annotate_schema.py

@@ -132,6 +132,7 @@ import jsonpointer
 import jsonschema
 import requests_cache
 
+from ogc.na.exceptions import ContextLoadError, SchemaLoadError
 from ogc.na.util import is_url, load_yaml, LRUCache, dump_yaml, \
     merge_contexts, merge_dicts, dict_contains, JSON_LD_KEYWORDS
 
@@ -200,8 +201,11 @@ class SchemaResolver:
         """
         contents = self._schema_cache.get(s)
         if contents is None:
-            contents = read_contents(s)[0]
-            self._schema_cache[s] = contents
+            try:
+                contents = read_contents(s)[0]
+                self._schema_cache[s] = contents
+            except Exception as e:
+                raise SchemaLoadError(f'Error loading schema from schema source "{s}"') from e
         return load_json_yaml(contents)
 
     def resolve_ref(self, ref: str | Path, from_schema: ReferencedSchema | None = None) -> tuple[Path | str, str]:
@@ -257,7 +261,10 @@ class SchemaResolver:
             if force_contents:
                 is_json = False
                 if isinstance(force_contents, str):
-                    contents = load_yaml(content=force_contents)
+                    try:
+                        contents = load_yaml(content=force_contents)
+                    except Exception as e:
+                        raise SchemaLoadError('Error loading schema from string contents') from e
                 else:
                     contents = force_contents
             else:
@@ -394,13 +401,20 @@ def resolve_context(ctx: Path | str | dict | list, expand_uris=True) -> Resolved
     def resolve_inner(inner_ctx, ctx_stack=None) -> ResolvedContext | None:
         resolved = None
         if isinstance(inner_ctx, Path) or (isinstance(inner_ctx, str) and not is_url(inner_ctx)):
-            resolved = resolve_context(load_yaml(filename=ctx).get('@context'))
+            try:
+                resolved = resolve_context(load_yaml(filename=ctx).get('@context'))
+            except Exception as e:
+                raise ContextLoadError(f'Error resolving context document in file "{ctx}"') from e
         elif isinstance(inner_ctx, str):
-            r = requests_session.get(ctx)
-            r.raise_for_status()
-            fetched = r.json().get('@context')
-            if fetched:
-                resolved = resolve_context(fetched)
+            try:
+                r = requests_session.get(ctx)
+                r.raise_for_status()
+                fetched = r.json().get('@context')
+                if fetched:
+                    resolved = resolve_context(fetched)
+            except Exception as e:
+                raise ContextLoadError(f'Error resolving context document at URL "{ctx}"') from e
+
         elif isinstance(inner_ctx, Sequence):
             resolved_ctx = {}
             inner_prefixes = {}
@@ -740,7 +754,7 @@ class ContextBuilder:
                 if isinstance(prop_context.get('@id'), str):
                     self.visited_properties[full_property_path_str] = prop_context['@id']
                     self._missed_properties[full_property_path_str] = False
-                    if prop_context['@id'] == '@nest':
+                    if prop_context['@id'] in ('@nest', '@graph'):
                         merge_contexts(onto_context, process_subschema(prop_val, from_schema, full_property_path))
                     else:
                         merge_contexts(prop_context['@context'],

ogc/na/exceptions.py

@@ -0,0 +1,6 @@
+class ContextLoadError(IOError):
+    pass
+
+
+class SchemaLoadError(IOError):
+    pass

{ogc_na-0.3.52.dist-info → ogc_na-0.3.54.dist-info}/METADATA

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

@@ -1,8 +1,9 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=nvAcSydy3aySvwpCHeRUJkAZGPXMNWFTF2Wf2WCrWP0,413
-ogc/na/annotate_schema.py,sha256=e6bOIJ05oVqwugWUUuBOQ8P9QL4GKRCE1PKua9kSHRs,41920
+ogc/na/_version.py,sha256=SIFfx0lgwTvAnd4cHgyIUN7PZREZhiGdTDRtpq4_MAM,413
+ogc/na/annotate_schema.py,sha256=cjKZPKNOEUSghcQH9qCOiE2-Evr0VFyYMN2NkUMz5wo,42647
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
+ogc/na/exceptions.py,sha256=cwvnq79ih90T9lfwJww0zOx_QwuICaUvlo3Mc8m8ouA,85
 ogc/na/gsp.py,sha256=KGa2G9i8kPefYTHNPUDoXnNyF7Tiwt8K__Ew_Qa7eeg,6048
 ogc/na/ingest_json.py,sha256=OUA9IfSpBbwE6bNE2od64iMzdEg-Q4h5iyowgJsn2M4,35659
 ogc/na/models.py,sha256=nGV8EALtXvmBtkUbu0FA4KOgwNUqQGWIDuMo7UGOKP8,652
@@ -14,7 +15,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.52.dist-info/METADATA,sha256=rMAaHZI6yEznilEzo4gxbU8TyF_GKwzu4wWxCD1MegA,3829
-ogc_na-0.3.52.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-ogc_na-0.3.52.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.52.dist-info/RECORD,,
+ogc_na-0.3.54.dist-info/METADATA,sha256=udHRdqATRi60hCfDejn_rgBXVpp5z76Ln_yJWFto_3s,3829
+ogc_na-0.3.54.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+ogc_na-0.3.54.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.54.dist-info/RECORD,,

{ogc_na-0.3.52.dist-info → ogc_na-0.3.54.dist-info}/WHEEL

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