cmem-cmemc 24.3.3__py3-none-any.whl → 25.1.0__py3-none-any.whl

cmem_cmemc/commands/graph.py

@@ -14,7 +14,7 @@ from xml.etree.ElementTree import (  # nosec
 )
 
 import click
-from click import Argument
+from click import Argument, ClickException, UsageError
 from cmem.cmempy.config import get_cmem_base_uri
 from cmem.cmempy.dp.authorization import refresh
 from cmem.cmempy.dp.proxy import graph as graph_api
@@ -121,7 +121,7 @@ def _get_export_names(
 
     Raises:
     ------
-        ValueError in case the template string produces a naming clash,
+        ClickException in case the template string produces a naming clash,
             means two IRIs result in the same filename
 
     """
@@ -135,7 +135,7 @@ def _get_export_names(
         _name_created = f"{Template(template).render(template_data)}{file_extension}"
         _names[iri] = _name_created
     if len(_names.values()) != len(set(_names.values())):
-        raise ValueError(
+        raise ClickException(
             "The given template string produces a naming clash. "
             "Please use a different template to produce unique names."
         )
@@ -208,7 +208,7 @@ def _get_graphs_filtered(filter_name: str, filter_value: str) -> list[dict]:
     # check for correct filter names
     possible_filter_names = ("access", "imported-by")
     if filter_name not in possible_filter_names:
-        raise ValueError(
+        raise ClickException(
             f"{filter_name} is an unknown filter name. " f"Use one of {possible_filter_names}."
         )
     # filter by access condition
@@ -218,14 +218,14 @@ def _get_graphs_filtered(filter_name: str, filter_value: str) -> list[dict]:
         elif filter_value == "readonly":
             graphs = get_graphs(writeable=False, readonly=True)
         else:
-            raise ValueError("Filter access is either 'readonly' or 'writeable'.")
+            raise ClickException("Filter access is either 'readonly' or 'writeable'.")
     else:
         # default is all graphs
         graphs = get_graphs()
     # filter by imported-by
     if filter_name == "imported-by":
         if filter_value not in get_graphs_as_dict():
-            raise ValueError(UNKNOWN_GRAPH_ERROR.format(filter_value))
+            raise ClickException(UNKNOWN_GRAPH_ERROR.format(filter_value))
         imported_graphs = get_graph_imports(filter_value)
         graphs = [_ for _ in graphs if _["iri"] in imported_graphs]
     return graphs
@@ -271,19 +271,19 @@ def _check_and_extend_exported_graphs(
 
     Raises:
     ------
-         ValueError
+         UsageError or ClickException
 
     """
     # transform given IRI-tuple to a distinct IRI-list
     iris = list(set(iris))
     if len(iris) == 0 and not all_flag:
-        raise ValueError(
+        raise UsageError(
             "Either provide at least one graph IRI or use the --all option "
             "in order to work with all graphs."
         )
     for iri in iris:
         if iri not in all_graphs:
-            raise ValueError(UNKNOWN_GRAPH_ERROR.format(iri))
+            raise ClickException(UNKNOWN_GRAPH_ERROR.format(iri))
     if all_flag:
         # in case --all is given,
         # list of graphs is filled with all available graph IRIs
@@ -377,7 +377,7 @@ def tree_command(
     """
     graphs = get_graphs_as_dict()
     if not iris and not all_:
-        raise ValueError(
+        raise UsageError(
             "Either specify at least one graph IRI or use the "
             "--all option to show the owl:imports tree of all graphs."
         )
@@ -386,7 +386,7 @@ def tree_command(
 
     for iri in iris:
         if iri not in graphs:
-            raise ValueError(UNKNOWN_GRAPH_ERROR.format(iri))
+            raise ClickException(UNKNOWN_GRAPH_ERROR.format(iri))
 
     iris = sorted(iris, key=lambda x: graphs[x]["label"]["title"].lower())
 
@@ -413,7 +413,7 @@ def tree_command(
         output += os.linesep.join(
             [
                 line
-                for line in tree.show(key=lambda x: x.tag.lower(), stdout=False).splitlines()
+                for line in tree.show(key=lambda x: x.tag.lower(), stdout=False).splitlines()  # type: ignore[arg-type, return-value]
                 if line.strip()
             ]
         )
@@ -486,12 +486,12 @@ def _validate_export_command_input_parameters(
 ) -> None:
     """Validate export command input parameters combinations"""
     if output_dir and create_catalog and compress:
-        raise click.UsageError(
+        raise UsageError(
             "Cannot create a catalog file when using a compressed graph file."
             " Please remove either the --create-catalog or --compress option."
         )
     if output_file == "- " and compress:
-        raise click.UsageError("Cannot output a binary file to terminal. Use --output-file option.")
+        raise UsageError("Cannot output a binary file to terminal. Use --output-file option.")
 
 
 # pylint: disable=too-many-arguments,too-many-locals
@@ -618,9 +618,7 @@ def export_command(  # noqa: PLR0913
     # no output directory set -> file export
     if output_file == "-":
         if compress:
-            raise click.UsageError(
-                "Cannot output a binary file to terminal. Use --output-file option."
-            )
+            raise UsageError("Cannot output a binary file to terminal. Use --output-file option.")
         # in case a file is stdout,
         # all triples from all graphs go in and other output is suppressed
         app.echo_debug("output is stdout")
@@ -647,7 +645,7 @@ def validate_input_path(input_path: str) -> None:
     """Validate input path
 
     This function checks the provided folder for any .ttl or .nt files
-    that have corresponding .gz files. If such files are found, it raises a ValueError.
+    that have corresponding .gz files. If such files are found, it raises a ClickException.
     """
     files = os.listdir(input_path)
 
@@ -659,7 +657,7 @@ def validate_input_path(input_path: str) -> None:
     conflicting_files = [f for f in gz_files if f in files]
 
     if conflicting_files:
-        raise ValueError(
+        raise ClickException(
             f"The following RDF files (.ttl/.nt) have corresponding '.gz' files,"
             f" which is not allowed: {', '.join(conflicting_files)}"
         )
@@ -755,7 +753,7 @@ def import_command(
     Note: Directories are scanned on the first level only (not recursively).
     """
     if replace and skip_existing:
-        raise ValueError(
+        raise UsageError(
             "The options --replace and --skip-existing are mutually "
             "exclusive, so please remove one of them."
         )
@@ -779,7 +777,7 @@ def import_command(
 
     elif SmartPath(input_path).is_file():
         if iri is None:
-            raise ValueError(
+            raise UsageError(
                 "Either specify an input file AND a graph IRI or an input directory ONLY."
             )
         graphs = [(input_path, iri)]
@@ -878,7 +876,7 @@ def count_command(
     Counts do not include imported graphs.
     """
     if not iris and not all_:
-        raise ValueError(
+        raise UsageError(
             "Either specify at least one graph IRI " "or use the --all option to count all graphs."
         )
     if all_:

cmem_cmemc/commands/manual.py

@@ -0,0 +1,56 @@
+"""manual command for cmem command line interface"""
+
+import click
+from click import Context, UsageError
+
+from cmem_cmemc.command import CmemcCommand
+from cmem_cmemc.manual_helper.graph import print_manual_graph
+from cmem_cmemc.manual_helper.multi_page import create_multi_page_documentation
+from cmem_cmemc.manual_helper.single_page import print_manual
+from cmem_cmemc.parameter_types.path import ClickSmartPath
+from cmem_cmemc.utils import get_version
+
+FORMAT_MD_FILE = "markdown-single-page"
+FORMAT_MD_DIRECTORY = "markdown-multi-page"
+FORMAT_TURTLE_FILE = "turtle"
+
+
+@click.command(cls=CmemcCommand, name="manual", hidden=True)
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice([FORMAT_MD_FILE, FORMAT_MD_DIRECTORY, FORMAT_TURTLE_FILE]),
+    help=f"Output format. The '{FORMAT_TURTLE_FILE}' and '{FORMAT_MD_FILE}' formats will "
+    f"be returned to stdout. The '{FORMAT_MD_DIRECTORY}' format creates a directory tree "
+    f"(use '--output-dir' to specify the root directory)",
+)
+@click.option(
+    "--output-dir",
+    type=ClickSmartPath(writable=True, file_okay=False),
+    help=f"The output directory to create the '{FORMAT_MD_DIRECTORY}' documentation. "
+    f"Warning: Existing directories will be overwritten.",
+)
+@click.pass_context
+def manual_command(ctx: Context, format_: str, output_dir: str) -> None:
+    """Generate reference documentation assets.
+
+    This command generates the cmemc reference documentation from the help texts
+    and outputs it in different formats.
+    """
+    if format_ is None:
+        raise UsageError(
+            "Please use the --format option to specify an output format. "
+            "Use --help for more information."
+        )
+    if format_ == FORMAT_TURTLE_FILE:
+        print_manual_graph(ctx.find_root(), get_version())
+        return
+    if format_ == FORMAT_MD_FILE:
+        print_manual(ctx.find_root())
+        return
+    if output_dir is None:
+        raise UsageError(
+            f"The output format '{FORMAT_MD_DIRECTORY}' needs an output directory "
+            f"('--output-dir'). Use --help for more information."
+        )
+    create_multi_page_documentation(ctx.find_root(), str(output_dir))

cmem_cmemc/commands/metrics.py

@@ -1,7 +1,7 @@
 """metrics commands for cmem command line interface."""
 
 import click
-from click import Argument, Context
+from click import Argument, ClickException, Context, UsageError
 from click.shell_completion import CompletionItem
 from cmem.cmempy.api import request
 from cmem.cmempy.config import get_cmem_base_uri, get_di_api_endpoint, get_dp_api_endpoint
@@ -11,7 +11,7 @@ from requests import HTTPError
 from cmem_cmemc import completion
 from cmem_cmemc.command import CmemcCommand
 from cmem_cmemc.command_group import CmemcGroup
-from cmem_cmemc.context import CONTEXT, ApplicationContext
+from cmem_cmemc.context import ApplicationContext
 from cmem_cmemc.object_list import (
     DirectValuePropertyFilter,
     ObjectList,
@@ -96,7 +96,7 @@ metrics_list = ObjectList(
 
 def _complete_metrics_id(ctx: Context, param: Argument, incomplete: str) -> list[CompletionItem]:  # noqa: ARG001
     """Prepare a list of metric identifier."""
-    CONTEXT.set_connection_from_params(ctx.find_root().params)
+    ApplicationContext.set_connection_from_params(ctx.find_root().params)
     candidates = [(_["id"], _["documentation"]) for _ in metrics_list.apply_filters(ctx=ctx)]
     return completion.finalize_completion(candidates=candidates, incomplete=incomplete)
 
@@ -107,7 +107,7 @@ def _complete_metric_label_filter(
     incomplete: str,
 ) -> list[CompletionItem]:
     """Prepare a list of label name or values"""
-    CONTEXT.set_connection_from_params(ctx.find_root().params)
+    ApplicationContext.set_connection_from_params(ctx.find_root().params)
     args = completion.get_completion_args(incomplete)
     incomplete = incomplete.lower()
     options: list[str] = []
@@ -141,11 +141,11 @@ def _filter_samples(family: dict, label_filter: tuple[tuple[str, str], ...]) ->
         sample_labels = sample[1]
         for name, value in label_filter:
             if name not in labels:
-                raise ValueError(
+                raise ClickException(
                     f"The metric '{family_name}' does " f"not have a label named '{name}'."
                 )
             if value not in labels[name]:
-                raise ValueError(
+                raise ClickException(
                     f"The metric '{family_name}' does "
                     f"not have a label '{name}' with the value '{value}'."
                 )
@@ -200,12 +200,12 @@ def get_command(
     app = ctx.obj
     data = metrics_list.apply_filters(ctx=ctx, filter_=[("id", metric_id)])
     if len(data) == 0:
-        raise click.UsageError(
+        raise UsageError(
             f"No metric with ID '{metric_id}' found. "
             "Use the `metrics list` command to list all metrics."
         )
     if len(data) > 1:
-        raise click.UsageError("Unknown Error - More than one metric with ID '{metric_id}' found.")
+        raise UsageError("Unknown Error - More than one metric with ID '{metric_id}' found.")
     metric = data[0]
 
     samples = _filter_samples(metric, label_filter)
@@ -214,7 +214,7 @@ def get_command(
         return
 
     if len(samples) == 0:
-        raise ValueError(
+        raise ClickException(
             "No data - the given label combination filtered out "
             f"all available samples of the metric {metric_id}."
         )
@@ -248,12 +248,12 @@ def inspect_command(ctx: Context, metric_id: str, raw: bool) -> None:
     app = ctx.obj
     data = metrics_list.apply_filters(ctx=ctx, filter_=[("id", metric_id)])
     if len(data) == 0:
-        raise click.UsageError(
+        raise UsageError(
             f"No metric with ID '{metric_id}' found. "
             "Use the `metrics list` command to list all metrics."
         )
     if len(data) > 1:
-        raise click.UsageError("Unknown Error - More than one metric with ID '{metric_id}' found.")
+        raise UsageError("Unknown Error - More than one metric with ID '{metric_id}' found.")
     if raw:
         app.echo_info_json(data)
         return

cmem_cmemc/commands/migration.py

@@ -9,12 +9,13 @@ from click.shell_completion import CompletionItem
 from cmem_cmemc.command import CmemcCommand
 from cmem_cmemc.command_group import CmemcGroup
 from cmem_cmemc.completion import check_option_in_params, finalize_completion
-from cmem_cmemc.context import CONTEXT
+from cmem_cmemc.context import ApplicationContext
 from cmem_cmemc.migrations.access_conditions_243 import (
     MoveAccessConditionsToNewGraph,
     RenameAuthVocabularyResources,
 )
 from cmem_cmemc.migrations.bootstrap_data import MigrateBootstrapData
+from cmem_cmemc.migrations.remove_noop_triple_251 import RemoveHideHeaderFooterStatements
 from cmem_cmemc.migrations.shapes_widget_integrations_243 import (
     ChartsOnNodeShapesToToWidgetIntegrations,
     ChartsOnPropertyShapesToWidgetIntegrations,
@@ -32,7 +33,6 @@ from cmem_cmemc.object_list import (
 )
 
 if TYPE_CHECKING:
-    from cmem_cmemc.context import ApplicationContext
     from cmem_cmemc.migrations.abc import MigrationRecipe
 
 
@@ -58,6 +58,7 @@ def get_migrations(ctx: click.Context) -> list[dict]:  # noqa: ARG001
             WorkflowTriggerPropertyShapesToWidgetIntegrations(),
             TableReportPropertyShapesToWidgetIntegrations(),
             SparqlDatatypesToXsdString(),
+            RemoveHideHeaderFooterStatements(),
         ]
     ]
     data.sort(key=lambda x: x["first_version"])
@@ -66,7 +67,7 @@ def get_migrations(ctx: click.Context) -> list[dict]:  # noqa: ARG001
 
 def complete_migration_ids(ctx: Context, param: Argument, incomplete: str) -> list[CompletionItem]:
     """Prepare a list of migration recipe IDs"""
-    CONTEXT.set_connection_from_params(ctx.find_root().params)
+    ApplicationContext.set_connection_from_params(ctx.find_root().params)
     options = []
     for _ in get_migrations(ctx=ctx):
         id_ = _["id"]

cmem_cmemc/commands/project.py

@@ -7,7 +7,7 @@ import tempfile
 from zipfile import ZipFile
 
 import click
-from click import UsageError
+from click import ClickException, UsageError
 from cmem.cmempy.config import get_di_api_endpoint
 from cmem.cmempy.plugins.marshalling import (
     get_extension_by_plugin,
@@ -44,7 +44,7 @@ def _validate_projects_to_process(project_ids: tuple[str], all_flag: bool) -> li
     list of IDs is without duplicates, and validated if they exist
     """
     if project_ids == () and not all_flag:
-        raise ValueError(
+        raise UsageError(
             "Either specify at least one project ID "
             "or use the --all option to process over all projects."
         )
@@ -59,7 +59,7 @@ def _validate_projects_to_process(project_ids: tuple[str], all_flag: bool) -> li
     # test if one of the projects does NOT exist
     for _ in projects_to_process:
         if _ not in all_projects:
-            raise ValueError(f"Project {_} does not exist.")
+            raise ClickException(f"Project {_} does not exist.")
     return projects_to_process
 
 
@@ -104,7 +104,7 @@ def open_command(app: ApplicationContext, project_ids: tuple[str]) -> None:
     projects = get_projects()
     for _ in project_ids:
         if _ not in (p["name"] for p in projects):
-            raise ValueError(f"Project '{_}' not found.")
+            raise ClickException(f"Project '{_}' not found.")
         open_project_uri = f"{get_di_api_endpoint()}/workbench/projects/{_}"
         app.echo_debug(f"Open {_}: {open_project_uri}")
         click.launch(open_project_uri)
@@ -221,7 +221,7 @@ def create_command(
     Note: Projects can be listed by using the `project list` command.
     """
     if from_transformation and len(project_ids) > 1:
-        raise ValueError(
+        raise UsageError(
             "By using --from-transformation,"
             " the project ID parameter is limited to a single project ID."
         )
@@ -229,7 +229,7 @@ def create_command(
     all_projects = [_["name"] for _ in get_projects()]
     for project_id in project_ids:
         if project_id in all_projects:
-            raise ValueError(f"Project {project_id} already exists.")
+            raise ClickException(f"Project {project_id} already exists.")
 
     if from_transformation:
         transformation_parts = from_transformation.split(":")
@@ -385,7 +385,7 @@ def export_command(  # noqa: PLR0913
 
     extractable_types = ("xmlZip", "xmlZipWithoutResources")
     if extract and marshalling_plugin not in extractable_types:
-        raise ValueError(
+        raise UsageError(
             f"The export type {marshalling_plugin} can not be extracted. "
             f"Use one of {extractable_types}."
         )
@@ -480,12 +480,12 @@ def import_command(
 
     all_projects = get_projects()
     if project_id and not replace and project_id in ([_["name"] for _ in all_projects]):
-        raise ValueError(f"Project {project_id} is already there.")
+        raise ClickException(f"Project {project_id} is already there.")
 
     if Path(path).is_dir():
         if not (Path(path) / "config.xml").is_file():
             # fail early if directory is not an export
-            raise ValueError(f"Directory {path} seems not to be a export directory.")
+            raise ClickException(f"Directory {path} seems not to be a export directory.")
 
         app.echo_info(f"Import directory {path} to project {project_id} ... ", nl=False)
         # in case of a directory, we zip it to a temp file
@@ -512,7 +512,7 @@ def import_command(
     # Remove the temporary file
     pathlib.Path.unlink(pathlib.Path(uploaded_file))
     if "errorMessage" in validation_response:
-        raise ValueError(validation_response["errorMessage"])
+        raise ClickException(validation_response["errorMessage"])
     import_id = validation_response["projectImportId"]
 
     # get project_id from response if not given as parameter

cmem_cmemc/commands/python.py

@@ -5,7 +5,7 @@ from dataclasses import asdict
 from re import match
 
 import click
-from click import UsageError
+from click import ClickException, UsageError
 from cmem.cmempy.workspace.python import (
     install_package_by_file,
     install_package_by_name,
@@ -60,7 +60,7 @@ def install_command(app: ApplicationContext, package: str) -> None:
         install_response = install_package_by_file(package_file=package)
     except FileNotFoundError as not_found_error:
         if not _looks_like_a_package(package):
-            raise ValueError(
+            raise ClickException(
                 f"{package} does not look like a package name or requirement "
                 "string, and a file with this name also does not exists."
             ) from not_found_error
@@ -231,6 +231,12 @@ def list_plugins_command(
     except TypeError:
         plugins = raw_output  # DI <= 22.1 output
 
+    if not all(plugin.get("isRegistered", True) for plugin in plugins):
+        app.echo_warning(
+            "Some plugins are installed but not registered. "
+            "Use the 'admin workspace python reload' command to register all installed plugins."
+        )
+
     if raw:
         app.echo_info_json(plugins)
         return
@@ -286,6 +292,26 @@ def open_command(app: ApplicationContext, package: str) -> None:
     click.launch(full_url)
 
 
+@click.command(cls=CmemcCommand, name="reload")
+@click.pass_obj
+def reload_command(app: ApplicationContext) -> None:
+    """Reload / Register all installed plugins.
+
+    This command will register all installed plugins into the DataIntegration workspace.
+    This command is useful, when you are installing packages
+    into the DataIntegration Python environment without using the provided cmemc
+    commands (e.g. by mounting a prepared filesystem in the docker container).
+    """
+    app.echo_info("Reloading python packages ... ", nl=False)
+    update_plugin_response = update_plugins()
+    app.echo_debug(f"Updated Plugins: {update_plugin_response!s}")
+    update_errors = update_plugin_response.get("errors", [])
+    if len(update_errors) == 0:
+        app.echo_success("done")
+    else:
+        app.echo_error("error (use --debug for more information)")
+
+
 @click.group(cls=CmemcGroup)
 def python() -> CmemcGroup:  # type: ignore[empty-body]
     """List, install, or uninstall python packages.
@@ -304,3 +330,4 @@ python.add_command(uninstall_command)
 python.add_command(list_command)
 python.add_command(list_plugins_command)
 python.add_command(open_command)
+python.add_command(reload_command)

cmem_cmemc/commands/query.py

@@ -1,5 +1,6 @@
 """query commands for cmem command line interface."""
 
+import csv
 import json
 import sys
 from hashlib import sha1
@@ -9,7 +10,7 @@ from time import sleep, time
 from uuid import uuid4
 
 import click
-from click import UsageError
+from click import ClickException, UsageError
 from click.shell_completion import CompletionItem
 from cmem.cmempy.queries import (
     QueryCatalog,
@@ -90,12 +91,14 @@ class ReplayStatistics:
                 iri = query_["iri"]
                 catalog_entry = self.catalog.get_query(iri)
                 if catalog_entry is None:
-                    raise ValueError(f"measure_query - query {iri} is not in catalog.")
+                    raise ClickException(f"measure_query - query {iri} is not in catalog.")
                 return catalog_entry
             query_string = query_["queryString"]
             return SparqlQuery(text=query_string)
         except KeyError as error:
-            raise ValueError("measure_query - given input dict has no queryString key.") from error
+            raise ClickException(
+                "measure_query - given input dict has no queryString key."
+            ) from error
 
     def _update_statistic_on_success(self, duration: int) -> None:
         """Update statistics and counters."""
@@ -368,11 +371,9 @@ def list_command(app: ApplicationContext, id_only: bool) -> None:
     "--accept",
     default="default",
     show_default=True,
+    shell_complete=completion.sparql_accept_types,
     help="Accept header for the HTTP request(s). Setting this to 'default' "
-    "means that cmemc uses an appropriate accept header for terminal "
-    "output (text/csv for tables, text/turtle for graphs, * otherwise). "
-    "Please refer to the Corporate Memory system manual for a list "
-    "of accepted mime types.",
+    "means that cmemc uses an appropriate output for terminals.",
 )
 @click.option(
     "--no-imports",
@@ -445,16 +446,16 @@ def execute_command(  # noqa: PLR0913
     placeholder = {}
     for key, value in parameter:
         if key in placeholder:
-            raise ValueError(
+            raise click.UsageError(
                 "Parameter can be given only once, " f"Value for '{key}' was given twice."
             )
         placeholder[key] = value
     app.echo_debug("Parameter: " + str(placeholder))
     for file_or_uri in queries:
         app.echo_debug(f"Start of execution: {file_or_uri} with " f"placeholder {placeholder}")
-        executed_query = QueryCatalog().get_query(file_or_uri, placeholder=placeholder)
+        executed_query: SparqlQuery = QueryCatalog().get_query(file_or_uri, placeholder=placeholder)
         if executed_query is None:
-            raise ValueError(f"{file_or_uri} is neither a (readable) file nor a query URI.")
+            raise ClickException(f"{file_or_uri} is neither a (readable) file nor a query URI.")
         app.echo_debug(
             f"Execute ({executed_query.query_type}): "
             f"{executed_query.label} < {executed_query.url}"
@@ -475,7 +476,23 @@ def execute_command(  # noqa: PLR0913
             offset=offset,
             timeout=timeout,
         )
-        app.echo_result(results)
+        if accept == "default" and submitted_accept == "text/csv":
+            csv_reader = csv.reader(results.splitlines(), delimiter=",", quotechar='"')
+            table = []
+            headers = []
+            for index, row in enumerate(csv_reader):
+                if index == 0:
+                    headers = row
+                else:
+                    table.append(row)
+            app.echo_info_table(
+                table,
+                headers=headers,
+                empty_table_message="No results for this query.",
+                caption=f"Query results: {executed_query.label}",
+            )
+        else:
+            app.echo_result(results)
 
 
 @click.command(cls=CmemcCommand, name="open")
@@ -497,7 +514,7 @@ def open_command(app: ApplicationContext, queries: tuple[str, ...]) -> None:
     for file_or_uri in queries:
         opened_query = QueryCatalog().get_query(file_or_uri)
         if opened_query is None:
-            raise ValueError(f"{file_or_uri} is neither a (readable) file nor a query URI.")
+            raise ClickException(f"{file_or_uri} is neither a (readable) file nor a query URI.")
         open_query_uri = opened_query.get_editor_url()
         app.echo_debug(f"Open {file_or_uri}: {open_query_uri}")
         click.launch(open_query_uri)
@@ -653,9 +670,9 @@ def replay_command(  # noqa: PLR0913
         with Path(replay_file).open(encoding="utf8") as _:
             input_queries = load(_)
     except JSONDecodeError as error:
-        raise ValueError(f"File {replay_file} is not a valid JSON document.") from error
+        raise ClickException(f"File {replay_file} is not a valid JSON document.") from error
     if len(input_queries) == 0:
-        raise ValueError(f"File {replay_file} contains no queries.")
+        raise ClickException(f"File {replay_file} contains no queries.")
     app.echo_debug(f"File {replay_file} contains {len(input_queries)} queries.")
 
     statistic = ReplayStatistics(app=app, label=run_label)

cmem_cmemc/commands/resource.py

@@ -3,6 +3,7 @@
 import re
 
 import click
+from click import ClickException, UsageError
 from cmem.cmempy.workspace.projects.resources import get_all_resources
 from cmem.cmempy.workspace.projects.resources.resource import (
     delete_resource,
@@ -32,7 +33,7 @@ def _get_resources_filtered(
     """Get file resources but filtered according to name and value."""
     # check for correct filter names (filter ids is used internally only)
     if filter_name not in RESOURCE_FILTER_TYPES + RESOURCE_FILTER_TYPES_HIDDEN:
-        raise ValueError(
+        raise UsageError(
             f"{filter_name} is an unknown filter name. " f"Use one of {RESOURCE_FILTER_TYPES}."
         )
     # filter by ID list
@@ -136,7 +137,7 @@ def delete_command(
     all resources.
     """
     if resource_ids == () and not all_ and filters_ == ():
-        raise ValueError(
+        raise UsageError(
             "Either specify at least one resource ID or use the --all or "
             "--filter options to specify resources for deletion."
         )
@@ -145,7 +146,7 @@ def delete_command(
     if len(resource_ids) > 0:
         for resource_id in resource_ids:
             if resource_id not in [_["id"] for _ in resources]:
-                raise ValueError(f"Resource {resource_id} not available.")
+                raise ClickException(f"Resource {resource_id} not available.")
         # "filter" by id
         resources = _get_resources_filtered(resources, "ids", resource_ids)
     for _ in filters_: