rudi-node-write 1.2.2__tar.gz → 1.3.0__tar.gz

{rudi_node_write-1.2.2 → rudi_node_write-1.3.0}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.2.2
+Version: 1.3.0
 Summary: Use the internal API of a RUDI Producer node
 Author-email: Olivier Martineau <olivier.martineau@irisa.fr>
 Maintainer-email: Olivier Martineau <olivier.martineau@irisa.fr>
-License: EUPL-1.2
+License-Expression: EUPL-1.2
 Project-URL: Homepage, https://github.com/OlivierMartineau/rudi-node-write
 Project-URL: Documentation, https://app.swaggerhub.com/apis/OlivierMartineau/RudiProducer-InternalAPI
 Project-URL: Repository, https://github.com/OlivierMartineau/rudi-node-write
@@ -13,33 +13,40 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE.md
-Requires-Dist: beautifulsoup4==4.12.3
+Requires-Dist: beautifulsoup4==4.13.4
 Requires-Dist: chardet==5.2.0
-Requires-Dist: deepdiff==8.0.1
+Requires-Dist: deepdiff==8.4.2
 Requires-Dist: puremagic==1.28
 Provides-Extra: dev
-Requires-Dist: black==24.10.0; extra == "dev"
+Requires-Dist: backports.tarfile==1.2.0; extra == "dev"
+Requires-Dist: black==25.1.0; extra == "dev"
 Requires-Dist: build==1.2.2.post1; extra == "dev"
-Requires-Dist: commitizen==3.29.1; extra == "dev"
-Requires-Dist: importlib-resources==6.4.5; extra == "dev"
-Requires-Dist: inflect==7.3.1; extra == "dev"
+Requires-Dist: commitizen==4.6.0; extra == "dev"
+Requires-Dist: flake8==7.2.0; extra == "dev"
+Requires-Dist: importlib-metadata==8.6.1; extra == "dev"
+Requires-Dist: importlib-resources==6.5.2; extra == "dev"
+Requires-Dist: inflect==7.5.0; extra == "dev"
 Requires-Dist: ipykernel==6.29.5; extra == "dev"
 Requires-Dist: jaraco.collections==5.1.0; extra == "dev"
-Requires-Dist: nbstripout==0.7.1; extra == "dev"
+Requires-Dist: nbstripout==0.8.1; extra == "dev"
 Requires-Dist: ordered-set==4.1.0; extra == "dev"
 Requires-Dist: pip-autoremove==0.10.0; extra == "dev"
 Requires-Dist: pip-chill==1.0.3; extra == "dev"
 Requires-Dist: pip-upgrade-outdated==1.5; extra == "dev"
 Requires-Dist: pip3-autoremove==1.2.2; extra == "dev"
-Requires-Dist: pre-commit==4.0.1; extra == "dev"
-Requires-Dist: pyright==1.1.386; extra == "dev"
-Requires-Dist: pytest-cov==5.0.0; extra == "dev"
-Requires-Dist: tomli==2.0.2; extra == "dev"
-Requires-Dist: twine==5.1.1; extra == "dev"
+Requires-Dist: pkginfo==1.12.1.2; extra == "dev"
+Requires-Dist: pre-commit==4.2.0; extra == "dev"
+Requires-Dist: pre-commit-hooks==5.0.0; extra == "dev"
+Requires-Dist: py-env==0.0.1; extra == "dev"
+Requires-Dist: pyright==1.1.399; extra == "dev"
+Requires-Dist: pytest-check==2.5.3; extra == "dev"
+Requires-Dist: pytest-cov==6.1.1; extra == "dev"
+Requires-Dist: tomli==2.2.1; extra == "dev"
+Requires-Dist: twine==6.1.0; extra == "dev"
+Dynamic: license-file
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Checked with pyright](https://microsoft.github.io/pyright/img/pyright_badge.svg)](https://microsoft.github.io/pyright/)
@@ -49,7 +56,7 @@ Requires-Dist: twine==5.1.1; extra == "dev"
 This library offers tools to take advantage of
 the [internal API](https://app.swaggerhub.com/apis/OlivierMartineau/RudiProducer-InternalAPI) of a RUDI Producer node (
 also
-referred as RUDI node), through the API of the backend of the user interface, the "Producer node manager" or "Prodmanager" module.
+referred as RUDI node), through the API of the backend of the user interface, the "Producer node manager" or "RUDI Manager" module.
 
 ## Installation
 

