rudi-node-write 1.3.4__tar.gz → 1.3.6__tar.gz

{rudi_node_write-1.3.4/src/rudi_node_write.egg-info → rudi_node_write-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.3.4
+Version: 1.3.6
 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>
@@ -58,13 +58,12 @@ Requires-Dist: protobuf==6.31.1; extra == "dev"
 Requires-Dist: py-env==0.0.1; extra == "dev"
 Requires-Dist: pybind11==2.13.6; extra == "dev"
 Requires-Dist: pyright==1.1.401; extra == "dev"
-Requires-Dist: pyside6-addons==6.9.0; extra == "dev"
+Requires-Dist: pyside6-addons==6.9.1; extra == "dev"
 Requires-Dist: pytest-check==2.5.3; extra == "dev"
 Requires-Dist: pytest-cov==6.1.1; extra == "dev"
 Requires-Dist: python-dotenv==1.1.0; extra == "dev"
 Requires-Dist: python-multipart==0.0.20; extra == "dev"
 Requires-Dist: regex==2024.11.6; extra == "dev"
-Requires-Dist: rudi-node-write==1.3.3; extra == "dev"
 Requires-Dist: timm==1.0.15; extra == "dev"
 Requires-Dist: tomli==2.2.1; extra == "dev"
 Requires-Dist: twine==6.1.0; extra == "dev"

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rudi-node-write"
-version = "1.3.4"
+version = "1.3.6"
 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.4"
+version = "1.3.6"
 version_files = ["pyproject.toml:version"]
 
 # ----- Tool: pytest

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/requirements-dev.txt

@@ -1,4 +1,3 @@
-# -r requirements.txt
 backports.tarfile==1.2.0
 black==25.1.0
 build==1.2.2.post1
@@ -36,13 +35,12 @@ protobuf==6.31.1
 py-env==0.0.1
 pybind11==2.13.6
 pyright==1.1.401
-pyside6-addons==6.9.0
+pyside6-addons==6.9.1
 pytest-check==2.5.3
 pytest-cov==6.1.1
 python-dotenv==1.1.0
 python-multipart==0.0.20
 regex==2024.11.6
-rudi-node-write==1.3.3
 timm==1.0.15
 tomli==2.2.1
 twine==6.1.0
@@ -87,7 +85,7 @@ websockets==15.0.1
 # hf-xet==1.1.2 # Installed as dependency for huggingface-hub
 # hidapi==0.14.0.post4 # Installed as dependency for onlykey
 # httpcore==1.0.9 # Installed as dependency for httpx
-# huggingface-hub==0.32.3 # Installed as dependency for timm
+# huggingface-hub==0.32.4 # Installed as dependency for timm
 # id==1.5.0 # Installed as dependency for twine
 # identify==2.6.12 # Installed as dependency for pre-commit
 # idna==3.10 # Installed as dependency for anyio, email-validator, httpx, requests
@@ -143,13 +141,13 @@ websockets==15.0.1
 # pydantic==2.11.5 # Installed as dependency for fastapi
 # pydantic-core==2.34.1 # Installed as dependency for pydantic
 # pyflakes==3.3.2 # Installed as dependency for flake8
-# pygments==2.19.1 # Installed as dependency for ipython, ipython-pygments-lexers, readme-renderer, rich
+# pygments==2.19.1 # Installed as dependency for ipython, ipython-pygments-lexers, pytest, readme-renderer, rich
 # pymsgbox==1.0.9 # Installed as dependency for lib-agent
 # pynacl==1.5.0 # Installed as dependency for lib-agent, onlykey
 # pyproject-hooks==1.2.0 # Installed as dependency for build
 # pyserial==3.5 # Installed as dependency for onlykey-solo-python
-# pyside6-essentials==6.9.0 # Installed as dependency for pyside6-addons
-# pytest==8.3.5 # Installed as dependency for pytest-check, pytest-cov
+# pyside6-essentials==6.9.1 # Installed as dependency for pyside6-addons
+# pytest==8.4.0 # Installed as dependency for pytest-check, pytest-cov
 # python-daemon==3.1.2 # Installed as dependency for lib-agent
 # python-dateutil==2.9.0.post0 # Installed as dependency for jupyter-client
 # pyusb==1.3.1 # Installed as dependency for onlykey-solo-python
@@ -169,7 +167,7 @@ websockets==15.0.1
 # safetensors==0.5.3 # Installed as dependency for timm
 # semver==3.0.4 # Installed as dependency for lib-agent
 # shellingham==1.5.4 # Installed as dependency for typer
-# shiboken6==6.9.0 # Installed as dependency for pyside6-addons, pyside6-essentials
+# shiboken6==6.9.1 # Installed as dependency for pyside6-addons, pyside6-essentials
 # six==1.17.0 # Installed as dependency for cssbeautifier, ecdsa, jsbeautifier, onlykey, python-dateutil
 # sniffio==1.3.1 # Installed as dependency for anyio
 # stack-data==0.6.3 # Installed as dependency for ipython

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/conf/meta_defaults.py

@@ -6,7 +6,7 @@ from rudi_node_write.rudi_types.rudi_const import Language
 DEFAULT_LANG: Language = "fr"
 
 # Current version for RUDI Node metadata
-RUDI_API_VERSION: Final[str] = "1.3.0"
+RUDI_API_VERSION: Final[str] = "1.4.0"
 
 # Current version for ODS
 ODS_API_VERSION: str = "2.1"

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/connectors/io_connector.py

@@ -244,7 +244,7 @@ class Connector:
         if not keep_alive and not self.keep_connection:
             self.close_connection()
 
-        if type(response_data) is str:
+        if isinstance(response_data, str):
             log_d_if(self.should_log_response, here, "Response is a string", response_data)
             if response.status < 400:
                 return rdata.decode("utf8")
@@ -259,10 +259,11 @@ class Connector:
 
 if __name__ == "__main__":  # pragma: no cover
     tests = "Connector tests"
-    connector = Connector("https://bacasable.fenix.rudi-univ-rennes1.fr/api/version")
+    node_url = "https://bacasable.fenix.rudi-univ-rennes1.fr"
+    connector = Connector(f"{node_url}/catalog/version")
     log_d(tests, "testing connection, got version", connector.test_connection())
 
-    connector = Connector("https://bacasable.fenix.rudi-univ-rennes1.fr/api/v1")
+    connector = Connector(f"{node_url}/catalog/v1")
     metadata_list = connector.request("resources")
     if isinstance(metadata_list, dict) and metadata_list["total"] is not None:
         log_d(tests, "number of resources declared", f"{metadata_list['total']}")

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/connectors/io_rudi_catalog_write.py

@@ -1,8 +1,7 @@
-from os.path import isdir, abspath
+from os.path import isdir
 from time import time
 from urllib.parse import quote
 
-from _pytest.config.argparsing import ArgumentError
 
 from rudi_node_write.connectors.io_connector import Connector, https_download
 from rudi_node_write.connectors.io_rudi_jwt_factory import RudiNodeJwtFactory
@@ -28,8 +27,8 @@ from rudi_node_write.utils.file_utils import read_json_file, write_file
 from rudi_node_write.utils.jwt import is_jwt_expired
 from rudi_node_write.utils.list_utils import get_first_list_elt_or_none
 from rudi_node_write.utils.log import log_d, log_e, log_w
-from rudi_node_write.utils.str_utils import slash_join, uuid4_str, is_uuid_v4
-from rudi_node_write.utils.typing_utils import get_type_name, check_type
+from rudi_node_write.utils.str_utils import absolute_path, slash_join, uuid4_str, is_uuid_v4
+from rudi_node_write.utils.typing_utils import get_type_name
 from rudi_node_write.utils.url_utils import ensure_url_startswith
 
 
@@ -663,11 +662,12 @@ class RudiNodeCatalogConnector(Connector):
             raise FileNotFoundError(f"The following folder does not exist: '{local_download_dir}'")
 
         media_name = media.get("media_name")
+        assert isinstance(media_name, str)
         media_url = safe_get_key(media, "connector", "url")
         if not media_url:
             raise FileNotFoundError(f"No URL was provided for the media {media_name}")
 
-        destination_path = abspath(slash_join(local_download_dir, media_name))
+        destination_path = absolute_path(local_download_dir, media_name)
         try:
             content = https_download(media_url)
             if not content:

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/connectors/io_rudi_manager_write.py

@@ -1,6 +1,5 @@
-from base64 import urlsafe_b64decode, urlsafe_b64encode
 from json import dumps
-from os.path import abspath, exists, isdir
+from os.path import exists, isdir
 from ssl import SSLCertVerificationError
 from time import time
 from typing import Literal
@@ -22,10 +21,10 @@ from rudi_node_write.rudi_types.serializable import Serializable
 from rudi_node_write.utils.dict_utils import check_is_dict, merge_dict_of_list, pick_in_dict, safe_get_key
 from rudi_node_write.utils.err import HttpError, HttpErrorNotFound, UnexpectedValueException
 from rudi_node_write.utils.file_utils import check_is_file, read_json_file, write_file
-from rudi_node_write.utils.jwt import is_base64_url, is_jwt_expired, pad_b64_str
+from rudi_node_write.utils.jwt import is_jwt_expired
 from rudi_node_write.utils.list_utils import get_first_list_elt_or_none
 from rudi_node_write.utils.log import log_d, log_e, log_w
-from rudi_node_write.utils.str_utils import check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
+from rudi_node_write.utils.str_utils import absolute_path, check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
 from rudi_node_write.utils.type_date import Date
 from rudi_node_write.utils.typing_utils import check_is_int, get_type_name
 from rudi_node_write.utils.url_utils import ensure_url_startswith
@@ -1027,7 +1026,7 @@ class RudiNodeManagerConnector(Connector):
         if not media_url:
             raise FileNotFoundError(f"No URL was provided for the media {media_name}")
 
-        destination_path = abspath(slash_join(local_download_dir, media_name))
+        destination_path = absolute_path(local_download_dir, media_name)
         try:
             content = https_download(media_url)
             if not content:
@@ -1131,6 +1130,7 @@ class RudiNodeManagerConnector(Connector):
         self,
         file_local_path: str,
         media_id: str = uuid4_str(),
+        rudi_media: RudiMediaFile | None = None,
     ):
         """
         :param file_local_path: the path of a local file we wish to send to a RUDI node Storage server
@@ -1139,9 +1139,20 @@ class RudiNodeManagerConnector(Connector):
         """
         here = f"{self.class_name}.post_local_file"
 
