cmem-cmemc 25.5.0rc1__py3-none-any.whl → 26.1.0rc1__py3-none-any.whl

cmem_cmemc/cli.py

@@ -7,6 +7,8 @@ from importlib.resources import open_text
 from os import environ as env
 
 import click
+from cmem_client.exceptions import BaseError as ClientBaseError
+from eccenca_marketplace_client.exceptions import BaseError as MarketplaceClientBaseError
 
 from cmem_cmemc import completion
 from cmem_cmemc.command_group import CmemcGroup
@@ -16,6 +18,7 @@ from cmem_cmemc.commands import (
     dataset,
     graph,
     manual,
+    package,
     project,
     query,
     vocabulary,
@@ -106,7 +109,7 @@ def cli(  # noqa: PLR0913
 
                         https://eccenca.com/go/cmemc
 
-    cmemc is © 2025 eccenca GmbH, licensed under the Apache License 2.0.
+    cmemc is © 2026 eccenca GmbH, licensed under the Apache License 2.0.
     """
     _ = connection, debug, quiet, config_file, external_http_timeout
     if " ".join(sys.argv).find("config edit") != -1:
@@ -120,6 +123,7 @@ cli.add_command(admin.admin)
 cli.add_command(config.config)
 cli.add_command(dataset.dataset)
 cli.add_command(graph.graph)
+cli.add_command(package.package_group)
 cli.add_command(project.project)
 cli.add_command(query.query)
 cli.add_command(vocabulary.vocabulary)
@@ -130,9 +134,10 @@ cli.add_command(manual.manual_command)
 def main() -> None:
     """Start the command line interface."""
     try:
-        cli()  # pylint: disable=no-value-for-parameter
-    except CmemcError as error:
-        app: ApplicationContext = error.app
-        app.echo_debug(traceback.format_exc())
-        app.echo_error(extract_error_message(error))
+        cli()
+    except (CmemcError, ClientBaseError, MarketplaceClientBaseError) as error:
+        if "--debug" in sys.argv or "-d" in sys.argv:
+            ApplicationContext.echo_debug_string(traceback.format_exc())
+        message = extract_error_message(error).removeprefix("CmemcError: ")
+        ApplicationContext.echo_error(message)
         sys.exit(1)

cmem_cmemc/command.py

@@ -53,4 +53,4 @@ class CmemcCommand(HelpColorsCommand):
             NotImplementedError,
             KeyError,
         ) as e:
-            raise CmemcError(ctx.obj, extract_error_message(e, True)) from e
+            raise CmemcError(extract_error_message(e, True)) from e

cmem_cmemc/command_group.py

@@ -1,5 +1,10 @@
 """cmemc Click Command Group"""
 
+import shutil
+
+from click import Command, Context
+from click.core import _complete_visible_commands
+from click.shell_completion import CompletionItem
 from click_didyoumean import DYMGroup
 from click_help_colors import HelpColorsGroup
 
@@ -24,49 +29,72 @@ class CmemcGroup(HelpColorsGroup, DYMGroup):
         kwargs.setdefault(
             "help_options_custom_colors",
             {
+                "acl": self.color_for_command_groups,
+                "admin": self.color_for_command_groups,
                 "bootstrap": self.color_for_writing_commands,
-                "showcase": self.color_for_writing_commands,
-                "delete": self.color_for_writing_commands,
-                "password": self.color_for_writing_commands,
-                "secret": self.color_for_writing_commands,
-                "upload": self.color_for_writing_commands,
-                "import": self.color_for_writing_commands,
+                "cache": self.color_for_command_groups,
+                "cancel": self.color_for_writing_commands,
+                "client": self.color_for_command_groups,
+                "config": self.color_for_command_groups,
                 "create": self.color_for_writing_commands,
-                "enable": self.color_for_writing_commands,
+                "dataset": self.color_for_command_groups,
+                "delete": self.color_for_writing_commands,
                 "disable": self.color_for_writing_commands,
+                "enable": self.color_for_writing_commands,
+                "eval": self.color_for_writing_commands,
                 "execute": self.color_for_writing_commands,
-                "replay": self.color_for_writing_commands,
-                "io": self.color_for_writing_commands,
+                "file": self.color_for_command_groups,
+                "graph": self.color_for_command_groups,
+                "import": self.color_for_writing_commands,
+                "imports": self.color_for_command_groups,
+                "insights": self.color_for_command_groups,
                 "install": self.color_for_writing_commands,
-                "uninstall": self.color_for_writing_commands,
-                "reload": self.color_for_writing_commands,
-                "update": self.color_for_writing_commands,
-                "eval": self.color_for_writing_commands,
-                "cancel": self.color_for_writing_commands,
-                "admin": self.color_for_command_groups,
-                "user": self.color_for_command_groups,
-                "store": self.color_for_command_groups,
+                "io": self.color_for_writing_commands,
                 "metrics": self.color_for_command_groups,
-                "config": self.color_for_command_groups,
-                "dataset": self.color_for_command_groups,
-                "graph": self.color_for_command_groups,
+                "migrate": self.color_for_writing_commands,
+                "migrations": self.color_for_command_groups,
+                "password": self.color_for_writing_commands,
+                "package": self.color_for_command_groups,
                 "project": self.color_for_command_groups,
+                "python": self.color_for_command_groups,
                 "query": self.color_for_command_groups,
+                "reload": self.color_for_writing_commands,
+                "replay": self.color_for_writing_commands,
+                "resource": self.color_for_command_groups,
                 "scheduler": self.color_for_command_groups,
+                "secret": self.color_for_writing_commands,
+                "showcase": self.color_for_writing_commands,
+                "store": self.color_for_command_groups,
+                "uninstall": self.color_for_writing_commands,
+                "update": self.color_for_writing_commands,
+                "upload": self.color_for_writing_commands,
+                "user": self.color_for_command_groups,
+                "validation": self.color_for_command_groups,
+                "variable": self.color_for_command_groups,
                 "vocabulary": self.color_for_command_groups,
                 "workflow": self.color_for_command_groups,
                 "workspace": self.color_for_command_groups,
-                "python": self.color_for_command_groups,
-                "cache": self.color_for_command_groups,
-                "resource": self.color_for_command_groups,
-                "acl": self.color_for_command_groups,
-                "client": self.color_for_command_groups,
-                "variable": self.color_for_command_groups,
-                "validation": self.color_for_command_groups,
-                "migrate": self.color_for_writing_commands,
-                "migrations": self.color_for_command_groups,
-                "imports": self.color_for_command_groups,
-                "insights": self.color_for_command_groups,
             },
         )
         super().__init__(*args, **kwargs)
+
+    def shell_complete(self, ctx: Context, incomplete: str) -> list[CompletionItem]:
+        """Override shell completion to use full terminal width for help text.
+
+        This method extends the default Click Group shell completion by using
+        the full terminal width for command descriptions instead of the default
+        45-character limit.
+        """
+        # Get terminal width, default to a large number if not available
+        terminal_width = shutil.get_terminal_size(fallback=(200, 24)).columns
+
+        # Get completions for subcommands with full-width help text
+        results = [
+            CompletionItem(name, help=command.get_short_help_str(limit=terminal_width))
+            for name, command in _complete_visible_commands(ctx, incomplete)
+        ]
+
+        # Call Command.shell_complete (not Group.shell_complete) to get options, etc.
+        # This avoids duplicate subcommand completions from the parent Group class
+        results.extend(Command.shell_complete(self, ctx, incomplete))
+        return results