From 081a1305f0a8a009614f7c05d33adf456dc68696 Mon Sep 17 00:00:00 2001 From: Graham Neubig Date: Thu, 23 Jan 2025 18:21:11 -0500 Subject: [PATCH] Fix resolver linting issues (#6401) Co-authored-by: openhands --- openhands/resolver/github_issue.py | 1 + openhands/resolver/resolve_all_issues.py | 3 ++- openhands/resolver/resolve_issue.py | 3 ++- openhands/resolver/send_pull_request.py | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openhands/resolver/github_issue.py b/openhands/resolver/github_issue.py index 9b8f58d589..d7d7974d3f 100644 --- a/openhands/resolver/github_issue.py +++ b/openhands/resolver/github_issue.py @@ -18,3 +18,4 @@ class GithubIssue(BaseModel): review_threads: list[ReviewThread] | None = None thread_ids: list[str] | None = None head_branch: str | None = None + base_branch: str | None = None diff --git a/openhands/resolver/resolve_all_issues.py b/openhands/resolver/resolve_all_issues.py index 9c44855a2d..6192fc02f8 100644 --- a/openhands/resolver/resolve_all_issues.py +++ b/openhands/resolver/resolve_all_issues.py @@ -331,9 +331,10 @@ def main(): if not token: raise ValueError('Github token is required.') + 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=my_args.llm_api_key or os.environ['LLM_API_KEY'], + api_key=str(api_key) if api_key else None, base_url=my_args.llm_base_url or os.environ.get('LLM_BASE_URL', None), ) diff --git a/openhands/resolver/resolve_issue.py b/openhands/resolver/resolve_issue.py index 4e0b2b4ad9..6045462c1b 100644 --- a/openhands/resolver/resolve_issue.py +++ b/openhands/resolver/resolve_issue.py @@ -601,9 +601,10 @@ def main(): if not token: raise ValueError('Github token is required.') + 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=my_args.llm_api_key or os.environ['LLM_API_KEY'], + api_key=str(api_key) if api_key else None, base_url=my_args.llm_base_url or os.environ.get('LLM_BASE_URL', None), ) diff --git a/openhands/resolver/send_pull_request.py b/openhands/resolver/send_pull_request.py index 1122e2c6a4..6b37502aaa 100644 --- a/openhands/resolver/send_pull_request.py +++ b/openhands/resolver/send_pull_request.py @@ -719,9 +719,10 @@ def main(): else os.getenv('GITHUB_USERNAME') ) + 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=my_args.llm_api_key or os.environ['LLM_API_KEY'], + api_key=str(api_key) if api_key else None, base_url=my_args.llm_base_url or os.environ.get('LLM_BASE_URL', None), )