PyPI - oqtopus - Versions diffs - 0.2.0__py3-none-any.whl → 1.0.0__py3-none-any.whl - Mend

oqtopus 0.2.0py3-none-any.whl → 1.0.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

oqtopus/core/module.py +176 -32
oqtopus/core/module_operation_task.py +234 -0
oqtopus/core/module_package.py +27 -10
oqtopus/core/modules_config.py +2 -0
oqtopus/core/package_prepare_task.py +240 -25
oqtopus/gui/database_connection_widget.py +12 -5
oqtopus/gui/database_create_dialog.py +3 -3
oqtopus/gui/database_duplicate_dialog.py +4 -4
oqtopus/gui/logs_widget.py +94 -7
oqtopus/gui/main_dialog.py +118 -31
oqtopus/gui/module_selection_widget.py +110 -22
oqtopus/gui/module_widget.py +647 -61
oqtopus/gui/parameters_groupbox.py +25 -13
oqtopus/gui/plugin_widget.py +13 -0
oqtopus/gui/project_widget.py +5 -0
oqtopus/gui/settings_dialog.py +2 -0
oqtopus/oqtopus_plugin.py +10 -1
oqtopus/ui/module_selection_widget.ui +96 -96
oqtopus/ui/module_widget.ui +72 -58
oqtopus/ui/settings_dialog.ui +18 -11
oqtopus/utils/plugin_utils.py +113 -19
oqtopus/utils/qt_utils.py +54 -0
{oqtopus-0.2.0.dist-info → oqtopus-1.0.0.dist-info}/METADATA +1 -1
oqtopus-1.0.0.dist-info/RECORD +47 -0
{oqtopus-0.2.0.dist-info → oqtopus-1.0.0.dist-info}/WHEEL +1 -1
tests/test_imports.py +59 -0
oqtopus-0.2.0.dist-info/RECORD +0 -45
{oqtopus-0.2.0.dist-info → oqtopus-1.0.0.dist-info}/licenses/LICENSE +0 -0
{oqtopus-0.2.0.dist-info → oqtopus-1.0.0.dist-info}/top_level.txt +0 -0

oqtopus/gui/parameters_groupbox.py CHANGED Viewed

@@ -1,6 +1,5 @@
 import logging
