Spaces:
Running
on
L40S
Running
on
L40S
File size: 17,691 Bytes
46a0b0f 29918c0 46a0b0f c8c66b5 46a0b0f 5d0be2a 46a0b0f 5d0be2a 46a0b0f 5d0be2a 46a0b0f 49e9feb c8c66b5 49e9feb c8c66b5 49e9feb c8c66b5 49e9feb c8c66b5 46a0b0f 29918c0 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 |
import os
import re
import json
import subprocess
import ast
import difflib
def show_project_structure(structure, spacing=0) -> str:
"""pprint the project structure"""
pp_string = ''
for key, value in structure.items():
if '.' in key and '.py' not in key:
continue # skip none python files
# TODO: maybe we should skip the test files...
if key.startswith('test'):
continue # skip the test files as well...
if '.' in key:
pp_string += ' ' * spacing + str(key) + '\n'
else:
pp_string += ' ' * spacing + str(key) + '/' + '\n'
if 'text' not in value:
pp_string += show_project_structure(value, spacing + 4)
return pp_string
# def clone_github_repo(github_url, local_path):
# """Clone GitHub repository to local path"""
# try:
# subprocess.run(['git', 'clone', github_url, local_path], check=True)
# print(f"Successfully cloned repository to: {local_path}")
# except subprocess.CalledProcessError as e:
# print(f"Warning: Repository cloning may have failed: {e}")
def clone_github_repo(github_url, local_path, commit_hash=None):
"""Clone GitHub repository to local path and optionally checkout specific commit"""
try:
subprocess.run(['git', 'clone', github_url, local_path], check=True)
print(f"Successfully cloned repository to: {local_path}")
# If commit hash is provided, checkout to that specific commit
if commit_hash:
subprocess.run(['git', 'checkout', commit_hash], cwd=local_path, check=True)
print(f"Successfully checked out to commit: {commit_hash}")
except subprocess.CalledProcessError as e:
print(f"Warning: Repository cloning or checkout may have failed: {e}")
def parse_python_file(file_path, file_content=None):
"""Parse a Python file to extract class and function definitions with their line numbers.
:param file_path: Path to the Python file.
:return: Class names, function names, and file contents
"""
if file_content is None:
try:
with open(file_path, "r") as file:
file_content = file.read()
parsed_data = ast.parse(file_content)
except Exception as e: # Catch all types of exceptions
print(f"Error in file {file_path}: {e}")
return [], [], ""
else:
try:
parsed_data = ast.parse(file_content)
except Exception as e: # Catch all types of exceptions
print(f"Error in file {file_path}: {e}")
return [], [], ""
class_info = []
function_names = []
class_methods = set()
for node in ast.walk(parsed_data):
if isinstance(node, ast.ClassDef):
methods = []
for n in node.body:
if isinstance(n, ast.FunctionDef):
methods.append(
{
"name": n.name,
"start_line": n.lineno,
"end_line": n.end_lineno,
"text": file_content.splitlines()[
n.lineno - 1 : n.end_lineno
],
}
)
class_methods.add(n.name)
class_info.append(
{
"name": node.name,
"start_line": node.lineno,
"end_line": node.end_lineno,
"text": file_content.splitlines()[
node.lineno - 1 : node.end_lineno
],
"methods": methods,
}
)
elif isinstance(node, ast.FunctionDef) and not isinstance(
node, ast.AsyncFunctionDef
):
if node.name not in class_methods:
function_names.append(
{
"name": node.name,
"start_line": node.lineno,
"end_line": node.end_lineno,
"text": file_content.splitlines()[
node.lineno - 1 : node.end_lineno
],
}
)
return class_info, function_names, file_content.splitlines()
# def create_structure(directory_path):
# """Create the structure of the repository directory by parsing Python files.
# :param directory_path: Path to the repository directory.
# :return: A dictionary representing the structure.
# """
# structure = {}
# for root, _, files in os.walk(directory_path):
# repo_name = os.path.basename(directory_path)
# relative_root = os.path.relpath(root, directory_path)
# if relative_root == ".":
# relative_root = repo_name
# curr_struct = structure
# for part in relative_root.split(os.sep):
# if part not in curr_struct:
# curr_struct[part] = {}
# curr_struct = curr_struct[part]
# for file_name in files:
# if file_name.endswith(".py"):
# file_path = os.path.join(root, file_name)
# class_info, function_names, file_lines = parse_python_file(file_path)
# curr_struct[file_name] = {
# "classes": class_info,
# "functions": function_names,
# "text": file_lines,
# }
# else:
# curr_struct[file_name] = {}
# return structure
def create_structure(directory_path):
"""Create the structure of the repository directory by parsing Python files.
:param directory_path: Path to the repository directory.
:return: A dictionary representing the structure.
"""
structure = {}
for root, dirs, files in os.walk(directory_path):
relative_root = os.path.relpath(root, directory_path)
# Build the current directory position in the structure
if relative_root == ".":
curr_struct = structure
else:
curr_struct = structure
# Split by path separator and create directory structure layer by layer
path_parts = relative_root.split(os.sep)
for part in path_parts:
if part not in curr_struct:
curr_struct[part] = {}
curr_struct = curr_struct[part]
# First create empty dictionary structure for all subdirectories
for dir_name in dirs:
# Skip hidden directories and common ignored directories
if not dir_name.startswith('.') and dir_name not in ['__pycache__', 'node_modules']:
if dir_name not in curr_struct:
curr_struct[dir_name] = {}
# Process all files in the current directory
for file_name in files:
# Skip hidden files and compiled files
if file_name.startswith('.') or file_name.endswith('.pyc'):
continue
file_path = os.path.join(root, file_name)
if file_name.endswith(".py"):
# Python files: parse class and function information
try:
class_info, function_names, file_lines = parse_python_file(file_path)
curr_struct[file_name] = {
"classes": class_info,
"functions": function_names,
"text": file_lines,
}
except Exception as e:
print(f"Failed to parse Python file {file_path}: {e}")
curr_struct[file_name] = {"text": []}
else:
code_extensions = ['.js', '.ts', '.jsx', '.tsx', '.java', '.cpp', '.c', '.h', '.hpp',
'.cs', '.php', '.rb', '.go', '.rs', '.swift', '.kt', '.scala',
'.sh', '.bat', '.ps1', '.sql', '.html', '.css', '.scss', '.less',
'.json', '.xml', '.yaml', '.yml', '.toml', '.ini', '.cfg', '.conf',
'.md', '.txt', '.rst', '.tex', '.r', '.R', '.m', '.pl', '.lua']
if any(file_name.endswith(ext) for ext in code_extensions):
try:
with open(file_path, 'r', encoding='utf-8', errors='ignore') as f:
file_content = f.read()
curr_struct[file_name] = {"text": file_content.splitlines()}
except Exception as e:
print(f"Failed to read file {file_path}: {e}")
curr_struct[file_name] = {"text": []}
else:
curr_struct[file_name] = {"text": []}
return structure
def build_repo_structure(root_path):
"""Build repository structure using improved parsing method"""
return create_structure(root_path)
def get_loc_prompt(issue_text,repo_structure):
obtain_relevant_files_prompt = """
Please look through the following GitHub problem description and Repository structure and provide a list of files that one would need to edit to fix the problem.
### GitHub Problem Description ###
{problem_statement}
###
### Repository Structure ###
{structure}
###
Please only provide the full path and return at most 5 files.
The returned files should be separated by new lines ordered by most to least important and wrapped with ```
For example:
```
file1.py
file2.py
```
"""
prompt_content = obtain_relevant_files_prompt.format(problem_statement=issue_text,structure=repo_structure)
return prompt_content
def get_repair_prompt(issue_text,file_content):
repair_prompt_combine_topn_cot_diff = """
We are currently solving the following issue within our repository. Here is the issue text:
--- BEGIN ISSUE ---
{problem_statement}
--- END ISSUE ---
Below are some code segments, each from a relevant file. One or more of these files may contain bugs.
--- BEGIN FILE ---
```
{content}
```
--- END FILE ---
Please first localize the bug based on the issue statement, and then generate *SEARCH/REPLACE* edits to fix the issue.
Every *SEARCH/REPLACE* edit must use this format:
1. The file path
2. The start of search block: <<<<<<< SEARCH
3. A contiguous chunk of lines to search for in the existing source code
4. The dividing line: =======
5. The lines to replace into the source code
6. The end of the replace block: >>>>>>> REPLACE
Here is an example:
```python
### mathweb/flask/app.py
<<<<<<< SEARCH
from flask import Flask
=======
import math
from flask import Flask
>>>>>>> REPLACE
```
Please note that the *SEARCH/REPLACE* edit REQUIRES PROPER INDENTATION. If you would like to add the line ' print(x)', you must fully write that out, with all those spaces before the code!
Wrap the *SEARCH/REPLACE* edit in blocks ```python...```.
"""
prompt_content = repair_prompt_combine_topn_cot_diff.format(problem_statement=issue_text,content=file_content.rstrip())
return prompt_content
def get_repo_files(structure, filepaths: list[str]):
files, classes, functions = get_full_file_paths_and_classes_and_functions(structure)
file_contents = dict()
for filepath in filepaths:
content = None
for file_content in files:
if file_content[0] == filepath:
content = '\n'.join(file_content[1])
file_contents[filepath] = content
break
# assert content is not None, "file not found"
return file_contents
def correct_file_path_in_structure(file_name, structure):
"""
Search for the correct file path in the structure, mainly checking first-level subdirectories
Args:
file_name (str): File name to search for
structure (dict): Repository structure
Returns:
str: Correct file path if found, otherwise returns original file_name
"""
# Search in current directory
file_contents = get_repo_files(structure, [file_name])
if file_contents != {}:
return file_name
# Only check first-level subdirectories
for sub_dir in structure.keys():
if isinstance(structure[sub_dir], dict):
file_contents = get_repo_files(structure[sub_dir], [file_name])
if file_contents != {}:
return f'{sub_dir}/{file_name}'
return file_name
def get_full_file_paths_and_classes_and_functions(structure, current_path=''):
"""
Recursively retrieve all file paths, classes, and functions within a directory structure.
Arguments:
structure -- a dictionary representing the directory structure
current_path -- the path accumulated so far, used during recursion (default="")
Returns:
A tuple containing:
- files: list of full file paths
- classes: list of class details with file paths
- functions: list of function details with file paths
"""
files = []
classes = []
functions = []
for name, content in structure.items():
if isinstance(content, dict):
if (
(
'functions' not in content.keys()
and 'classes' not in content.keys()
and 'text' not in content.keys()
)
or not len(content.keys()) == 3
or (
isinstance(content.get('text', []), dict)
or isinstance(content.get('functions', []), dict)
or isinstance(content.get('classes', []), dict)
)
):
# or guards against case where functions and classes are somehow part of the structure.
next_path = f'{current_path}/{name}' if current_path else name
(
sub_files,
sub_classes,
sub_functions,
) = get_full_file_paths_and_classes_and_functions(content, next_path)
files.extend(sub_files)
classes.extend(sub_classes)
functions.extend(sub_functions)
else:
next_path = f'{current_path}/{name}' if current_path else name
files.append((next_path, content.get('text', [])))
if content.get('text', []) == []:
continue
if 'classes' in content:
for clazz in content['classes']:
classes.append(
{
'file': next_path,
'name': clazz['name'],
'start_line': clazz['start_line'],
'end_line': clazz['end_line'],
'methods': [
{
'name': method['name'],
'start_line': method['start_line'],
'end_line': method['end_line'],
}
for method in clazz.get('methods', [])
],
},
)
if 'functions' in content:
for function in content['functions']:
try:
function['file'] = next_path
except TypeError:
continue
functions.append(function)
else:
next_path = f'{current_path}/{name}' if current_path else name
files.append(next_path)
return files, classes, functions
def post_process(response: str) -> str:
content = response
if "◁/think▷" in content:
content = content.replace("◁think▷", "")
parts = content.split("◁/think▷")
content = parts[-1]
# Extract content between triple backticks (```)
matches = re.findall(r"```.*?```", content, re.DOTALL)
if matches:
matches = [item.replace("```","") for item in matches]
return "\n".join(matches) # Return all matched code blocks joined by new lines
return content # If no match, return the full response
def correct_file_paths(model_found_files, files, similarity_threshold=0.8):
found_files = []
all_file_paths = [file_content[0] for file_content in files]
if model_found_files:
for model_file in model_found_files:
match_found = False
for file_path in all_file_paths:
if model_file == file_path:
found_files.append(file_path)
match_found = True
break
elif file_path.endswith(model_file):
found_files.append(file_path)
match_found = True
break
elif os.path.basename(file_path) == os.path.basename(model_file):
found_files.append(file_path)
match_found = True
break
if not match_found:
close_matches = difflib.get_close_matches(model_file, all_file_paths, n=1, cutoff=similarity_threshold)
if close_matches:
found_files.append(close_matches[0])
return found_files
else:
return [] |