cmem-cmemc 26.1.0rc3__tar.gz → 26.1.0rc4__tar.gz

{cmem_cmemc-26.1.0rc3 → cmem_cmemc-26.1.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmem-cmemc
-Version: 26.1.0rc3
+Version: 26.1.0rc4
 Summary: Command line client for eccenca Corporate Memory
 License: Apache-2.0
 License-File: LICENSE
@@ -32,7 +32,7 @@ Requires-Dist: certifi (>=2024.2.2)
 Requires-Dist: click (>=8.3.0,<9.0.0)
 Requires-Dist: click-didyoumean (>=0.3.1,<0.4.0)
 Requires-Dist: click-help-colors (>=0.9.4,<0.10.0)
-Requires-Dist: cmem-client (==0.7.1)
+Requires-Dist: cmem-client (==0.8.0)
 Requires-Dist: cmem-cmempy (==25.4.0)
 Requires-Dist: configparser (>=7.2.0,<8.0.0)
 Requires-Dist: humanize (>=4.14.0,<5.0.0)

{cmem_cmemc-26.1.0rc3 → cmem_cmemc-26.1.0rc4}/cmem_cmemc/cli.py

@@ -68,7 +68,21 @@ CONTEXT_SETTINGS = {"auto_envvar_prefix": "CMEMC", "help_option_names": ["-h", "
 )
 @click.option("-q", "--quiet", is_flag=True, help="Suppress any non-error info messages.")
 @click.option(
-    "-d", "--debug", is_flag=True, help="Output debug messages and stack traces after errors."
+    "-d",
+    "--debug",
+    is_flag=True,
+    help="Output debug messages and stack traces after errors. The log level "
+    "can be set in the config via the CMEMC_LOG_LEVEL environment variable. "
+    "Options are: 'TRACE', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'"
+    "  [default: DEBUG]",
+)
+@click.option(
+    "--log-level",
+    type=click.Choice(
+        ["TRACE", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False
+    ),
+    help="Set the log level when --debug is enabled. "
+    "Can also be set via CMEMC_LOG_LEVEL environment variable.",
 )
 @click.option(
     "--external-http-timeout",
@@ -89,6 +103,7 @@ def cli(  # noqa: PLR0913
     config_file: str,
     connection: str,
     external_http_timeout: int,
+    log_level: str,
 ) -> None:
     """Eccenca Corporate Memory Control (cmemc).
 
@@ -111,7 +126,7 @@ def cli(  # noqa: PLR0913
 
     cmemc is © 2026 eccenca GmbH, licensed under the Apache License 2.0.
     """
-    _ = connection, debug, quiet, config_file, external_http_timeout
+    _ = connection, debug, quiet, config_file, external_http_timeout, log_level
     if " ".join(sys.argv).find("config edit") != -1:
         app = ApplicationContext(config_file=config_file, debug=debug, quiet=quiet)
     else:

{cmem_cmemc-26.1.0rc3 → cmem_cmemc-26.1.0rc4}/cmem_cmemc/commands/package.py

@@ -103,7 +103,7 @@ def _complete_marketplace_package_ids(
     ApplicationContext.set_connection_from_params(ctx.find_root().params)
     client = Client.from_cmempy()
     marketplace = Marketplace(client=client)
-    candidates = [(_.id, f"{_.name} ({_.type})") for _ in marketplace.get_available_packages()]
+    candidates = [(_.id, f"{_.name}") for _ in marketplace.get_available_packages()]
     return completion.finalize_completion(candidates=candidates, incomplete=incomplete)
 
 
@@ -499,6 +499,58 @@ def publish_command(app: ApplicationContext, package_archive: str, marketplace_u
     app.echo_success("done")
 
 
+@click.command(cls=CmemcCommand, name="search")
+@click.argument(
+    "SEARCH_TERMS",
+    nargs=-1,
+    type=click.STRING,
+)
+@click.option("--raw", is_flag=True, help="Outputs raw JSON.")
+@click.pass_obj
+def search_command(app: ApplicationContext, search_terms: tuple[str], raw: bool) -> None:
+    """Search for available packages with a given search text."""
+    packages = app.client.marketplace.get_available_packages()
+
+    available_packages = []
+    search_terms_lower = [term.lower() for term in search_terms]
+
+    if search_terms == "":
+        available_packages = packages
+    else:
+        for package in packages:
+            searchable_text = (
+                f"{package.id.lower()} {package.name.lower()} "
+                f"{package.description.lower()} {package.type.value.lower()}"
+            )
+            if all(term in searchable_text for term in search_terms_lower):
+                available_packages.append(package)
+
+    if raw:
+        package_data = [
+            json.loads(metadata.model_dump_json(indent=2)) for metadata in available_packages
+        ]
+        app.echo_info_json(package_data)
+        return
+
+    table = [
+        (
+            _.id,
+            _.name,
+            _.description,
+            _.type.value,
+        )
+        for _ in available_packages
+    ]
+    app.echo_info_table(
+        table,
+        headers=["ID", "Name", "Description", "Type"],
+        sort_column=0,
+        empty_table_message="No available packages found.",
+        caption=f"{len(available_packages)} package{'' if len(available_packages) == 1 else "s" } "
+        f"found on marketplace.eccenca.dev",
+    )
+
+
 @click.group(cls=CmemcGroup)
 def package_group() -> CmemcGroup:  # type: ignore[empty-body]
     """List, (un)install, export, create, or inspect packages."""
@@ -511,3 +563,4 @@ package_group.add_command(uninstall_command)
 package_group.add_command(export_command)
 package_group.add_command(build_command)
 package_group.add_command(publish_command)
+package_group.add_command(search_command)

{cmem_cmemc-26.1.0rc3 → cmem_cmemc-26.1.0rc4}/cmem_cmemc/context.py

@@ -3,6 +3,7 @@
 import ast
 import configparser
 import json
+import logging
 import os
 import re
 import subprocess  # nosec
@@ -57,6 +58,19 @@ KNOWN_SECRET_KEYS = ("OAUTH_PASSWORD", "OAUTH_CLIENT_SECRET", "OAUTH_ACCESS_TOKE
 SSL_VERIFY_WARNING = "SSL verification is disabled (SSL_VERIFY=False)."
 
 
+class ClickHandler(logging.Handler):
+    """Custom logging handler that outputs using click.secho with dimming."""
+
+    def emit(self, record: logging.LogRecord) -> None:
+        """Emit a log record using click.secho."""
+        try:
+            now = datetime.now(tz=timezone.utc)
+            msg = self.format(record)
+            click.secho(f"[{now!s}] {msg}", err=True, dim=True)
+        except Exception:  # noqa: BLE001
+            self.handleError(record)
+
+
 def build_caption(
     count: int,
     item_name: str,
@@ -101,12 +115,14 @@ class ApplicationContext:
     connection: str | None
     console: Console
     console_width: int | None = None
+    log_level: str | None = None
 
     def __init__(
         self,
         config_file: str,
         connection: str | None = None,
         debug: bool = False,
+        log_level: str | None = None,
         quiet: bool = False,
     ):
         """Initialize main context."""
@@ -114,6 +130,7 @@ class ApplicationContext:
         self.app_name = "cmemc"
         self.set_debug(debug)
         self.set_quiet(quiet)
+        self.log_level = log_level
         self.ensure_app_config_dir()
         self.set_connection(connection)
         self.set_external_http_timeout(self.DEFAULT_EXTERNAL_HTTP_TIMEOUT)
@@ -123,7 +140,18 @@ class ApplicationContext:
     @property
     def client(self) -> Client:
         """The cmem_client Client object."""
-        return Client.from_cmempy()
+        client = Client.from_cmempy()
+        if self.debug:
+            level = self.log_level or "DEBUG"
+            handler = ClickHandler()
+            formatter = logging.Formatter("%(name)s - [%(levelname)s] - %(message)s")
+            handler.setFormatter(formatter)
+            client.configure_client_logger(
+                level=level,
+                format_string="%(name)s - [%(levelname)s] - %(message)s",
+                handlers=[handler],
+            )
+        return client
 
     @staticmethod
     def from_params(params: dict) -> "ApplicationContext":
@@ -134,6 +162,7 @@ class ApplicationContext:
         config_file = params.get("config_file")
         debug = str_to_bool(str(params.get("debug")))
         quiet = str_to_bool(str(params.get("quiet")))
+        log_level = str(params.get("log_level")) if params.get("log_level") else None
         external_http_timeout = (
             int(str(params.get("external_http_timeout")))
             if "external_http_timeout" in params
@@ -143,7 +172,11 @@ class ApplicationContext:
         if not config_file:
             raise ValueError("Missing required key: 'config_file' in config dictionary")
         app = ApplicationContext(
-            config_file=config_file, connection=connection, debug=debug, quiet=quiet
+            config_file=config_file,
+            connection=connection,
+            debug=debug,
+            quiet=quiet,
+            log_level=log_level,
         )
         app.set_external_http_timeout(external_http_timeout)
         if not app.debug:
@@ -184,6 +217,10 @@ class ApplicationContext:
         """Set debug state"""
         self.debug = debug
 
+    def set_log_level(self, log_level: str) -> None:
+        """Set log level"""
+        self.log_level = log_level
+
     def set_quiet(self, quiet: bool = False) -> None:
         """Set quiets state"""
         self.quiet = quiet
@@ -247,6 +284,9 @@ class ApplicationContext:
         for key, value in config.items():
             if key == "CMEMC_DEBUG":
                 self.set_debug(str_to_bool(value))
+            elif key == "CMEMC_LOG_LEVEL":
+                self.set_log_level(value)
+                self.echo_debug(f"set log level to {value}")
             elif key == "CMEMC_QUIET":
                 self.set_quiet(str_to_bool(value))
             elif key == "CMEMC_CONNECTION":

{cmem_cmemc-26.1.0rc3 → cmem_cmemc-26.1.0rc4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmem-cmemc"
-version = "26.1.0rc3"
+version = "26.1.0rc4"
 description = "Command line client for eccenca Corporate Memory"
 license = "Apache-2.0"
 classifiers = [
@@ -36,7 +36,7 @@ click-didyoumean = "^0.3.1"
 click-help-colors = "^0.9.4"
 cmem-cmempy = "==25.4.0"
 # cmem-cmempy = { path = "cmempy", develop = true }
-cmem-client = "=0.7.1"
+cmem-client = "=0.8.0"
 # cmem-client = { path = "cmem-client", develop = true }
 configparser = "^7.2.0"
 jinja2 = "^3.1.6"