rudi-node-write 1.3.5__tar.gz → 1.3.7__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {rudi_node_write-1.3.5/src/rudi_node_write.egg-info → rudi_node_write-1.3.7}/PKG-INFO +1 -1
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/pyproject.toml +2 -2
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/requirements-dev.txt +1 -1
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_manager_write.py +4 -5
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_manager_write_v3.py +13 -3
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7/src/rudi_node_write.egg-info}/PKG-INFO +1 -1
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/LICENCE.md +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/README.md +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/requirements.txt +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/setup.cfg +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/__init__.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/conf/meta_defaults.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_connector.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_catalog_write.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_jwt_factory.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_manager_write_v2.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_rudi_storage_write.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/rudi_node_auth.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_node_writer.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_const.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_contact.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_dates.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_dictionary_entry.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_geo.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_licence.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_media.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_meta.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_meta_misc.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_org.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/serializable.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/dict_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/err.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/file_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/html_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/jwt.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/list_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/log.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/str_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/type_date.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/typing_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/utils/url_utils.py +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write.egg-info/SOURCES.txt +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write.egg-info/dependency_links.txt +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write.egg-info/requires.txt +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write.egg-info/top_level.txt +0 -0
- {rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/tests/test_rudi_node_write.py +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "rudi-node-write"
|
|
7
|
-
version = "1.3.
|
|
7
|
+
version = "1.3.7"
|
|
8
8
|
authors = [{ name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" }]
|
|
9
9
|
maintainers = [
|
|
10
10
|
{ name = "Olivier Martineau", email = "olivier.martineau@irisa.fr" },
|
|
@@ -45,7 +45,7 @@ target-version = ['py311']
|
|
|
45
45
|
# ----- Tool: commitizen
|
|
46
46
|
[tool.commitizen]
|
|
47
47
|
name = "cz_conventional_commits"
|
|
48
|
-
version = "1.3.
|
|
48
|
+
version = "1.3.7"
|
|
49
49
|
version_files = ["pyproject.toml:version"]
|
|
50
50
|
|
|
51
51
|
# ----- Tool: pytest
|
|
@@ -82,7 +82,7 @@ websockets==15.0.1
|
|
|
82
82
|
# filelock==3.18.0 # Installed as dependency for huggingface-hub, torch, virtualenv
|
|
83
83
|
# fsspec==2025.5.1 # Installed as dependency for huggingface-hub, torch
|
|
84
84
|
# h11==0.16.0 # Installed as dependency for httpcore, uvicorn
|
|
85
|
-
# hf-xet==1.1.
|
|
85
|
+
# hf-xet==1.1.3 # Installed as dependency for huggingface-hub
|
|
86
86
|
# hidapi==0.14.0.post4 # Installed as dependency for onlykey
|
|
87
87
|
# httpcore==1.0.9 # Installed as dependency for httpx
|
|
88
88
|
# huggingface-hub==0.32.4 # Installed as dependency for timm
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
from base64 import urlsafe_b64decode, urlsafe_b64encode
|
|
2
1
|
from json import dumps
|
|
3
|
-
from os.path import
|
|
2
|
+
from os.path import exists, isdir
|
|
4
3
|
from ssl import SSLCertVerificationError
|
|
5
4
|
from time import time
|
|
6
5
|
from typing import Literal
|
|
@@ -22,10 +21,10 @@ from rudi_node_write.rudi_types.serializable import Serializable
|
|
|
22
21
|
from rudi_node_write.utils.dict_utils import check_is_dict, merge_dict_of_list, pick_in_dict, safe_get_key
|
|
23
22
|
from rudi_node_write.utils.err import HttpError, HttpErrorNotFound, UnexpectedValueException
|
|
24
23
|
from rudi_node_write.utils.file_utils import check_is_file, read_json_file, write_file
|
|
25
|
-
from rudi_node_write.utils.jwt import
|
|
24
|
+
from rudi_node_write.utils.jwt import is_jwt_expired
|
|
26
25
|
from rudi_node_write.utils.list_utils import get_first_list_elt_or_none
|
|
27
26
|
from rudi_node_write.utils.log import log_d, log_e, log_w
|
|
28
|
-
from rudi_node_write.utils.str_utils import check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
|
|
27
|
+
from rudi_node_write.utils.str_utils import absolute_path, check_is_uuid4, is_uuid_v4, slash_join, uuid4_str
|
|
29
28
|
from rudi_node_write.utils.type_date import Date
|
|
30
29
|
from rudi_node_write.utils.typing_utils import check_is_int, get_type_name
|
|
31
30
|
from rudi_node_write.utils.url_utils import ensure_url_startswith
|
|
@@ -1143,7 +1142,7 @@ class RudiNodeManagerConnector(Connector):
|
|
|
1143
1142
|
if rudi_media is None:
|
|
1144
1143
|
rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
|
|
1145
1144
|
else:
|
|
1146
|
-
check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
|
|
1145
|
+
check_media_info = RudiMediaFile.from_local_file(file_local_path, rudi_media.media_id)
|
|
1147
1146
|
rudi_media.file_size = check_media_info.file_size
|
|
1148
1147
|
rudi_media.checksum = check_media_info.checksum
|
|
1149
1148
|
|
|
@@ -1122,17 +1122,18 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
|
|
|
1122
1122
|
if rudi_media is None:
|
|
1123
1123
|
rudi_media = RudiMediaFile.from_local_file(file_local_path, media_id)
|
|
1124
1124
|
else:
|
|
1125
|
-
check_media_info = RudiMediaFile.from_local_file(file_local_path, media_id)
|
|
1125
|
+
check_media_info = RudiMediaFile.from_local_file(file_local_path, rudi_media.media_id)
|
|
1126
|
+
# log_d(here, "media_info", check_media_info)
|
|
1126
1127
|
rudi_media.file_size = check_media_info.file_size
|
|
1127
1128
|
rudi_media.checksum = check_media_info.checksum
|
|
1128
|
-
|
|
1129
|
+
# log_d(here, "rudi_media", rudi_media)
|
|
1129
1130
|
media_id = rudi_media.media_id
|
|
1130
1131
|
|
|
1131
1132
|
# Posting the file as a binary directly to RUDI node Storage module
|
|
1132
1133
|
try:
|
|
1133
1134
|
res = self.storage_connector.post_local_file(
|
|
1134
1135
|
file_local_path=check_is_file(file_local_path),
|
|
1135
|
-
media_id=
|
|
1136
|
+
media_id=media_id,
|
|
1136
1137
|
rudi_media=rudi_media,
|
|
1137
1138
|
)
|
|
1138
1139
|
except IncompleteRead as e:
|
|
@@ -1158,6 +1159,15 @@ class RudiNodeManagerConnectorV3(RudiNodeManagerConnector):
|
|
|
1158
1159
|
if not self._gen == 1:
|
|
1159
1160
|
try:
|
|
1160
1161
|
api_media_info = self.put_catalog("media", media_info)
|
|
1162
|
+
# list_meta = self.search_metadata_with_media_uuid(media_uuid=media_id)
|
|
1163
|
+
# assert isinstance(list_meta, list)
|
|
1164
|
+
# for meta_info in list_meta:
|
|
1165
|
+
# api_meta_info = self.put_catalog(url="resources", body=meta_info, keep_alive=True)
|
|
1166
|
+
# assert isinstance(api_meta_info, dict)
|
|
1167
|
+
# api_meta = RudiMetadata.from_json(api_meta_info)
|
|
1168
|
+
# log_d(here, "Metadata updated", api_meta.global_id)
|
|
1169
|
+
# log_d(here, "Metadata updated", api_meta.available_formats[0])
|
|
1170
|
+
# log_d(here, "Media info updated on Catalog")
|
|
1161
1171
|
except HttpError:
|
|
1162
1172
|
self._gen = 1
|
|
1163
1173
|
log_w(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/io_connector.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/connectors/rudi_node_auth.py
RENAMED
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_const.py
RENAMED
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_contact.py
RENAMED
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_dates.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_licence.py
RENAMED
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_media.py
RENAMED
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/rudi_meta_misc.py
RENAMED
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write/rudi_types/serializable.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{rudi_node_write-1.3.5 → rudi_node_write-1.3.7}/src/rudi_node_write.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|