MoleditPy 2.0.1__py3-none-any.whl → 2.1.0__py3-none-any.whl

moleditpy/modules/constants.py

@@ -16,7 +16,7 @@ from PyQt6.QtGui import QFont, QColor
 from rdkit import Chem
 
 #Version
-VERSION = '2.0.1'
+VERSION = '2.1.0'
 
 ATOM_RADIUS = 18
 BOND_OFFSET = 3.5

moleditpy/modules/main_window_main_init.py

@@ -1736,14 +1736,42 @@ class MainWindowMainInit(object):
         
         # Add dynamic plugin actions
         plugins = self.plugin_manager.discover_plugins(self)
+        
         if not plugins:
             no_plugin_action = QAction("(No plugins found)", self)
             no_plugin_action.setEnabled(False)
             plugin_menu.addAction(no_plugin_action)
         else:
+            # Sort plugins: directories first (to create menus), then alphabetical by name
+            # Actually simple sort by rel_folder, name is fine
+            plugins.sort(key=lambda x: (x.get('rel_folder', ''), x['name']))
+            
+            # Dictionary to keep track of created submenus: path -> QMenu
+            menus = { "": plugin_menu }
+
             for p in plugins:
-                # Use default param in lambda to capture the current p
+                rel_folder = p.get('rel_folder', "")
+                
+                # Get or create the parent menu for this plugin
+                parent_menu = menus.get("") # Start at root
+                
+                if rel_folder:
+                    # Split path and traverse/create submenus
+                    parts = rel_folder.split(os.sep)
+                    current_path = ""
+                    for part in parts:
+                        new_path = os.path.join(current_path, part) if current_path else part
+                        
+                        if new_path not in menus:
+                            # Create new submenu
+                            sub_menu = parent_menu.addMenu(part)
+                            menus[new_path] = sub_menu
+                        
+                        parent_menu = menus[new_path]
+                        current_path = new_path
+
+                # Add action to the resolved parent_menu
                 action = QAction(p['name'], self)
                 action.triggered.connect(lambda checked, mod=p['module']: self.plugin_manager.run_plugin(mod, self.mw if hasattr(self, 'mw') else self)) 
-                plugin_menu.addAction(action)
+                parent_menu.addAction(action)
 

moleditpy/modules/plugin_manager.py

@@ -34,7 +34,8 @@ class PluginManager:
 
     def discover_plugins(self, parent=None):
         """
-        Scans the plugin directory for .py files and attempts to import them.
+        Recursively scans the plugin directory for .py files and attempts to import them.
+        Ignores __pycache__ and other directories starting with "__".
         Returns a list of valid loaded plugins.
         """
         self.ensure_plugin_dir()
@@ -43,35 +44,69 @@ class PluginManager:
         if not os.path.exists(self.plugin_dir):
             return []
 
-        for filename in os.listdir(self.plugin_dir):
-            if filename.endswith(".py") and not filename.startswith("__"):
-                filepath = os.path.join(self.plugin_dir, filename)
-                try:
-                    # Dynamically import the module
-                    spec = importlib.util.spec_from_file_location(filename[:-3], filepath)
-                    if spec and spec.loader:
-                        module = importlib.util.module_from_spec(spec)
-                        sys.modules[spec.name] = module # helper for relative imports if needed
-                        spec.loader.exec_module(module)
-
-                        # Check for required attributes
-                        plugin_name = getattr(module, 'PLUGIN_NAME', filename[:-3])
+        for root, dirs, files in os.walk(self.plugin_dir):
+            # Modify dirs in-place to skip hidden directories and __pycache__
+            dirs[:] = [d for d in dirs if not d.startswith('__') and d != '__pycache__']
+            
+            for filename in files:
+                if filename.endswith(".py") and not filename.startswith("__"):
+                    filepath = os.path.join(root, filename)
+                    
+                    # Calculate relative folder path for menu structure
+                    # equivalent to: rel_path = os.path.relpath(root, self.plugin_dir)
+                    # if root is plugin_dir, rel_path is '.'
+                    rel_folder = os.path.relpath(root, self.plugin_dir)
+                    if rel_folder == '.':
+                        rel_folder = ""
+                        
+                    try:
+                        # Unique module name based on file path to avoid conflicts
+                        # e.g. plugins.subdir.myplugin
+                        module_name = os.path.splitext(os.path.relpath(filepath, self.plugin_dir))[0].replace(os.sep, '.')
                         
