ogc-na 0.3.43__py3-none-any.whl → 0.3.45__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.43'
-__version_tuple__ = version_tuple = (0, 3, 43)
+__version__ = version = '0.3.45'
+__version_tuple__ = version_tuple = (0, 3, 45)

ogc/na/annotate_schema.py

@@ -122,7 +122,6 @@ import json
 import logging
 import re
 import sys
-from collections import deque
 from operator import attrgetter
 from pathlib import Path
 from typing import Any, AnyStr, Callable, Sequence, Iterable
@@ -131,7 +130,8 @@ from urllib.parse import urlparse, urljoin
 import jsonschema
 import requests_cache
 
-from ogc.na.util import is_url, load_yaml, LRUCache, dump_yaml, merge_contexts, merge_dicts, dict_contains
+from ogc.na.util import is_url, load_yaml, LRUCache, dump_yaml, \
+    merge_contexts, merge_dicts, dict_contains, JSON_LD_KEYWORDS
 
 logger = logging.getLogger(__name__)
 
@@ -146,6 +146,8 @@ ANNOTATION_IGNORE_EXPAND = [ANNOTATION_CONTEXT, ANNOTATION_EXTRA_TERMS, ANNOTATI
 
 CURIE_TERMS = '@id', '@type', '@index'
 
+UNDEFINED = object()
+
 context_term_cache = LRUCache(maxsize=20)
 requests_session = requests_cache.CachedSession('ogc.na.annotate_schema', backend='memory', expire_after=180)
 
@@ -340,12 +342,14 @@ def resolve_context(ctx: Path | str | dict | list, expand_uris=True) -> Resolved
     prefixes = {}
 
     def expand_uri(curie, ctx_stack):
-        if not expand_uris or not ctx_stack or not curie or curie[0] == '@':
+        if not expand_uris or not ctx_stack or not curie or curie in JSON_LD_KEYWORDS:
             return curie
         if ':' in curie:
             prefix, localpart = curie.split(':', 1)
         else:
             prefix, localpart = None, None
+
+        vocab = UNDEFINED
         for c in reversed(ctx_stack):
             if localpart:
                 # prefix:localpart format
@@ -354,9 +358,11 @@ def resolve_context(ctx: Path | str | dict | list, expand_uris=True) -> Resolved
                     prefix_uri = term_val if isinstance(term_val, str) else term_val.get('@id')
                     prefixes[prefix] = prefix_uri
                     return f"{prefix_uri}{localpart}"
-            elif '@vocab' in c:
-                # look for @vocab
-                return f"{c['@vocab']}{curie}"
+            elif '@vocab' in c and vocab is UNDEFINED:
+                # look for @vocab unless it has been overridden (e.g. set to null) somewhere down the chain
+                vocab = c['@vocab']
+                if isinstance(vocab, str):
+                    return f"{c['@vocab']}{curie}"
 
         return curie
 
@@ -388,7 +394,11 @@ def resolve_context(ctx: Path | str | dict | list, expand_uris=True) -> Resolved
             resolved_ctx = {}
             inner_prefixes = {}
             for ctx_entry in inner_ctx:
-                resolved_entry = resolve_context(ctx_entry)
+                if isinstance(ctx_entry, dict):
+                    # Array entries must be wrapped with @context
+                    resolved_entry = resolve_context({'@context': ctx_entry})
+                else:
+                    resolved_entry = resolve_context(ctx_entry)
                 inner_prefixes.update(resolved_entry.prefixes)
                 resolved = ResolvedContext(merge_dicts(resolved_entry.context, resolved_ctx), inner_prefixes)
         else:
@@ -481,26 +491,28 @@ class SchemaAnnotator:
         updated_refs: set[int] = set()
 
         def find_prop_context(prop, context_stack) -> dict | None:
+            vocab = UNDEFINED
             for ctx in reversed(context_stack):
-                vocab = ctx.get('@vocab')
+                if vocab is UNDEFINED and '@vocab' in ctx:
+                    vocab = ctx.get('@vocab')
                 if prop in ctx:
                     prop_ctx = ctx[prop]
                     if isinstance(prop_ctx, str):
-                        if vocab and ':' not in prop_ctx and prop_ctx[0] != '@':
+                        if vocab and ':' not in prop_ctx and prop_ctx not in JSON_LD_KEYWORDS:
                             prop_ctx = f"{vocab}{prop_ctx}"
                         return {'@id': prop_ctx}
                     elif '@id' not in prop_ctx and not vocab:
                         raise ValueError(f'Missing @id for property {prop} in context {json.dumps(ctx, indent=2)}')
                     else:
-                        result = {k: v for k, v in prop_ctx.items() if k.startswith('@')}
+                        result = {k: v for k, v in prop_ctx.items() if k in JSON_LD_KEYWORDS}
                         if vocab:
                             prop_id = result.get('@id')
                             if not prop_id:
                                 result['@id'] = f"{vocab}{prop}"
-                            elif ':' not in prop_id and prop_id[0] != '@':
+                            elif ':' not in prop_id and prop_id not in JSON_LD_KEYWORDS:
                                 result['@id'] = f"{vocab}{prop_id}"
                         return result
-                elif '@vocab' in ctx:
+                elif isinstance(vocab, str):
                     return {'@id': f"{ctx['@vocab']}{prop}"}
 
         def process_properties(obj: dict, context_stack: list[dict[str, Any]],
@@ -514,7 +526,7 @@ class SchemaAnnotator:
 
             used_terms = set()
             for prop in list(properties.keys()):
-                if prop[0] == '@':
+                if prop in JSON_LD_KEYWORDS:
                     # skip JSON-LD keywords
                     continue
                 prop_value = properties[prop]
@@ -531,7 +543,7 @@ class SchemaAnnotator:
                     used_terms.add(prop)
                     prop_schema_ctx = {f"{ANNOTATION_PREFIX}{k[1:]}": v
                                        for k, v in prop_ctx.items()
-                                       if k[0] == '@' and k != '@context'}
+                                       if k in JSON_LD_KEYWORDS and k != '@context'}
                     prop_ctx_base = prop_ctx.get('@context', {}).get('@base')
                     if prop_ctx_base:
                         prop_schema_ctx[ANNOTATION_BASE] = prop_ctx_base
@@ -608,12 +620,14 @@ class SchemaAnnotator:
             if len(context_stack) == level and context_stack[-1]:
                 extra_terms = {}
                 for k, v in context_stack[-1].items():
-                    if k[0] != '@' and k not in prefixes and k not in used_terms:
+                    if k not in JSON_LD_KEYWORDS and k not in prefixes and k not in used_terms:
                         if isinstance(v, dict):
                             if len(v) == 1 and '@id' in v:
                                 v = v['@id']
                             else:
-                                v = {f"{ANNOTATION_PREFIX}{vk[1:]}": vv for vk, vv in v.items() if vk[0] == '@'}
+                                v = {f"{ANNOTATION_PREFIX}{vk[1:]}": vv
+                                     for vk, vv in v.items()
+                                     if vk in JSON_LD_KEYWORDS}
                         if isinstance(v, str) and v[-1] in ('#', '/', ':'):
                             prefixes[k] = v
                         else:
@@ -806,7 +820,7 @@ class ContextBuilder:
         if compact:
 
             def compact_uri(uri: str) -> str:
-                if uri.startswith('@'):
+                if uri in JSON_LD_KEYWORDS:
                     # JSON-LD keyword
                     return uri
 
@@ -821,7 +835,7 @@ class ContextBuilder:
 
             def compact_branch(branch, context_stack=None) -> bool:
                 child_context_stack = context_stack + [branch] if context_stack else [branch]
-                terms = list(k for k in branch.keys() if k[0] != '@')
+                terms = list(k for k in branch.keys() if k not in JSON_LD_KEYWORDS)
 
                 changed = False
                 for term in terms:
@@ -853,14 +867,15 @@ class ContextBuilder:
 
             def compact_uris(branch, context_stack=None):
                 child_context_stack = context_stack + [branch] if context_stack else [branch]
-                terms = list(k for k in branch.keys() if k[0] != '@')
+                terms = list(k for k in branch.keys() if k not in JSON_LD_KEYWORDS)
                 for term in terms:
                     term_value = branch.get(term)
                     if isinstance(term_value, str):
                         branch[term] = compact_uri(term_value)
                     elif isinstance(term_value, dict):
-                        if '@id' in term_value:
-                            term_value['@id'] = compact_uri(term_value['@id'])
+                        for k in CURIE_TERMS:
+                            if k in term_value:
+                                term_value[k] = compact_uri(term_value[k])
                         if len(term_value) == 1 and '@id' in term_value:
                             branch[term] = term_value['@id']
                         elif '@context' in term_value:

ogc/na/util.py

@@ -28,6 +28,32 @@ try:
 except ImportError:
     from yaml import Loader as YamlLoader, SafeLoader as SafeYamlLoader, Dumper as YamlDumper
 
+JSON_LD_KEYWORDS = {
+    '@base',
+    '@container',
+    '@context',
+    '@direction',
+    '@graph',
+    '@id',
+    '@import',
+    '@included',
+    '@index',
+    '@json',
+    '@language',
+    '@list',
+    '@nest',
+    '@none',
+    '@prefix',
+    '@propagate',
+    '@protected',
+    '@reverse',
+    '@set',
+    '@type',
+    '@value',
+    '@version',
+    '@vocab'
+}
+
 
 class ContextMergeError(Exception):
     pass
@@ -294,7 +320,7 @@ def merge_contexts(a: dict, b: dict, fix_nest=True) -> dict[str, Any]:
     for term in list(a.keys()):
         va = a[term]
         vb = b.get(term)
-        if term[0] != '@':
+        if term not in JSON_LD_KEYWORDS:
             if isinstance(va, str):
                 va = {'@id': va}
                 a[term] = va

{ogc_na-0.3.43.dist-info → ogc_na-0.3.45.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=3SM8TQK0XTeTAO_UFFJd4QeOtXiE6t02ayy_xRZ5U98,413
-ogc/na/annotate_schema.py,sha256=zhg8sBSWcfr1JlGALomrKVhrmJQ8HMkIfLVf1yqQg9I,39592
+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/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/gsp.py,sha256=KGa2G9i8kPefYTHNPUDoXnNyF7Tiwt8K__Ew_Qa7eeg,6048
@@ -9,12 +9,12 @@ 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/util.py,sha256=ayMUT9HzNKynpSDTZ8epM8qSMTu4-_KlEL-Zlci2Pnk,11573
+ogc/na/util.py,sha256=r-cwqxqVVH1oXWsWuobTvXFGUVCqwlalN97b85nUN4U,11951
 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.43.dist-info/METADATA,sha256=tANOeQvrhO_4uhdtrPJs2zpyG7gjSA-3InVOt-5_mx0,3796
-ogc_na-0.3.43.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ogc_na-0.3.43.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.3.43.dist-info/RECORD,,
+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,,