cmem-cmemc 24.1.1rc1__tar.gz → 24.1.3rc1__tar.gz

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmem-cmemc
-Version: 24.1.1rc1
+Version: 24.1.3rc1
 Summary: Command line client for eccenca Corporate Memory
 Home-page: https://eccenca.com/go/cmemc
 License: Apache 2.0
@@ -26,7 +26,7 @@ Requires-Dist: certifi (>=2023.5.7)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: click-didyoumean (>=0.3.0,<0.4.0)
 Requires-Dist: click-help-colors (>=0.9.1,<0.10.0)
-Requires-Dist: cmem-cmempy (==24.1.0)
+Requires-Dist: cmem-cmempy (==24.1.1)
 Requires-Dist: configparser (>=5.3.0,<6.0.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: natsort (>=8.3.1,<9.0.0)

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/__init__.py

@@ -1,4 +1,5 @@
 """The main command line interface."""
+
 import contextlib
 import os
 import sys

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/__init__.py

@@ -1,4 +1,5 @@
 """cmemc commands."""
+
 from click_didyoumean import DYMGroup
 from click_help_colors import HelpColorsCommand, HelpColorsGroup
 

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/admin.py

@@ -1,5 +1,6 @@
 """admin commands for cmem command line interface."""
-from datetime import UTC, datetime
+
+from datetime import datetime, timezone
 
 import click
 import jwt
@@ -41,12 +42,9 @@ def _check_graphdb_license(app: ApplicationContext, data: dict, months: int, exi
         # DP < 24.1 has no graph license information here
         return
     expiration_date_str = data["dp"]["info"]["store"]["licenseExpiration"]
-    if expiration_date_str == "1970-01-01":
-        # DP = 24.1 outputs this for GraphDB free ...¯\_(ツ)_/¯
-        return
-    expiration_date = datetime.strptime(expiration_date_str, "%Y-%m-%d").astimezone(tz=UTC)
+    expiration_date = datetime.strptime(expiration_date_str, "%Y-%m-%d").astimezone(tz=timezone.utc)
     grace_starts = expiration_date - relativedelta(months=months)
-    if grace_starts < datetime.now(tz=UTC):
+    if grace_starts < datetime.now(tz=timezone.utc):
         graphdb_license_end = data["dp"]["info"]["store"]["licenseExpiration"]
         output = f"Your GraphDB license expires on {graphdb_license_end}."
         if exit_1 == "always":

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/config.py

@@ -1,4 +1,5 @@
 """configuration commands for cmem command line interface."""
+
 import click
 
 from cmem_cmemc.commands import CmemcCommand, CmemcGroup

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/dataset.py

@@ -1,4 +1,5 @@
 """dataset commands for cmem command line interface."""
+
 import json
 import re
 from pathlib import Path
@@ -284,7 +285,7 @@ def _check_or_set_dataset_type(
 
     """
     source = Path(dataset_file).name if dataset_file else ""
-    target = parameter_dict["file"] if "file" in parameter_dict else ""
+    target = parameter_dict.get("file", "")
     suggestions = (
         (".ttl", "file"),
         (".csv", "csv"),

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/graph.py

@@ -1,4 +1,5 @@
 """graph commands for cmem command line interface."""
+
 import hashlib
 import json
 import os

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/project.py

@@ -1,4 +1,5 @@
 """DataIntegration project commands for the cmem command line interface."""
+
 import os
 import shutil
 import tempfile

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/python.py

@@ -1,4 +1,5 @@
 """DataIntegration python management commands."""
+
 import sys
 from dataclasses import asdict
 from re import match
@@ -49,6 +50,10 @@ def install_command(app: ApplicationContext, package: str) -> None:
     .tar.gz file, by uploading a build distribution .whl file, or by
     specifying a package name, i.e., a pip requirement specifier with a
     package name available on pypi.org (e.g. `requests==2.27.1`).
+
+    Note: The tab-completion of this command lists only public packages from
+    pypi.org and not from additional or changed python package repositories you
+    may have configured on the server.
     """
     app.echo_info(f"Install package {package} ... ", nl=False)
     try:

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/query.py

@@ -1,4 +1,5 @@
 """query commands for cmem command line interface."""
+
 import json
 import sys
 from hashlib import sha1

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/resource.py

@@ -1,4 +1,5 @@
 """DataIntegration dataset resource commands for cmemc."""
+
 import re
 
 import click

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/scheduler.py

@@ -1,4 +1,5 @@
 """DataIntegration scheduler commands for the cmem command line interface."""
+
 from typing import Any
 
 import click

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/store.py

@@ -1,4 +1,5 @@
 """DataPlatform store commands for the cmem command line interface."""
+
 import os
 from pathlib import Path
 

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/user.py

@@ -1,4 +1,5 @@
 """Keycloak user management commands"""
+
 import sys
 from getpass import getpass
 

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/validation.py

@@ -1,6 +1,7 @@
 """graph validation command group"""
+
 import time
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 import click
 import requests
@@ -144,8 +145,8 @@ def _get_batch_validation_option(validation_: dict) -> tuple[str, str]:
     id_ = validation_["id"]
     state = validation_["state"]
     graph = validation_["contextGraphIri"]
-    stamp = datetime.fromtimestamp(validation_["executionStarted"] / 1000, tz=UTC)
-    time_ago = timeago.format(stamp, datetime.now(tz=UTC))
+    stamp = datetime.fromtimestamp(validation_["executionStarted"] / 1000, tz=timezone.utc)
+    time_ago = timeago.format(stamp, datetime.now(tz=timezone.utc))
     resources = _get_resource_count(validation_)
     violations = _get_violation_count(validation_)
     return (
@@ -295,7 +296,7 @@ def _get_resource_count(batch_validation: dict) -> str:
 
 def _get_violation_count(process_data: dict) -> str:
     """Get violation count from validation report"""
-    if process_data.get("executionStarted", None) is None:
+    if process_data.get("executionStarted") is None:
         return "-"
     resources = str(process_data.get("resourcesWithViolationsCount", "0"))
     violations = str(process_data.get("violationsCount", "0"))
@@ -408,8 +409,8 @@ def list_command(ctx: Context, filter_: tuple[tuple[str, str]], id_only: bool, r
     table = []
     for _ in validations:
         if "executionStarted" in _ and _["executionStarted"] is not None:
-            stamp = datetime.fromtimestamp(_["executionStarted"] / 1000, tz=UTC)
-            time_ago = timeago.format(stamp, datetime.now(tz=UTC))
+            stamp = datetime.fromtimestamp(_["executionStarted"] / 1000, tz=timezone.utc)
+            time_ago = timeago.format(stamp, datetime.now(tz=timezone.utc))
         else:
             time_ago = f"{_['state']}"
         row = [

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/variable.py

@@ -1,4 +1,5 @@
 """DataIntegration variable commands for cmemc."""
+
 import re
 
 import click

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/vocabulary.py

@@ -1,6 +1,7 @@
 """vocabularies commands for cmem command line interface."""
+
 import io
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from re import match
 from urllib.parse import urlparse
 
@@ -140,7 +141,7 @@ def _insert_catalog_entry(iri: str, prefix: str, namespace: str, label: str, lan
         iri=iri,
         prefix=prefix,
         namespace=namespace,
-        date=datetime.now(tz=UTC).date(),
+        date=datetime.now(tz=timezone.utc).date(),
         label=label,
         language=language,
         description="vocabulary imported with cmemc",
@@ -150,7 +151,7 @@ def _insert_catalog_entry(iri: str, prefix: str, namespace: str, label: str, lan
 
 
 def _get_vocabulary_metadata_from_file(
-    file: io.StringIO, namespace_given: bool = False
+    file: io.BytesIO, namespace_given: bool = False
 ) -> dict[str, str]:
     """Get potential graph iri and prefix/namespace from a turtle file."""
     metadata = {"iri": "", "prefix": "", "namespace": ""}
@@ -345,19 +346,19 @@ def import_command(
     description which correctly uses the `vann:preferredNamespacePrefix` and
     `vann:preferredNamespaceUri` properties.
     """
-    string_buffer = io.StringIO()
+    _buffer = io.BytesIO()
     with click.open_file(file, "rb") as file_handle:
-        string_buffer.write(file_handle.read().decode("utf-8"))
-    string_buffer.seek(0)
+        _buffer.write(file_handle.read())
+    _buffer.seek(0)
 
     # fetch metadata
     if namespace != (None, None):
         _validate_namespace(app, namespace)
-        meta_data = _get_vocabulary_metadata_from_file(string_buffer, True)
+        meta_data = _get_vocabulary_metadata_from_file(_buffer, True)
         meta_data["prefix"] = namespace[0]  # type: ignore[assignment]
         meta_data["namespace"] = namespace[1]  # type: ignore[assignment]
     else:
-        meta_data = _get_vocabulary_metadata_from_file(string_buffer, False)
+        meta_data = _get_vocabulary_metadata_from_file(_buffer, False)
     iri = meta_data["iri"]
 
     success_message = "done"
@@ -368,8 +369,8 @@ def import_command(
             raise ValueError(f"Proposed graph {iri} does already exist.")
     app.echo_info(f"Import {file} as vocabulary to {iri} ... ", nl=False)
     # upload graph
-    string_buffer.seek(0)
-    graph_api.post_streamed(iri, string_buffer, replace=True)
+    _buffer.seek(0)
+    graph_api.post_streamed(iri, _buffer, replace=True)
 
     # resolve label
     resolved_label_object: dict = resolve([iri], graph=iri)[iri]

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/workflow.py

@@ -1,8 +1,9 @@
 """workflow commands for cmem command line interface."""
+
 import re
 import sys
 import time
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from pathlib import Path
 
 import click
@@ -319,8 +320,8 @@ def _workflow_echo_status(app: ApplicationContext, status: dict) -> None:
     canceled only exists sometimes
     """
     # prepare human friendly relative time
-    now = datetime.now(tz=UTC)
-    stamp = datetime.fromtimestamp(status["lastUpdateTime"] / 1000, tz=UTC)
+    now = datetime.now(tz=timezone.utc)
+    stamp = datetime.fromtimestamp(status["lastUpdateTime"] / 1000, tz=timezone.utc)
     time_ago = timeago.format(stamp, now, "en")
     status_name = status["statusName"]
     status_message = status["message"]
@@ -338,9 +339,9 @@ def _workflow_echo_status(app: ApplicationContext, status: dict) -> None:
             f"statusName is {status_name}, expecting one of: " "Running, Canceling or Waiting."
         )
     # not running can be Idle or Finished
-    if "failed" in status and status["failed"]:
+    if status.get("failed"):
         app.echo_error(message, nl=True, err=False)
-    elif "cancelled" in status and status["cancelled"]:
+    elif status.get("cancelled"):
         app.echo_warning(message)
     elif status["statusName"] == "Idle":
         app.echo_info(message)

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/commands/workspace.py

@@ -1,4 +1,5 @@
 """workspace commands for cmem command line interface."""
+
 import os
 from pathlib import Path
 

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/completion.py

@@ -1,4 +1,5 @@
 """Utility functions for CLI auto-completion functionality."""
+
 # ruff: noqa: ARG001
 import os
 from contextlib import suppress

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/constants.py

@@ -1,4 +1,5 @@
 """cmemc constants"""
+
 NAMESPACES = {
     "void": "http://rdfs.org/ns/void#",
     "di": "https://vocab.eccenca.com/di/",

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/context.py

@@ -1,11 +1,12 @@
 """The main command line interface."""
+
 import ast
 import configparser
 import json
 import os
 import re
 import subprocess  # nosec
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from os import environ as env
 from os import getenv
 from pathlib import Path
@@ -21,6 +22,7 @@ from pygments.lexers import get_lexer_by_name
 from rich import box
 from rich.console import Console
 from rich.table import Table
+from urllib3.exceptions import InsecureRequestWarning
 
 from cmem_cmemc.exceptions import InvalidConfigurationError
 
@@ -47,6 +49,8 @@ KNOWN_CONFIG_KEYS = {
 
 KNOWN_SECRET_KEYS = ("OAUTH_PASSWORD", "OAUTH_CLIENT_SECRET", "OAUTH_ACCESS_TOKEN")
 
+SSL_VERIFY_WARNING = "SSL verification is disabled (SSL_VERIFY=False)."
+
 
 class ApplicationContext:
     """Context of the command line interface."""
@@ -90,7 +94,7 @@ class ApplicationContext:
     def get_template_data(self) -> dict[str, str]:
         """Get the template data dict with vars from the context."""
         data: dict[str, str] = {}
-        today = str(datetime.now(tz=UTC).date())
+        today = str(datetime.now(tz=timezone.utc).date())
         data.update(date=today)
         if self.connection is not None:
             data.update(connection=self.connection.name)
@@ -142,12 +146,6 @@ class ApplicationContext:
             self.set_credential_from_process(_, _ + "_PROCESS", config)
 
         self.echo_debug(f"CA bundle loaded from {cmempy_config.get_requests_ca_bundle()}")
-        # If cert validation is disabled, output a warning
-        # Also disable library warnings:
-        # https://urllib3.readthedocs.io/en/latest/advanced-usage.html
-        if not cmempy_config.get_ssl_verify():
-            self.echo_warning("SSL verification is disabled (SSL_VERIFY=False).")
-            urllib3.disable_warnings()
         return
 
     def set_connection_from_params(self, params: dict) -> None:
@@ -192,7 +190,7 @@ class ApplicationContext:
         self.config = self.get_config()
         self.connection = None
         if section_string is None or section_string == "":
-            self.echo_debug("No config given, use API default connection.")
+            self.echo_debug("No config given, use API defaults or environment connection.")
         elif section_string not in self.config:
             raise InvalidConfigurationError(
                 f"There is no connection '{section_string}' configured in "
@@ -202,6 +200,14 @@ class ApplicationContext:
             self.echo_debug(f"Use connection config: {section_string}")
             self.connection = self.config[section_string]
         self.configure_cmempy(self.connection)
+
+        # If cert validation is disabled, output a warning
+        # Also disable library warnings:
+        # https://urllib3.readthedocs.io/en/latest/advanced-usage.html#tls-warnings
+        if not cmempy_config.get_ssl_verify():
+            self.echo_warning(SSL_VERIFY_WARNING)
+            urllib3.disable_warnings(category=InsecureRequestWarning)
+
         return self.connection
 
     def get_config_file(self) -> Path:
@@ -262,7 +268,7 @@ class ApplicationContext:
         """Output a debug message if --debug is enabled."""
         # pylint: disable=invalid-name
         if self.debug:
-            now = datetime.now(tz=UTC)
+            now = datetime.now(tz=timezone.utc)
             click.secho(f"[{now!s}] {message}", err=True, dim=True)
 
     def echo_info(self, message: str | list[str] | set[str], nl: bool = True, fg: str = "") -> None:

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/manual_helper/graph.py

@@ -1,4 +1,5 @@
 """Generate a help text and command structure graph."""
+
 import contextlib
 
 import click.core

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/manual_helper/multi_page.py

@@ -1,4 +1,5 @@
 """Generate a multi page documentation for documentation.eccenca.com."""
+
 import re
 from pathlib import Path
 

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/object_list.py

@@ -1,4 +1,5 @@
 """Filterable object list."""
+
 import re
 from abc import ABC, abstractmethod
 from collections.abc import Callable

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/cmem_cmemc/utils.py

@@ -1,4 +1,5 @@
 """Utility functions for CLI interface."""
+
 import json
 import os
 import re
@@ -295,6 +296,8 @@ def get_published_packages() -> list[PublishedPackage]:
         name = _.findChildren(class_="package-snippet__name")[0].getText()
         if name == "cmem-plugin-base":
             continue
+        if not name.startswith("cmem-plugin-"):
+            continue
         description = _.findChildren(class_="package-snippet__description")[0].getText()
         package_version = _.findChildren(class_="package-snippet__version")[0].getText()
         published = _.findChildren(name="time")[0].attrs["datetime"]

{cmem_cmemc-24.1.1rc1 → cmem_cmemc-24.1.3rc1}/pyproject.toml

@@ -1,9 +1,9 @@
 [tool.poetry]
 name = "cmem-cmemc"
-version = "24.1.1rc1"
+version = "24.1.3rc1"
 description = "Command line client for eccenca Corporate Memory"
 license = "Apache 2.0"
-classifiers = ["Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Intended Audience :: Science/Research", "Intended Audience :: System Administrators", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.9", "Topic :: Software Development :: Testing", "Topic :: Database", "Topic :: Utilities"]
+classifiers = ["Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Intended Audience :: Science/Research", "Intended Audience :: System Administrators", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Testing", "Topic :: Database", "Topic :: Utilities"]
 homepage = "https://eccenca.com/go/cmemc"
 authors = ["eccenca <cmempy-developer@eccenca.com>", "Sebastian Tramp <sebastian.tramp@eccenca.com>"]
 readme = "README-public.md"
@@ -15,7 +15,7 @@ certifi = ">=2023.5.7"
 click = "^8.1.7"
 click-didyoumean = "^0.3.0"
 click-help-colors = "^0.9.1"
-cmem-cmempy = "==24.1.0"
+cmem-cmempy = "==24.1.1"
 # cmem-cmempy = { path = "cmempy", develop = true }
 configparser = "^5.3.0"
 jinja2 = "^3.1.2"
@@ -42,7 +42,7 @@ pytest = "^7.3.1"
 pytest-cov = "^4.1.0"
 pytest-dotenv = "^0.5.2"
 pytest-memray = { version = "^1.5.0",  markers = "platform_system != 'Windows'" }
-ruff = "^0.1.5"
+ruff = "^0.3.4"
 safety = "^1.10.3"
 types-requests = "^2.31.0.10"
 types-six = "^1.16.21.9"
@@ -92,5 +92,6 @@ ignore = [
     "PD",      # opinionated linting for pandas code
     "S101",    # use of assert detected
     "TRY003",  # Avoid specifying long messages outside the exception class
+    "UP017",   # We need compatibility 3.10 at the moment
 ]