ogc-na 0.3.57__py3-none-any.whl → 0.4__py3-none-any.whl

ogc/na/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.57'
-__version_tuple__ = version_tuple = (0, 3, 57)
+__version__ = version = '0.4'
+__version_tuple__ = version_tuple = (0, 4)

ogc/na/update_vocabs.py

@@ -40,6 +40,7 @@ from rdflib import Graph, RDF, SKOS, URIRef
 
 from ogc.na import util
 from ogc.na.domain_config import DomainConfiguration, DomainConfigurationEntry
+from ogc.na.profile import ProfileRegistry
 from ogc.na.provenance import generate_provenance, ProvenanceMetadata, FileProvenanceMetadata
 
 logger = logging.getLogger('ogc.na.update_vocabs')
@@ -245,6 +246,7 @@ def _main():
 
     parser.add_argument(
         "domain_cfg",
+        nargs="?",
         metavar="domain-cfg",
         help=("Domain configuration (can be a local or remote RDF file, "
               "or a SPARQL endpoint in the form 'sparql:http://example.org/sparql')"),
@@ -362,6 +364,17 @@ def _main():
         help='Ignore errors when retrieving profile artifacts'
     )
 
+    parser.add_argument(
+        '--graph-uri',
+        help='Override graph URI that will be used for all resources',
+    )
+
+    parser.add_argument(
+        '--profile-uris',
+        nargs='*',
+        help='Override profile URIs that will be used for all resources',
+    )
+
     args = parser.parse_args()
 
     setup_logging(args.debug)
@@ -410,29 +423,52 @@ def _main():
                 raise Exception(f"Invalid local artifact mapping: {mappingstr}")
             local_artifacts_mappings[mapping[0]] = mapping[1]
 
-    domain_cfg = DomainConfiguration(args.domain_cfg, working_directory=args.working_directory,
-                                     profile_sources=args.profile_source,
-                                     ignore_artifact_errors=args.ignore_artifact_errors,
-                                     local_artifacts_mappings=local_artifacts_mappings)
-    cfg_entries = domain_cfg.entries
-    if not len(cfg_entries):
-        if args.domain:
-            logger.warning('No configuration found in %s for domain %s, exiting',
-                           args.domain_cfg, args.domain)
+    if not args.domain_cfg and not (args.profile_source and args.profile_uris):
+        logger.error('Either a domain configuration or a profile source and a set of '
+                     'profile URIs need to be provided')
+        sys.exit(2)
+
+    modified: dict[Path, DomainConfigurationEntry | None]
+    added: dict[Path, DomainConfigurationEntry | None]
+
+    if args.domain_cfg:
+        domain_cfg = DomainConfiguration(args.domain_cfg, working_directory=args.working_directory,
+                                         profile_sources=args.profile_source,
+                                         ignore_artifact_errors=args.ignore_artifact_errors,
+                                         local_artifacts_mappings=local_artifacts_mappings)
+        cfg_entries = domain_cfg.entries
+        if not len(cfg_entries):
+            if args.domain:
+                logger.warning('No configuration found in %s for domain %s, exiting',
+                               args.domain_cfg, args.domain)
+            else:
+                logger.warning('No configuration found in %s exiting', args.domain_cfg)
+            sys.exit(1)
+
+        profile_registry = domain_cfg.profile_registry
+
+        if args.batch:
+            modified = cfg_entries.find_all()
+            added = {}
         else:
-            logger.warning('No configuration found in %s exiting', args.domain_cfg)
-        sys.exit(1)
+            modified = cfg_entries.find_entries_for_files(mod_list)
+            added = cfg_entries.find_entries_for_files(add_list)
 
-    profile_registry = domain_cfg.profile_registry
+        root_directory = domain_cfg.working_directory
 
-    modified: dict[Path, DomainConfigurationEntry]
-    added: dict[Path, DomainConfigurationEntry]
-    if args.batch:
-        modified = cfg_entries.find_all()
-        added = {}
+    elif args.batch:
+        logger.error('--batch requires a domain configuration')
+        sys.exit(3)
     else:
-        modified = cfg_entries.find_entries_for_files(mod_list)
-        added = cfg_entries.find_entries_for_files(add_list)
+        logger.info('Loading profile sources and URIs from script parameters')
+        profile_registry = ProfileRegistry(args.profile_source,
+                                           ignore_artifact_errors=args.ignore_artifact_errors,
+                                           local_artifact_mappings=args.local_artifact_mappings)
+
+        modified = {Path(x): None for x in mod_list}
+        added = {Path(x): None for x in add_list}
+
+        root_directory = Path(args.working_directory or os.getcwd())
 
     output_path = Path(args.output_directory) if args.output_directory else None
 
@@ -448,21 +484,28 @@ def _main():
             if args.no_provenance:
                 provenance_metadata = None
             else:
