π OpenHands: AI-Driven Development
(Chore): Unsupport resolve all issues in resolver (#7975)
Rohit Malhotra4f9120ffc6e9
diff --git a/openhands/resolver/README.md b/openhands/resolver/README.mdindex 349bf23a6b..35dd0c1ef0 100644--- a/openhands/resolver/README.md+++ b/openhands/resolver/README.md@@ -138,18 +138,6 @@ If you've installed the package from source using poetry, you can use:poetry run python openhands/resolver/resolve_issue.py --selected-repo all-hands-ai/openhands --issue-number 100```-For resolving multiple issues at once (e.g., in a batch process), you can use the `resolve_all_issues` command:--```bash-python -m openhands.resolver.resolve_all_issues --selected-repo [OWNER]/[REPO] --issue-numbers [NUMBERS]-```--For example:--```bash-python -m openhands.resolver.resolve_all_issues --selected-repo all-hands-ai/openhands --issue-numbers 100,101,102-```-## Responding to PR CommentsThe resolver can also respond to comments on pull requests using:diff --git a/openhands/resolver/resolve_all_issues.py b/openhands/resolver/resolve_all_issues.pydeleted file mode 100644index 9d99010f4e..0000000000--- a/openhands/resolver/resolve_all_issues.py+++ /dev/null@@ -1,427 +0,0 @@-# flake8: noqa: E501--import argparse-import asyncio-import multiprocessing as mp-import os-import pathlib-import subprocess-from typing import Any, Awaitable, TextIO--from pydantic import SecretStr-from tqdm import tqdm--import openhands-from openhands.core.config import LLMConfig-from openhands.core.logger import openhands_logger as logger-from openhands.integrations.service_types import ProviderType-from openhands.resolver.interfaces.issue import Issue-from openhands.resolver.resolve_issue import (- issue_handler_factory,- process_issue,-)-from openhands.resolver.resolver_output import ResolverOutput-from openhands.resolver.utils import identify_token---def cleanup() -> None:- logger.info('Cleaning up child processes...')- for process in mp.active_children():- logger.info(f'Terminating child process: {process.name}')- process.terminate()- process.join()---# This function tracks the progress AND write the output to a JSONL file-async def update_progress(- output: Awaitable[ResolverOutput], output_fp: TextIO, pbar: tqdm-) -> None:- resolved_output = await output- pbar.update(1)- pbar.set_description(f'issue {resolved_output.issue.number}')- pbar.set_postfix_str(- f'Test Result: {resolved_output.metrics.get("test_result", "N/A") if resolved_output.metrics else "N/A"}'- )- logger.info(- f'Finished issue {resolved_output.issue.number}: {resolved_output.metrics.get("test_result", "N/A") if resolved_output.metrics else "N/A"}'- )- output_fp.write(resolved_output.model_dump_json() + '\n')- output_fp.flush()---async def resolve_issues(- owner: str,- repo: str,- token: str,- username: str,- platform: ProviderType,- max_iterations: int,- limit_issues: int | None,- num_workers: int,- output_dir: str,- llm_config: LLMConfig,- base_container_image: str | None,- runtime_container_image: str,- prompt_template: str,- issue_type: str,- repo_instruction: str | None,- issue_numbers: list[int] | None,- base_domain: str = 'github.com',-) -> None:- """Resolve multiple github or gitlab issues.-- Args:- owner: Github or Gitlab owner of the repo.- repo: Github or Gitlab repository to resolve issues in form of `owner/repo`.- token: Github or Gitlab token to access the repository.- username: Github or Gitlab username to access the repository.- max_iterations: Maximum number of iterations to run.- limit_issues: Limit the number of issues to resolve.- num_workers: Number of workers to use for parallel processing.- output_dir: Output directory to write the results.- llm_config: Configuration for the language model.- runtime_container_image: Container image to use.- prompt_template: Prompt template to use.- issue_type: Type of issue to resolve (issue or pr).- repo_instruction: Repository instruction to use.- issue_numbers: List of issue numbers to resolve.- """- issue_handler = issue_handler_factory(- issue_type, owner, repo, token, llm_config, platform, username, base_domain- )-- # Load dataset- issues: list[Issue] = issue_handler.get_converted_issues(- issue_numbers=issue_numbers- )-- if limit_issues is not None:- issues = issues[:limit_issues]- logger.info(f'Limiting resolving to first {limit_issues} issues.')-- # TEST METADATA- model_name = llm_config.model.split('/')[-1]-- pathlib.Path(output_dir).mkdir(parents=True, exist_ok=True)- pathlib.Path(os.path.join(output_dir, 'infer_logs')).mkdir(- parents=True, exist_ok=True- )- logger.info(f'Using output directory: {output_dir}')-- # checkout the repo- repo_dir = os.path.join(output_dir, 'repo')- if not os.path.exists(repo_dir):- checkout_output = subprocess.check_output( # noqa: ASYNC101- [- 'git',- 'clone',- issue_handler.get_clone_url(),- f'{output_dir}/repo',- ]- ).decode('utf-8')- if 'fatal' in checkout_output:- raise RuntimeError(f'Failed to clone repository: {checkout_output}')-- # get the commit id of current repo for reproducibility- base_commit = (- subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=repo_dir) # noqa: ASYNC101- .decode('utf-8')- .strip()- )- logger.info(f'Base commit: {base_commit}')-- if repo_instruction is None:- # Check for .openhands_instructions file in the workspace directory- openhands_instructions_path = os.path.join(repo_dir, '.openhands_instructions')- if os.path.exists(openhands_instructions_path):- with open(openhands_instructions_path, 'r') as f: # noqa: ASYNC101- repo_instruction = f.read()-- # OUTPUT FILE- output_file = os.path.join(output_dir, 'output.jsonl')- logger.info(f'Writing output to {output_file}')- finished_numbers = set()- if os.path.exists(output_file):- with open(output_file, 'r') as f: # noqa: ASYNC101- for line in f:- data = ResolverOutput.model_validate_json(line)- finished_numbers.add(data.issue.number)- logger.warning(- f'Output file {output_file} already exists. Loaded {len(finished_numbers)} finished issues.'- )- output_fp = open(output_file, 'a') # noqa: ASYNC101-- logger.info(- f'Resolving issues with model {model_name}, max iterations {max_iterations}.'- )-- # =============================================- # filter out finished issues- new_issues = []- for issue in issues:- if issue.number in finished_numbers:- logger.info(f'Skipping issue {issue.number} as it is already finished.')- continue- new_issues.append(issue)- logger.info(- f'Finished issues: {len(finished_numbers)}, Remaining issues: {len(issues)}'- )- # =============================================-- pbar = tqdm(total=len(issues))-- # This sets the multi-processing- logger.info(f'Using {num_workers} workers.')-- try:- tasks = []- for issue in issues:- # checkout to pr branch- if issue_type == 'pr':- logger.info(- f'Checking out to PR branch {issue.head_branch} for issue {issue.number}'- )-- subprocess.check_output( # noqa: ASYNC101- ['git', 'checkout', f'{issue.head_branch}'],- cwd=repo_dir,- )-- base_commit = (- subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=repo_dir) # noqa: ASYNC101- .decode('utf-8')- .strip()- )-- task = update_progress(- process_issue(- issue,- platform,- base_commit,- max_iterations,- llm_config,- output_dir,- base_container_image,- runtime_container_image,- prompt_template,- issue_handler,- repo_instruction,- bool(num_workers > 1),- ),- output_fp,- pbar,- )- tasks.append(task)-- # Use asyncio.gather with a semaphore to limit concurrency- sem = asyncio.Semaphore(num_workers)-- async def run_with_semaphore(task: Awaitable[Any]) -> Any:- async with sem:- return await task-- await asyncio.gather(*[run_with_semaphore(task) for task in tasks])-- except KeyboardInterrupt:- logger.info('KeyboardInterrupt received. Cleaning up...')- cleanup()-- output_fp.close()- logger.info('Finished.')---def main() -> None:- parser = argparse.ArgumentParser(- description='Resolve multiple issues from Github or Gitlab.'- )- parser.add_argument(- '--selected-repo',- type=str,- required=True,- help='Github or Gitlab repository to resolve issues in form of `owner/repo`.',- )- parser.add_argument(- '--token',- type=str,- default=None,- help='Github or Gitlab token to access the repository.',- )- parser.add_argument(- '--username',- type=str,- default=None,- help='Github or Gitlab username to access the repository.',- )- parser.add_argument(- '--base-container-image',- type=str,- default=None,- help='Base container image to use.',- )- parser.add_argument(- '--runtime-container-image',- type=str,- default=None,- help='Container image to use.',- )- parser.add_argument(- '--max-iterations',- type=int,- default=50,- help='Maximum number of iterations to run.',- )- parser.add_argument(- '--limit-issues',- type=int,- default=None,- help='Limit the number of issues to resolve.',- )- parser.add_argument(- '--issue-numbers',- type=str,- default=None,- help='Comma separated list of issue numbers to resolve.',- )- parser.add_argument(- '--num-workers',- type=int,- default=1,- help='Number of workers to use for parallel processing.',- )- parser.add_argument(- '--output-dir',- type=str,- default='output',- help='Output directory to write the results.',- )- parser.add_argument(- '--llm-model',- type=str,- default=None,- help='LLM model to use.',- )- parser.add_argument(- '--llm-api-key',- type=str,- default=None,- help='LLM API key to use.',- )- parser.add_argument(- '--llm-base-url',- type=str,- default=None,- help='LLM base URL to use.',- )- parser.add_argument(- '--prompt-file',- type=str,- default=None,- help='Path to the prompt template file in Jinja format.',- )- parser.add_argument(- '--repo-instruction-file',- type=str,- default=None,- help='Path to the repository instruction file in text format.',- )- parser.add_argument(- '--issue-type',- type=str,- default='issue',- choices=['issue', 'pr'],- help='Type of issue to resolve, either open issue or pr comments.',- )- parser.add_argument(- '--base-domain',- type=str,- default='github.com',- help='Base domain for GitHub Enterprise (default: github.com)',- )-- my_args = parser.parse_args()-- base_container_image = my_args.base_container_image-- runtime_container_image = my_args.runtime_container_image-- if runtime_container_image is not None and base_container_image is not None:- raise ValueError('Cannot provide both runtime and base container images.')-- if (- runtime_container_image is None- and base_container_image is None- and not my_args.is_experimental- ):- runtime_container_image = (- f'ghcr.io/all-hands-ai/runtime:{openhands.__version__}-nikolaik'- )-- owner, repo = my_args.selected_repo.split('/')- token = my_args.token or os.getenv('GITHUB_TOKEN') or os.getenv('GITLAB_TOKEN')- username = my_args.username if my_args.username else os.getenv('GIT_USERNAME')- if not username:- raise ValueError('Username is required.')-- if not token:- raise ValueError('Token is required.')-- platform = identify_token(token, my_args.selected_repo, my_args.base_domain)- api_key = my_args.llm_api_key or os.environ['LLM_API_KEY']-- llm_config = LLMConfig(- model=my_args.llm_model or os.environ['LLM_MODEL'],- api_key=SecretStr(api_key) if api_key else None,- base_url=my_args.llm_base_url or os.environ.get('LLM_BASE_URL', None),- api_version=os.environ.get('LLM_API_VERSION', None),- )-- repo_instruction = None- if my_args.repo_instruction_file:- with open(my_args.repo_instruction_file, 'r') as f:- repo_instruction = f.read()-- issue_numbers = None- if my_args.issue_numbers:- issue_numbers = [int(number) for number in my_args.issue_numbers.split(',')]-- issue_type = my_args.issue_type-- # Read the prompt template- prompt_file = my_args.prompt_file- if prompt_file is None:- if issue_type == 'issue':- prompt_file = os.path.join(- os.path.dirname(__file__), 'prompts/resolve/basic-with-tests.jinja'- )- else:- prompt_file = os.path.join(- os.path.dirname(__file__), 'prompts/resolve/basic-followup.jinja'- )- with open(prompt_file, 'r') as f:- prompt_template = f.read()-- asyncio.run(- resolve_issues(- owner=owner,- repo=repo,- token=token,- username=username,- platform=platform,- base_container_image=base_container_image,- runtime_container_image=runtime_container_image,- max_iterations=my_args.max_iterations,- limit_issues=my_args.limit_issues,- num_workers=my_args.num_workers,- output_dir=my_args.output_dir,- llm_config=llm_config,- prompt_template=prompt_template,- issue_type=issue_type,- repo_instruction=repo_instruction,- issue_numbers=issue_numbers,- base_domain=my_args.base_domain,- )- )---if __name__ == '__main__':- main()