+        if rudi_media is None:
+            rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
+        else:
+            check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
+            rudi_media.file_size = check_media_info.file_size
+            rudi_media.checksum = check_media_info.checksum
+
+        media_id = rudi_media.media_id
+
         # Posting the file as a binary directly to RUDI node Storage storage module
         res = self.storage_connector.post_local_file(
-            file_local_path=check_is_file(file_local_path), media_id=check_is_uuid4(media_id)
+            file_local_path=check_is_file(file_local_path),
+            media_id=check_is_uuid4(media_id),
+            rudi_media=rudi_media,
         )
         if res is None or not isinstance(res, dict) or res["media_info"] is None:
             raise Exception("Upload to RUDI Media failed!")
@@ -1277,10 +1288,16 @@ class RudiNodeStorageConnector(Connector):
         media_info = media_list.get("zone1")  # What if there are other zones?
         return [] if media_info is None else media_info.get("list")
 
-    def post_local_file(self, file_local_path: str, media_id: str = uuid4_str()):
+    def post_local_file(
+        self,
+        file_local_path: str,
+        media_id: str = uuid4_str(),
+        rudi_media: RudiMediaFile | None = None,
+    ):
         """
         :param file_local_path: the path of a local file we wish to send to a RUDI node Media server
         :param media_id: the UUIDv4 that identifies the media on the RUDI node
+        :param rudi_media: an optional RudiMediaFile object (in the case of an update)
         :return:
         """
         # :param media_name: the original name of the file
