ogc-na 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

ogc/na/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.2'
-__version_tuple__ = version_tuple = (0, 4, 2)
+__version__ = version = '0.4.3'
+__version_tuple__ = version_tuple = (0, 4, 3)
 
 __commit_id__ = commit_id = None

ogc/na/annotate_schema.py

@@ -609,7 +609,8 @@ class SchemaAnnotator:
 
             return used_terms
 
-        def process_subschema(subschema, context_stack, from_schema: ReferencedSchema, level=1) -> Iterable[str]:
+        def process_subschema(subschema, context_stack, from_schema: ReferencedSchema, level=1,
+                              in_defs=False) -> Iterable[str]:
             if not subschema or not isinstance(subschema, dict):
                 return ()
 
@@ -620,7 +621,8 @@ class SchemaAnnotator:
                 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))
+                        # Do not add to used_terms if only used in $defs
+                        process_subschema(entry, context_stack, from_schema, level + 1, in_defs=True)
 
             if '$ref' in subschema and id(subschema) not in updated_refs:
                 if self._ref_mapper:
@@ -628,8 +630,10 @@ class SchemaAnnotator:
                 if subschema['$ref'].startswith('#/') or subschema['$ref'].startswith(f"{from_schema.location}#/"):
                     target_schema = self.schema_resolver.resolve_schema(subschema['$ref'], from_schema)
                     if target_schema:
-                        used_terms.update(process_subschema(target_schema.subschema, context_stack,
-                                                            target_schema, level + 1))
+                        new_terms = process_subschema(target_schema.subschema, context_stack,
+                                                            target_schema, level + 1, in_defs=in_defs)
+                        if not in_defs:
+                            used_terms.update(new_terms)
                 updated_refs.add(id(subschema))
 
             # Annotate oneOf, allOf, anyOf
@@ -637,16 +641,22 @@ class SchemaAnnotator:
                 collection = subschema.get(p)
                 if collection and isinstance(collection, list):
                     for entry in collection:
-                        used_terms.update(process_subschema(entry, context_stack, from_schema, level + 1))
+                        new_terms = process_subschema(entry, context_stack, from_schema, level + 1, in_defs=in_defs)
+                        if not in_defs:
+                            used_terms.update(new_terms)
 
             for p in ('then', 'else', 'additionalProperties'):
                 branch = subschema.get(p)
                 if branch and isinstance(branch, dict):
-                    used_terms.update(process_subschema(branch, context_stack, from_schema, level))
+                    new_terms = process_subschema(branch, context_stack, from_schema, level, in_defs=in_defs)
+                    if not in_defs:
+                        used_terms.update(new_terms)
 
             for pp in subschema.get('patternProperties', {}).values():
                 if pp and isinstance(pp, dict):
-                    used_terms.update(process_subschema(pp, context_stack, from_schema, level + 1))
+                    new_terms = process_subschema(pp, context_stack, from_schema, level + 1, in_defs=in_defs)
+                    if not in_defs:
+                        used_terms.update(new_terms)
 
             # Annotate main schema
             schema_type = subschema.get('type')
@@ -657,7 +667,10 @@ class SchemaAnnotator:
                 used_terms.update(process_properties(subschema, context_stack, from_schema, level + 1))
             elif schema_type == 'array':
                 for k in ('prefixItems', 'items', 'contains'):
-                    used_terms.update(process_subschema(subschema.get(k), context_stack, from_schema, level + 1))
+                    new_terms = process_subschema(subschema.get(k), context_stack, from_schema, level + 1,
+                                                  in_defs=in_defs)
+                    if not in_defs:
+                        used_terms.update(new_terms)
 
             # Get prefixes
             for p, bu in subschema.get(ANNOTATION_PREFIXES, {}).items():

{ogc_na-0.4.2.dist-info → ogc_na-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogc_na
-Version: 0.4.2
+Version: 0.4.3
 Summary: OGC Naming Authority tools
 Author-email: Rob Atkinson <ratkinson@ogc.org>, Piotr Zaborowski <pzaborowski@ogc.org>, Alejandro Villar <avillar@ogc.org>
 License-Expression: Apache-2.0

{ogc_na-0.4.2.dist-info → ogc_na-0.4.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ogc/na/__init__.py,sha256=uzcNiJ3uKFNJ1HBfKxIwgAy2HMUFsLAe5RkrUg8ncac,464
-ogc/na/_version.py,sha256=A45grTqzrHuDn1CT9K5GVUbY4_Q3OSTcXAl3zdHzcEI,704
-ogc/na/annotate_schema.py,sha256=qCQJnm-e-OlLANRc1Tq1lMKmBEYgFLvQqOBz2kNn8c0,43910
+ogc/na/_version.py,sha256=bmI9ViMEsJ1Rjce-6ExwiNh2B7sZKTyBkze4k8NsTrU,704
+ogc/na/annotate_schema.py,sha256=MYXYzmFDua0DjOxccmGTAFHDS3T7U01jNv-u001ytj4,44584
 ogc/na/domain_config.py,sha256=ORzITa1rTrD1MQdpWYrIVW5SwSa9lJd3hnyHIxNgiIU,13947
 ogc/na/download.py,sha256=2afrLyl4WsAlxkCgXsl47fs9mNKfDmhVpeT2iwNSoq0,3354
 ogc/na/exceptions.py,sha256=cwvnq79ih90T9lfwJww0zOx_QwuICaUvlo3Mc8m8ouA,85
@@ -16,8 +16,8 @@ ogc/na/input_filters/__init__.py,sha256=AhE7n_yECwxFKwOM3Jc0ft96TtF5i_Z-fHrS4HYO
 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.4.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ogc_na-0.4.2.dist-info/METADATA,sha256=ARd3I_Gq1d9d3wyZw0oPl-9NK_ruTEJsiYWNgFq82OY,3917
-ogc_na-0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ogc_na-0.4.2.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
-ogc_na-0.4.2.dist-info/RECORD,,
+ogc_na-0.4.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ogc_na-0.4.3.dist-info/METADATA,sha256=kdSKsp_WMZhKj6lKJAg85TnyPf7sXzHVvfuGRij2bPA,3917
+ogc_na-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ogc_na-0.4.3.dist-info/top_level.txt,sha256=Kvy3KhzcIhNPT4_nZuJCmS946ptRr_MDyU4IIhZJhCY,4
+ogc_na-0.4.3.dist-info/RECORD,,