npe2 0.7.8rc0__py3-none-any.whl → 0.7.9rc0__py3-none-any.whl

npe2/_inspection/_fetch.py

@@ -160,9 +160,47 @@ def _get_manifest_from_zip_url(url: str) -> PluginManifest:
     --------
     $ npe2 fetch https://github.com/org/project/archive/refs/heads/master.zip
     """
+    from npe2.manifest import PluginManifest
+
+    def find_manifest_file(root: Path) -> Optional[Path]:
+        """Recursively find a napari manifest file."""
+        # Check current directory for manifest files
+        for filename in ["napari.yaml", "napari.yml"]:
+            manifest_path = root / filename
+            if manifest_path.exists():
+                return manifest_path
+
+        # Check for pyproject.toml with napari config
+        pyproject_path = root / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                import tomllib
+            except ImportError:
+                import tomli as tomllib  # type: ignore
+
+            with open(pyproject_path, "rb") as f:
+                data = tomllib.load(f)
+                if "tool" in data and "napari" in data["tool"]:
+                    return pyproject_path
+
+        # Recursively search subdirectories for the manifest file
+        for item in root.iterdir():
+            if item.is_dir() and not item.name.startswith("."):
+                result = find_manifest_file(item)
+                if result:
+                    return result
+        return None
+
     with _tmp_zip_download(url) as zip_path:
-        src_dir = next(Path(zip_path).iterdir())  # find first directory
-        return _build_src_and_extract_manifest(src_dir)
+        # In a zip file, we do not need to build a wheel. We can extract
+        # the manifest directly from the extracted files.
+        manifest_file = find_manifest_file(Path(zip_path))
+        if manifest_file:
+            return PluginManifest.from_file(manifest_file)
+        else:
+            # Keep original behavior to try to build a wheel as a fallback
+            src_dir = next(Path(zip_path).iterdir())
+            return _build_src_and_extract_manifest(src_dir)
 
 
 def _get_manifest_from_wheel_url(url: str) -> PluginManifest:

npe2/cli.py

@@ -11,7 +11,11 @@ from npe2 import PluginManager, PluginManifest, __version__
 if TYPE_CHECKING:
     from rich.console import RenderableType
 
-app = typer.Typer(no_args_is_help=True)
+app = typer.Typer(
+    no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
+    rich_markup_mode="rich",
+)
 
 
 def _show_version_and_exit(value: bool) -> None:
@@ -498,4 +502,10 @@ def compile(
 
 
 def main():
+    import sys
+
+    # If no arguments provided, show help without error box
+    if len(sys.argv) == 1:
+        sys.argv.append("--help")
+
     app()

npe2/io_utils.py

@@ -319,5 +319,5 @@ def _write(
 
     # napari_get_writer-style writers don't always return a list
     # though strictly speaking they should?
-    result = [res] if isinstance(res, str) else res or []  # type: ignore
+    result = [res] if isinstance(res, str) else res or []
     return (result, writer) if return_writer else result

npe2/manifest/_npe1_adapter.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from shutil import rmtree
 from typing import List, Sequence
 
-from appdirs import user_cache_dir
+from platformdirs import user_cache_dir
 
 from npe2._inspection._from_npe1 import manifest_from_npe1
 from npe2.manifest import PackageMetadata

npe2/manifest/contributions/_contributions.py

@@ -36,8 +36,15 @@ class ContributionPoints(BaseModel):
     widgets: Optional[List[WidgetContribution]]
     sample_data: Optional[List[SampleDataContribution]]
     themes: Optional[List[ThemeContribution]]
-    menus: Dict[str, List[MenuItem]] = Field(default_factory=dict, hide_docs=True)
-    submenus: Optional[List[SubmenuContribution]] = Field(None, hide_docs=True)
+    menus: Dict[str, List[MenuItem]] = Field(
+        default_factory=dict,
+        description="Add menu items to existing napari menus."
+        "A menu item can be a command, such as open a widget, or a submenu."
+        "Using menu items, nested hierarchies can be created within napari menus."
+        "This allows you to organize your plugin's contributions within"
+        "napari's menu structure.",
+    )
+    submenus: Optional[List[SubmenuContribution]]
     keybindings: Optional[List[KeyBindingContribution]] = Field(None, hide_docs=True)
 
     configuration: List[ConfigurationContribution] = Field(

npe2/manifest/contributions/_sample_data.py

@@ -32,7 +32,9 @@ class SampleDataGenerator(_SampleDataContribution, Executable[List[LayerData]]):
     """Contribute a callable command that creates data on demand."""
 
     command: str = Field(
-        ..., description="Identifier of a command that returns layer data tuple."
+        ...,
+        description="Identifier of a command that returns layer data tuple. "
+        "Note that this command cannot return `[(None,)]`.",
     )
 
     def open(

npe2/manifest/contributions/_submenu.py

@@ -6,6 +6,13 @@ from ._icon import Icon
 
 
 class SubmenuContribution(BaseModel):
+    """Contributes a submenu that can contain menu items or other submenus.
+
+    Submenus allow you to organize menu items into hierarchical structures.
+    Each submenu defines an id, label, and optional icon that can be
+    referenced by menu items to create nested menu structures.
+    """
+
     id: str = Field(description="Identifier of the menu to display as a submenu.")
     label: str = Field(
         description="The label of the menu item which leads to this submenu."

{npe2-0.7.8rc0.dist-info → npe2-0.7.9rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npe2
-Version: 0.7.8rc0
+Version: 0.7.9rc0
 Summary: napari plugin engine v2
 Project-URL: homepage, https://github.com/napari/npe2
 Project-URL: repository, https://github.com/napari/npe2
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: appdirs
 Requires-Dist: build>=1
+Requires-Dist: platformdirs
 Requires-Dist: psygnal>=0.3.0
 Requires-Dist: pydantic
 Requires-Dist: pyyaml

{npe2-0.7.8rc0.dist-info → npe2-0.7.9rc0.dist-info}/RECORD

@@ -6,22 +6,22 @@ npe2/_plugin_manager.py,sha256=0sPujjzJqdx03e-BuXlnMv652OtO18-xyPuJAlva320,30694
 npe2/_pydantic_compat.py,sha256=S7snBijrnYsIovWmlmiZ91bbQNmbLuftr8CUcDnek20,1152
 npe2/_pytest_plugin.py,sha256=Dw73_eHFoBT_mivmFzr73ZGwBe1wwoSb790Mk1QlKn8,3610
 npe2/_setuptools_plugin.py,sha256=VefF1gMcnRxA0yp8tSYkcoB4mkefaf7NST5f0PWHm-M,6786
-npe2/cli.py,sha256=hPsDOjOInm9Fr5wd2GYHAnRWA-DpxqaLj8D9-ucL1S0,15401
+npe2/cli.py,sha256=Q3SsDydPHzxxpGAm23JxBHQnp2yo4ZVYR-ug3hHU3dk,15637
 npe2/implements.py,sha256=RmzTS42dCNPLfCKK29rXlLBQ0Gj7gz7A_ewbxKR_2X0,4023
 npe2/implements.pyi,sha256=KcATek_BMxZGGlpd1yBgwBSFkeeJoJhX8S80GuprYRw,1392
-npe2/io_utils.py,sha256=H2EtIPJX5NCstA5zrmArqHwAHPdZy36h_ZVXr3nKDNE,10058
+npe2/io_utils.py,sha256=0jnCHWjHSpVeKEXDmsvBXywchxdx2r8JEWIImGB6wBc,10042
 npe2/plugin_manager.py,sha256=e6egPx3H4tlyJ1fMJhske9uKCt1BdupAR6S-EBx1Afg,4466
 npe2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 npe2/types.py,sha256=3CCIQ84yTwUbc8rHBfvpMGgv7Fg968MFX-brXbbhk1I,2216
 npe2/_inspection/__init__.py,sha256=Z23w_mB3aHP1AZlLYDB4OMHjgXQMuBAPzOIYEd1HuFk,295
 npe2/_inspection/_compile.py,sha256=sIjcpyfgaETHrdrAB_jPyLHd2HxOuWdnKkDotXuOTk8,3941
-npe2/_inspection/_fetch.py,sha256=cR0DJBIq1JYRVkQI297yqO_G3qitaCdRvG6-QbQDW24,12792
+npe2/_inspection/_fetch.py,sha256=WA1kp8KrUThxXpI4GcKwC8l7jR-1X7bJzIalbB20Vgk,14298
 npe2/_inspection/_from_npe1.py,sha256=WP4mvMouGxRr9KlDmcQNukzS6ScT3izF0WlAN1g91o8,23607
 npe2/_inspection/_setuputils.py,sha256=EUnNq7rAJ4nVnMyaGztCufbT1JDxcJK3G9o3omqmd5U,4575
 npe2/_inspection/_visitors.py,sha256=XqjCR2VqgOlFKBw2SvJJfWhUCEqofSuIxZ8ecLyi7k0,19738
 npe2/manifest/__init__.py,sha256=sfgHfeC2AKoewwRgnAqX84X0U-ThDHxmt0Olidnmalo,159
 npe2/manifest/_bases.py,sha256=Fs_juL_8sS3vR6_FdQ_O5RESiTEUER7BQI0C8ZnKOC0,3649
-npe2/manifest/_npe1_adapter.py,sha256=siztkuFQ4QhS6LkLv7_7-a3B6hS2KuAa_JhK4lfAbyw,5212
+npe2/manifest/_npe1_adapter.py,sha256=6ZLGSSy-U6oEQekXeI2l-GXTJC3DuWTlFownbI5e8mo,5217
 npe2/manifest/_package_metadata.py,sha256=NQpEoq50vPK1ULVZnGQVJ5Ns9TUZEwtctQV0s_kpp78,9241
 npe2/manifest/_validators.py,sha256=v_GaW2DE1A7x3J-VA6mIWMLXO-AijLvZgf4-kcpQfWI,2875
 npe2/manifest/menus.py,sha256=SMJyp1wI45ub8hdZUKqQi9SUZ3GpFlarHsOJ1ZwAMbs,181
@@ -31,19 +31,19 @@ npe2/manifest/utils.py,sha256=fuHCy573ZyJH4GFi_KdOUnJA0xRDY0qiN1dldP_aTTE,12355
 npe2/manifest/contributions/__init__.py,sha256=b5eNqUL5tskS6gVwh_zalBCsPxX6HO1R1tNvG9A3m68,1003
 npe2/manifest/contributions/_commands.py,sha256=f7x1yDoHS2GBAjQaFGqIcsqNC1avqtr6o4w_RZcHexs,4329
 npe2/manifest/contributions/_configuration.py,sha256=i8DPBUfpJZ4Y_Hug1E1FGCsLivd6SpZZmGZ_80WdFeg,6516
-npe2/manifest/contributions/_contributions.py,sha256=fmNSbzZ6VEjVdIAwfmsowRp_EFbKXfd7KGLM7muZkcc,2175
+npe2/manifest/contributions/_contributions.py,sha256=gC9-zMnmLQrObu8YTL_4NF4szD11jsN5ms9nf7K8YD8,2476
 npe2/manifest/contributions/_icon.py,sha256=NXeAPy1qoPLcFBHpQK_7j4pqxHGYbZ0gb3yCXr47CLM,161
 npe2/manifest/contributions/_json_schema.py,sha256=rIERaRMzVJzx5YPkdnGUyQDrfK3PN-eLM-gOOumFyHA,10953
 npe2/manifest/contributions/_keybindings.py,sha256=E_mrSzngXEGuyIfytPLOc0WL7Bb1Zebazdt1Nw6ZhD0,962
 npe2/manifest/contributions/_menus.py,sha256=FAkXdpSGHdDqjA4yr2Oxb62x7POXJY7ETAcs23AJTFY,2233
 npe2/manifest/contributions/_readers.py,sha256=XziSWpJrrbS_CJ6bvPhGH4vwKZq5in8kls07j1TAdXw,2513
-npe2/manifest/contributions/_sample_data.py,sha256=4sm0QdChvJ8RsU6ClhsXJOhNZVPP5iYwMmZp8wrQ9Gg,2330
-npe2/manifest/contributions/_submenu.py,sha256=pjHZbfn5iCQBwNaTIGMWHNNswtSPLlnmlWpOY67BFgw,666
+npe2/manifest/contributions/_sample_data.py,sha256=KRZ2vEDhd0Qmv9HOa6e_Db9sTzLrPc2VsTsFeWQbmvw,2400
+npe2/manifest/contributions/_submenu.py,sha256=jRUFdKB1iIgUfADeaHJV9rZ3_u3SfYjwfGgXelhEfXs,960
 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.8rc0.dist-info/METADATA,sha256=NcMdnVwFIQ6IO3N58FftNLPTJuMPBzJIi_MmCjfAQ_8,5968
-npe2-0.7.8rc0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-npe2-0.7.8rc0.dist-info/entry_points.txt,sha256=5zoegMudO8Hkn6589GlAXIW49Ar5HSWZjTRc0TkJu3s,250
-npe2-0.7.8rc0.dist-info/licenses/LICENSE,sha256=uyX2Y2Q7D-WzOUc6EKZVDuadkWenBWSYTR--BsewGpg,1514
-npe2-0.7.8rc0.dist-info/RECORD,,
+npe2-0.7.9rc0.dist-info/METADATA,sha256=PSwtqFzgHbvC4UIYP33c4JrMK4-K_0dFL17K9X6l-sc,5973
+npe2-0.7.9rc0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+npe2-0.7.9rc0.dist-info/entry_points.txt,sha256=5zoegMudO8Hkn6589GlAXIW49Ar5HSWZjTRc0TkJu3s,250
+npe2-0.7.9rc0.dist-info/licenses/LICENSE,sha256=uyX2Y2Q7D-WzOUc6EKZVDuadkWenBWSYTR--BsewGpg,1514
+npe2-0.7.9rc0.dist-info/RECORD,,