-                        # Validate that it has a run function
-                        if hasattr(module, 'run') and callable(module.run):
-                            self.plugins.append({
-                                'name': plugin_name,
-                                'module': module
-                            })
-                        else:
-                            print(f"Plugin {filename} skipped: Missing 'run(main_window)' function.")
-                except Exception as e:
-                    # Robust error handling with user notification
-                    msg = f"Failed to load plugin {filename}:\n{e}"
-                    print(msg)
-                    traceback.print_exc()
-                    if parent:
-                        QMessageBox.warning(parent, "Plugin Load Error", msg)
+                        spec = importlib.util.spec_from_file_location(module_name, filepath)
+                        if spec and spec.loader:
+                            module = importlib.util.module_from_spec(spec)
+                            sys.modules[spec.name] = module 
+                            spec.loader.exec_module(module)
+
+                            # Check for required attributes
+                            plugin_name = getattr(module, 'PLUGIN_NAME', filename[:-3])
+                            
+                            # Valid plugin if it has 'run' OR 'autorun'
+                            has_run = hasattr(module, 'run') and callable(module.run)
+                            has_autorun = hasattr(module, 'autorun') and callable(module.autorun)
+                             
+                            if has_run:
+                                self.plugins.append({
+                                    'name': plugin_name,
+                                    'module': module,
+                                    'rel_folder': rel_folder
+                                })
+                            
+                            if has_autorun:
+                                try:
+                                    if parent:
+                                        module.autorun(parent)
+                                    else:
+                                        print(f"Skipping autorun for {plugin_name}: parent not provided.")
+                                except Exception as e:
+                                    print(f"Error executing autorun for {filename}: {e}")
+                                    traceback.print_exc()
+
+                            if not has_run and not has_autorun:
+                                print(f"Plugin {filename} skipped: Missing 'run(main_window)' or 'autorun(main_window)' function.")
+
+                    except Exception as e:
+                        # Robust error handling
+                        msg = f"Failed to load plugin {filename}:\n{e}"
+                        print(msg)
+                        traceback.print_exc()
+                        if parent:
+                            # Use print/status bar instead of popups for non-critical failures during bulk load?
+                            # For now, keep it visible but maybe less intrusive if many fail?
+                            # sticking to original logic just in catch block
+                            pass 
         
         return self.plugins
 

