mirror of
https://github.com/clearml/clearml
synced 2025-03-03 10:42:00 +00:00
Fix set artifacts storage destination with output_uri
This commit is contained in:
parent
648a972199
commit
2ba372560e
@ -286,6 +286,9 @@ class UploadEvent(MetricsEventAdapter):
|
||||
storage_key_prefix = self._override_storage_key_prefix
|
||||
key = '/'.join(x for x in (storage_key_prefix, self.metric, self.variant, filename.strip('/')) if x)
|
||||
url = '/'.join(x.strip('/') for x in (e_storage_uri, key))
|
||||
# make sure we preserve local path root
|
||||
if e_storage_uri.startswith('/'):
|
||||
url = '/'+url
|
||||
return key, url
|
||||
|
||||
|
||||
|
@ -434,7 +434,7 @@ class ScriptInfo(object):
|
||||
plugin = next((p for p in cls.plugins if p.exists(script_dir)), None)
|
||||
repo_info = DetectionResult()
|
||||
if not plugin:
|
||||
_log("expected one of: {}", ", ".join((p.name for p in cls.plugins)))
|
||||
log.info("No repository found, storing script code instead")
|
||||
else:
|
||||
try:
|
||||
repo_info = plugin.get_info(str(script_dir), include_diff=check_uncommitted)
|
||||
|
@ -240,11 +240,12 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
|
||||
return res.response.id
|
||||
|
||||
def _set_storage_uri(self, value):
|
||||
value = value.rstrip('/')
|
||||
value = value.rstrip('/') if value else None
|
||||
self._storage_uri = StorageHelper.conform_url(value)
|
||||
self.data.output.destination = self._storage_uri
|
||||
self._edit(output_dest=self._storage_uri)
|
||||
self.output_model.upload_storage_uri = self._storage_uri
|
||||
self._edit(output_dest=self._storage_uri or '')
|
||||
if self._storage_uri or self._output_model:
|
||||
self.output_model.upload_storage_uri = self._storage_uri
|
||||
|
||||
@property
|
||||
def storage_uri(self):
|
||||
|
@ -307,7 +307,7 @@ class Artifacts(object):
|
||||
"""
|
||||
Upload local file and return uri of the uploaded file (uploading in the background)
|
||||
"""
|
||||
upload_uri = self._task.get_logger().get_default_upload_destination()
|
||||
upload_uri = self._task.output_uri or self._task.get_logger().get_default_upload_destination()
|
||||
if not isinstance(local_file, Path):
|
||||
local_file = Path(local_file)
|
||||
ev = UploadEvent(metric='artifacts', variant=name,
|
||||
|
@ -413,6 +413,7 @@ class Task(_Task):
|
||||
task.set_model_config(config_text='')
|
||||
task.set_model_label_enumeration({})
|
||||
task.set_artifacts([])
|
||||
task._set_storage_uri(None)
|
||||
|
||||
except (Exception, ValueError):
|
||||
# we failed reusing task, create a new one
|
||||
|
Loading…
Reference in New Issue
Block a user