npe2 0.7.5rc0__py3-none-any.whl → 0.7.7__py3-none-any.whl

npe2/_plugin_manager.py

@@ -4,7 +4,7 @@ import contextlib
 import os
 import urllib
 import warnings
-from collections import Counter
+from collections import Counter, defaultdict
 from fnmatch import fnmatch
 from importlib import metadata
 from logging import getLogger
@@ -38,6 +38,7 @@ from .types import PathLike, PythonName
 if TYPE_CHECKING:
     from .manifest.contributions import (
         CommandContribution,
+        MenuCommand,
         MenuItem,
         ReaderContribution,
         SampleDataContribution,
@@ -235,6 +236,9 @@ class PluginManager:
         self._manifests: Dict[PluginName, PluginManifest] = {}
         self.events = PluginManagerEvents(self)
         self._npe1_adapters: List[NPE1Adapter] = []
+        self._command_menu_map: Dict[
+            str, Dict[str, Dict[str, List[MenuCommand]]]
+        ] = defaultdict(dict)
 
         # up to napari 0.4.15, discovery happened in the init here
         # so if we're running on an older version of napari, we need to discover
@@ -358,14 +362,28 @@ class PluginManager:
             self._npe1_adapters.append(manifest)
         else:
             self._contrib.index_contributions(manifest)
+            self._populate_command_menu_map(manifest)
         self.events.plugins_registered.emit({manifest})
 
+    def _populate_command_menu_map(self, manifest: PluginManifest):
+        # map of manifest -> command -> menu_id -> list[items]
+        self._command_menu_map[manifest.name] = defaultdict(lambda: defaultdict(list))
+        menu_map = self._command_menu_map[manifest.name]  # just for conciseness below
+        for menu_id, menu_items in manifest.contributions.menus.items() or ():
+            # command IDs are keys in map
+            # each value is a dict menu_id: list of MenuCommands
+            # for the command and menu
+            for item in menu_items:
+                if (command_id := getattr(item, "command", None)) is not None:
+                    menu_map[command_id][menu_id].append(item)
+
     def unregister(self, key: PluginName):
         """Unregister plugin named `key`."""
         if key not in self._manifests:
             raise ValueError(f"No registered plugin named {key!r}")  # pragma: no cover
         self.deactivate(key)
         self._contrib.remove_contributions(key)
+        self._command_menu_map.pop(key)
         self._manifests.pop(key)
 
     def activate(self, key: PluginName) -> PluginContext:
@@ -448,6 +466,7 @@ class PluginManager:
         mf = self._manifests.get(plugin_name)
         if mf is not None:
             self._contrib.index_contributions(mf)
+            self._populate_command_menu_map(mf)
         self.events.enablement_changed({plugin_name}, {})
 
     def disable(self, plugin_name: PluginName) -> None:
@@ -467,6 +486,7 @@ class PluginManager:
 
         self._disabled_plugins.add(plugin_name)
         self._contrib.remove_contributions(plugin_name)
+        self._command_menu_map.pop(plugin_name, None)
         self.events.enablement_changed({}, {plugin_name})
 
     def is_disabled(self, plugin_name: str) -> bool:

{npe2-0.7.5rc0.dist-info → npe2-0.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: npe2
-Version: 0.7.5rc0
+Version: 0.7.7
 Summary: napari plugin engine v2
 Project-URL: homepage, https://github.com/napari/npe2
 Project-URL: repository, https://github.com/napari/npe2

{npe2-0.7.5rc0.dist-info → npe2-0.7.7.dist-info}/RECORD

@@ -2,7 +2,7 @@ npe2/__init__.py,sha256=2yMcClmts4aO-1qQR80J_XOcx_fiXXhPHxx6BYlvG3s,812
 npe2/__main__.py,sha256=NwbyYIU4bE1YPADH6zxLF3i7_51oELpK1UXz6141iwE,65
 npe2/_command_registry.py,sha256=-L2QLeikqcFalIk-tZgqkgEGjHUCZpm5cIGP0TxzoN8,5056
 npe2/_dynamic_plugin.py,sha256=Y_kduq8YlyF9QrNVhGbMihlaBqeoww1HXvg456jpaww,10040
-npe2/_plugin_manager.py,sha256=6HzS9SVx0CkQTIoJ0zTnWe9Aew72aI-aADOLprEkjKI,29071
+npe2/_plugin_manager.py,sha256=vhG_4988gXv2AVMWVw6_RDo15BYgjqau0izyJuZWdmI,30135
 npe2/_pydantic_compat.py,sha256=RpUWS_pVOAx2pbNgZvdxsZtXxR5igZA2jsSQzTWtYNU,1152
 npe2/_pytest_plugin.py,sha256=Dw73_eHFoBT_mivmFzr73ZGwBe1wwoSb790Mk1QlKn8,3610
 npe2/_setuptools_plugin.py,sha256=85tFOTmGAMeMDcPYmT3HvadPsQSAKLrAt63BhYmJQxk,6785
@@ -42,8 +42,8 @@ npe2/manifest/contributions/_submenu.py,sha256=pjHZbfn5iCQBwNaTIGMWHNNswtSPLlnml
 npe2/manifest/contributions/_themes.py,sha256=FeHBeqayZOIN4ccyik1xPZ30cE-_3Xr7aozilyoamiY,2683
 npe2/manifest/contributions/_widgets.py,sha256=ung4t6R4EB6Rz9Xmlb4Z46ilOHHmkoWkEMuHQC4kABw,2217
 npe2/manifest/contributions/_writers.py,sha256=i1usy_tR_1XIf93c8HXu0APLJI3QrOJUc0-0nxLrLbI,7867
-npe2-0.7.5rc0.dist-info/METADATA,sha256=FzEA-khJ86DwtlkTsAebj4BQgFvEiXw6aEQnQ8rfsRY,3098
-npe2-0.7.5rc0.dist-info/WHEEL,sha256=bq9SyP5NxIRA9EpQgMCd-9RmPHWvbH-4lTDGwxgIR64,87
-npe2-0.7.5rc0.dist-info/entry_points.txt,sha256=5zoegMudO8Hkn6589GlAXIW49Ar5HSWZjTRc0TkJu3s,250
-npe2-0.7.5rc0.dist-info/licenses/LICENSE,sha256=uyX2Y2Q7D-WzOUc6EKZVDuadkWenBWSYTR--BsewGpg,1514
-npe2-0.7.5rc0.dist-info/RECORD,,
+npe2-0.7.7.dist-info/METADATA,sha256=LCNfwgBkYvgtwnG12ab5BPCUjz9pU1CzLAxV9BnrKnc,3095
+npe2-0.7.7.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+npe2-0.7.7.dist-info/entry_points.txt,sha256=5zoegMudO8Hkn6589GlAXIW49Ar5HSWZjTRc0TkJu3s,250
+npe2-0.7.7.dist-info/licenses/LICENSE,sha256=uyX2Y2Q7D-WzOUc6EKZVDuadkWenBWSYTR--BsewGpg,1514
+npe2-0.7.7.dist-info/RECORD,,

{npe2-0.7.5rc0.dist-info → npe2-0.7.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.22.3
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any