auto parse dict inputs

Author: CTY-git

patchwork/common/utils/input_parsing.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
+import json
 from collections.abc import Iterable, Mapping
+from shutil import posix
 
 from typing_extensions import AnyStr, Union
 
@@ -69,3 +71,22 @@ def parse_to_list(
             continue
         rv.append(stripped_value)
     return rv
+
+def parse_to_dict(possible_dict, limit = -1):
+    if possible_dict is None and limit == 0:
+        return None
+
+    if isinstance(possible_dict, dict):
+        new_dict = dict()
+        for k, v in possible_dict.items():
+            new_dict[k] = parse_to_dict(v, limit - 1)
+        return new_dict
+    elif isinstance(possible_dict, str):
+        try:
+            new_dict = json.loads(possible_dict, strict=False)
+        except json.JSONDecodeError:
+            return possible_dict
+
+        return parse_to_dict(new_dict, limit - 1)
+    else:
+        return possible_dict

patchwork/steps/CallSQL/CallSQL.py

@@ -2,6 +2,7 @@
 
 from sqlalchemy import URL, create_engine, exc, text
 
+from patchwork.common.utils.input_parsing import parse_to_dict
 from patchwork.common.utils.utils import mustache_render
 from patchwork.logger import logger
 from patchwork.step import Step, StepStatus
@@ -25,7 +26,7 @@ def __build_engine(self, inputs: dict):
             port=inputs.get("db_port", 5432),
             password=inputs.get("db_password"),
             database=inputs.get("db_database"),
-            query=inputs.get("db_params"),
+            query=parse_to_dict(inputs.get("db_params")),
         )
         connection_url = URL.create(
             dialect_plus_driver,
@@ -34,7 +35,7 @@ def __build_engine(self, inputs: dict):
 
         connect_args = None
         if inputs.get("db_driver_args") is not None:
-            connect_args = inputs.get("db_driver_args")
+            connect_args = parse_to_dict(inputs.get("db_driver_args"))
 
         self.engine = create_engine(connection_url, connect_args=connect_args)
         with self.engine.connect() as conn:

patchwork/steps/ModifyCodeOnce/typed.py

@@ -15,3 +15,4 @@ class ModifyCodeOnceOutputs(TypedDict):
     path: str
     start_line: int
     end_line: int
+    diff: str

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "patchwork-cli"
-version = "0.0.91.dev0"
+version = "0.0.92.dev0"
 description = ""
 authors = ["patched.codes"]
 license = "AGPL"