add CRS verification for Provider.CRS list

Author: KatKatKateryna

models/top_level/utils.py

@@ -1,6 +1,4 @@
 from enum import Enum
-import requests
-from urllib.parse import urlparse
 
 STRING_SEPARATOR = " | "
 
@@ -46,31 +44,3 @@ def bbox_from_list(raw_bbox_list: list):
         )
 
     return InlineList(list_bbox_val)
-
-
-def is_url_responsive(url: str) -> bool:
-
-    parsed_url = urlparse(url)
-    if not all([parsed_url.scheme, parsed_url.netloc]):
-        return False, "Invalid URL"
-
-    try:
-        # Detect OGC ExceptionReport (invalid request)
-        response = requests.get(url, allow_redirects=True, timeout=5)
-        if response.status_code != 200:
-            return False, f"HTTP response status code: {response.status_code}"
-        else:
-            text = response.text
-            if "ExceptionReport" in text or "ExceptionText" in text:
-                return False, "Invalid CRS URL"
-            return True, "Valid CRS URL"
-
-    except requests.ConnectionError:
-        # No internet or server unreachable
-        return False, "No internet connection or cannot reach server."
-
-    except requests.Timeout:
-        return False, "Request timed out."
-
-    except requests.RequestException:
-        return False, "Something went wrong with the request :("

pygeoapi_config_dialog.py

@@ -25,6 +25,8 @@
 import os
 import yaml
 
+from .ui_widgets.utils import get_url_status
+
 
 from .models.top_level.providers.records import ProviderTypes
 from .ui_widgets.providers.NewProviderWindow import NewProviderWindow
@@ -34,7 +36,6 @@
 from .models.top_level.utils import (
     InlineList,
     get_enum_value_from_string,
-    is_url_responsive,
 )
 from .models.top_level.utils import STRING_SEPARATOR
 
@@ -364,19 +365,7 @@ def _validate_and_add_res_provider(
     def validate_res_extents_crs(self):
         """Called from .ui file."""
         url = self.data_from_ui_setter.get_extents_crs_from_ui(self)
-        response = is_url_responsive(url)
-        if response[0]:
-            QMessageBox.information(
-                self,
-                "Information",
-                f"{response[1]}",
-            )
-        else:
-            QMessageBox.warning(
-                self,
-                "Warning",
-                f"{response[1]}",
-            )
+        get_url_status(url, self)
 
     def delete_metadata_id_title(self):
         """Delete keyword from metadata, called from .ui file."""

ui_widgets/providers/StringListWidget.py

@@ -8,6 +8,8 @@
     QLabel,
     QLineEdit,
     QMessageBox,
+    QDialog,
+    QDialogButtonBox,
 )
 from PyQt5.QtGui import QFontMetrics
 
@@ -16,7 +18,9 @@ class StringListWidget(QWidget):
     label: QLabel
     default_new_string: str = ""
 
-    def __init__(self, label_text: str, default_new_string: str = ""):
+    def __init__(
+        self, label_text: str, default_new_string: str = "", validation_callback=None
+    ):
         super().__init__()
         # self.setWindowTitle(label_text)
 
@@ -36,14 +40,14 @@ def __init__(self, label_text: str, default_new_string: str = ""):
         layout.addLayout(button_layout)
 
         self.add_button = QPushButton("Add")
-        self.add_button.clicked.connect(self.add_item)
+        self.add_button.clicked.connect(lambda: self.add_item(validation_callback))
         button_layout.addWidget(self.add_button)
 
         self.remove_button = QPushButton("Remove")
         self.remove_button.clicked.connect(self.remove_item)
         button_layout.addWidget(self.remove_button)
 
-    def add_item(self):
+    def add_item(self, validation_callback):
         # short option, but the dialog window is too narrow
         r"""
         text, ok = QInputDialog.getText(
@@ -54,22 +58,11 @@ def add_item(self):
         """
 
         # longer option
-
-        # create the dialog instance
-        dialog = QInputDialog(self)
-        dialog.setWindowTitle("Add Item")
-        dialog.setLabelText("Enter new item:")
-        dialog.setTextValue(self.default_new_string)
-
-        # auto-size based on text width
-        fm = QFontMetrics(dialog.font())
-        width = (
-            fm.horizontalAdvance(self.default_new_string) + 150
-        )  # extra space for padding/buttons
-        dialog.resize(width, dialog.height())
-
-        if dialog.exec_() == QInputDialog.Accepted:
-            text = dialog.textValue().strip()
+        dialog = InputWithValidateDialog(
+            self.default_new_string, validation_callback, self
+        )
+        if dialog.exec_() == QDialog.Accepted:
+            text = dialog.line_edit.text().strip()
             if text:
                 self.list_widget.addItem(text)
 
@@ -90,3 +83,42 @@ def values_to_list(self):
             all_values.append(value)
 
         return all_values
+
+
+class InputWithValidateDialog(QDialog):
+    def __init__(self, default_text="", validation_callback=None, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Add Item")
+
+        layout = QVBoxLayout(self)
+
+        # Label + input row
+        label = QLabel("Enter new item:")
+        layout.addWidget(label)
+
+        input_row = QHBoxLayout()
+        self.line_edit = QLineEdit(default_text)
+        input_row.addWidget(self.line_edit)
+
+        # Add validate button if requested
+        if validation_callback is not None:
+            self.validate_btn = QPushButton("Validate")
+            self.validate_btn.clicked.connect(
+                lambda: validation_callback(self.line_edit.text().strip(), self)
+            )
+            input_row.addWidget(self.validate_btn)
+
+        layout.addLayout(input_row)
+
+        # Standard OK/Cancel buttons
+        self.button_box = QDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel
+        )
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+
+        # Auto-size based on default text
+        fm = QFontMetrics(self.font())
+        width = fm.horizontalAdvance(default_text) + 150
+        self.resize(width, self.height())

