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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.3.1
+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>
@@ -16,11 +16,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 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.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.7.1; extra == "dev"
+Requires-Dist: commitizen==4.7.2; extra == "dev"
 Requires-Dist: flake8==7.2.0; extra == "dev"
 Requires-Dist: importlib-metadata==8.7.0; extra == "dev"
 Requires-Dist: importlib-resources==6.5.2; extra == "dev"
@@ -40,7 +44,7 @@ Requires-Dist: py-env==0.0.1; 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.0; 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.1 → 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.1"
+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.1"
+version = "1.3.2"
 version_files = ["pyproject.toml:version"]
 
 # ----- Tool: pytest

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

@@ -1,7 +1,8 @@
+# -r requirements.txt
 backports.tarfile==1.2.0
 black==25.1.0
 build==1.2.2.post1
-commitizen==4.7.1
+commitizen==4.7.2
 flake8==7.2.0
 importlib-metadata==8.7.0
 importlib-resources==6.5.2
@@ -21,7 +22,7 @@ py-env==0.0.1
 pyright==1.1.400
 pytest-check==2.5.3
 pytest-cov==6.1.1
-rudi-node-write==1.3.0
+rudi-node-write==1.3.1
 tomli==2.2.1
 twine==6.1.0
 # appnope==0.1.4 # Installed as dependency for ipykernel
@@ -102,7 +103,7 @@ twine==6.1.0
 # 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.1.0 # 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.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

rudi_node_write-1.3.2/requirements.txt

@@ -0,0 +1,7 @@
+beautifulsoup4==4.13.4
+chardet==5.2.0
+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.1 → rudi_node_write-1.3.2}/src/rudi_node_write/connectors/io_rudi_manager_write.py

@@ -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.1 → rudi_node_write-1.3.2}/src/rudi_node_write/connectors/io_rudi_manager_write_v3.py

@@ -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}")
@@ -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.1 → 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.1 → 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.1
+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>
@@ -16,11 +16,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 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.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.7.1; extra == "dev"
+Requires-Dist: commitizen==4.7.2; extra == "dev"
 Requires-Dist: flake8==7.2.0; extra == "dev"
 Requires-Dist: importlib-metadata==8.7.0; extra == "dev"
 Requires-Dist: importlib-resources==6.5.2; extra == "dev"
@@ -40,7 +44,7 @@ Requires-Dist: py-env==0.0.1; 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.0; 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.1 → rudi_node_write-1.3.2}/src/rudi_node_write.egg-info/requires.txt

@@ -1,9 +1,13 @@
+beautifulsoup4==4.13.4
+chardet==5.2.0
+deepdiff==8.5.0
+puremagic==1.29
 
 [dev]
 backports.tarfile==1.2.0
 black==25.1.0
 build==1.2.2.post1
-commitizen==4.7.1
+commitizen==4.7.2
 flake8==7.2.0
 importlib-metadata==8.7.0
 importlib-resources==6.5.2
@@ -23,6 +27,6 @@ py-env==0.0.1
 pyright==1.1.400
 pytest-check==2.5.3
 pytest-cov==6.1.1
-rudi-node-write==1.3.0
+rudi-node-write==1.3.1
 tomli==2.2.1
 twine==6.1.0

rudi_node_write-1.3.1/requirements.txt

@@ -1,7 +0,0 @@
-# beautifulsoup4==4.13.4 # Installed as dependency for rudi-node-write
-# chardet==5.2.0 # Installed as dependency for rudi-node-write
-# deepdiff==8.5.0 # Installed as dependency for rudi-node-write
-# orderly-set==5.4.1 # Installed as dependency for deepdiff
-# puremagic==1.29 # Installed as dependency for rudi-node-write
-# soupsieve==2.7 # Installed as dependency for beautifulsoup4
-# typing-extensions==4.13.2 # Installed as dependency for beautifulsoup4, pyright, referencing, typeguard