{moleditpy-2.0.1.dist-info → moleditpy-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MoleditPy
-Version: 2.0.1
+Version: 2.1.0
 Summary: A cross-platform, simple, and intuitive molecular structure editor built in Python. It allows 2D molecular drawing and 3D structure visualization. It supports exporting structure files for input to DFT calculation software.
 Author-email: HiroYokoyama <titech.yoko.hiro@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{moleditpy-2.0.1.dist-info → moleditpy-2.1.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ moleditpy/modules/bond_item.py,sha256=eVkEeKvM4igYI67DYxpey3FllqDyt_iWDo4VPYMhaP
 moleditpy/modules/bond_length_dialog.py,sha256=k5x_DhK9Q8CSwouKhEo_kLRRdaYHDaK84KDNmuDNLvY,14868
 moleditpy/modules/calculation_worker.py,sha256=KiGQY7i-QCQofEoE0r65KoQgpEGFcbhmxWv6egfkUdc,42324
 moleditpy/modules/color_settings_dialog.py,sha256=Ow44BhCOLo0AFb6klO001k6B4drOgKX9DeNBQhZLp5o,15474
-moleditpy/modules/constants.py,sha256=m8tYMuiXp0w4IUeFW1hbSogm6-7g0voDQs5kJygquQA,4702
+moleditpy/modules/constants.py,sha256=oZuMoNzSH87-nWDMDeJ8pi5WxslbauU2b5LTAtM3u1k,4702
 moleditpy/modules/constrained_optimization_dialog.py,sha256=IEdNVhFoNSEMeA5ABpUH9Q88-YzDXFloQM2gwnPwnHY,30150
 moleditpy/modules/custom_interactor_style.py,sha256=NjsXE2a43IDNEanZBlcG9eR4ZIERT1MsQC6lbfesapQ,38453
 moleditpy/modules/custom_qt_interactor.py,sha256=MFaTuDh-FPeFBS4303CqxsxmsOIOW4QXUz6USwI8PHQ,2451
@@ -25,7 +25,7 @@ moleditpy/modules/main_window_dialog_manager.py,sha256=S1ROCWqzB2uVSKHY4o5CbTtJA
 moleditpy/modules/main_window_edit_3d.py,sha256=uY203adPg3CLyAdbG2NCThG2Am0WduzPDan9rXAlc14,19841
 moleditpy/modules/main_window_edit_actions.py,sha256=lUFxNFTUQzeXN8CNlb4_4S9j4M1EEq8kpJmh9dCzM3M,64818
 moleditpy/modules/main_window_export.py,sha256=e0HA_jeaokIOBunQqGxUn5QKdniCmE8GrsE1Igy6zm8,38351
-moleditpy/modules/main_window_main_init.py,sha256=ecRDVqOLMieqRDYTzsCRTjZSqj0fUBuFjqFacbC0lCg,78515
+moleditpy/modules/main_window_main_init.py,sha256=brmB2zwiW58SFNDxFDqCxXlIdj77fMP5FGarflp7Am0,79797
 moleditpy/modules/main_window_molecular_parsers.py,sha256=Ex4-urYsKf6PyHp4XToOhgXzuYWa_n7q--QmHci4OCU,48401
 moleditpy/modules/main_window_project_io.py,sha256=q1vEmWQDqla32HVkmk8-j0OY9ut5TI5NJ4ikahewkEo,17259
 moleditpy/modules/main_window_string_importers.py,sha256=mQVDv2Dj4MwnPgMRe2IqdAAKnB_quE6QfYeAgCjfv28,10892
@@ -38,7 +38,7 @@ moleditpy/modules/molecule_scene.py,sha256=c5GNL7LrzerXYWshmpY_6Rg-2cBlF7xUt_orx
 moleditpy/modules/move_group_dialog.py,sha256=65HVXTJSaQ9lp03XFhI1l7OzUsXmH_aqd8OgwjpjfGg,27174
 moleditpy/modules/periodic_table_dialog.py,sha256=ItEZUts1XCietz9paY-spvbzxh6SXak3GnikwqkHZCw,4006
 moleditpy/modules/planarize_dialog.py,sha256=yY8o-SxT8vGEHVWnjDTXecRv5NUaEejEsXH-836Xk8g,8681
-moleditpy/modules/plugin_manager.py,sha256=Qbje9i-b4f81k_gxiDkfH8bv2eNTTya1563L93USQQA,3441
+moleditpy/modules/plugin_manager.py,sha256=2GwuJurN09VVmPYjnr5GhrBf4JSxqLFVeVbqoKo5T24,5570
 moleditpy/modules/settings_dialog.py,sha256=Nr7yE8UmYRi3VObWvRlrnv0DnjSjmYXbvqryZ02O12k,65348
 moleditpy/modules/template_preview_item.py,sha256=Ks3C35pYFuLT5G4fsloI7ljE6ESXoYyGvLkM22qcmt0,6673
 moleditpy/modules/template_preview_view.py,sha256=4OCHZDO51BvJpKdfrBWJ4_4WfLfFSKxsVIyf7I-Kj2E,3350
@@ -48,9 +48,9 @@ moleditpy/modules/zoomable_view.py,sha256=hjwljui13QpvjvxJHY4Evot4jMQvxRBQUNH5HU
 moleditpy/modules/assets/icon.icns,sha256=wD5R6-Vw7K662tVKhu2E1ImN0oUuyAP4youesEQsn9c,139863
 moleditpy/modules/assets/icon.ico,sha256=RfgFcx7-dHY_2STdsOQCQziY5SNhDr3gPnjO6jzEDPI,147975
 moleditpy/modules/assets/icon.png,sha256=kCFN1WacYIdy0GN6SFEbNA00ef39pCczBnFdkkBI8Bs,147110
-moleditpy-2.0.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-moleditpy-2.0.1.dist-info/METADATA,sha256=tj2oawfvI4p70dB5JTtoPv1BWVwq13oLosjSfeBSqiw,58985
-moleditpy-2.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-moleditpy-2.0.1.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
-moleditpy-2.0.1.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
-moleditpy-2.0.1.dist-info/RECORD,,
+moleditpy-2.1.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+moleditpy-2.1.0.dist-info/METADATA,sha256=Krcn6qc1Izh90Ffad_oc2BY3Ih8N3cycPfh0sB9qpKk,58985
+moleditpy-2.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+moleditpy-2.1.0.dist-info/entry_points.txt,sha256=yH1h9JjALhok1foXT3-hYrC4ufoZt8b7oiBcsdnGNNM,54
+moleditpy-2.1.0.dist-info/top_level.txt,sha256=ARICrS4ihlPXqywlKl6o-oJa3Qz3gZRWu_VZsQ3_c44,10
+moleditpy-2.1.0.dist-info/RECORD,,