ogc-na 0.3.46__py3-none-any.whl → 0.3.47__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.46'
-__version_tuple__ = version_tuple = (0, 3, 46)
+__version__ = version = '0.3.47'
+__version_tuple__ = version_tuple = (0, 3, 47)

ogc/na/annotate_schema.py

@@ -688,6 +688,9 @@ class ContextBuilder:
         if prefixes:
             own_context.update(prefixes)
 
+        # store processed $defs and definitions to avoid parsing them twice
+        processed_refs = set()
+
         def read_properties(subschema: dict, from_schema: ReferencedSchema,
                             onto_context: dict, schema_path: list[str]) -> dict | None:
             if schema_path:
@@ -746,6 +749,8 @@ class ContextBuilder:
 
             if '$ref' in subschema:
                 ref = subschema['$ref']
+                ref_path_str = f"{from_schema.location}{ref}"
+                processed_refs.add(ref_path_str)
                 referenced_schema = self.schema_resolver.resolve_schema(ref, from_schema)
                 if referenced_schema:
                     process_subschema(referenced_schema.subschema, referenced_schema, onto_context,
@@ -767,6 +772,15 @@ class ContextBuilder:
                 if isinstance(pp, dict):
                     process_subschema(pp, from_schema, onto_context, schema_path + [pp_k])
 
+            for p in ('definitions', '$defs'):
+                defs = subschema.get(p)
+                if defs and isinstance(defs, dict):
+                    for entry_key, entry in defs.items():
+                        def_path = schema_path + [entry_key]
+                        def_path_str = f"{from_schema.location}#{'/'.join(def_path)}"
+                        if def_path_str not in processed_refs:
+                            process_subschema(entry, from_schema, onto_context, def_path)
+
             if ANNOTATION_EXTRA_TERMS in subschema:
                 for extra_term, extra_term_context in subschema[ANNOTATION_EXTRA_TERMS].items():
                     if extra_term not in onto_context:

ogc/na/domain_config.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import Union, Optional, Sequence, cast, IO, TypeVar, Iterable
 
 import wcmatch.glob
-from rdflib import Graph, Namespace, URIRef, DCTERMS, DCAT, Literal
+from rdflib import Graph, Namespace, URIRef, DCTERMS, DCAT, Literal, RDF
 from wcmatch.glob import globmatch
 
 from ogc.na.profile import ProfileRegistry
@@ -214,7 +214,7 @@ class DomainConfiguration:
 
             identifier = cfg_graph.value(cfg_ref, DCTERMS.identifier) or str(cfg_ref)
 
-            if profile_refs:
+            if (cfg_ref, RDF.type, DCFG.DomainConfiguration) in cfg_graph:
                 self.entries.append(DomainConfigurationEntry(
                     working_directory=self.working_directory,
                     glob=globs,

{ogc_na-0.3.46.dist-info → ogc_na-0.3.47.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=nKT1cOpmRV-LeICJaPCDMdhIUkMGhRcN3p0Hyw8DrwA,413
-ogc/na/annotate_schema.py,sha256=bVzQ-YjQ0ULJxaLxWk5ZFaVTKky2TbEY91VlYMqxmSs,40335
-ogc/na/domain_config.py,sha256=C6ao37dbXEKv_K7WcfzQgI3H1Hr3c4-3p24hgl2oH54,13896
+ogc/na/_version.py,sha256=MU1To0oLGMljUY5xtLtnFwxvNZIg8MhRIqWxqn6vDSQ,413
+ogc/na/annotate_schema.py,sha256=1W0gS190-s1f9cnmjzPakM82YB15aBYCHl1mmy2SehM,41052
+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
@@ -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.46.dist-info/METADATA,sha256=gMk9QGd1n214nQuZUPe3vp7RdERy5yCus7q1lWTdJFk,3829
-ogc_na-0.3.46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ogc_na-0.3.46.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.46.dist-info/RECORD,,
+ogc_na-0.3.47.dist-info/METADATA,sha256=t22dnhWzSyECXYG8MiMqXAiTv3Hk-TYJGxV6mNN9MUY,3829
+ogc_na-0.3.47.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+ogc_na-0.3.47.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.3.47.dist-info/RECORD,,

{ogc_na-0.3.46.dist-info → ogc_na-0.3.47.dist-info}/WHEEL

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