refactor(system,core): Removes deferred tag provider and corrects tag filtering logic

- Removes overture tag provider (was deferred)
- Simplified tags
- Reserved tags instead of reserved namespaces
- Fixes small issue introduced in earlier commit

Signed-off-by: Roel <75250264+RoelBollens-TomTom@users.noreply.github.com>

Author: RoelBollens-TomTom

packages/overture-schema-core/pyproject.toml

@@ -38,6 +38,5 @@ dev = [
 ]
 
 [project.entry-points."overture.tag_providers"]
-overture  = "overture.schema.core.tag_providers:overture_provider"
 authority = "overture.schema.core.tag_providers:authority_provider"
 theme     = "overture.schema.core.tag_providers:theme_provider"

packages/overture-schema-core/src/overture/schema/core/tag_providers.py

@@ -21,22 +21,15 @@
     "overture.schema.places:Place",
     "overture.schema.transportation:Connector",
     "overture.schema.transportation:Segment",
+    "overture.schema.annex:Sources",
 }
 
 
 def authority_provider(
     model_class: type[BaseModel], key: ModelKey, tags: set[str]
 ) -> set[str]:
     if _matches_manifest(key):
-        tags.add("overture:official")
-    return tags
-
-
-def overture_provider(
-    model_class: type[BaseModel], key: ModelKey, tags: set[str]
-) -> set[str]:
-    if any(issubclass(tp, OvertureFeature) for tp in _reduce_types(model_class)):
-        tags.add("overture:feature")
+        tags.add("overture")
     return tags
 
 
@@ -52,7 +45,7 @@ def theme_provider(
 
 
 def _matches_manifest(key: ModelKey) -> bool:
-    return key.entry_point in APPROVED:
+    return key.entry_point in APPROVED
 
 
 def _reduce_types(tp: Any) -> set[type]:

packages/overture-schema-system/src/overture/schema/system/discovery.py

@@ -73,7 +73,7 @@ def generate_tags(
     for provider_key, provider in providers.items():
         try:
             added_tags = provider(model_class, key, tags.copy()).difference(tags)
-            filtered_tags = _filter_tags(added_tags, provider_key.package_name)
+            filtered_tags = _filter_tags(added_tags, provider_key)
             tags.update(filtered_tags)
         except Exception as e:
             logger.warning(
@@ -83,17 +83,17 @@ def generate_tags(
     return tags
 
 
-def _filter_tags(tags: set[str], package: str) -> set[str]:
-    reserved_namespaces = tuple(
-        f"{namespace}:"
-        for namespace, reserved_packages in RESERVED_TAGS.items()
-        if package not in reserved_packages
+def _filter_tags(tags: set[str], provider: TagProviderKey) -> set[str]:
+    reserved_tags = tuple(
+        tag
+        for tag, dist in RESERVED_TAGS.items()
+        if provider.package_name not in dist
     )
 
     return {
         tag
         for tag in tags
-        if TAG_RE.match(tag) and not tag.startswith(reserved_namespaces)
+        if TAG_RE.match(tag) and not tag in reserved_tags
     }
 
 
@@ -155,11 +155,7 @@ def discover_models(
                 key = ModelKey(
                     name=model.name,
                     entry_point=model.value,
-                    tags=(
-                        frozenset(_distribution_tags(model.dist))
-                        if model.dist
-                        else frozenset()
-                    ),
+                    tags=frozenset(),
                 )
 
                 try:
@@ -183,17 +179,6 @@ def discover_models(
     return models
 
 
-def _distribution_tags(dist: importlib.metadata.Distribution) -> set[str]:
-    """Extract tags from the distribution metadata."""
-    tags = set()
-    if dist.name:
-        tags.add("dist:name=" + dist.name)
-    if dist.version:
-        tags.add("dist:version=" + dist.version)
-
-    return tags
-
-
 def get_registered_model(feature_type: str) -> type[BaseModel] | None:
     """Get the Pydantic model for a type.
 
@@ -244,7 +229,7 @@ def feature_provider(
     model_class: type[BaseModel], key: ModelKey, tags: set[str]
 ) -> set[str]:
     if any(issubclass(tp, Feature) for tp in _extract_types(model_class)):
-        tags.add("system:feature")
+        tags.add("feature")
     return tags