@@ -1289,6 +1306,13 @@ class RudiNodeStorageConnector(Connector):
         # :param charset: the encoding of the file
         here = f"{self.class_name}.post_local_file"
 
+        if rudi_media is None:
+            rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
+        else:
+            check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
+            rudi_media.file_size = check_media_info.file_size
+            rudi_media.checksum = check_media_info.checksum
+
         rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
         if rudi_media.file_size > FileTooBigException.MAX_SIZE:
             raise FileTooBigException(rudi_media.file_size)

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/connectors/io_rudi_manager_write_v3.py

@@ -1,6 +1,6 @@
 from http.client import IncompleteRead
 from json import dumps
-from os.path import abspath, exists, isdir
+from os.path import exists, isdir
 from re import T
 from time import time
 from typing import Literal
@@ -26,7 +26,7 @@ from rudi_node_write.utils.file_utils import check_is_file, read_json_file, writ
 from rudi_node_write.utils.jwt import is_jwt_expired
 from rudi_node_write.utils.list_utils import get_first_list_elt_or_none
 from rudi_node_write.utils.log import log_d, log_e, log_w
-from rudi_node_write.utils.str_utils import check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
+from rudi_node_write.utils.str_utils import absolute_path, check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
 from rudi_node_write.utils.type_date import Date
 from rudi_node_write.utils.typing_utils import check_is_int, get_type_name
 from rudi_node_write.utils.url_utils import ensure_url_startswith