+                used = [FileProvenanceMetadata(filename=doc)]
+                if args.domain_cfg:
+                    used.append(FileProvenanceMetadata(filename=args.domain_cfg))
                 provenance_metadata = ProvenanceMetadata(
-                    used=[FileProvenanceMetadata(filename=doc),
-                          FileProvenanceMetadata(filename=args.domain_cfg)],
+                    used=used,
                     start=datetime.now(),
                     end_auto=True,
-                    root_directory=domain_cfg.working_directory,
+                    root_directory=root_directory,
                     batch_activity_id=activity_id,
                     activity_label='Entailment and validation',
                     comment=cmdline,
                     base_uri=args.base_uri,
                 )
 
+            if cfg:
+                conforms_to = cfg.conforms_to
+            else:
+                conforms_to = args.profile_uris
+
             origg = Graph().parse(doc)
-            newg, entail_artifacts = profile_registry.entail(origg, cfg.conforms_to)
-            validation_result = profile_registry.validate(newg, cfg.conforms_to, log_artifact_errors=True)
+            newg, entail_artifacts = profile_registry.entail(origg, conforms_to)
+            validation_result = profile_registry.validate(newg, conforms_to, log_artifact_errors=True)
 
             if provenance_metadata:
                 def add_artifact(a: Union[str, Path]):
@@ -482,7 +525,7 @@ def _main():
             else:
                 entailment_dir = DEFAULT_ENTAILED_DIR
 
-            loadable_path = make_rdf(doc, newg, cfg.uri_root_filter,
+            loadable_path = make_rdf(doc, newg, cfg.uri_root_filter if cfg else None,
                                      entailment_dir, provenance_metadata)
             with open(loadable_path.with_suffix('.txt'), 'w') as validation_file:
                 validation_file.write(validation_result.text)
@@ -495,13 +538,20 @@ def _main():
                     if p != loadable_path:
                         loadables[p] = g
 
-                graphname = next(get_graph_uri_for_vocab(newg), None)
+                if args.graph_uri:
+                    graphname = args.graph_uri
+                else:
+                    graphname = next(get_graph_uri_for_vocab(newg), None)
+
                 if not graphname:
                     logger.warning("No graph name could be deduced from the vocabulary")
                     # Create graph name from a colon-separated list of
                     # path components relative to the working directory
-                    urnpart = ':'.join(p for p in docrelpath.parts if p and p != '..')
-                    graphname = "x-urn:{}".format(urnpart)
+                    urnparts = ['x-urn', 'ogc', 'na']
+                    if cfg and cfg.identifier:
+                        urnparts.append(str(cfg.identifier))
+                    urnparts.extend(p for p in docrelpath.parts if p and p != '..')
+                    graphname = ':'.join(urnparts)
                 append_data = graphname in uploaded_graphs
                 logger.info("Using graph name %s for %s", graphname, str(doc))
 
@@ -523,7 +573,7 @@ def _main():
                         raise e
                     versioned_gname = f'{graphname}{n + 1}'
 
-            report.setdefault(cfg.identifier, {}) \
+            report.setdefault(cfg.identifier if cfg else args.graph_uri, {}) \
                 .setdefault(report_cat, []).append(os.path.relpath(doc))
 
     for scope, scopereport in report.items():

{ogc_na-0.3.57.dist-info → ogc_na-0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ogc_na
-Version: 0.3.57
+Version: 0.4
 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.57.dist-info → ogc_na-0.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=KqIVwYBdIdahVzuj89W2dfY5Y-ewSsfE6L9PQnp8tPw,413
+ogc/na/_version.py,sha256=z4A7Ai6QyXWBOpaj5g4Fi0n9CYi27WfJ6gm02OiXBxE,506
 ogc/na/annotate_schema.py,sha256=YtxL9pOeeVk9CubvnByUMh7nZUJYZCDQ60hXEvtiR6g,43869
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
@@ -9,14 +9,14 @@ 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=GWzWhIvZiCbioyIl3Ln8DHSW_olu5oG17kWGOgxad48,19506
+ogc/na/update_vocabs.py,sha256=9um_Qn3Si6yQ20qLYsFhiaXcxA2ryzduvYprNb252-U,21370
 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/xlsx.py,sha256=X9EpFgC9WwHQD8iUJRGdaDYfgiLKjXPdhTVhDmNPAQ0,2730
 ogc/na/input_filters/xml.py,sha256=9qYjp_w5JLInFM48zB15IYH9eTafjp1Aqd_8kfuW3aA,2074
-ogc_na-0.3.57.dist-info/METADATA,sha256=dcn9t_MBayKk9qKGfH5an7jKwcCpmK8QtDovmc5Ljmw,3843
-ogc_na-0.3.57.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ogc_na-0.3.57.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.57.dist-info/RECORD,,
+ogc_na-0.4.dist-info/METADATA,sha256=-Fn_jl_HfMJq4QBy8GnlxUzZoN8sbq0wP39mZkH6plg,3840
+ogc_na-0.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ogc_na-0.4.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.4.dist-info/RECORD,,

{ogc_na-0.3.57.dist-info → ogc_na-0.4.dist-info}/WHEEL

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