fix use of to_json() instead of to_dict()

datalad · Feb 27, 2023 · 31d87d4 · 31d87d4
1 parent f60e7f2
commit 31d87d4
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/datalad_metalad/conduct.py b/datalad_metalad/conduct.py
@@ -303,7 +303,7 @@ def process_parallel(executor,
                 status="ok",
                 path=str(path),
                 logger=lgr,
-                pipeline_data=pipeline_data.to_json())
+                pipeline_data=pipeline_data.to_dict())
             continue
 
         lgr.debug(f"Starting new instance of {processor_specs[0]} on {pipeline_data}")
@@ -343,7 +343,7 @@ def process_parallel(executor,
                             status="ok",
                             path=str(path),
                             logger=lgr,
-                            pipeline_data=pipeline_data.to_json())
+                            pipeline_data=pipeline_data.to_dict())
                 else:
                     lgr.debug(
                         f"Starting processor[{next_index}]"
@@ -396,7 +396,7 @@ def process_parallel(executor,
                             status="ok",
                             path=str(path),
                             logger=lgr,
-                            pipeline_data=pipeline_data.to_json())
+                            pipeline_data=pipeline_data.to_dict())
                 else:
                     lgr.debug(
                         f"Handing pipeline data {pipeline_data} to"
@@ -500,7 +500,7 @@ def process_downstream(pipeline_data: PipelineData,
             status="ok",
             path=str(path),
             logger=lgr,
-            pipeline_data=pipeline_data.to_json())
+            pipeline_data=pipeline_data.to_dict())
 
         lgr.debug(
             f"Pipeline finished, returning datalad result {datalad_result}")

diff --git a/datalad_metalad/pipeline/pipelinedata.py b/datalad_metalad/pipeline/pipelinedata.py
@@ -20,8 +20,11 @@ class PipelineDataState(Enum):
     CONTINUE = "continue"
     STOP = "stop"
 
+    def to_dict(self) -> str:
+        return self.name
+
     def to_json(self):
-        return f'"{self.name}"'
+        return json.dumps(self.to_dict())
 
 
 @dataclass
@@ -94,8 +97,8 @@ def __str__(self):
             "result": self._result
         })
 
-    def to_json(self) -> Dict:
-        json_obj = {
+    def to_dict(self) -> Dict:
+        obj = {
             "state": self.state.name,
             "result": {
                 key: [
@@ -106,5 +109,8 @@ def to_json(self) -> Dict:
                 if key not in ("path",)
             }
         }
-        json_obj["result"]["path"] = str(self._result["path"])
-        return json_obj
+        obj["result"]["path"] = str(self._result["path"])
+        return obj
+
+    def to_json(self) -> str:
+        return json.dumps(self.to_dict())
diff --git a/datalad_metalad/pipeline/processor/add.py b/datalad_metalad/pipeline/processor/add.py
@@ -36,7 +36,7 @@ class MetadataAddResult(PipelineResult):
 
     def to_json(self) -> Dict:
         return {
-            **super().to_json(),
+            **super().to_dict(),
             "path": str(self.path)
         }
 

diff --git a/datalad_metalad/pipeline/processor/extract.py b/datalad_metalad/pipeline/processor/extract.py
@@ -100,7 +100,7 @@ def process(self, pipeline_data: PipelineData) -> PipelineData:
                 extractorname=self.extractor_name,
                 dataset=dataset_path,
                 path=intra_dataset_path,
-                file_info=dataset_traverse_record.element_info.to_json(),
+                file_info=dataset_traverse_record.element_info.to_dict(),
                 result_renderer="disabled")
         elif object_type == "dataset":
             kwargs = dict(

diff --git a/datalad_metalad/pipeline/processor/filter.py b/datalad_metalad/pipeline/processor/filter.py
@@ -30,7 +30,7 @@ class MetadataFilterResult(PipelineResult):
 
     def to_json(self) -> Dict:
         return {
-            **super().to_json(),
+            **super().to_dict(),
             "path": str(self.path),
             "metadata_record": self.metadata_record
         }

diff --git a/datalad_metalad/tests/test_conduct.py b/datalad_metalad/tests/test_conduct.py
@@ -109,12 +109,15 @@ class ConductTestResult(PipelineResult):
 class StringResult(PipelineResult):
     content: str
 
-    def to_json(self) -> Dict:
+    def to_dict(self) -> Dict:
         return {
-            **super().to_json(),
+            **super().to_dict(),
             "content": self.content
         }
 
+    def to_json(self) -> str:
+        return json.dumps(self.to_dict())
+
 
 class ConductTestTraverser(Provider):
     def __init__(self, path_spec: str):
@@ -247,7 +250,8 @@ def test_multiple_adder():
                     ]
                 ))
             ],
-            configuration=adder_pipeline))
+            configuration=adder_pipeline,
+            processing_mode="sequential"))
 
     eq_(len(pipeline_results), 1)
     result = pipeline_results[0]