cmem-cmemc 25.2.0__tar.gz → 25.4.0__tar.gz

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cmem-cmemc
-Version: 25.2.0
+Version: 25.4.0
 Summary: Command line client for eccenca Corporate Memory
 License: Apache-2.0
 Author: eccenca
@@ -30,7 +30,7 @@ Requires-Dist: certifi (>=2024.2.2)
 Requires-Dist: click (>=8.1.8,<8.2.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-cmempy (==25.1.0)
+Requires-Dist: cmem-cmempy (==25.3.0)
 Requires-Dist: configparser (>=7.2.0,<8.0.0)
 Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
 Requires-Dist: junit-xml (>=1.9,<2.0)

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/commands/query.py

@@ -10,8 +10,8 @@ from time import sleep, time
 from uuid import uuid4
 
 import click
-from click import ClickException, UsageError
 from click.shell_completion import CompletionItem
+from cmem.cmempy.config import get_cmem_base_uri
 from cmem.cmempy.queries import (
     QueryCatalog,
     SparqlQuery,
@@ -91,12 +91,12 @@ class ReplayStatistics:
                 iri = query_["iri"]
                 catalog_entry = self.catalog.get_query(iri)
                 if catalog_entry is None:
-                    raise ClickException(f"measure_query - query {iri} is not in catalog.")
+                    raise click.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 ClickException(
+            raise click.ClickException(
                 "measure_query - given input dict has no queryString key."
             ) from error
 
@@ -330,6 +330,13 @@ def _output_query_status_details(app: ApplicationContext, status_dict: dict) ->
 
 
 @click.command(cls=CmemcCommand, name="list")
+@click.option(
+    "--catalog-graph",
+    default="https://ns.eccenca.com/data/queries/",
+    show_default=True,
+    shell_complete=completion.graph_uris,
+    help="The used query catalog graph.",
+)
 @click.option(
     "--id-only",
     is_flag=True,
@@ -337,13 +344,13 @@ def _output_query_status_details(app: ApplicationContext, status_dict: dict) ->
     "This is useful for piping the ids into other cmemc commands.",
 )
 @click.pass_obj
-def list_command(app: ApplicationContext, id_only: bool) -> None:
+def list_command(app: ApplicationContext, catalog_graph: str, id_only: bool) -> None:
     """List available queries from the catalog.
 
     Outputs a list of query URIs which can be used as reference for
     the query execute command.
     """
-    queries = QueryCatalog().get_queries().items()
+    queries = QueryCatalog(graph=catalog_graph).get_queries().items()
     if id_only:
         # sort dict by short_url - https://docs.python.org/3/howto/sorting.html
         for _, sparql_query in sorted(queries, key=lambda k: k[1].short_url.lower()):
@@ -359,7 +366,12 @@ def list_command(app: ApplicationContext, id_only: bool) -> None:
             ]
             table.append(row)
         app.echo_info_table(
-            table, headers=["Query URI", "Type", "Placeholder", "Label"], sort_column=3
+            table,
+            headers=["Query URI", "Type", "Placeholder", "Label"],
+            sort_column=3,
+            empty_table_message="There are no query available in the "
+            f"selected catalog ({catalog_graph}).",
+            caption=f"Queries from {catalog_graph} ({get_cmem_base_uri()})",
         )
 
 
@@ -367,6 +379,13 @@ def list_command(app: ApplicationContext, id_only: bool) -> None:
 @click.argument(
     "QUERIES", nargs=-1, required=True, shell_complete=completion.remote_queries_and_sparql_files
 )
+@click.option(
+    "--catalog-graph",
+    default="https://ns.eccenca.com/data/queries/",
+    show_default=True,
+    shell_complete=completion.graph_uris,
+    help="The used query catalog graph.",
+)
 @click.option(
     "--accept",
     default="default",
@@ -420,6 +439,7 @@ def list_command(app: ApplicationContext, id_only: bool) -> None:
 def execute_command(  # noqa: PLR0913
     app: ApplicationContext,
     queries: tuple[str, ...],
+    catalog_graph: str,
     accept: str,
     no_imports: bool,
     base64: bool,
@@ -453,9 +473,14 @@ def execute_command(  # noqa: PLR0913
     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: SparqlQuery = QueryCatalog().get_query(file_or_uri, placeholder=placeholder)
+        executed_query: SparqlQuery = QueryCatalog(graph=catalog_graph).get_query(
+            file_or_uri, placeholder=placeholder
+        )
         if executed_query is None:
-            raise ClickException(f"{file_or_uri} is neither a (readable) file nor a query URI.")
+            raise click.UsageError(
+                f"{file_or_uri} is neither a (readable) file nor "
+                f"a query URI in the catalog graph {catalog_graph}"
+            )
         app.echo_debug(
             f"Execute ({executed_query.query_type}): "
             f"{executed_query.label} < {executed_query.url}"
@@ -499,8 +524,15 @@ def execute_command(  # noqa: PLR0913
 @click.argument(
     "QUERIES", nargs=-1, required=True, shell_complete=completion.remote_queries_and_sparql_files
 )
+@click.option(
+    "--catalog-graph",
+    default="https://ns.eccenca.com/data/queries/",
+    show_default=True,
+    shell_complete=completion.graph_uris,
+    help="The used query catalog graph.",
+)
 @click.pass_obj
-def open_command(app: ApplicationContext, queries: tuple[str, ...]) -> None:
+def open_command(app: ApplicationContext, queries: tuple[str, ...], catalog_graph: str) -> None:
     """Open queries in the editor of the query catalog in your browser.
 
     With this command, you can open (remote) queries from the query catalog in
@@ -512,10 +544,13 @@ def open_command(app: ApplicationContext, queries: tuple[str, ...]) -> None:
     opening multiple browser tabs.
     """
     for file_or_uri in queries:
-        opened_query = QueryCatalog().get_query(file_or_uri)
+        opened_query = QueryCatalog(graph=catalog_graph).get_query(file_or_uri)
         if opened_query is None:
-            raise ClickException(f"{file_or_uri} is neither a (readable) file nor a query URI.")
-        open_query_uri = opened_query.get_editor_url()
+            raise click.UsageError(
+                f"{file_or_uri} is neither a (readable) file nor "
+                f"a query URI in the catalog graph {catalog_graph}"
+            )
+        open_query_uri = opened_query.get_editor_url(graph=catalog_graph)
         app.echo_debug(f"Open {file_or_uri}: {open_query_uri}")
         click.launch(open_query_uri)
 
@@ -571,7 +606,7 @@ def status_command(
         queries = query_status_list.apply_filters(ctx=ctx, filter_=filter_)
 
     if query_id and len(queries) == 0:
-        raise UsageError(f"Query with ID '{query_id}' does not exist (anymore).")
+        raise click.UsageError(f"Query with ID '{query_id}' does not exist (anymore).")
 
     if raw:
         app.echo_info_json(queries)
@@ -666,14 +701,14 @@ def replay_command(  # noqa: PLR0913
     other data.
     """
     if loops <= 0:
-        raise UsageError("Please set a positive loops integer value (>=1).")
+        raise click.UsageError("Please set a positive loops integer value (>=1).")
     try:
         with Path(replay_file).open(encoding="utf8") as _:
             input_queries = load(_)
     except JSONDecodeError as error:
-        raise ClickException(f"File {replay_file} is not a valid JSON document.") from error
+        raise click.ClickException(f"File {replay_file} is not a valid JSON document.") from error
     if len(input_queries) == 0:
-        raise ClickException(f"File {replay_file} contains no queries.")
+        raise click.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-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/commands/store.py

@@ -10,6 +10,7 @@ from cmem.cmempy.dp.admin import create_showcase_data, delete_bootstrap_data, im
 from cmem.cmempy.dp.admin.backup import get_zip, post_zip
 from cmem.cmempy.dp.workspace import migrate_workspaces
 from cmem.cmempy.health import get_dp_info
+from cmem.cmempy.workspace import reload_workspace
 from jinja2 import Template
 
 from cmem_cmemc.command import CmemcCommand
@@ -53,7 +54,7 @@ def bootstrap_command(app: ApplicationContext, import_: bool, remove: bool) -> N
 
     Note: The import part of this command is equivalent to the 'bootstrap-data' migration recipe
     """
-    if import_ and remove or not import_ and not remove:
+    if (import_ and remove) or (not import_ and not remove):
         raise UsageError("Either use the --import or the --remove option.")
     if import_:
         app.echo_info("Update or import bootstrap data ... ", nl=False)
@@ -99,12 +100,15 @@ def showcase_command(app: ApplicationContext, scale: int, create: bool, delete:
         raise UsageError("Either use the --create or the --delete flag.")
     if delete:
         raise NotImplementedError(
-            "This feature is not implemented yet. " "Please delete the graphs manually."
+            "This feature is not implemented yet. Please delete the graphs manually."
         )
     if create:
         app.echo_info(f"Create showcase data with scale factor {scale} ... ", nl=False)
         create_showcase_data(scale_factor=scale)
         app.echo_success("done")
+        app.echo_info("Reload workspace  ... ", nl=False)
+        reload_workspace()
+        app.echo_success("done")
 
 
 @click.command(cls=CmemcCommand, name="export")

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/commands/workflow.py

@@ -51,8 +51,15 @@ FILE_EXTENSIONS_TO_PLUGIN_ID = {
     ".json": "json",
     ".xml": "xml",
     ".txt": "text",
+    ".md": "text",
     ".xlsx": "excel",
     ".zip": "multiCsv",
+    ".pdf": "binaryFile",
+    ".png": "binaryFile",
+    ".jpg": "binaryFile",
+    ".jpeg": "binaryFile",
+    ".gif": "binaryFile",
+    ".tiff": "binaryFile",
 }
 
 # Derive valid extensions from FILE_EXTENSIONS_TO_PLUGIN_ID keys
@@ -63,6 +70,7 @@ EXTRA_INPUT_MIME_TYPES = [
     "application/json",
     "application/xml",
     "text/csv",
+    "application/octet-stream",
 ]
 
 EXTRA_OUTPUT_MIME_TYPES = [
@@ -71,6 +79,7 @@ EXTRA_OUTPUT_MIME_TYPES = [
     "application/n-triples",
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
     "text/csv",
+    "application/octet-stream",
 ]
 
 STDOUT_UNSUPPORTED_MIME_TYPES = {

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/completion.py

@@ -495,32 +495,6 @@ def installable_packages(ctx: Context, param: Argument, incomplete: str) -> list
     )
 
 
-def workflow_io_input_files(ctx: Context, param: Argument, incomplete: str) -> list[CompletionItem]:
-    """Prepare a list of acceptable workflow io input files."""
-    return (
-        file_list(incomplete=incomplete, suffix=".csv", description="CSV Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".xml", description="XML Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".json", description="JSON Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".xlsx", description="Excel Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".txt", description="Text Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".zip", description="Multi CSV Dataset resource")
-    )
-
-
-def workflow_io_input_mimetypes(
-    ctx: Context, param: Argument, incomplete: str
-) -> list[CompletionItem]:
-    """Prepare a list of acceptable workflow io input mimetypes."""
-    return (
-        file_list(incomplete=incomplete, suffix=".csv", description="CSV Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".xml", description="XML Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".json", description="JSON Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".xlsx", description="Excel Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".txt", description="Text Dataset resource")
-        + file_list(incomplete=incomplete, suffix=".zip", description="Multi CSV Dataset resource")
-    )
-
-
 def workflow_io_output_files(
     ctx: Context, param: Argument, incomplete: str
 ) -> list[CompletionItem]:
@@ -535,6 +509,18 @@ def workflow_io_output_files(
     )
 
 
+def workflow_io_input_files(ctx: Context, param: Argument, incomplete: str) -> list[CompletionItem]:
+    """Prepare a list of acceptable workflow io input files."""
+    files = []
+    for extension, info in get_dataset_file_mapping().items():
+        # handle zip extension separately.
+        if extension != ".zip":
+            files += file_list(
+                incomplete=incomplete, suffix=extension, description=info["description"]
+            )
+    return files
+
+
 def get_dataset_file_mapping() -> dict[str, dict[str, str]]:
     """Return file extension to type and description mapping"""
     return {
@@ -547,15 +533,22 @@ def get_dataset_file_mapping() -> dict[str, dict[str, str]]:
         ".json.zip": {"description": "JSON Dataset resource (zipped)", "type": "json"},
         ".jsonl": {"description": "JSON Lines Dataset resource", "type": "json"},
         ".jsonl.zip": {"description": "JSON Lines Dataset resource (zipped)", "type": "json"},
-        ".yaml": {"description": "YAML Document", "type": "text"},
-        ".yaml.zip": {"description": "YAML Document (zipped)", "type": "text"},
-        ".yml": {"description": "YAML Document", "type": "text"},
-        ".yml.zip": {"description": "YAML Document (zipped)", "type": "text"},
+        ".yaml": {"description": "YAML Text Document", "type": "text"},
+        ".yaml.zip": {"description": "YAML Text Document (zipped)", "type": "text"},
+        ".md": {"description": "Markdown Text Document", "type": "text"},
+        ".md.zip": {"description": "Markdown Text Document (zipped)", "type": "text"},
+        ".yml": {"description": "YAML Text Document", "type": "text"},
+        ".yml.zip": {"description": "YAML Text Document (zipped)", "type": "text"},
         ".ttl": {"description": "RDF file Dataset resource", "type": "file"},
         ".orc": {"description": "Apache ORC Dataset resource", "type": "orc"},
         ".txt": {"description": "Text dataset resource", "type": "text"},
         ".txt.zip": {"description": "Text dataset resource (zipped)", "type": "text"},
-        ".zip": {"description": "multiCsv Dataset resource", "type": "multiCsv"},
+        ".zip": {"description": "Potential multiCsv Dataset resource", "type": "multiCsv"},
+        ".pdf": {"description": "Potential Binary Dataset resource", "type": "binaryFile"},
+        ".png": {"description": "Potential Binary Dataset resource", "type": "binaryFile"},
+        ".jpg": {"description": "Potential Binary Dataset resource", "type": "binaryFile"},
+        ".gif": {"description": "Potential Binary Dataset resource", "type": "binaryFile"},
+        ".tiff": {"description": "Potential Binary Dataset resource", "type": "binaryFile"},
     }
 
 
@@ -650,10 +643,11 @@ def placeholder(ctx: Context, param: Argument, incomplete: str) -> list[Completi
     args = get_completion_args(incomplete)
     # setup configuration
     ApplicationContext.set_connection_from_params(ctx.find_root().params)
+    catalog_graph = ctx.params.get("catalog_graph")
     # extract placeholder from given queries in the command line
     options = []
     placeholders: dict[str, QueryPlaceholder] = {}
-    catalog = QueryCatalog()  # fetch all queries
+    catalog = QueryCatalog(graph=catalog_graph) if catalog_graph else QueryCatalog()
     for _, arg in enumerate(args):
         query = catalog.get_query(arg)
         if query is not None:
@@ -661,7 +655,7 @@ def placeholder(ctx: Context, param: Argument, incomplete: str) -> list[Completi
             placeholders = placeholders | get_placeholders_for_query(iri=query.url)
             # collect all placeholder keys
             options.extend(list(query.get_placeholder_keys()))
-    # look if cursor is in value position of the -p option and
+    # look if the cursor is in value position of the -p option and
     # use placeholder value completion, in case it is
     if args[len(args) - 2] in ("-p", "--parameter"):
         key = args[len(args) - 1]
@@ -683,8 +677,10 @@ def placeholder(ctx: Context, param: Argument, incomplete: str) -> list[Completi
 def remote_queries(ctx: Context, param: Argument, incomplete: str) -> list[CompletionItem]:
     """Prepare a list of query URIs."""
     ApplicationContext.set_connection_from_params(ctx.find_root().params)
+    catalog_graph = ctx.params.get("catalog_graph")
+    catalog = QueryCatalog(graph=catalog_graph) if catalog_graph else QueryCatalog()
     options = []
-    for query in QueryCatalog().get_queries().values():
+    for query in catalog.get_queries().values():
         url = query.short_url
         label = query.label
         options.append((url, label))

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/context.py

@@ -29,9 +29,9 @@ from cmem_cmemc.exceptions import InvalidConfigurationError
 from cmem_cmemc.string_processor import StringProcessor, process_row
 from cmem_cmemc.utils import is_enabled, str_to_bool
 
-DI_TARGET_VERSION = "v25.1.0"
+DI_TARGET_VERSION = "v25.2.0"
 
-EXPLORE_TARGET_VERSION = "v25.1.0"
+EXPLORE_TARGET_VERSION = "v25.2.0"
 
 KNOWN_CONFIG_KEYS = {
     "CMEM_BASE_URI": cmempy_config.get_cmem_base_uri,

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/cmem_cmemc/manual_helper/multi_page.py

@@ -31,6 +31,7 @@ def get_icon_for_command_group(full_name: str) -> str:
         "project variable": "material/variable-box",
         "query": "eccenca/application-queries",
         "graph": "eccenca/artefact-dataset-eccencadataplatform",
+        "graph imports": "material/family-tree",
         "graph validation": "octicons/verified-16",
         "vocabulary": "eccenca/application-vocabularies",
         "vocabulary cache": "eccenca/application-vocabularies",
@@ -58,6 +59,7 @@ def get_tags_for_command_group(full_name: str) -> str:
         "project variable": ["Variables", "cmemc"],
         "query": ["SPARQL", "cmemc"],
         "graph": ["KnowledgeGraph", "cmemc"],
+        "graph imports": ["KnowledgeGraph", "cmemc"],
         "graph validation": ["KnowledgeGraph", "Validation", "cmemc"],
         "vocabulary": ["Vocabulary", "cmemc"],
         "vocabulary cache": ["Vocabulary", "cmemc"],

{cmem_cmemc-25.2.0 → cmem_cmemc-25.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmem-cmemc"
-version = "25.2.0"
+version = "25.4.0"
 description = "Command line client for eccenca Corporate Memory"
 license = "Apache-2.0"
 classifiers = [
@@ -35,7 +35,7 @@ certifi = ">=2024.2.2"
 click = "^8.1.8, <8.2.0"
 click-didyoumean = "^0.3.1"
 click-help-colors = "^0.9.4"
-cmem-cmempy = "==25.1.0"
+cmem-cmempy = "==25.3.0"
 # cmem-cmempy = { path = "cmempy", develop = true }
 configparser = "^7.2.0"
 jinja2 = "^3.1.6"
@@ -59,7 +59,7 @@ cmemc = 'cmem_cmemc.cli:main'
 
 [tool.poetry.group.dev.dependencies]
 genbadge = {extras = ["coverage"], version = "^1.1.1"}
-mypy = "^1.13.0"
+mypy = "1.15.0"
 pip = "^25"
 pytest = "^8.3.3"
 pytest-cov = "^6.0.0"