usecli 0.1.58__tar.gz → 0.1.60__tar.gz

{usecli-0.1.58 → usecli-0.1.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.58
+Version: 0.1.60
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>
@@ -182,19 +182,10 @@ choice = Menu(["A", "B", "C"]).show()
 ```
 about        Show app info
 help         Show help
-init         Initialize usecli
+init         Initialize usecli (usecli only)
 inspire      Random quote
-make:command Create new command
-```
-
-### Hiding Built-in Commands
-
-Add this to `usecli.config.toml`:
-
-```toml
-[usecli]
-hide_init = true
-hide_inspire = true
+make:command Create new command (usecli only)
+make:theme   Create new theme (usecli only)
 ```
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

{usecli-0.1.58 → usecli-0.1.60}/README.md

@@ -154,19 +154,10 @@ choice = Menu(["A", "B", "C"]).show()
 ```
 about        Show app info
 help         Show help
-init         Initialize usecli
+init         Initialize usecli (usecli only)
 inspire      Random quote
-make:command Create new command
-```
-
-### Hiding Built-in Commands
-
-Add this to `usecli.config.toml`:
-
-```toml
-[usecli]
-hide_init = true
-hide_inspire = true
+make:command Create new command (usecli only)
+make:theme   Create new theme (usecli only)
 ```
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

{usecli-0.1.58 → usecli-0.1.60}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.58"
+version = "0.1.60"
 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.58 → usecli-0.1.60}/src/usecli/__init__.py

@@ -2,16 +2,24 @@
 
 from __future__ import annotations
 
-import shutil
 import sys
 from importlib import import_module
-from typing import Any, Optional, Sequence
+from typing import TYPE_CHECKING, Any, Optional, Sequence
 
 import click
 import typer
 from click.exceptions import BadParameter, ClickException, Exit, UsageError
 from typer.core import TyperGroup
 
+if TYPE_CHECKING:
+    from rich.console import Console
+
+    from usecli.menu import Menu
+    from usecli.params import Argument, Option
+    from usecli.ui import Confirm, Prompt
+
+    console: Console
+
 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]
@@ -23,13 +31,8 @@ except ImportError:
 
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
-from usecli.cli.core.exceptions import UsecliBadParameter, UsecliUsageError
-from usecli.cli.core.ui.list import list_commands
 from usecli.cli.services.command_service import CommandService
-from usecli.menu import Menu
-from usecli.params import Argument, Option
 from usecli.shared.config.manager import get_config
-from usecli.ui import Confirm, Console, Prompt, console
 
 colors = import_module("usecli.cli.config.colors")
 theme = COLOR
@@ -37,6 +40,27 @@ theme = COLOR
 sys.modules.setdefault(__name__ + ".colors", colors)
 sys.modules.setdefault("colors", colors)
 
+_LAZY_EXPORTS = {
+    "Menu": ("usecli.menu", "Menu"),
+    "Argument": ("usecli.params", "Argument"),
+    "Option": ("usecli.params", "Option"),
+    "Prompt": ("usecli.ui", "Prompt"),
+    "Confirm": ("usecli.ui", "Confirm"),
+    "Console": ("usecli.ui", "Console"),
+    "console": ("usecli.ui", "console"),
+}
+
+
+def __getattr__(name: str) -> Any:
+    export = _LAZY_EXPORTS.get(name)
+    if export is None:
+        raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+    module_name, attr_name = export
+    value = getattr(import_module(module_name), attr_name)
+    globals()[name] = value
+    return value
+
+
 __all__ = [
     "BaseCommand",
     "console",
@@ -52,6 +76,10 @@ __all__ = [
 ]
 
 
+def _console():
+    return __getattr__("console")
+
+
 def _is_interactive_flag_present() -> bool:
     """Check if -i/--interactive flag is present in sys.argv.
 
@@ -206,10 +234,14 @@ class PrefixMatchingGroup(TyperGroup):
         except Exit:
             sys.exit(0)
         except (BadParameter, TyperBadParameter) as e:
+            from usecli.cli.core.exceptions import UsecliBadParameter
+
             styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
             styled_error.show()
             sys.exit(styled_error.exit_code)
         except (UsageError, TyperUsageError) as e:
+            from usecli.cli.core.exceptions import UsecliUsageError
+
             styled_error = UsecliUsageError(e.message, ctx=e.ctx)
             styled_error.show()
             sys.exit(styled_error.exit_code)
@@ -241,18 +273,34 @@ class FilteredListCommand(click.Command):
         Args:
             ctx: The Click context.
         """
+        from usecli.cli.core.ui.list import list_commands
+
         list_commands(app, prefix_filter=self.prefix_filter)
         return None
 
 
+def _get_default_help() -> str:
+    return "Usecli CLI - An elegant CLI framework for Python"
+
+
 app = typer.Typer(
-    help=_get_cli_help_text(),
+    help=_get_default_help(),
     invoke_without_command=True,
     no_args_is_help=False,
     cls=PrefixMatchingGroup,
     pretty_exceptions_enable=False,  # Use custom error styling
 )
 
+_help_resolved = False
+
+
+def _resolve_help():
+    global _help_resolved
+    if not _help_resolved:
+        app.info.help = _get_cli_help_text()
+        _help_resolved = True
+
+
 service = CommandService(app)
 service.load_commands()
 
@@ -278,14 +326,20 @@ def run_app(
         version: Flag to show version and exit.
         help: Flag to show help and exit.
     """
+    _resolve_help()
+
     if help:
+        from usecli.cli.core.ui.list import list_commands
+
         list_commands(app)
         raise typer.Exit()
 
     if version:
+        import shutil
+
         config = get_config()
         command_path = shutil.which(sys.argv[0]) or sys.argv[0]
-        console.print(
+        _console().print(
             f"[bold {theme.SECONDARY}]{config.get('title')} {service.version}[/bold {theme.SECONDARY}] [{theme.INFO}]({command_path})[/{theme.INFO}]"
         )
         raise typer.Exit()
@@ -305,18 +359,21 @@ def run_app(
         prefix_filter: str | None = None
         if ctx.obj and isinstance(ctx.obj, dict):
             prefix_filter = ctx.obj.get("prefix_filter")
+        from usecli.cli.core.ui.list import list_commands
+
         list_commands(app, prefix_filter=prefix_filter)
 
 
 def main() -> None:
     """Run the CLI application with custom error handling."""
+    _resolve_help()
     config = get_config()
     command_name = config._get_command_name()
     if command_name == "usecli" and not config.is_usecli_direct_dependency():
-        console.print(
+        _console().print(
             "[bold red]Error:[/bold red] usecli is not a direct dependency of this project."
         )
-        console.print(
+        _console().print(
             "Add it to your [cyan]pyproject.toml[/cyan] dependencies or dependency-groups."
         )
         sys.exit(1)
@@ -326,10 +383,14 @@ def main() -> None:
     except Exit:
         sys.exit(0)
     except (BadParameter, TyperBadParameter) as e:
+        from usecli.cli.core.exceptions import UsecliBadParameter
+
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()
         sys.exit(styled_error.exit_code)
     except (UsageError, TyperUsageError) as e:
+        from usecli.cli.core.exceptions import UsecliUsageError
+
         styled_error = UsecliUsageError(e.message, ctx=e.ctx)
         styled_error.show()
         sys.exit(styled_error.exit_code)

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/base/about_command.py

@@ -1,30 +1,53 @@
 from __future__ import annotations
 
-import importlib.metadata
 import os
-import platform
-import re
 import sys
-from importlib.metadata import PackageNotFoundError
-from importlib.metadata import version as get_version
 from pathlib import Path
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
-from rich.console import Console
-
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
-from usecli.cli.core.ui.title import get_project_name, get_script_command_name
-from usecli.shared.config.manager import ConfigManager, get_config
+from usecli.shared.config.manager import get_config
+
+
+class _LazyConsole:
+    _console = None
+
+    def _get_console(self):
+        if self._console is None:
+            from rich.console import Console
+
+            self._console = Console()
+        return self._console
+
+    def __getattr__(self, name):
+        return getattr(self._get_console(), name)
+
+
+console = _LazyConsole()
+
+
+def _load_toml(text: str):
+    if sys.version_info >= (3, 11):
+        import tomllib
+    else:
+        import tomli as tomllib
+
+    return tomllib.loads(text)
 
-console = Console()
+
+def _toml_decode_error():
+    if sys.version_info >= (3, 11):
+        pass
+    else:
+        pass
+
+    return _toml_decode_error()
 
 
 def _get_version() -> str:
+    from importlib.metadata import PackageNotFoundError
+    from importlib.metadata import version as get_version
+
     try:
         return get_version("usecli")
     except PackageNotFoundError:
@@ -36,6 +59,8 @@ def _parse_dependency_requirement(req: str) -> tuple[str, str | None]:
     if not req_core:
         return "", None
 
+    import re
+
     match = re.match(r"^([A-Za-z0-9_.-]+)", req_core)
     if not match:
         return "", None
@@ -57,11 +82,11 @@ def _parse_dependency_requirement(req: str) -> tuple[str, str | None]:
     return name, remainder
 
 
-def _get_console_script_distribution(
-    command_name: str | None,
-) -> importlib.metadata.Distribution | None:
+def _get_console_script_distribution(command_name: str | None):
     if not command_name:
         return None
+    import importlib.metadata
+
     try:
         distributions = importlib.metadata.distributions()
     except Exception:
@@ -79,9 +104,7 @@ def _get_console_script_distribution(
     return None
 
 
-def _get_package_dependencies_from_distribution(
-    dist: importlib.metadata.Distribution,
-) -> list[tuple[str, str | None]]:
+def _get_package_dependencies_from_distribution(dist) -> list[tuple[str, str | None]]:
     requires = dist.requires or []
     result: list[tuple[str, str | None]] = []
     for req in requires:
@@ -93,10 +116,12 @@ def _get_package_dependencies_from_distribution(
     return result
 
 
-def _get_dependencies(config: ConfigManager) -> list[tuple[str, str | None]]:
+def _get_dependencies(config) -> list[tuple[str, str | None]]:
     command_name = os.path.basename(sys.argv[0]) if sys.argv else None
     dist = _get_console_script_distribution(command_name)
     if dist is None:
+        from usecli.cli.core.ui.title import get_script_command_name
+
         primary_command = get_script_command_name(default=None)
         dist = _get_console_script_distribution(primary_command)
     if dist is not None:
@@ -107,8 +132,8 @@ def _get_dependencies(config: ConfigManager) -> list[tuple[str, str | None]]:
         return []
 
     try:
-        data = tomllib.loads(pyproject_path.read_text())
-    except (tomllib.TOMLDecodeError, OSError):
+        data = _load_toml(pyproject_path.read_text())
+    except (_toml_decode_error(), OSError):
         return []
 
     deps = data.get("project", {}).get("dependencies", [])
@@ -125,16 +150,18 @@ def _get_dependencies(config: ConfigManager) -> list[tuple[str, str | None]]:
     return result
 
 
-def _get_application_distribution() -> importlib.metadata.Distribution | None:
+def _get_application_distribution():
     command_name = os.path.basename(sys.argv[0]) if sys.argv else None
     dist = _get_console_script_distribution(command_name)
     if dist is None:
+        from usecli.cli.core.ui.title import get_script_command_name
+
         primary_command = get_script_command_name(default=None)
         dist = _get_console_script_distribution(primary_command)
     return dist
 
 
-def _get_application_version(config: ConfigManager) -> str:
+def _get_application_version(config) -> str:
     dist = _get_application_distribution()
     if dist is not None:
         return dist.version
@@ -146,7 +173,7 @@ def _get_application_version(config: ConfigManager) -> str:
     return _get_version()
 
 
-def _get_application_description(config: ConfigManager) -> str:
+def _get_application_description(config) -> str:
     description = config.get("description")
     if (
         config.has_key("description")
@@ -165,14 +192,14 @@ def _get_application_description(config: ConfigManager) -> str:
     )
 
 
-def _get_project_description(config: ConfigManager) -> str | None:
+def _get_project_description(config) -> str | None:
     pyproject_path = config.pyproject_path
     if not pyproject_path.exists():
         return None
 
     try:
-        data = tomllib.loads(pyproject_path.read_text())
-    except (tomllib.TOMLDecodeError, OSError):
+        data = _load_toml(pyproject_path.read_text())
+    except (_toml_decode_error(), OSError):
         return None
 
     description = data.get("project", {}).get("description")
@@ -202,6 +229,8 @@ def _get_installed_script_commands(command_name: str | None) -> list[str]:
 
 
 def _get_script_commands() -> list[str]:
+    from usecli.cli.core.ui.title import get_script_command_name
+
     primary_command = get_script_command_name(default=None)
     command_name = os.path.basename(sys.argv[0]) if sys.argv else primary_command
     installed_commands = _get_installed_script_commands(command_name)
@@ -217,8 +246,8 @@ def _get_script_commands() -> list[str]:
         return []
 
     try:
-        data = tomllib.loads(pyproject_path.read_text())
-    except (tomllib.TOMLDecodeError, OSError):
+        data = _load_toml(pyproject_path.read_text())
+    except (_toml_decode_error(), OSError):
         return []
 
     scripts = data.get("project", {}).get("scripts", {})
@@ -245,6 +274,8 @@ class AboutCommand(BaseCommand):
     def handle(self) -> None:
         config = get_config()
         version = _get_application_version(config)
+        from usecli.cli.core.ui.title import get_project_name
+
         app_name = get_project_name()
         description = _get_application_description(config)
 
@@ -262,6 +293,8 @@ class AboutCommand(BaseCommand):
         version_label = "Cli Version" if dist is not None else "Application Version"
         self._print_row(name_label, app_name)
         self._print_row(version_label, version)
+        import platform
+
         self._print_row("Python Version", platform.python_version())
         self._print_row("Platform", f"[{COLOR.FOREGROUND_MUTED}]{platform.platform()}")
 
@@ -282,6 +315,8 @@ class AboutCommand(BaseCommand):
         if deps:
             for dep_name, spec in deps:
                 try:
+                    from importlib.metadata import version as get_version
+
                     installed_version = get_version(dep_name)
                     self._print_row(dep_name, installed_version)
                 except Exception:

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/base/help_command.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from usecli.cli.core.base_command import BaseCommand
-from usecli.cli.core.ui.list import list_commands
 
 
 class HelpCommand(BaseCommand):
@@ -19,4 +18,6 @@ class HelpCommand(BaseCommand):
 
     def handle(self) -> None:
         """Handle the command execution."""
+        from usecli.cli.core.ui.list import list_commands
+
         list_commands(self.app)

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/base/inspire_command.py

@@ -4,15 +4,10 @@ from __future__ import annotations
 
 import random
 
-from rich.console import Console
-from rich.panel import Panel
-
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
 from usecli.shared.config.manager import get_config
 
-console = Console()
-
 
 class InspireCommand(BaseCommand):
     """Command for displaying random inspirational quotes."""
@@ -78,7 +73,10 @@ class InspireCommand(BaseCommand):
         selected = random.choice(quotes)
         quote, author = selected.rsplit(" - ", 1)
 
-        console.print(
+        from rich.console import Console
+        from rich.panel import Panel
+
+        Console().print(
             Panel(
                 f"{quote}\n\n[{COLOR.FOREGROUND_MUTED}]— {author}[/{COLOR.FOREGROUND_MUTED}]",
                 border_style=COLOR.PANEL_PRIMARY,

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/core/utils.py

@@ -8,12 +8,25 @@ from datetime import datetime, timedelta
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from rich.console import Console
-
 if TYPE_CHECKING:
     pass
 
-console = Console()
+
+class _LazyConsole:
+    _console = None
+
+    def _get_console(self):
+        if self._console is None:
+            from rich.console import Console
+
+            self._console = Console()
+        return self._console
+
+    def __getattr__(self, name):
+        return getattr(self._get_console(), name)
+
+
+console = _LazyConsole()
 
 
 def is_interactive() -> bool:

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/make/make_command.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import os
+import sys
 from pathlib import Path
 
 import typer
@@ -21,8 +23,8 @@ class MakeCommand(BaseCommand):
     """Command for generating new CLI command files."""
 
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_make_command", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         """Return the command signature."""
@@ -50,7 +52,8 @@ class MakeCommand(BaseCommand):
         if config.get_project_root().resolve() != current_root:
             reset_config()
             config = get_config()
-        commands_dir = config.get_project_commands_dir()
+        project_paths = config.get_project_paths()
+        commands_dir = project_paths["commands_dir"]
         commands_dir.mkdir(parents=True, exist_ok=True)
         target_file = commands_dir / file_name
 
@@ -59,7 +62,8 @@ class MakeCommand(BaseCommand):
                 f"[{COLOR.ERROR}]Error: Command file {target_file} already exists.[/{COLOR.ERROR}]"
             )
             return
-        project_template_path = config.get_project_templates_dir() / "command.py.j2"
+        templates_dir = project_paths["templates_dir"]
+        project_template_path = templates_dir / "command.py.j2"
         if project_template_path.exists():
             template_path = project_template_path
         else:

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/defaults/make/make_theme_command.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import os
+import sys
 from pathlib import Path
 
 import typer
@@ -23,8 +25,8 @@ console = Console()
 
 class MakeThemeCommand(BaseCommand):
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_make_theme", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         return "make:theme"
@@ -46,6 +48,7 @@ class MakeThemeCommand(BaseCommand):
             reset_config()
             config = get_config()
 
+        project_paths = config.get_project_paths()
         themes_entries = self._normalize_theme_entries(config.get("themes_dir", []))
         if not themes_entries:
             console.print(
@@ -86,7 +89,8 @@ class MakeThemeCommand(BaseCommand):
                     break
                 counter += 1
 
-        project_template_path = config.get_project_templates_dir() / "theme.toml.j2"
+        templates_dir = project_paths["templates_dir"]
+        project_template_path = templates_dir / "theme.toml.j2"
         if project_template_path.exists():
             template_path = project_template_path
         else:

{usecli-0.1.58 → usecli-0.1.60}/src/usecli/cli/commands/init_command.py

@@ -29,15 +29,15 @@ from usecli.cli.core.exceptions import UsecliBadParameter
 from usecli.cli.core.validators import validate_command_name
 from usecli.cli.utils.interactive.terminal_menu import terminal_menu
 from usecli.shared.config.globals import TEMPLATES_DIR, THEMES_DIR, USECLI_CONFIG_TOML
-from usecli.shared.config.manager import ConfigManager, get_config
+from usecli.shared.config.manager import ConfigManager
 
 console = Console()
 
 
 class InitCommand(BaseCommand):
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_init", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         return "init"
@@ -244,6 +244,30 @@ class InitCommand(BaseCommand):
             return "themes"
         return str(parent / "themes")
 
+    def _infer_commands_dir(self, project_root: Path) -> str:
+        src_dir = project_root / "src"
+        if src_dir.exists() and src_dir.is_dir():
+            packages = [
+                d
+                for d in src_dir.iterdir()
+                if d.is_dir() and not d.name.startswith((".", "_"))
+            ]
+            if len(packages) == 1:
+                package_name = packages[0].name
+                return f"src/{package_name}/cli/commands"
+        pyproject_path = project_root / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                data = tomllib.loads(pyproject_path.read_text())
+                project_name = data.get("project", {}).get("name")
+                if project_name:
+                    package_name = project_name.replace("-", "_").replace(" ", "_")
+                    if (project_root / package_name).is_dir():
+                        return f"{package_name}/cli/commands"
+            except (tomllib.TOMLDecodeError, OSError):
+                pass
+        return "cli/commands"
+
     def _get_existing_usecli_script_name(self, pyproject_path: Path) -> str | None:
         if not pyproject_path.exists():
             return None
@@ -532,9 +556,7 @@ include = ["{root_package}*"]
         description: str = typer.Option(
             "A custom CLI tool", help="Description for your CLI"
         ),
-        commands_dir: str = typer.Option(
-            "cli/commands", help="Directory for custom commands"
-        ),
+        commands_dir: str = typer.Option(None, help="Directory for custom commands"),
         command_name: Annotated[
             str,
             typer.Option(
@@ -554,6 +576,9 @@ include = ["{root_package}*"]
             project_root / "pyproject.toml"
         )
 
+        if commands_dir is None:
+            commands_dir = self._infer_commands_dir(project_root)
+
         console.print()
         existing_command_name = self._get_existing_usecli_script_name(pyproject_path)
         if existing_command_name and command_name == "usecli":