ogc-na 0.3.45__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.45'
-__version_tuple__ = version_tuple = (0, 3, 45)
+__version__ = version = '0.3.47'
+__version_tuple__ = version_tuple = (0, 3, 47)

ogc/na/annotate_schema.py

@@ -127,6 +127,7 @@ from pathlib import Path
 from typing import Any, AnyStr, Callable, Sequence, Iterable
 from urllib.parse import urlparse, urljoin
 
+import jsonpointer
 import jsonschema
 import requests_cache
 
@@ -180,26 +181,21 @@ class SchemaResolver:
 
     def __init__(self, working_directory=Path()):
         self.working_directory = working_directory.resolve()
-        self._schema_cache: dict[str | Path, tuple[Any, bool]] = {}
+        self._schema_cache: dict[str | Path, Any] = {}
 
     @staticmethod
     def _get_branch(schema: dict, ref: str):
-        path = re.sub(r'^#?/?', '', ref).split('/')
-        pointer = schema
-        for item in path:
-            if item:
-                pointer = pointer[item]
-        return pointer
+        return jsonpointer.resolve_pointer(schema, re.sub('^#', '', ref))
 
     def load_contents(self, s: str | Path) -> tuple[dict, bool]:
         """
         Load the contents of a schema. Can be overriden by subclasses to alter the loading process.
         """
-        contents, is_json = self._schema_cache.get(s, (None, False))
+        contents = self._schema_cache.get(s)
         if contents is None:
-            contents, is_json = load_json_yaml(read_contents(s)[0])
-            self._schema_cache[s] = contents, is_json
-        return contents, is_json
+            contents = read_contents(s)[0]
+            self._schema_cache[s] = contents
+        return load_json_yaml(contents)
 
     def resolve_ref(self, ref: str | Path, from_schema: ReferencedSchema | None = None) -> tuple[Path | str, str]:
         location = ref
@@ -230,7 +226,8 @@ class SchemaResolver:
 
         return location, fragment
 
-    def resolve_schema(self, ref: str | Path, from_schema: ReferencedSchema | None = None) -> ReferencedSchema | None:
+    def resolve_schema(self, ref: str | Path, from_schema: ReferencedSchema | None = None,
+                       force_contents: dict | None = None) -> ReferencedSchema | None:
         chain = from_schema.chain + [from_schema] if from_schema else []
         try:
             schema_source, fragment = self.resolve_ref(ref, from_schema)
@@ -251,6 +248,8 @@ class SchemaResolver:
                                         is_json=from_schema.is_json)
 
             contents, is_json = self.load_contents(schema_source)
+            if force_contents:
+                contents = force_contents
             if fragment:
                 return ReferencedSchema(location=schema_source, fragment=fragment,
                                         subschema=SchemaResolver._get_branch(contents, fragment),
@@ -457,12 +456,8 @@ class SchemaAnnotator:
     def process_schema(self, location: Path | str | None,
                        default_context: str | Path | dict | None = None,
                        contents: dict | None = None) -> AnnotatedSchema | None:
-        resolved_schema = self.schema_resolver.resolve_schema(location)
-        if contents:
-            # overriden
-            schema = contents
-        else:
-            schema = resolved_schema.subschema
+        resolved_schema = self.schema_resolver.resolve_schema(location, force_contents=contents)
+        schema = resolved_schema.subschema
 
         if all(x not in schema for x in ('schema', 'openapi')):
             validate_schema(schema)
@@ -568,6 +563,13 @@ class SchemaAnnotator:
 
             used_terms = set()
 
+            # Annotate definitions and $defs - can later be overridden if referenced from a different path
+            for p in ('definitions', '$defs'):
+                defs = subschema.get(p)
+                if defs and isinstance(defs, dict):
+                    for entry in defs.values():
+                        used_terms.update(process_subschema(entry, context_stack, from_schema, level + 1))
+
             if '$ref' in subschema and id(subschema) not in updated_refs:
                 if self._ref_mapper:
                     subschema['$ref'] = self._ref_mapper(subschema['$ref'], subschema)
@@ -585,13 +587,6 @@ class SchemaAnnotator:
                     for entry in collection:
                         used_terms.update(process_subschema(entry, context_stack, from_schema, level + 1))
 
-            # Annotate definitions and $defs
-            for p in ('definitions', '$defs'):
-                defs = subschema.get(p)
-                if defs and isinstance(defs, dict):
-                    for entry in defs.values():
-                        used_terms.update(process_subschema(entry, context_stack, from_schema, level + 1))
-
             for p in ('then', 'else', 'additionalProperties'):
                 branch = subschema.get(p)
                 if branch and isinstance(branch, dict):
@@ -693,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:
@@ -751,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,
@@ -772,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.45.dist-info → ogc_na-0.3.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ogc_na
-Version: 0.3.45
+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/
@@ -26,6 +26,7 @@ Requires-Dist: GitPython >=3.1.32
 Requires-Dist: rfc3987
 Requires-Dist: requests-cache
 Requires-Dist: xmltodict
+Requires-Dist: jsonpointer ~=2.4
 Requires-Dist: setuptools
 Provides-Extra: dev
 Requires-Dist: mkdocs >=1.4.2 ; extra == 'dev'

{ogc_na-0.3.45.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=94Zx_mr9eAoDR-QvqK5Ld0uUkeJswI5m5cnKSahrcV8,413
-ogc/na/annotate_schema.py,sha256=IdVc3my8FkxvJwwmIGFu5RcyvyOK-dQjwLWh-NFrm4g,40367
-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.45.dist-info/METADATA,sha256=M64A21bqXChPrmV3fK6LfkXI9khRbLYtDTkC4xc2qv0,3796
-ogc_na-0.3.45.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ogc_na-0.3.45.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.45.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.45.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