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

ogc/na/update_vocabs.py

@@ -79,7 +79,8 @@ def setup_logging(debug: bool = False):
 
 
 def load_vocab(vocab: Union[Graph, str, Path], graph_uri: str,
-               graph_store: str, auth_details: tuple[str] = None) -> None:
+               graph_store: str, auth_details: tuple[str] = None,
+               append = False) -> None:
     """
     Loads a vocabulary onto a triplestore using the [SPARQL Graph Store
     protocol](https://www.w3.org/TR/sparql11-http-rdf-update/).
@@ -88,6 +89,7 @@ def load_vocab(vocab: Union[Graph, str, Path], graph_uri: str,
     :param graph_uri: a target graph URI
     :param graph_store: the target SPARQL Graph Store protocol URL
     :param auth_details: a `(username, password)` tuple for authentication
+    :param append: whether to append the data to the graph (otherwise the graph data will be replaced)
     :return:
     """
     # PUT is equivalent to DROP GRAPH + INSERT DATA
@@ -99,8 +101,9 @@ def load_vocab(vocab: Union[Graph, str, Path], graph_uri: str,
         with open(vocab, 'rb') as f:
             content = f.read()
 
-    r = requests.put(
-        graph_store,
+    r = requests.request(
+        method='POST' if append else 'PUT',
+        url=graph_store,
         params={
             'graph': graph_uri,
         },
@@ -436,6 +439,7 @@ def _main():
     report = {}
     activity_id = str(uuid.uuid4())
     cmdline = 'python ogc.na.update_vocabs ' + " ".join(sys.argv[1:])
+    uploaded_graphs = set()
     for collection in (modified, added):
         report_cat = 'modified' if collection == modified else 'added'
         for doc, cfg in collection.items():
@@ -498,15 +502,21 @@ def _main():
                     # path components relative to the working directory
                     urnpart = ':'.join(p for p in docrelpath.parts if p and p != '..')
                     graphname = "x-urn:{}".format(urnpart)
+                append_data = graphname in uploaded_graphs
                 logger.info("Using graph name %s for %s", graphname, str(doc))
 
                 versioned_gname = graphname
                 for n, (path, loadable) in enumerate(loadables.items()):
                     try:
                         load_vocab(loadable, versioned_gname,
-                                   args.graph_store, authdetails)
-                        logging.info("Uploaded %s for %s to SPARQL graph store",
-                                     str(path), str(doc))
+                                   args.graph_store, authdetails, append=append_data)
+                        if append_data:
+                            logging.info("Uploaded %s for %s to SPARQL graph store (with append)",
+                                         str(path), str(doc))
+                        else:
+                            logging.info("Uploaded %s for %s to SPARQL graph store (with replace)",
+                                         str(path), str(doc))
+                        uploaded_graphs.add(versioned_gname)
                     except Exception as e:
                         logging.error("Failed to upload %s for %s: %s",
                                       str(path), str(doc), str(e))

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

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

@@ -1,5 +1,5 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=SIFfx0lgwTvAnd4cHgyIUN7PZREZhiGdTDRtpq4_MAM,413
+ogc/na/_version.py,sha256=vA6gPTjPSdC1gxj6eZa79wc5Se9JVwdnhpHXCsZkLbU,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
@@ -9,13 +9,13 @@ 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=m9Nd90Aplsm3m7cvNdiemPbnfq6Xq6rUDXGT1GBwDT4,18898
+ogc/na/update_vocabs.py,sha256=GWzWhIvZiCbioyIl3Ln8DHSW_olu5oG17kWGOgxad48,19506
 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.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.55.dist-info/METADATA,sha256=FPql5ZiyEyfGR0_tSciYAakCV0BkLfWdHJMmzPZaJME,3829
+ogc_na-0.3.55.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ogc_na-0.3.55.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.55.dist-info/RECORD,,

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

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