ui_widgets/providers/utils.py

@@ -1,18 +1,25 @@
-from PyQt5.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QGridLayout, QComboBox
+from PyQt5.QtWidgets import (
+    QHBoxLayout,
+    QLabel,
+    QLineEdit,
+    QGridLayout,
+    QComboBox,
+    QPushButton,
+)
 from PyQt5.QtGui import QIntValidator
 
 from .StringListWidget import StringListWidget
-from ..utils import set_combo_box_value_from_data
+from ..utils import get_url_status, set_combo_box_value_from_data
 
 
 def create_label_lineedit_pair(
-    label_text: str, default_value="", placeholder: str = ""
+    label_text: str, default_value="", placeholder: str = "", validation_callback=None
 ) -> QHBoxLayout:
     label = QLabel(label_text)
     line_edit = QLineEdit(default_value)
     line_edit.setPlaceholderText(placeholder)
 
-    return label, line_edit
+    return {"label": label, "line_edit": line_edit}
 
 
 def create_label_dropdown_pair(label_text: str, all_values: list) -> QHBoxLayout:
@@ -25,8 +32,10 @@ def create_label_dropdown_pair(label_text: str, all_values: list) -> QHBoxLayout
     return label, dropdown
 
 
-def create_list_widget(label_text: str, default_new_string: str = ""):
-    return StringListWidget(label_text, default_new_string)
+def create_list_widget(
+    label_text: str, default_new_string: str = "", validation_callback=None
+):
+    return StringListWidget(label_text, default_new_string, validation_callback)
 
 
 def add_widgets_to_grid_by_specs(
@@ -42,22 +51,31 @@ def add_widgets_to_grid_by_specs(
 
         # if regular widget (QLineEdit for str and int; QListWIdget for list)
         if not special_widget_type:
+
+            # set up defaults
+            default_list_entry = ""
+            validation_callback = None
+
+            if label.endswith("crs"):
+                default_list_entry = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+                validation_callback = lambda url, parent: get_url_status(url, parent)
+
+            # check data types and create corresponding widgets
             if data_type is str or data_type is int:
-                label_widget, data_widget = create_label_lineedit_pair(
-                    label, default, placeholder
+                new_widgets = create_label_lineedit_pair(
+                    label, default, placeholder, validation_callback
                 )
-                group_layout.addWidget(label_widget, i, 0)
-                group_layout.addWidget(data_widget, i, 1)
+                group_layout.addWidget(new_widgets["label"], i, 0)
+                group_layout.addWidget(new_widgets["line_edit"], i, 1)
 
                 if data_type is int:
-                    data_widget.setValidator(QIntValidator())
+                    new_widgets["line_edit"].setValidator(QIntValidator())
 
             elif data_type is list:
-                default_list_entry = ""
-                if label.endswith("crs"):
-                    default_list_entry = "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
 
-                data_widget = create_list_widget(label, default_list_entry)
+                data_widget = create_list_widget(
+                    label, default_list_entry, validation_callback
+                )
                 group_layout.addWidget(data_widget.label, i, 0)
                 group_layout.addWidget(data_widget, i, 1)
 

ui_widgets/utils.py

@@ -1,5 +1,8 @@
 from enum import Enum
-from PyQt5.QtWidgets import QComboBox, QLineEdit
+import requests
+from urllib.parse import urlparse
+
+from PyQt5.QtWidgets import QComboBox, QLineEdit, QMessageBox
 
 
 def get_widget_text_value(widget):
@@ -39,3 +42,48 @@ def set_combo_box_value_from_data(*, combo_box, value):
         combo_box.setCurrentIndex(0)
     else:
         combo_box.clear()
+
+
+def _is_url_responsive(url: str) -> bool:
+
+    parsed_url = urlparse(url)
+    if not all([parsed_url.scheme, parsed_url.netloc]):
+        return False, "Invalid URL"
+
+    try:
+        # Detect OGC ExceptionReport (invalid request)
+        response = requests.get(url, allow_redirects=True, timeout=5)
+        if response.status_code != 200:
+            return False, f"HTTP response status code: {response.status_code}"
+        else:
+            text = response.text
+            if "ExceptionReport" in text or "ExceptionText" in text:
+                return False, "Invalid CRS URL"
+            return True, "Valid CRS URL"
+
+    except requests.ConnectionError:
+        # No internet or server unreachable
+        return False, "No internet connection or cannot reach server."
+
+    except requests.Timeout:
+        return False, "Request timed out."
+
+    except requests.RequestException:
+        return False, "Something went wrong with the request :("
+
+
+def get_url_status(url, parent=None):
+
+    response = _is_url_responsive(url)
+    if response[0]:
+        QMessageBox.information(
+            parent,
+            "Information",
+            f"{response[1]}",
+        )
+    else:
+        QMessageBox.warning(
+            parent,
+            "Warning",
+            f"{response[1]}",
+        )