usecli 0.1.54__tar.gz → 0.1.56__tar.gz

{usecli-0.1.54 → usecli-0.1.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.54
+Version: 0.1.56
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.54 → usecli-0.1.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.54"
+version = "0.1.56"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.54 → usecli-0.1.56}/src/usecli/__init__.py

@@ -2,14 +2,25 @@
 
 from __future__ import annotations
 
+import shutil
 import sys
 from importlib import import_module
+from typing import Any, Optional, Sequence
 
 import click
 import typer
 from click.exceptions import BadParameter, ClickException, Exit, UsageError
 from typer.core import TyperGroup
 
+try:
+    from typer._click.exceptions import BadParameter as TyperBadParameter  # type: ignore[import-untyped]
+    from typer._click.exceptions import ClickException as TyperClickException  # type: ignore[import-untyped]
+    from typer._click.exceptions import UsageError as TyperUsageError  # type: ignore[import-untyped]
+except ImportError:
+    TyperBadParameter = BadParameter
+    TyperClickException = ClickException
+    TyperUsageError = UsageError
+
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
 from usecli.cli.core.exceptions import UsecliBadParameter, UsecliUsageError
@@ -156,6 +167,31 @@ class PrefixMatchingGroup(TyperGroup):
 
         return FilteredListCommand(cmd_name)
 