-from pum import ParameterDefinition, ParameterType
 from qgis.PyQt.QtWidgets import (
     QCheckBox,
     QGroupBox,
@@ -10,6 +9,8 @@ from qgis.PyQt.QtWidgets import (
     QWidget,
 )
+from ..libs.pum import ParameterDefinition, ParameterType
 logger = logging.getLogger(__name__)
@@ -21,33 +22,44 @@ class ParameterWidget(QWidget):
         self.setLayout(self.layout)
         self.value = None
-        if parameter_definition.type != ParameterType.BOOLEAN:
+        # Get the parameter type value (handle both enum and string cases)
+        # This is needed because during plugin reload, enums can become strings
+        param_type = parameter_definition.type
+        if isinstance(param_type, ParameterType):
+            param_type_value = param_type.value
+        elif isinstance(param_type, str):
+            # Handle string representations like "ParameterType.INTEGER" or "integer"
+            param_type_value = (
+                param_type.split(".")[-1].lower() if "." in param_type else param_type.lower()
+            )
+        else:
+            param_type_value = str(param_type).split(".")[-1].lower()
+        if param_type_value != "boolean":
             self.layout.addWidget(QLabel(parameter_definition.name, self))
-        if parameter_definition.type == ParameterType.BOOLEAN:
+        if param_type_value == "boolean":
             self.widget = QCheckBox(parameter_definition.name, self)
             if parameter_definition.default is not None:
                 self.widget.setChecked(parameter_definition.default)
             self.layout.addWidget(self.widget)
             self.value = lambda: self.widget.isChecked()
-        elif parameter_definition.type in (
-            ParameterType.DECIMAL,
-            ParameterType.INTEGER,
-            ParameterType.TEXT,
-            ParameterType.PATH,
-        ):
+        elif param_type_value in ("decimal", "integer", "text", "path"):
             self.widget = QLineEdit(self)
             if parameter_definition.default is not None:
                 self.widget.setPlaceholderText(str(parameter_definition.default))
             self.layout.addWidget(self.widget)
-            if parameter_definition.type == ParameterType.INTEGER:
+            if param_type_value == "integer":
                 self.value = lambda: int(self.widget.text() or self.widget.placeholderText())
-            elif parameter_definition.type == ParameterType.DECIMAL:
+            elif param_type_value == "decimal":
                 self.value = lambda: float(self.widget.text() or self.widget.placeholderText())
             else:
                 self.value = lambda: self.widget.text() or self.widget.placeholderText()
         else:
-            raise ValueError(f"Unknown parameter type '{parameter_definition.type}'")
+            raise ValueError(
+                f"Unknown parameter type '{parameter_definition.type}' "
+                f"(normalized to '{param_type_value}')"
+            )
 class ParametersGroupBox(QGroupBox):
@@ -56,7 +68,7 @@ class ParametersGroupBox(QGroupBox):
         self.parameter_widgets = {}
     def setParameters(self, parameters: list[ParameterDefinition]):
-        logger.info(f"Setting parameters in ParametersGroupBox ({len(parameters)})")
+        logger.debug(f"Setting parameters in ParametersGroupBox ({len(parameters)})")
         self.clean()
         self.parameters = parameters
         # Remove all widgets from the parameters_group_box layout

oqtopus/gui/plugin_widget.py CHANGED Viewed

@@ -28,7 +28,20 @@ class PluginWidget(QWidget, DIALOG_UI):
         self.__current_module_package = module_package
         self.__packagePrepareGetPluginFilename()
+    def clearModulePackage(self):
+        """Clear module package state and reset UI."""
+        self.__current_module_package = None
+        self.info_label.setText(self.tr("No module package selected."))
+        QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+        QtUtils.setFontItalic(self.info_label, True)
     def __packagePrepareGetPluginFilename(self):
+        if self.__current_module_package is None:
+            self.info_label.setText(self.tr("No module package selected."))
+            QtUtils.setForegroundColor(self.info_label, PluginUtils.COLOR_WARNING)
+            QtUtils.setFontItalic(self.info_label, True)
+            return
         asset_plugin = self.__current_module_package.asset_plugin
         if asset_plugin is None:
             self.info_label.setText(self.tr("No plugin asset available for this module version."))

oqtopus/gui/project_widget.py CHANGED Viewed

@@ -29,6 +29,11 @@ class ProjectWidget(QWidget, DIALOG_UI):
         self.__current_module_package = module_package
         self.__updateProjectFilename()
+    def clearModulePackage(self):
+        """Clear module package state and reset UI."""
+        self.__current_module_package = None
+        self.__updateProjectFilename()
     def setService(self, service):
         self.__current_service = service
         self.__updateProjectFilename()

oqtopus/gui/settings_dialog.py CHANGED Viewed

@@ -11,6 +11,7 @@ class SettingsDialog(QDialog, DIALOG_UI):
         self.setupUi(self)
         self.githubToken_lineEdit.setText(PluginUtils.get_github_token())
+        self.allow_multiple_modules_checkBox.setChecked(PluginUtils.get_allow_multiple_modules())
         self.helpButton.setIcon(
             QApplication.style().standardIcon(QStyle.StandardPixmap.SP_DialogHelpButton)
@@ -19,6 +20,7 @@ class SettingsDialog(QDialog, DIALOG_UI):
     def accept(self):
         PluginUtils.set_github_token(self.githubToken_lineEdit.text())
+        PluginUtils.set_allow_multiple_modules(self.allow_multiple_modules_checkBox.isChecked())
         super().accept()
     def __show_github_token_help(self):

oqtopus/oqtopus_plugin.py CHANGED Viewed

@@ -30,7 +30,7 @@ class OqtopusPlugin:
         logger.info(f"Starting {PluginUtils.PLUGIN_NAME} plugin version {self.__version__}")
         self.actions = []
-        self.main_menu_name = self.tr(f"&{PluginUtils.PLUGIN_NAME}")
+        self.main_menu_name = f"&{PluginUtils.PLUGIN_NAME}"
     # noinspection PyMethodMayBeStatic
     def tr(self, source_text):
@@ -157,6 +157,15 @@ class OqtopusPlugin:
             self.iface.removePluginMenu(self.main_menu_name, action)
             self.iface.removeToolBarIcon(action)
+        # Remove pum modules from sys.modules to allow proper reloading
+        # This is necessary because pum is in the libs folder and imported at module level
+        import sys
+        pum_modules = [mod for mod in sys.modules.keys() if mod.startswith("pum")]
+        for mod in pum_modules:
+            del sys.modules[mod]
+            logger.debug(f"Removed {mod} from sys.modules for clean reload")
     def show_main_dialog(self):
         conf_path = Path(__file__).parent / "default_config.yaml"

oqtopus/ui/module_selection_widget.ui CHANGED Viewed

@@ -14,26 +14,6 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="2">
-    <widget class="QLabel" name="module_latestVersion_label">
-     <property name="text">
-      <string>latest</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="2">
-    <widget class="QLabel" name="module_informationProject_label">
-     <property name="text">
-      <string>-</string>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
@@ -48,12 +28,18 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="module_seeChangeLog_pushButton">
-     <property name="text">
-      <string>See changelog</string>
+   <item row="9" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
    <item row="7" column="1" colspan="2">
     <widget class="QLabel" name="module_informationPlugin_label">
@@ -68,28 +54,42 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="QGroupBox" name="module_zipPackage_groupBox">
-     <property name="title">
-      <string>Zip package</string>
+   <item row="5" column="1" colspan="2">
+    <widget class="QLabel" name="module_information_label">
+     <property name="text">
+      <string>-</string>
      </property>
-     <property name="flat">
+     <property name="openExternalLinks">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_9">
-      <item row="0" column="1">
-       <widget class="QToolButton" name="module_browseZip_toolButton">
-        <property name="text">
-         <string>...</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLineEdit" name="module_fromZip_lineEdit"/>
-      </item>
-     </layout>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="module_latestVersion_label">
+     <property name="text">
+      <string>latest</string>
+     </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <spacer name="verticalSpacer_8">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_17">
      <property name="text">
@@ -97,10 +97,29 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
+   <item row="1" column="1">
+    <widget class="QComboBox" name="module_package_comboBox">
+     <item>
+      <property name="text">
+       <string>1.6.3</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>1.6.2</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>testing (Attention! Never use in production)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="module_seeChangeLog_pushButton">
      <property name="text">
-      <string>Version</string>
+      <string>See changelog</string>
      </property>
     </widget>
    </item>
@@ -118,8 +137,8 @@
      </item>
     </widget>
    </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="QLabel" name="module_information_label">
+   <item row="6" column="1" colspan="2">
+    <widget class="QLabel" name="module_informationProject_label">
      <property name="text">
       <string>-</string>
      </property>
@@ -131,6 +150,13 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Version</string>
+     </property>
+    </widget>
+   </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_18">
      <property name="text">
@@ -138,7 +164,29 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="3">
+   <item row="2" column="0" colspan="3">
+    <widget class="QGroupBox" name="module_zipPackage_groupBox">
+     <property name="title">
+      <string>Zip package</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_9">
+      <item row="0" column="1">
+       <widget class="QToolButton" name="module_browseZip_toolButton">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLineEdit" name="module_fromZip_lineEdit"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
     <widget class="QProgressBar" name="module_progressBar">
      <property name="maximum">
       <number>0</number>
@@ -148,54 +196,6 @@
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacer_8">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>10</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="module_package_comboBox">
-     <item>
-      <property name="text">
-       <string>1.6.3</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>1.6.2</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>testing (Attention! Never use in production)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

oqtopus/ui/module_widget.ui CHANGED Viewed

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>481</width>
+    <height>323</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,16 +15,30 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="moduleInfo_label">
+    <widget class="QLabel" name="moduleInfo_installation_label">
      <property name="text">
-      <string>No module found</string>
+      <string>No installation found</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="moduleInfo_cancel_button">
+     <property name="text">
+      <string>Cancel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QProgressBar" name="moduleInfo_progressbar">
+     <property name="value">
+      <number>24</number>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QStackedWidget" name="moduleInfo_stackedWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="moduleInfo_stackedWidget_pageInstall">
       <layout class="QGridLayout" name="gridLayout_7">
@@ -38,7 +52,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QCheckBox" name="db_parameters_CreateAndGrantRoles_checkBox">
+           <widget class="QCheckBox" name="db_parameters_CreateAndGrantRoles_install_checkBox">
             <property name="text">
              <string>Create and grant roles</string>
             </property>
@@ -83,7 +97,7 @@
           <item>
            <spacer name="verticalSpacer_3">
             <property name="orientation">
-             <enum>Qt::Orientation::Vertical</enum>
+             <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -100,31 +114,65 @@
      </widget>
      <widget class="QWidget" name="moduleInfo_stackedWidget_pageUpgrade">
       <layout class="QGridLayout" name="gridLayout_10">
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_12">
-         <property name="text">
-          <string>Version</string>
-         </property>
-        </widget>
+       <item row="5" column="0" colspan="4">
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="1" column="3">
+          <widget class="QPushButton" name="uninstall_button">
+           <property name="text">
+            <string>Uninstall</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QPushButton" name="moduleInfo_upgrade_pushButton">
+           <property name="text">
+            <string>Upgrade</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QPushButton" name="moduleInfo_roles_pushButton">
+           <property name="text">
+            <string>Create and grant roles</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2">
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="0" column="0" colspan="2">
+          <widget class="QCheckBox" name="db_parameters_CreateAndGrantRoles_upgrade_checkBox">
+           <property name="text">
+            <string>Create and grant roles</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item row="4" column="0" colspan="2">
-        <widget class="QPushButton" name="moduleInfo_upgrade_pushButton">
+       <item row="0" column="0" colspan="4">
+        <widget class="QLabel" name="moduleInfo_selected_label">
          <property name="text">
-          <string>Upgrade</string>
+          <string>Selected module version</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QLabel" name="label_13">
-         <property name="text">
-          <string>CRS</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -134,40 +182,6 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1">
-        <widget class="QLabel" name="label_15">
-         <property name="text">
-          <string>module version</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="2">
-        <widget class="QPushButton" name="pushButton_7">
-         <property name="text">
-          <string>Edit settings</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLabel" name="label_16">
-         <property name="text">
-          <string>module crs</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" colspan="2">
-        <widget class="QLabel" name="label">
-         <property name="font">
-          <font>
-           <pointsize>12</pointsize>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Warning: Upgrade is not yet supported</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>

oqtopus/ui/settings_dialog.ui CHANGED Viewed

@@ -11,13 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Oqtopus settings</string>
+   <string>oQtopus settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="githubToken_lineEdit"/>
+   <item row="3" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -37,6 +44,9 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="githubToken_lineEdit"/>
+   </item>
    <item row="0" column="2">
     <widget class="QToolButton" name="helpButton">
      <property name="text">
@@ -44,13 +54,10 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="allow_multiple_modules_checkBox">
+     <property name="text">
+      <string>Allow installation of multiple modules per database</string>
      </property>
     </widget>
    </item>

oqtopus 0.2.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

oqtopus 0.2.0py3-none-any.whl → 1.0.0py3-none-any.whl