MRG: Merge pull request #621 from octue/fix-manifest-bugs

Fix data resource bugs
octue · Dec 5, 2023 · 88c41ca · 88c41ca
2 parents 384e5a1 + 19cfd4c
commit 88c41ca
Show file tree

Hide file tree

Showing 10 changed files with 500 additions and 254 deletions.
diff --git a/docs/source/inter_service_compatibility.rst b/docs/source/inter_service_compatibility.rst
diff --git a/octue/cloud/emulators/child.py b/octue/cloud/emulators/child.py
@@ -292,6 +292,9 @@ def _handle_result(self, message, **kwargs):
             output_manifest = Manifest.deserialise(output_manifest)
 
         try:
+            if kwargs["input_manifest"] is not None:
+                kwargs["input_manifest"] = Manifest.deserialise(kwargs["input_manifest"])
+
             return Analysis(
                 id=kwargs["analysis_id"],
                 twine={},

diff --git a/octue/metadata/recorded_questions.jsonl b/octue/metadata/recorded_questions.jsonl
@@ -81,3 +81,4 @@
 {"parent_sdk_version": "0.49.1", "question": {"data": "{\"input_values\": {\"height\": 4, \"width\": 72}, \"input_manifest\": {\"id\": \"34216d6d-e32e-4c40-8b05-ee9bd71966c9\", \"name\": null, \"datasets\": {\"my_dataset\": \"/var/folders/sk/hf5fbp616c77tsys9lz55qn40000gp/T/tmppi1e5t2n\"}}, \"children\": null, \"message_number\": 0}", "attributes": {"question_uuid": "3b1224da-8e7f-4b1b-8ef3-c5cf1a5e698c", "forward_logs": "1", "allow_save_diagnostics_data_on_crash": "1", "octue_sdk_version": "0.49.1"}}}
 {"parent_sdk_version": "0.49.2", "question": {"data": "{\"input_values\": {\"height\": 4, \"width\": 72}, \"input_manifest\": {\"id\": \"bdadcd12-a51b-4571-9db3-9d240bd15faa\", \"name\": null, \"datasets\": {\"my_dataset\": \"/var/folders/sk/hf5fbp616c77tsys9lz55qn40000gp/T/tmpw3232ii0\"}}, \"children\": null, \"message_number\": 0}", "attributes": {"question_uuid": "0b57da2c-38e2-4f8b-9368-fe35125da8fb", "forward_logs": "1", "allow_save_diagnostics_data_on_crash": "1", "octue_sdk_version": "0.49.2"}}}
 {"parent_sdk_version": "0.50.0", "question": {"data": "{\"input_values\": {\"height\": 4, \"width\": 72}, \"input_manifest\": {\"id\": \"2d618d16-2a2b-437b-8db7-d5139e1645f2\", \"name\": null, \"datasets\": {\"my_dataset\": \"/var/folders/sk/hf5fbp616c77tsys9lz55qn40000gp/T/tmpr7jpj4sp\"}}, \"children\": null, \"message_number\": 0}", "attributes": {"question_uuid": "7bc572dc-ab8b-4aed-a132-b0b509caceb3", "forward_logs": "1", "allow_save_diagnostics_data_on_crash": "1", "octue_sdk_version": "0.50.0"}}}
+{"parent_sdk_version": "0.50.1", "question": {"data": "{\"input_values\": {\"height\": 4, \"width\": 72}, \"input_manifest\": {\"id\": \"64fd48b8-8c81-4c7b-9cd3-466b8e612b60\", \"name\": null, \"datasets\": {\"my_dataset\": \"/var/folders/sk/hf5fbp616c77tsys9lz55qn40000gp/T/tmpya5m1ib5\"}}, \"children\": null, \"message_number\": 0}", "attributes": {"question_uuid": "d54e9568-c88f-4233-a217-636bf3a77f74", "forward_logs": "1", "allow_save_diagnostics_data_on_crash": "1", "octue_sdk_version": "0.50.1"}}}