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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.3.0
+Version: 1.3.2
 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>
@@ -18,15 +18,15 @@ Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: beautifulsoup4==4.13.4
 Requires-Dist: chardet==5.2.0
-Requires-Dist: deepdiff==8.4.2
-Requires-Dist: puremagic==1.28
+Requires-Dist: deepdiff==8.5.0
+Requires-Dist: puremagic==1.29
 Provides-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==4.6.0; extra == "dev"
+Requires-Dist: commitizen==4.7.2; extra == "dev"
 Requires-Dist: flake8==7.2.0; extra == "dev"
-Requires-Dist: importlib-metadata==8.6.1; extra == "dev"
+Requires-Dist: importlib-metadata==8.7.0; 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"
@@ -41,9 +41,10 @@ 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: pyright==1.1.400; extra == "dev"
 Requires-Dist: pytest-check==2.5.3; extra == "dev"
 Requires-Dist: pytest-cov==6.1.1; extra == "dev"
+Requires-Dist: rudi-node-write==1.3.1; extra == "dev"
 Requires-Dist: tomli==2.2.1; extra == "dev"
 Requires-Dist: twine==6.1.0; extra == "dev"
 Dynamic: license-file

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rudi-node-write"
-version = "1.3.0"
+version = "1.3.2"
 authors = [{ name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" }]
 maintainers = [
     { name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" },
@@ -45,7 +45,7 @@ target-version = ['py311']
 # ----- Tool: commitizen
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.3.0"
+version = "1.3.2"
 version_files = ["pyproject.toml:version"]
 
 # ----- Tool: pytest

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/requirements-dev.txt

@@ -1,9 +1,10 @@
+# -r requirements.txt
 backports.tarfile==1.2.0
 black==25.1.0
 build==1.2.2.post1
-commitizen==4.6.0
+commitizen==4.7.2
 flake8==7.2.0
-importlib-metadata==8.6.1
+importlib-metadata==8.7.0
 importlib-resources==6.5.2
 inflect==7.5.0
 ipykernel==6.29.5
@@ -18,9 +19,10 @@ 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
+pyright==1.1.400
 pytest-check==2.5.3
 pytest-cov==6.1.1
+rudi-node-write==1.3.1
 tomli==2.2.1
 twine==6.1.0
 # appnope==0.1.4 # Installed as dependency for ipykernel
@@ -28,10 +30,10 @@ twine==6.1.0
 # 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
+# certifi==2025.4.26 # 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
+# charset-normalizer==3.4.2 # Installed as dependency for commitizen, requests
+# click==8.2.0 # 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
@@ -47,7 +49,7 @@ twine==6.1.0
 # 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==9.2.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
@@ -56,7 +58,7 @@ twine==6.1.0
 # 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
+# jsonschema-specifications==2025.4.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
@@ -75,8 +77,8 @@ twine==6.1.0
 # 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
+# platformdirs==4.3.8 # Installed as dependency for black, jupyter-core, virtualenv
+# pluggy==1.6.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
@@ -96,17 +98,17 @@ twine==6.1.0
 # 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
+# rpds-py==0.25.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
+# termcolor==2.5.0 # 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
+# tornado==6.5 # 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
+# virtualenv==20.31.2 # 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 → rudi_node_write-1.3.2}/requirements.txt

@@ -1,7 +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
+deepdiff==8.5.0
+puremagic==1.29
+# orderly-set==5.4.1 # 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.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write/connectors/io_rudi_catalog_write.py

@@ -120,7 +120,7 @@ class RudiNodeCatalogConnector(Connector):
         """
         Performs an identified GET request through /api/admin path
         :param url: part of the URL that comes after /api/admin
-        :param keep_alive: True if the connection should be kep alive (for successive requests). Use
+        :param keep_alive: True if the connection should be kept alive (for successive requests). Use
         self.connection.close() in the end of your request series.
         :return: the result of the request, most likely a JSON
         """

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write/connectors/io_rudi_manager_write.py

@@ -127,7 +127,7 @@ class RudiNodeManagerConnector(Connector):
         """
         Performs an identified GET request through /api path
         :param url: part of the URL that comes after /api
-        :param keep_alive: True if the connection should be kep alive (for successive requests). Use
+        :param keep_alive: True if the connection should be kept alive (for successive requests). Use
         self.connection.close() in the end of your request series.
         :return: the result of the request, most likely a JSON
         """
@@ -326,7 +326,7 @@ class RudiNodeManagerConnector(Connector):
         """
         Performs an identified GET request through /api path
         :param url: part of the URL that comes after /api
-        :param keep_alive: True if the connection should be kep alive (for successive requests). Use
+        :param keep_alive: True if the connection should be kept alive (for successive requests). Use
         self.connection.close() in the end of your request series.
         :return: the result of the request, most likely a JSON
         """
@@ -475,7 +475,7 @@ class RudiNodeManagerConnector(Connector):
 
     @property
     def last_metadata_update_date(self) -> Date | None:
-        res = self.get_data("resources?sort=-updatedAt&limit=1&fields=updatedAt")
+        res = self.get_data("resources?sort_by=-updatedAt&limit=1&fields=updatedAt")
         if not isinstance(res, list):
             raise TypeError(f"The server should have returned a list, got:\n{res}")
         if len(res) == 0:
@@ -485,7 +485,7 @@ class RudiNodeManagerConnector(Connector):
 
     @property
     def last_data_update_date(self) -> Date | None:
-        res = self.get_data("resources?sort=-dataset_dates.updated&limit=1&fields=dataset_dates.updated")
+        res = self.get_data("resources?sort_by=-dataset_dates.updated&limit=1&fields=dataset_dates.updated")
         # print("last_data_update_date", res)
         if not isinstance(res, list):
             raise TypeError(f"The server should have returned a list, got:\n{res}")

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write/connectors/io_rudi_manager_write_v3.py

@@ -120,11 +120,11 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         return self._cached_conf
 
     # ----------[ Basic API calls ]-------------------------------------------------------------------------------------
-    def get_manager(self, url: str, headers: dict, keep_alive: bool = False):
+    def get_api(self, url: str, headers: dict, keep_alive: bool = False):
         """
         Performs an identified GET request through /api path
         :param url: part of the URL that comes after /api
-        :param keep_alive: True if the connection should be kep alive (for successive requests). Use
+        :param keep_alive: True if the connection should be kept alive (for successive requests). Use
         self.connection.close() in the end of your request series.
         :return: the result of the request, most likely a JSON
         """
@@ -180,7 +180,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         )
 
     def test_connection(self):
-        test = self.get_manager(url="open/test", headers=self._def_headers)
+        test = self.get_api(url="open/test", headers=self._def_headers)
         if test == "test":
             log_d(here, f"Node '{self.host}'", "connection OK")
             # log_d(here, f"Node '{self.host}'", "connection OK")
@@ -191,7 +191,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
     def test_identified_connection(self):
         self.test_connection()
         try:
-            self.get_manager(url="catalog/uuid", headers=self._id_headers)
+            self.get_api(url="catalog/uuid", headers=self._id_headers)
         except HttpError:
             raise ConnectionError(f"Identifiers seem to be not working for the node: {self.server_url}")
         return True
@@ -209,11 +209,11 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
 
     @property
     def tags(self):
-        return self.get_manager(url="open/tags", headers=self._def_headers)
+        return self.get_api(url="open/tags", headers=self._def_headers)
 
     @property
     def hash(self):
-        return self.get_manager(url="open/hash", headers=self._def_headers)
+        return self.get_api(url="open/hash", headers=self._def_headers)
 
     @property
     def _def_headers(self):
@@ -269,7 +269,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
     def _storage_jwt(self) -> str:
         here = "_storage_jwt"
         if is_jwt_expired(self._cached_storage_jwt):
-            res = self.get_manager(url="storage/jwt", headers=self._id_headers)
+            res = self.get_api(url="storage/jwt", headers=self._id_headers)
 
             if not isinstance(res, dict):
                 raise TypeError(f"An error occurred while getting Storage JWT: got {res}")
@@ -295,7 +295,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         """
         Performs an identified GET request through /api path
         :param url: part of the URL that comes after /api
-        :param keep_alive: True if the connection should be kep alive (for successive requests). Use
+        :param keep_alive: True if the connection should be kept alive (for successive requests). Use
         self.connection.close() in the end of your request series.
         :return: the result of the request, most likely a JSON
         """
@@ -380,7 +380,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
             if url in RUDI_OBJECT_TYPES:
                 data: list[dict] = self._get_full_obj_list(url)
             else:
-                data = self.get_manager(url=url, headers=self._id_headers)  # type: ignore
+                data = self.get_api(url=url, headers=self._id_headers)  # type: ignore
 
             self._data_cache[url] = {"data": data, _REFRESH_KEY: time()}
         obj_data = self._data_cache[url]["data"]
@@ -452,7 +452,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
 
     @property
     def last_metadata_update_date(self) -> Date | None:
-        res = self.get_catalog_cached("resources?sort=-updatedAt&limit=1&fields=updatedAt")
+        res = self.get_catalog_cached("resources?sort_by=-updatedAt&fields=updatedAt&limit=1")
         if not isinstance(res, list):
             raise TypeError(f"The server should have returned a list, got:\n{res}")
         if len(res) == 0:
@@ -462,7 +462,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
 
     @property
     def last_data_update_date(self) -> Date | None:
-        res = self.get_catalog_cached("resources?sort=-dataset_dates.updated&limit=1&fields=dataset_dates.updated")
+        res = self.get_catalog_cached("resources?sort_by=-dataset_dates.updated&limit=1&fields=dataset_dates.updated")
         # print("last_data_update_date", res)
         if not isinstance(res, list):
             raise TypeError(f"The server should have returned a list, got:\n{res}")
@@ -1356,7 +1356,7 @@ if __name__ == "__main__":  # pragma: no cover
     log_d(tests, "manager_url", manager.manager_url)
     log_d(tests, "manager_back_url", manager.base_url)
     log_d(tests, "test 1", manager.request(relative_url="open/test"))
-    log_d(tests, "test 2", manager.get_manager(url="open/test", headers=manager._def_headers))
+    log_d(tests, "test 2", manager.get_api(url="open/test", headers=manager._def_headers))
     log_d(tests, "test 3", manager.test_connection())
 
     log_d(tests, "nb orgs", manager._count_obj("organizations"))

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write/utils/file_utils.py

@@ -139,8 +139,7 @@ def get_file_hash(file_local_path: str, hash_algo: str = "md5") -> str:
 def read_json_file(file_path, mode: Literal["b", "t"] = "t"):  # pragma: no cover
     check_is_file(file_path)
     with open(file_path, f"r{mode}") as json_file_content:
-        json_dict = load(json_file_content)
-    return json_dict
+        return load(json_file_content)
 
 
 def write_file(destination_file_path: str, content, mode: Literal["b", "t"] = "t"):  # pragma: no cover

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.3.0
+Version: 1.3.2
 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>
@@ -18,15 +18,15 @@ Description-Content-Type: text/markdown
 License-File: LICENCE.md
 Requires-Dist: beautifulsoup4==4.13.4
 Requires-Dist: chardet==5.2.0
-Requires-Dist: deepdiff==8.4.2
-Requires-Dist: puremagic==1.28
+Requires-Dist: deepdiff==8.5.0
+Requires-Dist: puremagic==1.29
 Provides-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==4.6.0; extra == "dev"
+Requires-Dist: commitizen==4.7.2; extra == "dev"
 Requires-Dist: flake8==7.2.0; extra == "dev"
-Requires-Dist: importlib-metadata==8.6.1; extra == "dev"
+Requires-Dist: importlib-metadata==8.7.0; 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"
@@ -41,9 +41,10 @@ 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: pyright==1.1.400; extra == "dev"
 Requires-Dist: pytest-check==2.5.3; extra == "dev"
 Requires-Dist: pytest-cov==6.1.1; extra == "dev"
+Requires-Dist: rudi-node-write==1.3.1; extra == "dev"
 Requires-Dist: tomli==2.2.1; extra == "dev"
 Requires-Dist: twine==6.1.0; extra == "dev"
 Dynamic: license-file

{rudi_node_write-1.3.0 → rudi_node_write-1.3.2}/src/rudi_node_write.egg-info/requires.txt

@@ -1,15 +1,15 @@
 beautifulsoup4==4.13.4
 chardet==5.2.0
-deepdiff==8.4.2
-puremagic==1.28
+deepdiff==8.5.0
+puremagic==1.29
 
 [dev]
 backports.tarfile==1.2.0
 black==25.1.0
 build==1.2.2.post1
-commitizen==4.6.0
+commitizen==4.7.2
 flake8==7.2.0
-importlib-metadata==8.6.1
+importlib-metadata==8.7.0
 importlib-resources==6.5.2
 inflect==7.5.0
 ipykernel==6.29.5
@@ -24,8 +24,9 @@ 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
+pyright==1.1.400
 pytest-check==2.5.3
 pytest-cov==6.1.1
+rudi-node-write==1.3.1
 tomli==2.2.1
 twine==6.1.0