From 89b0fa919f5b4e140d0f307a89139964b7d4cc8f Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Mon, 3 May 2021 18:03:15 +0100 Subject: [PATCH] REF: Pull metadata gathering for Datafile into method --- octue/resources/datafile.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/octue/resources/datafile.py b/octue/resources/datafile.py index a92710925..22792854b 100644 --- a/octue/resources/datafile.py +++ b/octue/resources/datafile.py @@ -198,14 +198,7 @@ def to_cloud(self, project_name, bucket_name, path_in_bucket): local_path=self.get_local_path(), bucket_name=bucket_name, path_in_bucket=path_in_bucket, - metadata={ - "timestamp": self.timestamp, - "id": self.id, - "hash_value": self.hash_value, - "cluster": self.cluster, - "sequence": self.sequence, - "tags": self.tags.serialise(), - }, + metadata=self.metadata(), ) return storage.path.generate_gs_path(bucket_name, path_in_bucket) @@ -366,3 +359,17 @@ def __exit__(obj, *args): ) return DataFileContextManager + + def metadata(self): + """Get the datafile's metadata in a serialised form. + + :return dict: + """ + return { + "id": self.id, + "timestamp": self.timestamp, + "hash_value": self.hash_value, + "cluster": self.cluster, + "sequence": self.sequence, + "tags": self.tags.serialise(), + }