@@ -1006,7 +1006,7 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         if not media_url:
             raise FileNotFoundError(f"No URL was provided for the media {media_name}")
 
-        destination_path = abspath(slash_join(local_download_dir, media_name))
+        destination_path = absolute_path(local_download_dir, media_name)
         try:
             content = https_download(media_url)
             if not content:
@@ -1110,18 +1110,30 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         self,
         file_local_path: str,
         media_id: str = uuid4_str(),
-    ):
+        rudi_media: RudiMediaFile | None = None,
+    ) -> RudiMediaFile:
         """
         :param file_local_path: the path of a local file we wish to send to a RUDI node Storage server
         :param media_id: the UUIDv4 that identifies the media on the RUDI node
         :return:
         """
-        here = f"{self.class_name}_v3.post_local_file"
+        here = f"{self.class_name}.post_local_file"
+
+        if rudi_media is None:
+            rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
+        else:
+            check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
+            rudi_media.file_size = check_media_info.file_size
+            rudi_media.checksum = check_media_info.checksum
+
+        media_id = rudi_media.media_id
 
         # Posting the file as a binary directly to RUDI node Storage module
         try:
             res = self.storage_connector.post_local_file(
-                file_local_path=check_is_file(file_local_path), media_id=check_is_uuid4(media_id)
+                file_local_path=check_is_file(file_local_path),
+                media_id=rudi_media.media_id,
+                rudi_media=rudi_media,
             )
         except IncompleteRead as e:
             log_e(here, "Upload to RUDI Storage failed (IncompleteRead)", e)
@@ -1130,14 +1142,17 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
         except Exception as e:
             log_e(here, "Upload to RUDI Storage failed", e)
             raise e
-        if res is None or not isinstance(res, dict) or res["media_info"] is None:
+        if res is None or not isinstance(res, dict) or res.get("media_info") is None:
             raise Exception("Upload to RUDI Storage failed!")
         media_info, zone_name, commit_uuid = (
             res["media_info"],
             res["zone_name"],
             res["commit_uuid"],
         )
+        assert isinstance(media_info, RudiMediaFile)
         # log_d(here, "media_info", str(media_info))
