cmem-cmemc 25.5.0rc1__tar.gz → 25.6.0__tar.gz

{cmem_cmemc-25.5.0rc1 → cmem_cmemc-25.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmem-cmemc
-Version: 25.5.0rc1
+Version: 25.6.0
 Summary: Command line client for eccenca Corporate Memory
 License: Apache-2.0
 License-File: LICENSE
@@ -34,6 +34,7 @@ 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.4.0)
 Requires-Dist: configparser (>=7.2.0,<8.0.0)
+Requires-Dist: humanize (>=4.14.0,<5.0.0)
 Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
 Requires-Dist: junit-xml (>=1.9,<2.0)
 Requires-Dist: natsort (>=8.4.0,<9.0.0)

{cmem_cmemc-25.5.0rc1 → cmem_cmemc-25.6.0}/cmem_cmemc/command_group.py

@@ -24,49 +24,50 @@ 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,
                 "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)

{cmem_cmemc-25.5.0rc1 → cmem_cmemc-25.6.0}/cmem_cmemc/commands/acl.py

@@ -51,6 +51,10 @@ HELP_TEXTS = {
         "end of the pattern or the wildcard alone."
     ),
     "query": "Dynamic access condition query (file or the query catalog IRI).",
+    "replace": (
+        "Replace (overwrite) existing access condition, if present. "
+        "Can be used only in combination with '--id'."
+    ),
 }
 
 WARNING_UNKNOWN_USER = "Unknown User or no access to get user info."
@@ -255,6 +259,7 @@ def inspect_command(app: ApplicationContext, access_condition_id: str, raw: bool
     type=click.STRING,
     help=HELP_TEXTS["description"],
 )
+@click.option("--replace", is_flag=True, help=HELP_TEXTS["replace"])
 @click.pass_obj
 # pylint: disable-msg=too-many-arguments
 def create_command(  # noqa: PLR0913
@@ -271,6 +276,7 @@ def create_command(  # noqa: PLR0913
     write_graph_patterns: tuple[str],
     action_patterns: tuple[str],
     query: str,
+    replace: bool,
 ) -> None:
     """Create an access condition.
 
@@ -293,6 +299,9 @@ def create_command(  # noqa: PLR0913
 
     Example: cmemc admin acl create --group local-users --write-graph https://example.org/
     """
+    if replace and not id_:
+        raise click.UsageError("To replace an access condition, you must specify an ID.")
+
     if (
         not read_graphs
         and not write_graphs
@@ -312,7 +321,7 @@ def create_command(  # noqa: PLR0913
         query_str = get_query_text(query, {"user", "group", "readGraph", "writeGraph"})
 
     if not user and not groups and not query:
-        app.echo_warning("Access conditions without a user or group assignment affect ALL users.")
+        app.echo_warning("Access conditions without a user or group assignment affects ALL users.")
 
     if not name:
         name = generate_acl_name(user=user, groups=groups, query=query)
@@ -320,11 +329,11 @@ def create_command(  # noqa: PLR0913
     if not description:
         description = "This access condition was created with cmemc."
 
-    app.echo_info(
-        f"Creating access condition '{name}' ... ",
-        nl=False,
-    )
-
+    if replace and NS_ACL + id_ in [_["iri"] for _ in fetch_all_acls()]:
+        app.echo_info(f"Replacing access condition '{id_}' ... ", nl=False)
+        delete_access_condition(iri=NS_ACL + id_)
+    else:
+        app.echo_info(f"Creating access condition '{name}' ... ", nl=False)
     create_access_condition(
         name=name,
         static_id=id_,

{cmem_cmemc-25.5.0rc1 → cmem_cmemc-25.6.0}/cmem_cmemc/commands/dataset.py

@@ -16,16 +16,14 @@ from cmem.cmempy.workspace.projects.datasets.dataset import (
     update_dataset,
 )
 from cmem.cmempy.workspace.projects.resources.resource import (
-    create_resource,
     get_resource_response,
-    resource_exist,
 )
 from cmem.cmempy.workspace.search import list_items
 
 from cmem_cmemc import completion
 from cmem_cmemc.command import CmemcCommand
 from cmem_cmemc.command_group import CmemcGroup
-from cmem_cmemc.commands.resource import resource
+from cmem_cmemc.commands.file import _upload_file_resource, resource
 from cmem_cmemc.completion import get_dataset_file_mapping
 from cmem_cmemc.context import ApplicationContext
 from cmem_cmemc.exceptions import CmemcError
@@ -147,57 +145,6 @@ def _post_file_resource(
     app.echo_success("done")
 
 
-def _upload_file_resource(
-    app: ApplicationContext,
-    project_id: str,
-    local_file_name: str,
-    remote_file_name: str,
-    replace: bool,
-) -> None:
-    """Upload a local file as a dataset resource to a project.
-
-    Args:
-    ----
-        app: the click cli app context.
-        project_id: The project ID in the workspace.
-        local_file_name: The path to the local file name
-        remote_file_name: The remote file name
-        replace: Replace resource if needed.
-
-    Raises:
-    ------
-        ValueError: if resource exists and no replace
-
-    """
-    exist = resource_exist(project_name=project_id, resource_name=remote_file_name)
-    if exist and not replace:
-        raise ClickException(
-            f"A file resource with the name '{remote_file_name}' already "
-            "exists in this project. \n"
-            "Please rename the file or use the '--replace' "
-            "parameter in order to overwrite the remote file."
-        )
-    if exist:
-        app.echo_info(
-            f"Replace content of {remote_file_name} with content from "
-            f"{local_file_name} in project {project_id} ... ",
-            nl=False,
-        )
-    else:
-        app.echo_info(
-            f"Upload {local_file_name} as a file resource "
-            f"{remote_file_name} to project {project_id} ... ",
-            nl=False,
-        )
-    create_resource(
-        project_name=project_id,
-        resource_name=remote_file_name,
-        file_resource=ClickSmartPath.open(local_file_name),
-        replace=replace,
-    )
-    app.echo_success("done")
-
-
 def _get_metadata_out_of_parameter(parameter_dict: dict) -> dict:
     """Extract metadata keys out of the parameter dict.