{rudi_node_write-1.2.2 → rudi_node_write-1.3.0}/README.md

@@ -6,7 +6,7 @@
 This library offers tools to take advantage of
 the [internal API](https://app.swaggerhub.com/apis/OlivierMartineau/RudiProducer-InternalAPI) of a RUDI Producer node (
 also
-referred as RUDI node), through the API of the backend of the user interface, the "Producer node manager" or "Prodmanager" module.
+referred as RUDI node), through the API of the backend of the user interface, the "Producer node manager" or "RUDI Manager" module.
 
 ## Installation
 

{rudi_node_write-1.2.2 → rudi_node_write-1.3.0}/pyproject.toml

@@ -4,20 +4,31 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rudi-node-write"
-version = "1.2.2"
+version = "1.3.0"
 authors = [{ name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" }]
-maintainers = [{ name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" }]
+maintainers = [
+    { name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" },
+]
 description = "Use the internal API of a RUDI Producer node"
 readme = "README.md"
 requires-python = ">=3.11"
-license = { text = "EUPL-1.2" }
-classifiers = ["Programming Language :: Python :: 3.11",
+license-files = ["LICENCE.md"]
+license = "EUPL-1.2"
+classifiers = [
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Natural Language :: English",
     "Operating System :: OS Independent",
-    "License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)",
 ]
-keywords = ["rudi-node-write", "rudi-node-put", "RUDI", "producer node", "RUDI node", "open-data", "Univ. Rennes"]
+keywords = [
+    "rudi-node-write",
+    "rudi-node-put",
+    "RUDI",
+    "producer node",
+    "RUDI node",
+    "open-data",
+    "Univ. Rennes",
+]
 dynamic = ["dependencies", "optional-dependencies"]
 # dependencies = ["beautifulsoup4", "chardet", "deepdiff", "puremagic"]
 
@@ -34,7 +45,7 @@ target-version = ['py311']
 # ----- Tool: commitizen
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.2.2"
+version = "1.3.0"
 version_files = ["pyproject.toml:version"]
 
 # ----- Tool: pytest
@@ -42,7 +53,12 @@ version_files = ["pyproject.toml:version"]
 pythonpath = ["src"]
 norecursedirs = ["*.egg", ".eggs", "dist", "build", "wip"]
 filterwarnings = ["ignore:.*pkg_resources.*:DeprecationWarning"]
-addopts = ["--cov=rudi_node_write", "--cov-report=term-missing", "--cov-report=html:reports/html_dir", "--cov-report=xml:reports/coverage.xml" ]
+addopts = [
+    "--cov=rudi_node_write",
+    "--cov-report=term-missing",
+    "--cov-report=html:reports/html_dir",
+    "--cov-report=xml:reports/coverage.xml",
+]
 
 # ----- Tool: setuptools
 [tool.setuptools.packages.find]
@@ -50,17 +66,17 @@ where = ["src"]
 include = ["rudi_node_write*"]
 
 [tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
-optional-dependencies = {dev = { file = ["requirements-dev.txt"] }}
+dependencies = { file = ["requirements.txt"] }
+optional-dependencies = { dev = { file = ["requirements-dev.txt"] } }
 
 # ----- Tool: pyright
 [tool.pyright]
 exclude = ["**/node_modules", "**/__pycache__"]
 include = ["src"]
 pythonVersion = "3.11"
-reportMissingImports = "true"
-reportDuplicateImport = "true"
-reportUnusedImport = "true"
-reportImportCycles = "true"
+reportMissingImports = true
+reportDuplicateImport = true
+reportUnusedImport = true
+reportImportCycles = true
 venvPath = "."
 venv = ".venv"

rudi_node_write-1.3.0/requirements-dev.txt

@@ -0,0 +1,112 @@
+backports.tarfile==1.2.0
+black==25.1.0
+build==1.2.2.post1
+commitizen==4.6.0
+flake8==7.2.0
+importlib-metadata==8.6.1
+importlib-resources==6.5.2
+inflect==7.5.0
+ipykernel==6.29.5
+jaraco.collections==5.1.0
+nbstripout==0.8.1
+ordered-set==4.1.0
+pip-autoremove==0.10.0
+pip-chill==1.0.3
+pip-upgrade-outdated==1.5
+pip3-autoremove==1.2.2
+pkginfo==1.12.1.2
+pre-commit==4.2.0
+pre-commit-hooks==5.0.0
+py-env==0.0.1
+pyright==1.1.399
+pytest-check==2.5.3
+pytest-cov==6.1.1
+tomli==2.2.1
+twine==6.1.0
+# appnope==0.1.4 # Installed as dependency for ipykernel
+# argcomplete==3.6.2 # Installed as dependency for commitizen
+# asttokens==3.0.0 # Installed as dependency for stack-data
+# attrs==25.3.0 # Installed as dependency for jsonschema, referencing
+# autocommand==2.2.2 # Installed as dependency for jaraco.text
+# certifi==2025.1.31 # Installed as dependency for requests
+# cfgv==3.4.0 # Installed as dependency for pre-commit
+# charset-normalizer==3.4.1 # Installed as dependency for commitizen, requests
+# click==8.1.8 # Installed as dependency for black
+# colorama==0.4.6 # Installed as dependency for commitizen
+# comm==0.2.2 # Installed as dependency for ipykernel
+# coverage==7.8.0 # Installed as dependency for pytest-cov
+# debugpy==1.8.14 # Installed as dependency for ipykernel
+# decli==0.6.2 # Installed as dependency for commitizen
+# decorator==5.2.1 # Installed as dependency for ipython
+# distlib==0.3.9 # Installed as dependency for virtualenv
+# docutils==0.21.2 # Installed as dependency for readme-renderer
+# executing==2.2.0 # Installed as dependency for stack-data
+# fastjsonschema==2.21.1 # Installed as dependency for nbformat
+# filelock==3.18.0 # Installed as dependency for virtualenv
+# id==1.5.0 # Installed as dependency for twine
+# identify==2.6.10 # Installed as dependency for pre-commit
+# idna==3.10 # Installed as dependency for requests
+# iniconfig==2.1.0 # Installed as dependency for pytest
+# ipython==9.1.0 # Installed as dependency for ipykernel
+# ipython-pygments-lexers==1.1.1 # Installed as dependency for ipython
+# jaraco.classes==3.4.0 # Installed as dependency for keyring
+# jaraco.context==6.0.1 # Installed as dependency for jaraco.text, keyring
+# jaraco.functools==4.1.0 # Installed as dependency for jaraco.text, keyring
+# jaraco.text==4.0.0 # Installed as dependency for jaraco.collections
+# jedi==0.19.2 # Installed as dependency for ipython
+# jinja2==3.1.6 # Installed as dependency for commitizen
+# jsonschema==4.23.0 # Installed as dependency for nbformat
+# jsonschema-specifications==2024.10.1 # Installed as dependency for jsonschema
+# jupyter-client==8.6.3 # Installed as dependency for ipykernel
+# jupyter-core==5.7.2 # Installed as dependency for ipykernel, jupyter-client, nbformat
+# keyring==25.6.0 # Installed as dependency for twine
+# markdown-it-py==3.0.0 # Installed as dependency for rich
+# markupsafe==3.0.2 # Installed as dependency for jinja2
+# matplotlib-inline==0.1.7 # Installed as dependency for ipykernel, ipython
+# mccabe==0.7.0 # Installed as dependency for flake8
+# mdurl==0.1.2 # Installed as dependency for markdown-it-py
+# more-itertools==10.7.0 # Installed as dependency for inflect, jaraco.classes, jaraco.functools, jaraco.text
+# mypy-extensions==1.1.0 # Installed as dependency for black
+# nbformat==5.10.4 # Installed as dependency for nbstripout
+# nest-asyncio==1.6.0 # Installed as dependency for ipykernel
+# nh3==0.2.21 # Installed as dependency for readme-renderer
+# nodeenv==1.9.1 # Installed as dependency for pre-commit, pyright
+# packaging==25.0 # Installed as dependency for black, build, commitizen, ipykernel, pytest, twine
+# parso==0.8.4 # Installed as dependency for jedi
+# pathspec==0.12.1 # Installed as dependency for black
+# pexpect==4.9.0 # Installed as dependency for ipython
+# platformdirs==4.3.7 # Installed as dependency for black, jupyter-core, virtualenv
+# pluggy==1.5.0 # Installed as dependency for pytest
+# prompt-toolkit==3.0.51 # Installed as dependency for ipython, questionary
+# psutil==7.0.0 # Installed as dependency for ipykernel
+# ptyprocess==0.7.0 # Installed as dependency for pexpect
+# pure-eval==0.2.3 # Installed as dependency for stack-data
+# pycodestyle==2.13.0 # Installed as dependency for flake8
+# pyflakes==3.3.2 # Installed as dependency for flake8
+# pygments==2.19.1 # Installed as dependency for ipython, ipython-pygments-lexers, readme-renderer, rich
+# pyproject-hooks==1.2.0 # Installed as dependency for build
+# pytest==8.3.5 # Installed as dependency for pytest-check, pytest-cov
+# python-dateutil==2.9.0.post0 # Installed as dependency for jupyter-client
+# pyyaml==6.0.2 # Installed as dependency for commitizen, pre-commit
+# pyzmq==26.4.0 # Installed as dependency for ipykernel, jupyter-client
+# questionary==2.1.0 # Installed as dependency for commitizen
+# readme-renderer==44.0 # Installed as dependency for twine
+# referencing==0.36.2 # Installed as dependency for jsonschema, jsonschema-specifications
+# requests==2.32.3 # Installed as dependency for id, requests-toolbelt, twine
+# requests-toolbelt==1.0.0 # Installed as dependency for twine
+# rfc3986==2.0.0 # Installed as dependency for twine
+# rich==14.0.0 # Installed as dependency for twine
+# rpds-py==0.24.0 # Installed as dependency for jsonschema, referencing
+# ruamel.yaml==0.18.10 # Installed as dependency for pre-commit-hooks
+# ruamel.yaml.clib==0.2.12 # Installed as dependency for ruamel.yaml
+# six==1.17.0 # Installed as dependency for python-dateutil
+# stack-data==0.6.3 # Installed as dependency for ipython
+# termcolor==3.0.1 # Installed as dependency for commitizen
+# tomlkit==0.13.2 # Installed as dependency for commitizen
+# tornado==6.4.2 # Installed as dependency for ipykernel, jupyter-client
+# traitlets==5.14.3 # Installed as dependency for comm, ipykernel, ipython, jupyter-client, jupyter-core, matplotlib-inline, nbformat
+# typeguard==4.4.2 # Installed as dependency for inflect
+# urllib3==2.4.0 # Installed as dependency for requests, twine
+# virtualenv==20.30.0 # Installed as dependency for pre-commit
+# wcwidth==0.2.13 # Installed as dependency for prompt-toolkit
+# zipp==3.21.0 # Installed as dependency for importlib-metadata

rudi_node_write-1.3.0/requirements.txt

@@ -0,0 +1,7 @@
+beautifulsoup4==4.13.4
+chardet==5.2.0
+deepdiff==8.4.2
+puremagic==1.28
+# orderly-set==5.4.0 # Installed as dependency for deepdiff
+# soupsieve==2.7 # Installed as dependency for beautifulsoup4
+# typing-extensions==4.13.2 # Installed as dependency for beautifulsoup4, pyright, referencing, typeguard

{rudi_node_write-1.2.2 → rudi_node_write-1.3.0}/src/rudi_node_write/connectors/io_connector.py

@@ -7,7 +7,7 @@ from rudi_node_write.rudi_types.rudi_const import check_is_literal
 from rudi_node_write.rudi_types.serializable import Serializable
 from rudi_node_write.utils.dict_utils import is_dict, safe_get_key
 from rudi_node_write.utils.err import HttpError
-from rudi_node_write.utils.log import log_d_if, log_e, log_d
+from rudi_node_write.utils.log import log_d_if, log_e, log_d, log_w
 from rudi_node_write.utils.str_utils import slash_join
 from rudi_node_write.utils.url_utils import get_response_cookies, url_encode_req_params
 
@@ -55,6 +55,9 @@ class Connector:
         self._set_url(server_url)
         self._cookies = None
 
+        self.should_log_request: bool = True
+        self.should_log_response: bool = False
+
     def _set_url(self, server_url: str):
         here = f"super.{self.class_name}._set_url"
         (scheme, netloc, path, query, fragment) = urlsplit(server_url)
@@ -73,6 +76,10 @@ class Connector:
     def full_url(self, relative_url: str = "/"):
         return slash_join(self.base_url, url_encode_req_params(relative_url))
 
+    def set_path(self, new_path: str):
+        self.path = new_path
+        self.base_url = slash_join(f"{self.scheme}://{self.host}", self.path)
+
     def full_path(self, relative_url: str = "/"):
         return slash_join("/", self.path, url_encode_req_params(relative_url))
 
@@ -92,7 +99,6 @@ class Connector:
         relative_url: str,
         headers: dict | None = None,
         keep_alive: bool = False,
-        should_log_response: bool = False,
     ):
         """
         Download a file on the connector server
@@ -118,7 +124,7 @@ class Connector:
             log_e(here, f"ERR {response.status}", path_url)
             return None
         else:
-            log_d_if(should_log_response, here, f"OK {response.status}", path_url)
+            log_d_if(self.should_log_response, here, f"OK {response.status}", path_url)
             res_data = response.read()
             if not keep_alive and not self.keep_connection:
                 self.connection.close()
@@ -133,9 +139,7 @@ class Connector:
         body: dict | str | list | Serializable | BinaryIO | TextIO | None = None,
         headers=None,
         keep_alive: bool = False,
-        should_log_request: bool = False,
-        should_log_response: bool = False,
-    ):
+    ) -> dict | str | list | None:
         """
         Send a http(s) request
         :param relative_url: a relative URL that will be joined to the connector's base URL to form the request URL
@@ -153,23 +157,28 @@ class Connector:
 
         if headers is None:
             headers = DEFAULT_HEADERS
-        if isinstance(body, dict):
-            headers["Content-Type"] = "application/json"
-            body_str = dumps(body)
-        elif isinstance(body, Serializable):
-            headers["Content-Type"] = "application/json"
-            body_str = body.to_json_str(ensure_ascii=True)
-        elif isinstance(body, list):
-            body_str = str(list)
+        if req_method == "POST" or req_method == "PUT":
+            if isinstance(body, dict):
+                headers["Content-Type"] = "application/json"
+                body_str = dumps(body)
+            elif isinstance(body, Serializable):
+                headers["Content-Type"] = "application/json"
+                body_str = body.to_json_str(ensure_ascii=True)
+            elif isinstance(body, list):
+                body_str = str(list)
+            else:
+                body_str = body
         else:
-            body_str = body
+            # log_w(here, f"Body is ignored since http method used is {req_method}")
+            body_str = None
 
         path_url = self.full_path(relative_url)
         if self.host is None:
             raise ConnectionError("The connector host should be defined")
         self.connection = HTTPConnection(self.host) if self.scheme == "http" else HTTPSConnection(self.host)
 
-        log_d_if(should_log_request, here, req_method, self.full_url(relative_url))
+        # log_d_if(self.should_log_request, here, req_method, self.full_url(relative_url))
+        log_d_if(self.should_log_request, here, req_method, self.full_url(relative_url))
 
         try:
             self.connection.request(method=req_method, url=path_url, body=body_str, headers=headers)  # type: ignore
@@ -177,19 +186,35 @@ class Connector:
             log_e(here, "Error on request", req_method, self.full_url(relative_url))
             log_e(here, "ERR", e)
             raise e
-        return self.parse_response(
+        res = self.parse_response(
             relative_url=relative_url,
             req_method=req_method,
             keep_alive=keep_alive,
-            should_log_response=should_log_response,
         )
+        return res
+        # if not isinstance(res, dict):
+        #     return res
+        # redirect_url = res.get("redirection")
+        # if redirect_url is None:
+        #     return res
+
+        # try:
+        #     self.request(method=req_method, url=redirect_url, body=body_str, headers=headers)  # type: ignore
+        # except ConnectionRefusedError as e:
+        #     log_e(here, "Error on redirected request", req_method, self.full_url(relative_url))
+        #     log_e(here, "ERR", e)
+        #     raise e
+        # return self.parse_response(
+        #     relative_url=relative_url,
+        #     req_method=req_method,
+        #     keep_alive=keep_alive,
+        # )
 
     def parse_response(
         self,
         relative_url: str,
         req_method: HttpRequestMethod,
         keep_alive: bool = False,
-        should_log_response: bool = True,
     ):
         """Basic parsing of the result"""
         here = f"{self.class_name}.parse_response"
@@ -198,37 +223,38 @@ class Connector:
         response = self.connection.getresponse()
         self._cookies = get_response_cookies(response)
 
-        if response.status in [301, 302]:
-            return {STATUS: response.status, REDIRECTION: response.getheader("location")}
-        if (
-            response.status not in [200, 500, 501]
-            and not (530 <= response.status < 540)
-            and not (400 <= response.status < 500)
-        ):
-            return None
+        if response.status in [301, 302, 307, 308]:
+            return {"status": response.status, "from": relative_url, "redirection": response.getheader("location")}
+
+        # if (
+        #     response.status not in [200, 500, 501]
+        #     and not (530 <= response.status < 540)
+        #     and not (400 <= response.status < 500)
+        # ):
+        #     return None
 
         rdata = response.read()
         # log_d(here, "rdata", rdata)
         try:
             response_data = loads(rdata)
-            log_d_if(should_log_response, here, "Response is a JSON", response_data)
+            log_d_if(self.should_log_response, here, "Response is a JSON", response_data)
         except (TypeError, JSONDecodeError):
             response_data = repr(rdata)
-            log_d_if(should_log_response, here, "Response is not a JSON", response_data)
+            log_d_if(self.should_log_response, here, "Response is not a JSON", response_data)
         if not keep_alive and not self.keep_connection:
             self.close_connection()
 
         if type(response_data) is str:
-            log_d_if(should_log_response, here, "Response is a string", response_data)
-            if response.status == 200:
+            log_d_if(self.should_log_response, here, "Response is a string", response_data)
+            if response.status < 400:
                 return rdata.decode("utf8")
-        if response.status == 200:
+        if response.status < 400:
             return response_data
-        if response.status >= 400:
-            log_e(here, "Connection error", response_data)
-            log_e(here, "Request in error", req_method, self.full_url(relative_url))
-            # log_e(here, "Headers", response.headers)
-            raise HttpError(response_data, req_method, self.base_url, relative_url)
+
+        log_e(here, "Connection error", response_data)
+        log_e(here, "Request in error", req_method, self.full_url(relative_url))
+        # log_e(here, "Headers", response.headers)
+        raise HttpError(response_data, response.status, req_method, self.base_url, relative_url)
 
 
 if __name__ == "__main__":  # pragma: no cover

rudi_node_write-1.2.2/src/rudi_node_write/connectors/io_rudi_api_write.py → rudi_node_write-1.3.0/src/rudi_node_write/connectors/io_rudi_catalog_write.py

@@ -41,20 +41,20 @@ _STATUS_SKIPPED = "skipped"
 _STATUS_MISSING = "missing"
 _STATUS_DOWNLOADED = "downloaded"
 
-here = "RudiNodeApiConnector"
+here = "RudiNodeCatalogConnector"
 
 
 def ensure_url_startswith_api_admin(url):
     return ensure_url_startswith(url, "api/admin")
 
 
-class RudiNodeApiConnector(Connector):
+class RudiNodeCatalogConnector(Connector):
     def __init__(
         self,
         server_url: str,
         jwt_factory: RudiNodeJwtFactory | None = None,
         jwt: str | None = None,
-        headers_user_agent: str = "RudiNodeApiConnector",
+        headers_user_agent: str = "RudiNodeCatalogConnector",
     ):
         """
         Creates a connector to the internal API of the API/proxy module of a RUDI producer node.
@@ -116,9 +116,7 @@ class RudiNodeApiConnector(Connector):
     def _headers(self):
         return self._initial_headers | {"Authorization": f"Bearer {self._jwt}"}
 
-    def get_admin_api(
-        self, url: str, keep_alive: bool = False, should_log_request=False, should_log_response=False
-    ) -> str | int | list | dict:
+    def get_admin_api(self, url: str, keep_alive: bool = False) -> str | int | list | dict:
         """
         Performs an identified GET request through /api/admin path
         :param url: part of the URL that comes after /api/admin
@@ -131,8 +129,6 @@ class RudiNodeApiConnector(Connector):
             relative_url=ensure_url_startswith_api_admin(url),
             headers=self._headers,
             keep_alive=keep_alive,
-            should_log_request=should_log_request,
-            should_log_response=should_log_response,
         )  # type: ignore
 
     def put_admin_api(
@@ -637,7 +633,7 @@ class RudiNodeApiConnector(Connector):
         :param local_download_dir: the path to a local folder
         :return: an object that states if the file was downloaded, skipped or found missing
         """
-        here = "RudiNodeApiConnector.download_file_from_media_info"
+        here = "RudiNodeCatalogConnector.download_file_from_media_info"
 
         media_type = media.get("media_type")
 
@@ -771,26 +767,26 @@ class RudiNodeApiConnector(Connector):
 
 if __name__ == "__main__":  # pragma: no cover
     # ----------- INIT -----------
-    tests = "RudiNodeApiConnector tests"
+    tests = "RudiNodeCatalogConnector tests"
     begin = time()
     creds_file = "../creds/creds_bas.json"
     rudi_node_creds = read_json_file(creds_file)
     url = rudi_node_creds["url"]
 
-    node_jwt_factory = RudiNodeJwtFactory(url, rudi_node_creds)
-    rudi_node_api = RudiNodeApiConnector(server_url=url, jwt_factory=node_jwt_factory)
+    jwt_factory = RudiNodeJwtFactory(url, rudi_node_creds)
+    catalog = RudiNodeCatalogConnector(server_url=url, jwt_factory=jwt_factory)
 
     # ----------- TESTS -----------
     test_dir = "../dwnld"
-    log_d(tests, "producers", len(rudi_node_api.organization_list))
-    log_d(tests, "producer names", rudi_node_api.producer_names)
-    log_d(tests, "metadata_contacts", len(rudi_node_api.contact_list))
-    log_d(tests, "contact names", rudi_node_api.contact_names)
+    log_d(tests, "producers", len(catalog.organization_list))
+    log_d(tests, "producer names", catalog.producer_names)
+    log_d(tests, "metadata_contacts", len(catalog.contact_list))
+    log_d(tests, "contact names", catalog.contact_names)
 
-    log_d(tests, "themes", len(rudi_node_api.themes))
-    log_d(tests, "used_themes", len(rudi_node_api.used_themes))
-    log_d(tests, "keywords", len(rudi_node_api.keywords))
-    log_d(tests, "used_keywords", len(rudi_node_api.used_keywords))
+    log_d(tests, "themes", len(catalog.themes))
+    log_d(tests, "used_themes", len(catalog.used_themes))
+    log_d(tests, "keywords", len(catalog.keywords))
+    log_d(tests, "used_keywords", len(catalog.used_keywords))
 
     #
     # log_d(here, ' get_metadata_with_media_uuid',
@@ -800,25 +796,25 @@ if __name__ == "__main__":  # pragma: no cover
     log_d(
         tests,
         "download_files_for_metadata",
-        rudi_node_api.download_files_for_metadata("65d99589-7a7a-46a3-afe8-c5a47b964310", test_dir),
+        catalog.download_files_for_metadata("65d99589-7a7a-46a3-afe8-c5a47b964310", test_dir),
     )
 
     log_d(
         tests,
         "download_file_with_media_uuid '782bab2d-7ee8-4633-9c0a-173649b4d879'",
-        rudi_node_api.download_file_with_media_uuid("fef11852-0756-4cbe-bdfb-3722a1751de9", test_dir),
+        catalog.download_file_with_media_uuid("fef11852-0756-4cbe-bdfb-3722a1751de9", test_dir),
     )
 
     log_d(
         tests,
         "download_file_with_name '782bab2d-7ee8-4633-9c0a-173649b4d879'",
-        rudi_node_api.download_file_with_name("782bab2d-7ee8-4633-9c0a-173649b4d879", test_dir),
+        catalog.download_file_with_name("782bab2d-7ee8-4633-9c0a-173649b4d879", test_dir),
     )
 
     log_d(
         tests,
         "download_file_with_name 'toucan.jpg'",
-        "\n" + str(rudi_node_api.download_file_with_name("toucan.jpg", test_dir)),
+        "\n" + str(catalog.download_file_with_name("toucan.jpg", test_dir)),
     )
 
     log_d(tests, "exec. time", time() - begin)

{rudi_node_write-1.2.2 → rudi_node_write-1.3.0}/src/rudi_node_write/connectors/io_rudi_jwt_factory.py

@@ -46,7 +46,7 @@ class RudiNodeJwtFactory(Connector):
 
     def test_connection(self):
         test = self.request(relative_url="crypto/jwt", req_method="GET", headers=self._headers)
-        if not isinstance(test, dict) or test["RUDI"] != "JWT":
+        if not isinstance(test, dict) or test.get("RUDI") != "JWT":
             log_e("RudiNodeJwtFactory", f"!! Node '{self.host}'", "no connection!")
             raise ConnectionError(f"An error occurred while connecting to RUDI node JWT server {self.base_url}")
         # log_d("RudiNodeJwtFactory", f"Node '{self.host}'", "connection OK")