+        # log_d(here, "zone_name", zone_name)
+        # log_d(here, "commit_uuid", commit_uuid)
 
         # Posting the file metadata as a RudiMediaFile object to the RUDI Catalog module through the PM data API
         if not self._gen == 1:
@@ -1154,19 +1169,19 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
             return media_info
 
         # Committing the file that has been uploaded
-        log_d(here, "zone_name", zone_name)
-        log_d(here, "commit_uuid", commit_uuid)
-        res_commit = self.commit_media(media_id=media_info.media_id, zone_name=zone_name, commit_uuid=commit_uuid)
+        res_commit = self.commit_media(media_id=media_id, zone_name=zone_name, commit_uuid=commit_uuid)
         log_d(here, "res_commit", res_commit)
 
         # Returning the updated RudiMedia information
         if isinstance(api_media_info, dict):
             updated_media_info = RudiMediaFile.from_json(api_media_info)
-            return updated_media_info
         else:
-            log_w(here, f"unexpected result, should have a 'RudiMediaFile' compatible dict, got {media_info}")
+            log_w(here, f"unexpected result, should have a 'RudiMediaFile' compatible dict, got {api_media_info}")
             return media_info
 
+        # Returning the updated RudiMedia information
+        return updated_media_info
+
     # TODO: PM API for commit only file / only API / both?
 
     def commit_media(self, media_id: str, commit_uuid: str, zone_name: str, metadata_id: str | None = None):
@@ -1278,10 +1293,16 @@ class RudiNodeStorageConnectorV3(Connector):
 
         return [] if media_info is None else media_info.get("list")
 
-    def post_local_file(self, file_local_path: str, media_id: str = uuid4_str()):
+    def post_local_file(
+        self,
+        file_local_path: str,
+        media_id: str | None = None,
+        rudi_media: RudiMediaFile | None = None,
+    ):
         """
         :param file_local_path: the path of a local file we wish to send to a RUDI node Media server
         :param media_id: the UUIDv4 that identifies the media on the RUDI node
+        :param rudi_media: an optional RudiMediaFile object (in the case of an update)
         :return:
         """
         # :param media_name: the original name of the file
@@ -1290,12 +1311,19 @@ class RudiNodeStorageConnectorV3(Connector):
         # :param charset: the encoding of the file
         here = f"{self.class_name}.post_local_file"
 
-        media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
-        if media_info.file_size > FileTooBigException.MAX_SIZE:
-            raise FileTooBigException(media_info.file_size)
+        if rudi_media is None:
+            rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
+        else:
+            check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
+            rudi_media.file_size = check_media_info.file_size
+            rudi_media.checksum = check_media_info.checksum
+
+        if rudi_media.file_size > FileTooBigException.MAX_SIZE:
+            raise FileTooBigException(rudi_media.file_size)
+        media_id = rudi_media.media_id
 
-        log_d(here, "sending as binary for file", media_info)
-        headers = self.get_media_headers_for_file(media_info) | {"Content-Type": "octet/stream"}
+        log_d(here, "sending as binary for file", rudi_media)
+        headers = self.get_media_headers_for_file(rudi_media) | {"Content-Type": "octet/stream"}
         # log_d(here, "headers", headers)
         with open(file_local_path, "rb") as bin_content:
             try:
@@ -1315,17 +1343,18 @@ class RudiNodeStorageConnectorV3(Connector):
             commit_ready = res[-2]
             log_d(here, "commit_ready", commit_ready)
             # Updating the connector.url information for the media
-            media_info.set_url(slash_join(self.base_url, "download", media_id))
+            rudi_media.set_url(slash_join(self.base_url, "download", rudi_media.media_id))
             # Updating the file storage status information for the media
-            media_info.set_status("available")
+            rudi_media.set_status("available")
             return {
-                "media_info": media_info,
+                "media_info": rudi_media,
                 "zone_name": commit_ready["zone_name"],
                 "commit_uuid": commit_ready["commit_uuid"],
             }
         if len(res) > 0 and res[0].get("status") == "error":
             log_w(here, "ERR upload failed", res[0].get("msg"))
             raise Exception("File upload to RUDI Media falied:" + res[0])
