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

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 = {}

ogc/na/exceptions.py

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

ogc/na/ingest_json.py

@@ -869,8 +869,9 @@ def _process_cmdln():
 
     parser.add_argument(
         '--transform-arg',
+        metavar='ARG=VALUE',
         nargs='*',
-        help='Additional argument to pass to the jq transforms in the form variable=value'
+        help='Additional argument to pass to the jq transforms in the form argument=value'
     )
 
     parser.add_argument(

ogc/na/update_vocabs.py

@@ -13,6 +13,16 @@ This script can be used as a library, or run directly from the cli;
 please refer to the
 [OGC NamingAuthority repository](https://github.com/opengeospatial/NamingAuthority)
 for usage details on the latter.
+
+## Defining the SPARQL graph URI
+
+The graph URI that will be used for an RDF document when pushing the data to a SPARQL endpoint can
+be defined by adding a `http://www.opengis.net/ogc-na#targetGraph` predicate anywhere
+inside it, for example:
+
+```
+[] <http://www.opengis.net/ogc-na#targetGraph> <https://example.com/target-graph> .
+```
 """
 
 from __future__ import annotations
@@ -26,7 +36,7 @@ from pathlib import Path
 from typing import Union, Generator
 
 import requests
-from rdflib import Graph, RDF, SKOS
+from rdflib import Graph, RDF, SKOS, URIRef
 
 from ogc.na import util
 from ogc.na.domain_config import DomainConfiguration, DomainConfigurationEntry
@@ -108,12 +118,21 @@ def get_graph_uri_for_vocab(g: Graph = None) -> Generator[str, None, None]:
     """
     Find a target graph URI in a vocabulary [Graph][rdflib.Graph].
 
-    In effect, this function merely looks for
+    This function looks for any object of the http://www.opengis.net/ogc-na#targetGraph
+    predicate, and in its absence for a
     [SKOS ConceptScheme's](https://www.w3.org/TR/2008/WD-skos-reference-20080829/skos.html#ConceptScheme).
 
+    The following can be included in a Turtle document to specify its graph:
+
+    ```
+    [] <http://www.opengis.net/ogc-na#targetGraph> <https://example.com/target/graph> .
+    ```
+
     :param g: the [Graph][rdflib.Graph] for which to find the target URI
     :return: a [Node][rdflib.term.Node] generator
     """
+    for o in g.objects(predicate=URIRef('http://www.opengis.net/ogc-na#targetGraph')):
+        yield str(o)
     for s in g.subjects(predicate=RDF.type, object=SKOS.ConceptScheme):
         yield str(s)
 

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

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

@@ -1,20 +1,21 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=60Ia3PnFN2AmmKgfCNYmpAMQrUrLW-QEC6i_cVC4Jw8,413
-ogc/na/annotate_schema.py,sha256=e6bOIJ05oVqwugWUUuBOQ8P9QL4GKRCE1PKua9kSHRs,41920
+ogc/na/_version.py,sha256=ms1ItKqACBjR1STKEmk5I4axWdIv0W7fX_8zXbtA0Cg,413
+ogc/na/annotate_schema.py,sha256=1p-XZkIjzWaW1P1LYM093C8XYN2zhUpMlWbZ1n2N9cQ,42635
 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=Vcf1WyUQv3N_fUNGd1Npq88gkOg3uJFj1BHXdq7lkHE,35630
+ogc/na/ingest_json.py,sha256=OUA9IfSpBbwE6bNE2od64iMzdEg-Q4h5iyowgJsn2M4,35659
 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/update_vocabs.py,sha256=m9Nd90Aplsm3m7cvNdiemPbnfq6Xq6rUDXGT1GBwDT4,18898
 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.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.53.dist-info/METADATA,sha256=r7CUFV_8_TNhVFYmwbgVbGdFhMqiHzDLb4XsJXbB-Pg,3829
+ogc_na-0.3.53.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
+ogc_na-0.3.53.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.53.dist-info/RECORD,,

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

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