Merge pull request patched-codes#118 from patched-codes/fix-dependency-upgrade-regression

Fix dependency upgrade regression

Author: codelion

patchwork/patchflows/DependencyUpgrade/DependencyUpgrade.py

@@ -49,22 +49,18 @@ def run(self) -> dict:
         number = 0
         modified_files = []
 
-        if self.inputs.get("prompt_value_file") is not None:
-            with open(self.inputs["prompt_value_file"], "r") as fp:
-                vulns = json.load(fp)
-                if len(vulns) > 0:
-                    number = number + len(vulns[0]["Updates"])
+        if self.inputs.get("prompt_values") is not None:
+            vulns = self.inputs.get("prompt_values")[0]
+            number = number + len(vulns["Updates"])
 
         for i in range(self.n):
             if self.analyze_impact:
                 analyze_inputs = copy.deepcopy(self.inputs)
                 update_info_list = []
 
-                if analyze_inputs.get("prompt_value_file") is not None:
-                    with open(analyze_inputs["prompt_value_file"], "r") as fp:
-                        vulns = json.load(fp)
-                        if len(vulns) > 0:
-                            update_info_list = vulns[0]["Updates"]
+                if analyze_inputs.get("prompt_values") is not None:
+                    vulns = analyze_inputs.get("prompt_values")[0]
+                    update_info_list = vulns["Updates"]
 
                 for update_info in update_info_list:
                     analyze_inputs["update_info"] = update_info
@@ -115,12 +111,11 @@ def run(self) -> dict:
             self.inputs.update(outputs)
             outputs = ExtractPackageManagerFile(self.inputs).run()
             self.inputs.update(outputs)
-            if self.inputs.get("prompt_value_file") is not None:
-                with open(self.inputs["prompt_value_file"], "r") as fp:
-                    vulns = json.load(fp)
-                    if len(vulns) < 1:
-                        break
-                    number = number + len(vulns[0]["Updates"])
+            if self.inputs.get("prompt_values") is not None:
+                vulns = self.inputs.get("prompt_values")[0]
+                if len(vulns) < 1:
+                    break
+                number = number + len(vulns["Updates"])
 
         self.inputs["pr_header"] = f"This pull request from patchwork fixes {number} vulnerabilities."
         outputs = CommitChanges(self.inputs).run()

patchwork/patchflows/ResolveIssue/ResolveIssue.py

@@ -86,13 +86,7 @@ def run(self) -> dict:
             )
 
         self.inputs["prompt_values"] = extracted_code_contexts
-
-        # Save extracted data to JSON
-        output_file = Path(tempfile.mktemp(".json"))
-        with open(output_file, "w", encoding="utf-8") as f:
-            json.dump(extracted_code_contexts, f, indent=2)
-
-        self.inputs["code_file"] = output_file
+        self.inputs["files_to_patch"] = extracted_code_contexts
         self.inputs["prompt_id"] = "resolve_issue"
         self.inputs["response_partitions"] = {
             "patch": ["Fixed Code:", "```", "\n", "```"],