Update app.py

app.py

@@ -107,80 +107,80 @@ class GitHubBot:
         return response.json()
 
     def resolve_issue(self, token: str, owner: str, repo: str, issue_number: int, resolution: str, forked_repo: str) -> str:
-        try:
-            if not self.ai_provider:
-                raise ValueError("AI provider not initialized. Please initialize with an AI provider.")
-
-            # Create a unique branch name for this fix
-            branch_name = f"fix/issue-{issue_number}-{datetime.now().strftime('%Y%m%d-%H%M%S')}"
-
-            # Clone repository and create new branch
-            if not self.git.clone(forked_repo):
-                raise Exception("Failed to clone repository")
-
-            if not self.git.create_branch(branch_name):
-                raise Exception("Failed to create branch")
-
-            # Get repository content and analyze
-            code_contexts = self._get_main_branch_content(owner, repo)
-            
-            # Get issue details
-            issue_url = f"{self.github_api.base_url}/repos/{owner}/{repo}/issues/{issue_number}"
-            response = requests.get(issue_url, headers=self.github_api.headers)
-            response.raise_for_status()
-            issue = response.json()
-
-            # Determine severity
-            severity = self._determine_severity(issue)
-            
-            # Generate AI solution
-            context = f"Repository: {owner}/{repo}\nIssue #{issue_number}: {issue['title']}\n\nCode contexts:\n"
-            for ctx in code_contexts[:3]:
-                context += f"\nFile: {ctx.file_path}\n```{ctx.language}\n{ctx.content}\n```\n"
-            
-            ai_solution = self.ai_provider.generate_solution(context, issue['body'])
-            
-            # Create comprehensive resolution document
-            full_resolution = self._create_resolution_document(
-                issue_number, severity, resolution, ai_solution
-            )
-            
-            # Save resolution
-            resolution_path = Path(RESOLUTIONS_DIRECTORY) / f"resolution_{issue_number}_{datetime.now().strftime('%Y%m%d_%H%M%S')}.md"
-            resolution_path.write_text(full_resolution)
-
-            # Prompt for manual intervention
-            print("\nAI-generated solution and original resolution have been saved.")
-            print(f"Please review and apply changes in: {self.temp_dir}")
-            input("Press Enter when changes are ready to commit...")
-
-            # Commit and push changes
-            if not self.git.commit(f"Fix #{issue_number}: {issue['title']}\n\n{resolution}"):
-                raise Exception("Failed to commit changes")
-
-            if not self.git.push("origin", branch_name):
-                raise Exception("Failed to push changes")
-
-            # Create pull request
-            pr = self.create_pull_request(
-                owner=owner,
-                repo=repo,
-                title=f"Fix #{issue_number}: {issue['title']}",
-                body=full_resolution,
-                head=branch_name
-            )
+    try:
+        if not self.ai_provider:
+            raise ValueError("AI provider not initialized. Please initialize with an AI provider.")
 
-            return f"Resolution implemented and PR created: {pr['html_url']}"
+        # Create a unique branch name for this fix
+        branch_name = f"fix/issue-{issue_number}-{datetime.now().strftime('%Y%m%d-%H%M%S')}"
 
-        except Exception as e:
-            error_msg = f"Error resolving issue #{issue_number} in repository {owner}/{repo}: {str(e)}"
-            self.logger.error(error_msg)
-            return error_msg
+        # Clone repository and create new branch
+        if not self.git.clone(forked_repo):
+            raise Exception("Failed to clone repository")
+
+        if not self.git.create_branch(branch_name):
+            raise Exception("Failed to create branch")
+
+        # Get repository content and analyze
+        code_contexts = self._get_main_branch_content(owner, repo)
+        
+        # Get issue details
+        issue_url = f"{self.github_api.base_url}/repos/{owner}/{repo}/issues/{issue_number}"
+        response = requests.get(issue_url, headers=self.github_api.headers)
+        response.raise_for_status()
+        issue = response.json()
+
+        # Determine severity
+        severity = self._determine_severity(issue)
+        
+        # Generate AI solution
+        context = f"Repository: {owner}/{repo}\nIssue #{issue_number}: {issue['title']}\n\nCode contexts:\n"
+        for ctx in code_contexts[:3]:
+            context += f"\nFile: {ctx.file_path}\n```{ctx.language}\n{ctx.content}\n```\n"
+        
+        ai_solution = self.ai_provider.generate_solution(context, issue['body'])
+        
+        # Create comprehensive resolution document
+        full_resolution = self._create_resolution_document(
+            issue_number, severity, resolution, ai_solution
+        )
+        
+        # Save resolution
+        resolution_path = Path(RESOLUTIONS_DIRECTORY) / f"resolution_{issue_number}_{datetime.now().strftime('%Y%m%d_%H%M%S')}.md"
+        resolution_path.write_text(full_resolution)
+
+        # Prompt for manual intervention
+        print("\nAI-generated solution and original resolution have been saved.")
+        print(f"Please review and apply changes in: {self.temp_dir}")
+        input("Press Enter when changes are ready to commit...")
+
+        # Commit and push changes
+        if not self.git.commit(f"Fix #{issue_number}: {issue['title']}\n\n{resolution}"):
+            raise Exception("Failed to commit changes")
+
+        if not self.git.push("origin", branch_name):
+            raise Exception("Failed to push changes")
+
+        # Create pull request
+        pr = self.create_pull_request(
+            owner=owner,
+            repo=repo,
+            title=f"Fix #{issue_number}: {issue['title']}",
+            body=full_resolution,
+            head=branch_name
+        )
 
-        finally:
-            # Cleanup
-            if self.temp_dir and os.path.exists(self.temp_dir):
-                shutil.rmtree(self.temp_dir)
+        return f"Resolution implemented and PR created: {pr['html_url']}"
+
+            except Exception as e:
+                error_msg = f"Error resolving issue #{issue_number} in repository {owner}/{repo}: {str(e)}"
+                self.logger.error(error_msg)
+                return error_msg
+
+            finally:
+        # Cleanup
+        if self.temp_dir and os.path.exists(self.temp_dir):
+            shutil.rmtree(self.temp_dir)
 
 def _create_resolution_document(self, issue_number: int, severity: IssueSeverity, 
                                  resolution: str, ai_solution: str) -> str: