[CAT-102] pr-ing missed commit for bytestream (#119)

Author: goatrocks

indico/http/client.py

@@ -87,7 +87,8 @@ def _handle_files(self, req_kwargs):
         # deepcopying buffers is not supported
         # so, remove "streams" before the deepcopy.
         if "streams" in req_kwargs:
-            streams = req_kwargs["streams"].copy()
+            if req_kwargs["streams"] is not None:
+                streams = req_kwargs["streams"].copy()
             del req_kwargs["streams"]
 
         new_kwargs = deepcopy(req_kwargs)

indico/queries/datasets.py

@@ -319,6 +319,7 @@ class _AddFiles(GraphQLRequest):
         }
     }
     """
+    
 
     def __init__(self, dataset_id: int, metadata: List[str]):
         super().__init__(

indico/queries/workflow.py

@@ -35,7 +35,7 @@ class ListWorkflows(GraphQLRequest):
     """
 
     def __init__(
-        self, *, dataset_ids: List[int] = None, workflow_ids: List[int] = None
+            self, *, dataset_ids: List[int] = None, workflow_ids: List[int] = None
     ):
         super().__init__(
             self.query,
@@ -114,10 +114,10 @@ class UpdateWorkflowSettings(RequestChain):
     """
 
     def __init__(
-        self,
-        workflow: Union[Workflow, int],
-        enable_review: bool = None,
-        enable_auto_review: bool = None,
+            self,
+            workflow: Union[Workflow, int],
+            enable_review: bool = None,
+            enable_auto_review: bool = None,
     ):
         self.workflow_id = workflow.id if isinstance(workflow, Workflow) else workflow
         if enable_review is None and enable_auto_review is None:
@@ -134,7 +134,6 @@ def requests(self):
 
 
 class _WorkflowSubmission(GraphQLRequest):
-
     query = """
         mutation workflowSubmissionMutation({signature}) {{
             {mutation_name}({args}) {{
@@ -180,9 +179,9 @@ class _WorkflowSubmission(GraphQLRequest):
     }
 
     def __init__(
-        self,
-        detailed_response: bool,
-        **kwargs,
+            self,
+            detailed_response: bool,
+            **kwargs,
     ):
         self.workflow_id = kwargs["workflow_id"]
         self.record_submission = kwargs["record_submission"]
@@ -263,28 +262,33 @@ class WorkflowSubmission(RequestChain):
     detailed_response = False
 
     def __init__(
-        self,
-        workflow_id: int,
-        files: List[str] = None,
-        urls: List[str] = None,
-        submission: bool = True,
-        bundle: bool = False,
-        result_version: str = None,
-        streams: Dict[str, io.BufferedIOBase] = None
+            self,
+            workflow_id: int,
+            files: List[str] = None,
+            urls: List[str] = None,
+            submission: bool = True,
+            bundle: bool = False,
+            result_version: str = None,
+            streams: Dict[str, io.BufferedIOBase] = None
     ):
         self.workflow_id = workflow_id
         self.files = files
         self.urls = urls
         self.submission = submission
         self.bundle = bundle
         self.result_version = result_version
-        self.streams = streams.copy()
-
-        if not self.files and not self.urls and not len(streams) > 0:
+        self.has_streams = False
+        if streams is not None:
+            self.streams = streams.copy()
+            self.has_streams = True
+        else:
+            self.streams = None
+
+        if not self.files and not self.urls and not self.has_streams:
             raise IndicoInputError("One of 'files', 'streams', or 'urls' must be specified")
-        elif self.files and len(self.streams) > 0:
+        elif self.files and self.has_streams:
             raise IndicoInputError("Only one of 'files' or 'streams' or 'urls' may be specified.")
-        elif (self.files or len(streams) > 0) and self.urls:
+        elif (self.files or self.has_streams) and self.urls:
             raise IndicoInputError("Only one of 'files' or 'streams' or 'urls' may be specified")
 
     def requests(self):
@@ -307,7 +311,7 @@ def requests(self):
                 bundle=self.bundle,
                 result_version=self.result_version,
             )
-        elif len(self.streams) > 0:
+        elif self.has_streams:
             yield UploadDocument(streams=self.streams)
             yield _WorkflowSubmission(
                 self.detailed_response,
@@ -343,12 +347,12 @@ class WorkflowSubmissionDetailed(WorkflowSubmission):
     detailed_response = True
 
     def __init__(
-        self,
-        workflow_id: int,
-        files: List[str] = None,
-        urls: List[str] = None,
-        bundle: bool = False,
-        result_version: str = None,
+            self,
+            workflow_id: int,
+            files: List[str] = None,
+            urls: List[str] = None,
+            bundle: bool = False,
+            result_version: str = None,
     ):
         super().__init__(
             workflow_id,

indico/types/document_report.py

@@ -12,7 +12,7 @@ class DocumentReport(BaseType):
     """
     A Document report about the associated InputFiles.
 
-    
+
     """
     dataset_id: int
     workflow_id: int

tests/integration/queries/test_workflow.py

@@ -1,3 +1,5 @@
+import io
+
 from indico.queries.workflow import GetWorkflow
 import pytest
 from pathlib import Path
@@ -96,6 +98,39 @@ def test_workflow_submission(
     assert isinstance(sub, Submission)
     assert sub.retrieved is True
 
+def test_workflow_submission_with_streams(
+    indico, airlines_dataset, airlines_model_group: ModelGroup
+):
+    client = IndicoClient()
+    wfs = client.call(ListWorkflows(dataset_ids=[airlines_dataset.id]))
+    wf = max(wfs, key=lambda w: w.id)
+
+    path = Path(str(Path(__file__).parents[1]) + "/data/mock.pdf")
+    fd = open(path.absolute(), "rb")
+    files = {
+        "mock.pdf": fd
+    }
+    submission_ids = client.call(WorkflowSubmission(workflow_id=wf.id, streams=files))
+    submission_id = submission_ids[0]
+    assert submission_id is not None
+
+    with pytest.raises(IndicoInputError):
+        client.call(SubmissionResult(submission_id, "FAILED"))
+
+    with pytest.raises(IndicoInputError):
+        client.call(SubmissionResult(submission_id, "INVALID_STATUS"))
+
+    result_url = client.call(SubmissionResult(submission_id, "COMPLETE", wait=True))
+    result = client.call(RetrieveStorageObject(result_url.result))
+    assert isinstance(result, dict)
+    assert result["submission_id"] == submission_id
+    assert result["file_version"] == 1
+    client.call(UpdateSubmission(submission_id, retrieved=True))
+    sub = client.call(GetSubmission(submission_id))
+    assert isinstance(sub, Submission)
+    assert sub.retrieved is True
+
+
 
 @pytest.mark.parametrize(
     "_input",