+
         return res
 
 

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/rudi_node_writer.py

@@ -1,13 +1,12 @@
 from json import dumps, loads
-from os.path import abspath, isdir
+from os.path import isdir
 from time import time
 
 from rudi_node_write.connectors.io_connector import https_download
-from rudi_node_write.connectors.io_rudi_manager_write import RudiNodeManagerConnector
 from rudi_node_write.connectors.io_rudi_manager_write_v2 import RudiNodeManagerConnectorV2
 from rudi_node_write.connectors.io_rudi_manager_write_v3 import RudiNodeManagerConnectorV3
 from rudi_node_write.connectors.rudi_node_auth import RudiNodeAuth
-from rudi_node_write.rudi_types.rudi_meta import RudiMetadata
+from rudi_node_write.rudi_types.rudi_meta import RudiMediaFile, RudiMetadata
 from rudi_node_write.utils.dict_utils import (
     check_get_key,
     filter_dict_list,
@@ -17,7 +16,7 @@ from rudi_node_write.utils.dict_utils import (
 )
 from rudi_node_write.utils.file_utils import read_json_file
 from rudi_node_write.utils.log import log_d
-from rudi_node_write.utils.str_utils import check_is_string, check_is_uuid4, slash_join, uuid4_str
+from rudi_node_write.utils.str_utils import absolute_path, check_is_string, check_is_uuid4, slash_join, uuid4_str
 from rudi_node_write.utils.type_date import Date
 
 _USER_AGENT_DEFAULT = "RudiNodeWriter"
@@ -398,7 +397,7 @@ class RudiNodeWriter:
         media_name = check_get_key(media, "media_name")
         media_url = check_get_key(media, "connector", "url")
 
-        destination_path = abspath(slash_join(local_download_dir, media_name))
+        destination_path = absolute_path(local_download_dir, media_name)
         content = https_download(media_url)
         if content is None:
             raise Exception(f"Could not download from {media_url}")
@@ -475,7 +474,7 @@ class RudiNodeWriter:
         :param local_download_dir: the path to a local folder
         :param file_name: the name of the file in which the JSON representation of the list of metadata will be saved
         """
-        file_path = abspath(slash_join(local_download_dir, file_name))
+        file_path = absolute_path(local_download_dir, file_name)
         json_str = dumps(obj=self.metadata_list, ensure_ascii=False, indent=2).encode("utf-8")
         open(file_path, "wb").write(json_str)
 
@@ -485,13 +484,18 @@ class RudiNodeWriter:
         """
         return self.connector.put_metadata(metadata=metadata)
 
-    def post_local_file_and_media_info(self, file_local_path: str, media_id: str = uuid4_str()):
+    def post_local_file_and_media_info(
+        self,
+        file_local_path: str,
+        media_id: str = uuid4_str(),
+        rudi_media: RudiMediaFile | None = None,
+    ) -> RudiMediaFile:
         """
         Upload a local file on the RUDI node
-        Creates automatically the "media" part of the metadata
+        Creates automatically the "media" part of the metadata if it is not provided.
         :return:
         """
-        return self.connector.post_local_file(file_local_path=file_local_path, media_id=media_id)
+        return self.connector.post_local_file(file_local_path=file_local_path, media_id=media_id, rudi_media=rudi_media)
 
 
 if __name__ == "__main__":  # pragma: no cover

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/rudi_types/rudi_media.py

@@ -413,7 +413,7 @@ class RudiMediaFile(RudiMedia):
         self.file_status_update = Date.now_iso_str()
 
     @staticmethod
-    def from_local_file(file_local_path: str, media_id: str = uuid4_str(), file_url: str = "to_be_provided"):
+    def from_local_file(file_local_path: str, media_id: str | None = uuid4_str(), file_url: str = "to_be_provided"):
         here = f"{RudiMediaFile}.from_local_file"
         file_info = FileDetails(file_local_path)
         log_d(here, "file_info", file_info)
@@ -439,7 +439,7 @@ if __name__ == "__main__":  # pragma: no cover
             "updated": "2022-01-21T10:40:28.781+00:00",
         },
         "connector": {
-            "url": "https://bacasable.fenix.rudi-univ-rennes1.fr/media/download/2611547a-42f1-4d7c-b736-2fef5cca30fe",
+            "url": "https://bacasable.fenix.rudi-univ-rennes1.fr/storage/download/2611547a-42f1-4d7c-b736-2fef5cca30fe",
             "interface_contract": "dwnl",
             "connector_parameters": [
                 {

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/utils/err.py

@@ -68,12 +68,12 @@ class HttpError(Exception):
         self.url = url
         # print(here, f"http err {self.status}:", err)
         if type(err) is dict and "error" in err and "message" in err:
-            err_status = err["status"] if "status" in err else err.get("statusCode")
+            self.status = err["status"] if "status" in err else err.get("statusCode")
             err_type = err["error"]
             err_msg = err["message"]
-            self.message = f"{err_status} {err_type}: {err_msg}"
+            self.message = f"{err_type}: {err_msg}"
         else:
-            self.message = f"{self.status} {err}"
+            self.message = f"{err}"
         if req_method and base_url:
             self.message = f"for request '{req_method} {slash_join(base_url, url)}' -> {err}"
         super().__init__(self.message)

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write/utils/str_utils.py

@@ -1,3 +1,4 @@
+from os.path import abspath, join
 from re import compile
 from typing import Callable
 from uuid import UUID, uuid4
@@ -68,6 +69,10 @@ def check_is_uuid4(uuid) -> str:
     raise ValueError(f"Input parameter is not a valid UUID v4: '{uuid}'")
 
 
+def absolute_path(*args) -> str:
+    return abspath(join(*args))
+
+
 def slash_join(*args) -> str:
     """
     Joins a set of strings with a slash (/) between them (useful for merging URLs or paths fragments)

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6/src/rudi_node_write.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rudi-node-write
-Version: 1.3.4
+Version: 1.3.6
 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>
@@ -58,13 +58,12 @@ Requires-Dist: protobuf==6.31.1; extra == "dev"
 Requires-Dist: py-env==0.0.1; extra == "dev"
 Requires-Dist: pybind11==2.13.6; extra == "dev"
 Requires-Dist: pyright==1.1.401; extra == "dev"
-Requires-Dist: pyside6-addons==6.9.0; extra == "dev"
+Requires-Dist: pyside6-addons==6.9.1; extra == "dev"
 Requires-Dist: pytest-check==2.5.3; extra == "dev"
 Requires-Dist: pytest-cov==6.1.1; extra == "dev"
 Requires-Dist: python-dotenv==1.1.0; extra == "dev"
 Requires-Dist: python-multipart==0.0.20; extra == "dev"
 Requires-Dist: regex==2024.11.6; extra == "dev"
-Requires-Dist: rudi-node-write==1.3.3; extra == "dev"
 Requires-Dist: timm==1.0.15; extra == "dev"
 Requires-Dist: tomli==2.2.1; extra == "dev"
 Requires-Dist: twine==6.1.0; extra == "dev"

{rudi_node_write-1.3.4 → rudi_node_write-1.3.6}/src/rudi_node_write.egg-info/requires.txt

@@ -41,13 +41,12 @@ protobuf==6.31.1
 py-env==0.0.1
 pybind11==2.13.6
 pyright==1.1.401
-pyside6-addons==6.9.0
+pyside6-addons==6.9.1
 pytest-check==2.5.3
 pytest-cov==6.1.1
 python-dotenv==1.1.0
 python-multipart==0.0.20
 regex==2024.11.6
-rudi-node-write==1.3.3
 timm==1.0.15
 tomli==2.2.1
 twine==6.1.0