+    def main(
+        self,
+        args: Optional[Sequence[str]] = None,
+        prog_name: Optional[str] = None,
+        complete_var: Optional[str] = None,
+        standalone_mode: bool = True,
+        windows_expand_args: bool = True,
+        **extra: Any,
+    ) -> Any:
+        """Override main to disable standalone mode.
+
+        Click's default standalone_mode=True catches ClickException
+        internally and calls sys.exit(), preventing our custom error
+        handlers from running. Setting standalone_mode=False lets
+        exceptions propagate to our styled error handlers in invoke().
+        """
+        return super().main(
+            args=args,
+            prog_name=prog_name,
+            complete_var=complete_var,
+            standalone_mode=False,
+            windows_expand_args=windows_expand_args,
+            **extra,
+        )
+
     def invoke(self, ctx: click.Context) -> None:
         """Invoke the group with custom error handling.
 
@@ -169,15 +205,15 @@ class PrefixMatchingGroup(TyperGroup):
             return super().invoke(ctx)
         except Exit:
             sys.exit(0)
-        except BadParameter as e:
+        except (BadParameter, TyperBadParameter) as e:
             styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
             styled_error.show()
             sys.exit(styled_error.exit_code)
-        except UsageError as e:
+        except (UsageError, TyperUsageError) as e:
             styled_error = UsecliUsageError(e.message, ctx=e.ctx)
             styled_error.show()
             sys.exit(styled_error.exit_code)
-        except ClickException as e:
+        except (ClickException, TyperClickException) as e:
             if hasattr(e, "show"):
                 e.show()
             sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
@@ -247,8 +283,10 @@ def run_app(
         raise typer.Exit()
 
     if version:
+        config = get_config()
+        command_path = shutil.which(sys.argv[0]) or sys.argv[0]
         console.print(
-            f"[bold blue]CLI Version:[/bold blue] [green]{service.version}[/green]"
+            f"[bold {theme.SECONDARY}]{config.get('title')} {service.version}[/bold {theme.SECONDARY}] [{theme.INFO}]({command_path})[/{theme.INFO}]"
         )
         raise typer.Exit()
 
@@ -276,15 +314,15 @@ def main() -> None:
         app()
     except Exit:
         sys.exit(0)
-    except BadParameter as e:
+    except (BadParameter, TyperBadParameter) as e:
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except UsageError as e:
+    except (UsageError, TyperUsageError) as e:
         styled_error = UsecliUsageError(e.message, ctx=e.ctx)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except ClickException as e:
+    except (ClickException, TyperClickException) as e:
         if hasattr(e, "show"):
             e.show()
         sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)

{usecli-0.1.54 → usecli-0.1.56}/src/usecli/cli/core/base_command.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, ClassVar, Optional, Sequence
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import typer
 from click.exceptions import Exit
@@ -192,42 +192,6 @@ class CustomHelpCommand(TyperCommand):
             for param in getattr(self, "params", [])
         )
 
-    def main(
-        self,
-        args: Optional[Sequence[str]] = None,
-        prog_name: Optional[str] = None,
-        complete_var: Optional[str] = None,
-        standalone_mode: bool = True,
-        windows_expand_args: bool = True,
-        **extra: Any,
-    ) -> Any:
-        """Override main to disable standalone mode.
-
-        Click's default standalone_mode=True catches ClickException
-        internally and calls sys.exit(), preventing our custom error
-        handlers from running. Setting standalone_mode=False lets
-        exceptions propagate to our styled error handlers.
-
-        Args:
-            args: Command-line arguments.
-            prog_name: Program name for help display.
-            complete_var: Shell completion variable name.
-            standalone_mode: Must be False for custom error handling.
-            windows_expand_args: Windows argument expansion flag.
-            **extra: Additional context arguments.
-
-        Returns:
-            The command return value.
-        """
-        return super().main(
-            args=args,
-            prog_name=prog_name,
-            complete_var=complete_var,
-            standalone_mode=False,
-            windows_expand_args=windows_expand_args,
-            **extra,
-        )
-
     def invoke(self, ctx: ClickContext) -> Any:
         interactive = ctx.params.pop("interactive", False)
         if interactive:

{usecli-0.1.54 → usecli-0.1.56}/src/usecli/shared/config/manager.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import importlib.metadata
 import importlib.util
+import json
 import os
 import sys
 from pathlib import Path
@@ -138,6 +139,8 @@ class ConfigManager:
                         ):
                             detected_root = config_parent
         self.project_root: Path = (detected_root or start_dir).resolve()
+        if self._is_in_venv(self.project_root):
+            self.project_root = start_dir.resolve()
         self._config: dict[str, Any] = {}
         self._overrides: dict[str, Any] = {}
         self._load_config()
@@ -279,9 +282,26 @@ class ConfigManager:
 
     @staticmethod
     def _find_usecli_config_in_package() -> Path | None:
-        spec = importlib.util.find_spec(_get_package_name())
+        package_name = _get_package_name()
+        spec = importlib.util.find_spec(package_name)
         if spec is None or not spec.submodule_search_locations:
             return None
+
+        command_name = ConfigManager._get_command_name()
+        aliases = ConfigManager._get_console_script_aliases(command_name)
+
+        try:
+            dist = importlib.metadata.distribution(package_name)
+            source_root = ConfigManager._resolve_editable_source_root(dist)
+            if source_root:
+                source_config = ConfigManager._search_source_for_config(
+                    source_root, command_name, aliases
+                )
+                if source_config:
+                    return source_config
+        except Exception:
+            pass
+
         for location in spec.submodule_search_locations:
             package_root = Path(location)
             if not package_root.exists() or not package_root.is_dir():
@@ -289,8 +309,6 @@ class ConfigManager:
             candidates = [
                 path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
             ]
-            command_name = ConfigManager._get_command_name()
-            aliases = ConfigManager._get_console_script_aliases(command_name)
             if command_name:
                 candidates = [
                     path
@@ -311,6 +329,22 @@ class ConfigManager:
         spec = importlib.util.find_spec(package_name)
         if spec is None or not spec.submodule_search_locations:
             return None
+
+        command_name = cls._get_command_name()
+        aliases = cls._get_console_script_aliases(command_name)
+
+        try:
+            dist = importlib.metadata.distribution(package_name)
+            source_root = cls._resolve_editable_source_root(dist)
+            if source_root:
+                source_config = cls._search_source_for_config(
+                    source_root, command_name, aliases
+                )
+                if source_config:
+                    return source_config
+        except Exception:
+            pass
+
         for location in spec.submodule_search_locations:
             package_root = Path(location)
             if not package_root.exists() or not package_root.is_dir():
@@ -318,8 +352,6 @@ class ConfigManager:
             candidates = [
                 path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
             ]
-            command_name = cls._get_command_name()
-            aliases = cls._get_console_script_aliases(command_name)
             if command_name:
                 candidates = [
                     path
@@ -362,7 +394,15 @@ class ConfigManager:
                     normalized = dist_name.replace("-", "_")
                     if normalized not in candidates:
                         candidates.append(normalized)
+                aliases = cls._get_console_script_aliases(command_name)
                 for package_name in candidates:
+                    source_root = cls._resolve_editable_source_root(dist)
+                    if source_root:
+                        source_config = cls._search_source_for_config(
+                            source_root, command_name, aliases
+                        )
+                        if source_config:
+                            return source_config
                     match = cls._find_usecli_config_in_named_package(package_name)
                     if match:
                         return match
@@ -471,6 +511,71 @@ class ConfigManager:
             aliases = {command_name}
         return normalized in aliases
 
+    @staticmethod
+    def _is_in_venv(path: Path) -> bool:
+        resolved = path.resolve()
+        return any(part in ConfigManager._SKIP_DIRS for part in resolved.parts)
+
+    @staticmethod
+    def _resolve_editable_source_root(
+        dist: importlib.metadata.Distribution,
+    ) -> Path | None:
+        """Resolve the source directory for an editable-installed package.
+
+        Reads ``direct_url.json`` from the distribution's metadata to find the
+        local source tree.  Returns the source root or ``None`` when the
+        distribution is not an editable install or the source no longer exists.
+        """
+        try:
+            text = dist.read_text("direct_url.json")
+        except Exception:
+            return None
+        if not text:
+            return None
+        try:
+            data = json.loads(text)
+        except (json.JSONDecodeError, TypeError):
+            return None
+        if not isinstance(data, dict):
+            return None
+        if data.get("dir_info", {}).get("editable") is not True:
+            return None
+        url = data.get("url", "")
+        if not url:
+            return None
+        # ``url`` is a ``file://`` URI.
+        if url.startswith("file://"):
+            url = url[len("file://") :]
+        source = Path(url)
+        if source.exists() and source.is_dir():
+            return source.resolve()
+        return None
+
+    @staticmethod
+    def _search_source_for_config(
+        source_root: Path,
+        command_name: str | None,
+        aliases: set[str] | None,
+    ) -> Path | None:
+        """Search a source tree for a ``usecli.config.toml`` that matches."""
+        if not source_root.exists() or not source_root.is_dir():
+            return None
+        candidates = [
+            p
+            for p in source_root.rglob(USECLI_CONFIG_TOML)
+            if not any(part in ConfigManager._SKIP_DIRS for part in p.parts)
+        ]
+        if command_name:
+            candidates = [
+                p
+                for p in candidates
+                if ConfigManager._config_matches_command(p, command_name, aliases)
+            ]
+        if not candidates:
+            return None
+        candidates.sort(key=lambda p: (len(p.parts), str(p)))
+        return candidates[0]
+
     def get(self, key: str, default: Any = None) -> Any:
         """Get a configuration value using dot notation.