metadata and resource mandatory fields check and other details

KatKatKateryna · KatKatKateryna · commit b7706ad6f437 · 2025-10-08T21:59:31.000+01:00
diff --git a/models/ConfigData.py b/models/ConfigData.py
@@ -76,7 +76,7 @@ def set_data_from_yaml(self, dict_content: dict):
                 if resource_data.get("type") in [e.value for e in ResourceTypesEnum]:
 
                     # Create a new ResourceConfigTemplate instance and update with available values
-                    new_resource_item = ResourceConfigTemplate(
+                    new_resource_item = ResourceConfigTemplate.init_with_name(
                         instance_name=resource_instance_name
                     )
                     (
@@ -170,7 +170,9 @@ def asdict_enum_safe(self, obj):
     def add_new_resource(self) -> str:
         """Add a placeholder resource."""
         new_name = "new_resource"
-        self.resources[new_name] = ResourceConfigTemplate(instance_name=new_name)
+        self.resources[new_name] = ResourceConfigTemplate.init_with_name(
+            instance_name=new_name
+        )
         return new_name
 
     def delete_resource(self, dialog):
diff --git a/models/top_level/MetadataConfig.py b/models/top_level/MetadataConfig.py
@@ -5,6 +5,7 @@
 
 # records
 class MetadataKeywordTypeEnum(Enum):
+    NONE = ""
     DISCIPLINE = "discipline"
     TEMPORAL = "temporal"
     PLACE = "place"
@@ -42,43 +43,39 @@ class MetadataIdentificationConfig:
     title: str | dict = field(default_factory=lambda: "")
     description: str | dict = field(default_factory=lambda: "")
     keywords: list | dict = field(default_factory=lambda: [])
-    keywords_type: MetadataKeywordTypeEnum = field(
-        default_factory=lambda: MetadataKeywordTypeEnum.THEME
-    )
-    terms_of_service: str = field(
-        default="https://creativecommons.org/licenses/by/4.0/"
-    )
     url: str = field(default="https://example.org")
+    keywords_type: MetadataKeywordTypeEnum | None = None
+    terms_of_service: str | None = None
 
 
 @dataclass(kw_only=True)
 class MetadataLicenseConfig:
     name: str = field(default="CC-BY 4.0 license")
-    url: str = field(default="https://creativecommons.org/licenses/by/4.0/")
+    url: str | None = None
 
 
 @dataclass(kw_only=True)
 class MetadataProviderConfig:
     name: str = field(default="Organization Name")
-    url: str = field(default="https://pygeoapi.io")
+    url: str | None = None
 
 
 @dataclass(kw_only=True)
 class MetadataContactConfig:
     name: str = field(default="Lastname, Firstname")
-    position: str = field(default="Position Title")
-    address: str = field(default="Mailing Address")
-    city: str = field(default="City")
-    stateorprovince: str = field(default="Administrative Area")
-    postalcode: str = field(default="Zip or Postal Code")
-    country: str = field(default="Country")
-    phone: str = field(default="+xx-xxx-xxx-xxxx")
-    fax: str = field(default="+xx-xxx-xxx-xxxx")
-    email: str = field(default="you@example.org")
-    url: str = field(default="Contact URL")
-    hours: str = field(default="Mo-Fr 08:00-17:00")
-    instructions: str = field(default="During hours of service. Off on weekends.")
-    role: MetadataRoleEnum = field(default_factory=lambda: MetadataRoleEnum.NONE)
+    position: str | None = None
+    address: str | None = None
+    city: str | None = None
+    stateorprovince: str | None = None
+    postalcode: str | None = None
+    country: str | None = None
+    phone: str | None = None
+    fax: str | None = None
+    email: str | None = None
+    url: str | None = None
+    hours: str | None = None
+    instructions: str | None = None
+    role: MetadataRoleEnum | None = None
 
 
 @dataclass(kw_only=True)
@@ -108,15 +105,17 @@ def get_invalid_properties(self):
             all_invalid_fields.append("metadata.identification.description")
         if len(self.identification.keywords) == 0:
             all_invalid_fields.append("metadata.identification.keywords")
+        if len(self.identification.url) == 0:
+            all_invalid_fields.append("metadata.identification.url")
         if len(self.license.name) == 0:
             all_invalid_fields.append("metadata.license.name")
         if len(self.provider.name) == 0:
             all_invalid_fields.append("metadata.provider.name")
         if len(self.contact.name) == 0:
             all_invalid_fields.append("metadata.contact.name")
 
-        parsed_url = urlparse(self.identification.url)
-        if not all([parsed_url.scheme, parsed_url.netloc]):
-            all_invalid_fields.append("metadata.identification.url")
+        # parsed_url = urlparse(self.identification.url)
+        # if not all([parsed_url.scheme, parsed_url.netloc]):
+        #    all_invalid_fields.append("metadata.identification.url")
 
         return all_invalid_fields
diff --git a/models/top_level/ResourceConfigTemplate.py b/models/top_level/ResourceConfigTemplate.py
@@ -43,12 +43,15 @@ class ResourceLinkTemplate:
 class ResourceSpatialConfig:
     bbox: InlineList = field(default_factory=lambda: InlineList([-180, -90, 180, 90]))
 
-    # optional, but with assumed default value:
-    crs: str = field(default="http://www.opengis.net/def/crs/OGC/1.3/CRS84")
+    # optional
+    crs: str | None = None
 
     # we need these as separate properties so that Enum class values can be set&selected in the UI
     @property
     def crs_authority(self):
+        if self.crs is None:
+            return CrsAuthorities.OGC13
+
         crs_auth_id = self.crs.split("http://www.opengis.net/def/crs/")[
             -1
         ]  # OGC/1.3/CRS84
@@ -61,6 +64,8 @@ def crs_authority(self):
 
     @property
     def crs_id(self):
+        if self.crs is None:
+            return ""
         return self.crs.split("/")[-1]
 
 
@@ -109,51 +114,17 @@ class ResourceConfigTemplate:
     links: list[ResourceLinkTemplate] | None = None
     visibility: ResourceVisibilityEnum | None = None
     linked__data: dict | None = (
-        None  # intentionally with double undersore to not confuse with any reserved word
+        None  # intentionally with double undersore to not confuse with any reserved keyword
     )
     # limits: ignored for now
 
     # Overwriding __init__ method to pass 'instance_name' as an input but not make it an instance property
     # This will allow to have a clean 'asdict(class)' output without 'instance_name' in it
-    def __init__(
-        self,
-        *,
-        instance_name: str,
-        type: ResourceTypesEnum = ResourceTypesEnum.COLLECTION,
-        title: str = "",
-        description: str = "",
-        keywords: dict = None,
-        links: list[ResourceLinkTemplate] | None = None,
-        extents: ResourceExtentsConfig = None,
-        providers: list[
-            ProviderPostgresql | ProviderMvtProxy | ProviderWmsFacade
-        ] = None,
-        visibility: ResourceVisibilityEnum | None = None
-    ):
-        self._instance_name = instance_name
-        self.type = type
-        self.title = title
-        self.description = description
-
-        # using full class name here instead of type(self), because "type" is used here as a property name
-        if keywords is None:
-            keywords = ResourceConfigTemplate.__dataclass_fields__[
-                "keywords"
-            ].default_factory()
-        if extents is None:
-            extents = ResourceConfigTemplate.__dataclass_fields__[
-                "extents"
-            ].default_factory()
-        if providers is None:
-            providers = ResourceConfigTemplate.__dataclass_fields__[
-                "providers"
-            ].default_factory()
-
-        self.keywords = keywords
-        self.links = links
-        self.extents = extents
-        self.providers = providers
-        self.visibility = visibility
+    @classmethod
+    def init_with_name(cls, *, instance_name: str):
+        obj = cls()
+        obj._instance_name = instance_name
+        return obj
 
     @property
     def instance_name(self):
@@ -182,9 +153,7 @@ def get_invalid_properties(self):
             all_invalid_fields.append("keywords")
         if len(self.providers) == 0:
             all_invalid_fields.append("providers")
-        if not is_valid_string(self.extents.spatial.crs):
-            all_invalid_fields.append("extents.spatial.crs")
-        if len(self.extents.spatial.bbox) < 4:
+        if len(self.extents.spatial.bbox) < 4 or len(self.extents.spatial.bbox) > 6:
             all_invalid_fields.append("extents.spatial.bbox")
 
         return all_invalid_fields
diff --git a/models/top_level/ServerConfig.py b/models/top_level/ServerConfig.py
@@ -91,9 +91,6 @@ class ServerConfig:
     locale_dir: str | None = None
     api_rules: dict | None = None
 
-    # Not currently used in the UI
-    # api_rules: ServerApiRulesConfig | None = None
-
     def get_invalid_properties(self):
         """Checks the values of mandatory fields: bind (host), url, languages."""
         all_invalid_fields = []
diff --git a/models/top_level/providers/ProviderMvtProxy.py b/models/top_level/providers/ProviderMvtProxy.py
@@ -68,10 +68,11 @@ def ui_elements_grid(cls):
         # Mandatory to align the fields order with data packing and assigning.
         # label, data_type, default, special_widget_type, placeholder
         return [
-            (*cls.get_field_info(cls, "name"), "QComboBox", ["MVT-proxy"]),
-            (*cls.get_field_info(cls, "data"), None, ""),
-            (*cls.get_field_info(cls, "format.name"), None, ""),
-            (*cls.get_field_info(cls, "format.mimetype"), None, ""),
+            (*cls.get_field_info(cls, "name*"), "QComboBox", ["MVT-proxy"]),
+            (*cls.get_field_info(cls, "data*"), None, ""),
+            (*cls.get_field_info(cls, "format.name*"), None, ""),
+            (*cls.get_field_info(cls, "format.mimetype*"), None, ""),
+            # non-mandatory
             (*cls.get_field_info(cls, "crs"), None, ""),
             (*cls.get_field_info(cls, "options.zoom.min"), None, ""),
             (*cls.get_field_info(cls, "options.zoom.max"), None, ""),
diff --git a/models/top_level/providers/ProviderPostgresql.py b/models/top_level/providers/ProviderPostgresql.py
@@ -63,16 +63,16 @@ def ui_elements_grid(cls):
         # Mandatory to align the fields order with data packing and assigning.
         # label, data_type, default, special_widget_type, placeholder
         return [
-            (*cls.get_field_info(cls, "name"), "QComboBox", ["PostgreSQL"]),
-            (*cls.get_field_info(cls, "table"), None, ""),
-            (*cls.get_field_info(cls, "id_field"), None, ""),
-            (*cls.get_field_info(cls, "data.host"), None, ""),
+            (*cls.get_field_info(cls, "name*"), "QComboBox", ["PostgreSQL"]),
+            (*cls.get_field_info(cls, "table*"), None, ""),
+            (*cls.get_field_info(cls, "id_field*"), None, ""),
+            (*cls.get_field_info(cls, "data.host*"), None, ""),
             (
-                *cls.get_field_info(cls, "data.dbname"),
+                *cls.get_field_info(cls, "data.dbname*"),
                 None,
                 "",
             ),
-            (*cls.get_field_info(cls, "data.user"), None, ""),
+            (*cls.get_field_info(cls, "data.user*"), None, ""),
             # non-mandatory:
             (*cls.get_field_info(cls, "crs"), None, ""),
             (
diff --git a/models/top_level/providers/ProviderTemplate.py b/models/top_level/providers/ProviderTemplate.py
@@ -31,7 +31,7 @@ def get_field_info(current_cls: Type, field_path: str) -> tuple[str, Type, Any]:
         Inspect a (possibly nested) dataclass field on `cls` and return (type, default_value).
         If no default is defined, default_value is None.
         """
-        parts = field_path.split(".")
+        parts = field_path.replace("*", "").split(".")
         default = None
         field_type = None
         # type_hints = get_type_hints(current_cls)
diff --git a/models/top_level/providers/ProviderWmsFacade.py b/models/top_level/providers/ProviderWmsFacade.py
@@ -56,9 +56,10 @@ def ui_elements_grid(cls):
         # Mandatory to align the fields order with data packing and assigning.
         # label, data_type, default, special_widget_type, placeholder
         return [
-            (*cls.get_field_info(cls, "name"), "QComboBox", ["WMSFacade"]),
-            (*cls.get_field_info(cls, "data"), None, ""),
-            (*cls.get_field_info(cls, "options.layer"), None, ""),
+            (*cls.get_field_info(cls, "name*"), "QComboBox", ["WMSFacade"]),
+            (*cls.get_field_info(cls, "data*"), None, ""),
+            (*cls.get_field_info(cls, "options.layer*"), None, ""),
+            # non-mandatory
             (*cls.get_field_info(cls, "crs"), None, ""),
             (*cls.get_field_info(cls, "options.style"), None, ""),
             (*cls.get_field_info(cls, "options.version"), None, ""),
diff --git a/pygeoapi_config_dialog_base.ui b/pygeoapi_config_dialog_base.ui
diff --git a/ui_widgets/DataSetterFromUi.py b/ui_widgets/DataSetterFromUi.py
diff --git a/ui_widgets/UiSetter.py b/ui_widgets/UiSetter.py
diff --git a/ui_widgets/providers/utils.py b/ui_widgets/providers/utils.py
