From 0c307ea12e9979a2958f674645b2e3c3b95dd295 Mon Sep 17 00:00:00 2001 From: Graham Neubig Date: Sat, 14 Jun 2025 12:25:59 -0400 Subject: [PATCH] Lint all files in the repo (#9131) Co-authored-by: openhands Co-authored-by: Engel Nyst --- .github/workflows/lint-fix.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/py-unit-tests.yml | 1 - Makefile | 2 +- docs/README.md | 4 +- docs/usage/llms/google-llms.mdx | 4 +- docs/usage/llms/groq.mdx | 2 +- docs/usage/llms/litellm-proxy.mdx | 2 +- docs/usage/llms/openrouter.mdx | 2 +- docs/usage/prompting/microagents-org.mdx | 2 +- docs/usage/runtimes/local.mdx | 2 +- evaluation/benchmarks/swe_bench/loc_prompt.py | 4 +- .../benchmarks/swe_bench/prompts/swe_gpt4.j2 | 2 +- evaluation/benchmarks/swe_bench/run_infer.py | 10 +- evaluation/benchmarks/versicode/README.md | 205 +++-- .../inference_utils/api_code_migration.py | 268 +++---- .../api_test_block_completion.py | 282 +++---- .../versicode/inference_utils/test_block.py | 247 +++--- .../inference_utils/test_migration.py | 233 +++--- .../versicode/metric/compute_ism_pm_score.py | 701 +++++++++--------- .../metric/compute_migration_cdc_score.py | 363 ++++----- .../metric/compute_versicode_cdc_score.py | 400 +++++----- .../metric/compute_versicode_em_score.py | 384 +++++----- .../choose_core_line_from_block_versicode.py | 206 +++-- ...oose_core_line_from_migration_versicode.py | 210 +++--- .../versicode/output_processing/clear_ans.py | 74 +- .../settings/api-keys-manager.test.tsx | 8 +- .../check-home-hardcoded-strings.test.tsx | 2 +- frontend/public/mockServiceWorker.js | 143 ++-- .../check-translation-completeness.cjs | 10 +- frontend/tests/repo-selection-form.test.tsx | 54 +- .../visualbrowsing_agent.py | 4 +- openhands/core/config/mcp_config.py | 1 + .../integrations/github/github_service.py | 2 +- .../integrations/gitlab/gitlab_service.py | 7 +- .../resolver/gitlab/issue_comment_prompt.j2 | 2 +- .../resolver/gitlab/issue_labeled_prompt.j2 | 2 +- .../runtime/impl/docker/docker_runtime.py | 8 +- .../runtime/impl/remote/remote_runtime.py | 2 +- openhands/runtime/mcp/proxy/manager.py | 16 +- openhands/runtime/utils/edit.py | 6 +- openhands/runtime/utils/system.py | 2 +- openhands/server/config/server_config.py | 2 +- .../standalone_conversation_manager.py | 6 +- .../server/data_models/conversation_info.py | 1 - openhands/server/routes/conversation.py | 16 +- openhands/server/routes/feedback.py | 14 +- openhands/server/routes/files.py | 21 +- .../server/routes/manage_conversations.py | 45 +- openhands/server/routes/mcp.py | 11 +- openhands/server/routes/security.py | 14 +- openhands/server/routes/trajectory.py | 12 +- .../server/services/conversation_service.py | 7 +- openhands/server/session/agent_session.py | 10 +- .../conversation/file_conversation_store.py | 7 +- .../storage/secrets/file_secrets_store.py | 2 +- .../storage/settings/file_settings_store.py | 2 +- .../frontend/test_translation_completeness.py | 38 +- .../resolver/github/test_resolve_issues.py | 34 +- .../resolver/test_issue_handler_factory.py | 29 +- tests/unit/resolver/test_resolve_issue.py | 21 +- 61 files changed, 2203 insertions(+), 1972 deletions(-) diff --git a/.github/workflows/lint-fix.yml b/.github/workflows/lint-fix.yml index 8ce580596f..6eccc26e2d 100644 --- a/.github/workflows/lint-fix.yml +++ b/.github/workflows/lint-fix.yml @@ -74,7 +74,7 @@ jobs: - name: Fix python lint issues run: | # Run all pre-commit hooks and continue even if they modify files (exit code 1) - pre-commit run --config ./dev_config/python/.pre-commit-config.yaml --files openhands/**/* evaluation/**/* tests/**/* || true + pre-commit run --config ./dev_config/python/.pre-commit-config.yaml --all-files || true # Commit and push changes if any - name: Check for changes diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6a79ac06ed..2ce6f50b07 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -53,7 +53,7 @@ jobs: - name: Install pre-commit run: pip install pre-commit==3.7.0 - name: Run pre-commit hooks - run: pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --show-diff-on-failure --config ./dev_config/python/.pre-commit-config.yaml + run: pre-commit run --all-files --show-diff-on-failure --config ./dev_config/python/.pre-commit-config.yaml # Check version consistency across documentation check-version-consistency: diff --git a/.github/workflows/py-unit-tests.yml b/.github/workflows/py-unit-tests.yml index 553f1677bc..c988b8427f 100644 --- a/.github/workflows/py-unit-tests.yml +++ b/.github/workflows/py-unit-tests.yml @@ -81,4 +81,3 @@ jobs: env: TEST_RUNTIME: local DEBUG: "1" - diff --git a/Makefile b/Makefile index 39554f3741..6d5c0761e4 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ install-pre-commit-hooks: lint-backend: @echo "$(YELLOW)Running linters...$(RESET)" - @poetry run pre-commit run --files openhands/**/* evaluation/**/* tests/**/* --show-diff-on-failure --config $(PRE_COMMIT_CONFIG_PATH) + @poetry run pre-commit run --all-files --show-diff-on-failure --config $(PRE_COMMIT_CONFIG_PATH) lint-frontend: @echo "$(YELLOW)Running linters for frontend...$(RESET)" diff --git a/docs/README.md b/docs/README.md index d15eb6aa1b..1c505ed617 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,7 +4,7 @@ npm install -g mint ``` -or +or ``` yarn global add mint @@ -14,4 +14,4 @@ yarn global add mint ``` mint dev -``` \ No newline at end of file +``` diff --git a/docs/usage/llms/google-llms.mdx b/docs/usage/llms/google-llms.mdx index 999e32f8c1..d71c3151d6 100644 --- a/docs/usage/llms/google-llms.mdx +++ b/docs/usage/llms/google-llms.mdx @@ -8,7 +8,7 @@ description: OpenHands uses LiteLLM to make calls to Google's chat models. You c When running OpenHands, you'll need to set the following in the OpenHands UI through the Settings under the `LLM` tab: - `LLM Provider` to `Gemini` - `LLM Model` to the model you will be using. -If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` +If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` (e.g. gemini/<model-name> like `gemini/gemini-2.0-flash`). - `API Key` to your Gemini API key @@ -26,5 +26,5 @@ VERTEXAI_LOCATION="" Then set the following in the OpenHands UI through the Settings under the `LLM` tab: - `LLM Provider` to `VertexAI` - `LLM Model` to the model you will be using. -If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` +If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` (e.g. vertex_ai/<model-name>). diff --git a/docs/usage/llms/groq.mdx b/docs/usage/llms/groq.mdx index eb971c83a0..3b571a24f6 100644 --- a/docs/usage/llms/groq.mdx +++ b/docs/usage/llms/groq.mdx @@ -8,7 +8,7 @@ description: OpenHands uses LiteLLM to make calls to chat models on Groq. You ca When running OpenHands, you'll need to set the following in the OpenHands UI through the Settings under the `LLM` tab: - `LLM Provider` to `Groq` - `LLM Model` to the model you will be using. [Visit here to see the list of -models that Groq hosts](https://console.groq.com/docs/models). If the model is not in the list, +models that Groq hosts](https://console.groq.com/docs/models). If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` (e.g. groq/<model-name> like `groq/llama3-70b-8192`). - `API key` to your Groq API key. To find or create your Groq API Key, [see here](https://console.groq.com/keys). diff --git a/docs/usage/llms/litellm-proxy.mdx b/docs/usage/llms/litellm-proxy.mdx index 13fb4c8666..89bb46ac77 100644 --- a/docs/usage/llms/litellm-proxy.mdx +++ b/docs/usage/llms/litellm-proxy.mdx @@ -16,7 +16,7 @@ To use LiteLLM proxy with OpenHands, you need to: ## Supported Models -The supported models depend on your LiteLLM proxy configuration. OpenHands supports any model that your LiteLLM proxy +The supported models depend on your LiteLLM proxy configuration. OpenHands supports any model that your LiteLLM proxy is configured to handle. Refer to your LiteLLM proxy configuration for the list of available models and their names. diff --git a/docs/usage/llms/openrouter.mdx b/docs/usage/llms/openrouter.mdx index b465eebbbf..2b5f2fa87f 100644 --- a/docs/usage/llms/openrouter.mdx +++ b/docs/usage/llms/openrouter.mdx @@ -9,6 +9,6 @@ When running OpenHands, you'll need to set the following in the OpenHands UI thr * `LLM Provider` to `OpenRouter` * `LLM Model` to the model you will be using. [Visit here to see a full list of OpenRouter models](https://openrouter.ai/models). -If the model is not in the list, enable `Advanced` options, and enter it in +If the model is not in the list, enable `Advanced` options, and enter it in `Custom Model` (e.g. openrouter/<model-name> like `openrouter/anthropic/claude-3.5-sonnet`). * `API Key` to your OpenRouter API key. diff --git a/docs/usage/prompting/microagents-org.mdx b/docs/usage/prompting/microagents-org.mdx index 46b2028134..3444abb9f5 100644 --- a/docs/usage/prompting/microagents-org.mdx +++ b/docs/usage/prompting/microagents-org.mdx @@ -5,7 +5,7 @@ description: Organizations and users can define microagents that apply to all re ## Usage -These microagents can be [any type of microagent](./microagents-overview#microagent-types) and will be loaded +These microagents can be [any type of microagent](./microagents-overview#microagent-types) and will be loaded accordingly. However, they are applied to all repositories belonging to the organization or user. Add a `.openhands` repository under the organization or user and create a `microagents` directory and place the diff --git a/docs/usage/runtimes/local.mdx b/docs/usage/runtimes/local.mdx index c538c897a7..d1b93c7abc 100644 --- a/docs/usage/runtimes/local.mdx +++ b/docs/usage/runtimes/local.mdx @@ -15,7 +15,7 @@ Before using the Local Runtime, ensure that: 1. You can run OpenHands using the [Development workflow](https://github.com/All-Hands-AI/OpenHands/blob/main/Development.md). 2. For Linux and Mac, tmux is available on your system. 3. For Windows, PowerShell is available on your system. - - Only [CLI mode](../how-to/cli-mode) and [headless mode](../how-to/headless-mode) are supported in Windows with Local Runtime. + - Only [CLI mode](../how-to/cli-mode) and [headless mode](../how-to/headless-mode) are supported in Windows with Local Runtime. ## Configuration diff --git a/evaluation/benchmarks/swe_bench/loc_prompt.py b/evaluation/benchmarks/swe_bench/loc_prompt.py index 22a9d17904..ec8b833b37 100644 --- a/evaluation/benchmarks/swe_bench/loc_prompt.py +++ b/evaluation/benchmarks/swe_bench/loc_prompt.py @@ -1,4 +1,4 @@ -TASK_INSTRUECTION=""" +TASK_INSTRUECTION = """ Given the following GitHub problem description, your objective is to localize the specific files, classes or functions, and lines of code that need modification or contain key information to resolve the issue. Follow these steps to localize the issue: @@ -66,4 +66,4 @@ FAKE_USER_MSG_FOR_LOC = ( 'Verify that you have carefully analyzed the impact of the found locations on the repository, especially their dependencies. ' 'If you think you have solved the task, please send your final answer (including the former answer and reranking) to user through message and then call `finish` to finish.\n' 'IMPORTANT: YOU SHOULD NEVER ASK FOR HUMAN HELP.\n' -) \ No newline at end of file +) diff --git a/evaluation/benchmarks/swe_bench/prompts/swe_gpt4.j2 b/evaluation/benchmarks/swe_bench/prompts/swe_gpt4.j2 index 1ccae184a3..f0c6c9de24 100644 --- a/evaluation/benchmarks/swe_bench/prompts/swe_gpt4.j2 +++ b/evaluation/benchmarks/swe_bench/prompts/swe_gpt4.j2 @@ -27,7 +27,7 @@ You MUST plan extensively before each function call, and reflect extensively on 5. Debug as needed. Use debugging techniques to isolate and resolve issues. 6. Test frequently. Run tests after each change to verify correctness. 7. Iterate until the root cause is fixed and all tests pass. -8. Reflect and validate comprehensively. After tests pass, think about the original intent, write additional tests to ensure correctness, +8. Reflect and validate comprehensively. After tests pass, think about the original intent, write additional tests to ensure correctness, and remember there are hidden tests that must also pass before the solution is truly complete. Refer to the detailed sections below for more information on each step. diff --git a/evaluation/benchmarks/swe_bench/run_infer.py b/evaluation/benchmarks/swe_bench/run_infer.py index f999e72d55..4908440ae8 100644 --- a/evaluation/benchmarks/swe_bench/run_infer.py +++ b/evaluation/benchmarks/swe_bench/run_infer.py @@ -43,7 +43,7 @@ from openhands.core.config import ( AgentConfig, OpenHandsConfig, get_llm_config_arg, - get_parser + get_parser, ) from openhands.core.config.condenser_config import NoOpCondenserConfig from openhands.core.config.utils import get_condenser_config_arg @@ -92,10 +92,12 @@ def get_instruction(instance: pd.Series, metadata: EvalMetadata) -> MessageActio elif 'gpt-4.1' in llm_model: template_name = 'swe_gpt4.j2' else: - template_name = 'swe_default.j2' # Default for 'swe' mode (regular swe-bench) + template_name = ( + 'swe_default.j2' # Default for 'swe' mode (regular swe-bench) + ) else: # Fallback or error handling if mode is unexpected - logger.error(f"Unexpected evaluation mode: {mode}. Falling back to default.") + logger.error(f'Unexpected evaluation mode: {mode}. Falling back to default.') template_name = 'swe_default.j2' # Set up Jinja2 environment @@ -117,7 +119,7 @@ def get_instruction(instance: pd.Series, metadata: EvalMetadata) -> MessageActio f'The following command can be used to run the tests: `{list(MAP_REPO_TO_TEST_FRAMEWORK_VERBOSE[instance.repo].values())[0]}`. Make sure they fail in the expected way.\n' ) else: - context['test_instructions'] = '' # Ensure it's defined for other modes + context['test_instructions'] = '' # Ensure it's defined for other modes # Render the instruction instruction = template.render(context) diff --git a/evaluation/benchmarks/versicode/README.md b/evaluation/benchmarks/versicode/README.md index 2bd4fba58f..072c583ff7 100644 --- a/evaluation/benchmarks/versicode/README.md +++ b/evaluation/benchmarks/versicode/README.md @@ -1,103 +1,102 @@ -# VersiCode benchmark - -This project is used to evaluate the performance of the model on VersiCode. It includes: - -- data: the test data needed and the model outputs -- inference_utils: inference scripts for ours tasks and models -- metric: scripts for calculating various metric -- output_processing: process the model output to facilitate the calculation of model metrics - -# Details - -1. **Prepare the environment** - - ```shell - #create conda environment - conda create -n VersiCode python==3.12 - - #install requirements - pip install -r requirements.txt - ``` - -2. **Experiment Data** - - To obtain the experimental data, please visit the Hugging Face link: https://huggingface.co/datasets/AstoneNg/VersiCode. - Locate the files `VersiCode_block_completion.json` and `VersiCode_migration.json` under the `experiment_data` directory, and place them in the `/data/test_data directory` of this project. - - -3. **Model inference** - - ```shell - #cd inference_utils directory - cd inference_utils - - #The script file starting with 'test' is used to test the local model - #The script file at the beginning of the API is used to test the API call model - - #block level code completipn - #Modify the 10th and 12th lines of code to specify the base URL and model name - python api_test_block_completion.py - #Modify the 30th line of code to specify the local model path - python test_block.py - - # code migration (migration order is 'old_to_new') - #Modify the 10th and 12th lines of code to specify the base URL and model name - python api_code_migration.py - #Modify the 30th line of code to specify the local model path - python test_migration.py - ``` - -4. **Process output** - Process the output content of the model, remove redundant content, extract specified content for easy calculation of indicators. - - ```shell - #cd output_processing - cd output_processing - - #Extract content from and - #Modify the 8th and 9th lines of code to specify the model and task granularity - python clear_ans.py - - #In the block completion task and migration task, cdc@k The calculation of indicators needs to be targeted at key rows, - #Modify lines 76 and 79 to specify the data path - python choose_core_line_from_block_versicode.py - python choose_core_line_from_migration_versicode.py - ``` - -5. **Metric** - We have three metrics pass@k，em@k and cdc@k Due to our inability to automatically build a dynamic evaluation environment, we have not provided pass@k . - - ```shell - #cd metric - cd metric - - #Modify lines 137-140 in migration task (compute_migration_cdc_score.py) or 143-145 in block and line completion task (compute_versicode_cdc_score.py and compute_versicode_em_score.py) of the code to specify the data path and calculate the k-value of the metric - python compute_migration_cdc_score.py - python compute_versicode_cdc_score.py - python compute_versicode_em_score.py - - #Notes - #We found limitations in the ISM@k and PM@k metrics for evaluating code generation, so they are used only as reference in our experiments. - #Modify lines 261-265 in block and line completion task of the code to specify the data path and calculate the k-value of the metric - python compute_ism_pm_score.py - ``` - -# Citation - -``` -@article{versicode, - author={Tongtong Wu and Weigang Wu and Xingyu Wang and Kang Xu and Suyu Ma and Bo Jiang and Ping Yang and Zhenchang Xing and Yuan-Fang Li and Gholamreza Haffari}, - title = {VersiCode: Towards Version-controllable Code Generation}, - journal = {CoRR}, - volume = {abs/2406.07411}, - year = {2024}, - url = {https://arxiv.org/abs/2406.07411}, -} -``` - -**Github url**: https://github.com/wutong8023/VersiCode - -# Contributor - -[Tongtong Wu](https://scholar.google.com/citations?hl=zh-CN&user=u1Qp8lUAAAAJ&view_op=list_works&sortby=pubdate), [Weigang Wu](https://scholar.google.com/citations?hl=zh-CN&user=UneIZo8AAAAJ), [Xingyu Wang](https://scholar.google.com/citations?hl=zh-CN&user=wqPJcxcAAAAJ), [Kang Xu](https://scholar.google.com/citations?hl=zh-CN&user=N1UUDi0AAAAJ), [Suyu Ma](https://scholar.google.com/citations?hl=zh-CN&user=NJHR1ukAAAAJ), [Bo Jiang](https://wutong8023.site/VersiCode/), [Ping Yang](https://scholar.google.com/citations?view_op=list_works&hl=en&hl=en&user=hrogvxoAAAAJ), [Zhenchang Xing](https://scholar.google.com/citations?hl=zh-CN&user=0vCxuH4AAAAJ), [Yuan-Fang Li](https://scholar.google.com/citations?hl=zh-CN&user=wufXO1kAAAAJ), [Gholamreza Haffari](https://scholar.google.com/citations?hl=zh-CN&user=Perjx5EAAAAJ) - +# VersiCode benchmark + +This project is used to evaluate the performance of the model on VersiCode. It includes: + +- data: the test data needed and the model outputs +- inference_utils: inference scripts for ours tasks and models +- metric: scripts for calculating various metric +- output_processing: process the model output to facilitate the calculation of model metrics + +# Details + +1. **Prepare the environment** + + ```shell + #create conda environment + conda create -n VersiCode python==3.12 + + #install requirements + pip install -r requirements.txt + ``` + +2. **Experiment Data** + + To obtain the experimental data, please visit the Hugging Face link: https://huggingface.co/datasets/AstoneNg/VersiCode. + Locate the files `VersiCode_block_completion.json` and `VersiCode_migration.json` under the `experiment_data` directory, and place them in the `/data/test_data directory` of this project. + + +3. **Model inference** + + ```shell + #cd inference_utils directory + cd inference_utils + + #The script file starting with 'test' is used to test the local model + #The script file at the beginning of the API is used to test the API call model + + #block level code completipn + #Modify the 10th and 12th lines of code to specify the base URL and model name + python api_test_block_completion.py + #Modify the 30th line of code to specify the local model path + python test_block.py + + # code migration (migration order is 'old_to_new') + #Modify the 10th and 12th lines of code to specify the base URL and model name + python api_code_migration.py + #Modify the 30th line of code to specify the local model path + python test_migration.py + ``` + +4. **Process output** + Process the output content of the model, remove redundant content, extract specified content for easy calculation of indicators. + + ```shell + #cd output_processing + cd output_processing + + #Extract content from and + #Modify the 8th and 9th lines of code to specify the model and task granularity + python clear_ans.py + + #In the block completion task and migration task, cdc@k The calculation of indicators needs to be targeted at key rows, + #Modify lines 76 and 79 to specify the data path + python choose_core_line_from_block_versicode.py + python choose_core_line_from_migration_versicode.py + ``` + +5. **Metric** + We have three metrics pass@k，em@k and cdc@k Due to our inability to automatically build a dynamic evaluation environment, we have not provided pass@k . + + ```shell + #cd metric + cd metric + + #Modify lines 137-140 in migration task (compute_migration_cdc_score.py) or 143-145 in block and line completion task (compute_versicode_cdc_score.py and compute_versicode_em_score.py) of the code to specify the data path and calculate the k-value of the metric + python compute_migration_cdc_score.py + python compute_versicode_cdc_score.py + python compute_versicode_em_score.py + + #Notes + #We found limitations in the ISM@k and PM@k metrics for evaluating code generation, so they are used only as reference in our experiments. + #Modify lines 261-265 in block and line completion task of the code to specify the data path and calculate the k-value of the metric + python compute_ism_pm_score.py + ``` + +# Citation + +``` +@article{versicode, + author={Tongtong Wu and Weigang Wu and Xingyu Wang and Kang Xu and Suyu Ma and Bo Jiang and Ping Yang and Zhenchang Xing and Yuan-Fang Li and Gholamreza Haffari}, + title = {VersiCode: Towards Version-controllable Code Generation}, + journal = {CoRR}, + volume = {abs/2406.07411}, + year = {2024}, + url = {https://arxiv.org/abs/2406.07411}, +} +``` + +**Github url**: https://github.com/wutong8023/VersiCode + +# Contributor + +[Tongtong Wu](https://scholar.google.com/citations?hl=zh-CN&user=u1Qp8lUAAAAJ&view_op=list_works&sortby=pubdate), [Weigang Wu](https://scholar.google.com/citations?hl=zh-CN&user=UneIZo8AAAAJ), [Xingyu Wang](https://scholar.google.com/citations?hl=zh-CN&user=wqPJcxcAAAAJ), [Kang Xu](https://scholar.google.com/citations?hl=zh-CN&user=N1UUDi0AAAAJ), [Suyu Ma](https://scholar.google.com/citations?hl=zh-CN&user=NJHR1ukAAAAJ), [Bo Jiang](https://wutong8023.site/VersiCode/), [Ping Yang](https://scholar.google.com/citations?view_op=list_works&hl=en&hl=en&user=hrogvxoAAAAJ), [Zhenchang Xing](https://scholar.google.com/citations?hl=zh-CN&user=0vCxuH4AAAAJ), [Yuan-Fang Li](https://scholar.google.com/citations?hl=zh-CN&user=wufXO1kAAAAJ), [Gholamreza Haffari](https://scholar.google.com/citations?hl=zh-CN&user=Perjx5EAAAAJ) diff --git a/evaluation/benchmarks/versicode/inference_utils/api_code_migration.py b/evaluation/benchmarks/versicode/inference_utils/api_code_migration.py index c99c9d0385..9adba1f05f 100644 --- a/evaluation/benchmarks/versicode/inference_utils/api_code_migration.py +++ b/evaluation/benchmarks/versicode/inference_utils/api_code_migration.py @@ -1,134 +1,134 @@ -""" -GPT performs line level generation prediction and truncates overly long tokens -""" -import json -import openai -from openai import OpenAI -import os -import tiktoken -max_tokens = 127000 #gpt3.5 is 16ktoken gpt4o is 128k -model_name = "" - -os.environ["OPENAI_API_KEY"] = "" -client = OpenAI() - -def truncate_text(text, max_tokens): - encoding = tiktoken.get_encoding("cl100k_base") - disallowed_special = () - - tokens = encoding.encode(text, disallowed_special=disallowed_special) - print(len(tokens)) - - if len(tokens) > max_tokens: - tokens = tokens[:max_tokens] - - truncated_text = encoding.decode(tokens) - - return truncated_text - -def predict(content, model_name): - response = client.chat.completions.create( - model=model_name, - messages=[ - { - "role": "user", - "content": content - } - ], - frequency_penalty=0.1, - max_tokens=128, - logit_bias=None, - logprobs=None, - n=6, - presence_penalty=0.0, - seed=None, - stop=None, - stream=False, - temperature=0.8, - top_p=0.95 - ) - ans_list = [] - choices_list = response.choices - for c in choices_list: - content = c.message.content - ans_list.append(content) - final_ans = str(ans_list) - return final_ans - -def bulid_prompt(description, old_version, old_code, new_version) -> str: - """ - build prompt - :param version: - :param description: - :param masked_code: - :param options: - :return: - """ - prompt = f""" - You are now a professional Python programming engineer. I will provide you with a code snippet and a description of its functionality, - including the dependencies and versions used in the code. Then, I will provide the same dependencies but with a specified new version. - Your task is to refactor the code using the methods provided by the specified new version and return the refactored code. - Please note that you only need to return the refactored code and enclose it with and : - ###Functionality description of the code - {description} - ###Dependency and old version - {old_version} - ###Old version code - {old_code} - ###Dependency and new version - {new_version} - ###Refactored new code - """ - - return prompt - - -json_path = '../data/test_data/VersiCode_migration.json' - - -with open(json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) -data_dict = lodict -data_list = data_dict - - -for data in data_list: - if "model_output" in data: - print(f"the {data_list.index(data) + 1} has already been predicted, skipping this data!") - continue - try: - print(f"Predicting {data_list.index(data) + 1} ") - old_version = data['dependency'] + data['old_version'] # package == x.x.x - new_version = data['dependency'] + data['new_version'] # package == x.x.x - description = data['description'] # 功能描述 - old_code = data['old_code'] # mask后的代码 - - instruction = bulid_prompt(description, old_version, old_code, new_version) - truncated_text = truncate_text(instruction, max_tokens) - prediction = predict(truncated_text, model_name) - - data['model_output'] = prediction - except Exception as e: - print(f"error：{e}") - print("save current data") - save_folder_path = os.path.join('../data/result_data/code_migration', model_name) - if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) - save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - - with open(save_json_path, 'w', encoding='utf-8') as fw: - json.dump(data_dict, fw, indent=4, ensure_ascii=False) - break - - - -save_folder_path = os.path.join('../data/result_data/code_migration', model_name) -if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) -save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - -with open(save_json_path, 'w', encoding='utf-8')as fw: - json.dump(data_dict, fw, indent=4, ensure_ascii=False) - - - +""" +GPT performs line level generation prediction and truncates overly long tokens +""" + +import json +import os + +import tiktoken +from openai import OpenAI + +max_tokens = 127000 # gpt3.5 is 16ktoken gpt4o is 128k +model_name = '' + +os.environ['OPENAI_API_KEY'] = '' +client = OpenAI() + + +def truncate_text(text, max_tokens): + encoding = tiktoken.get_encoding('cl100k_base') + disallowed_special = () + + tokens = encoding.encode(text, disallowed_special=disallowed_special) + print(len(tokens)) + + if len(tokens) > max_tokens: + tokens = tokens[:max_tokens] + + truncated_text = encoding.decode(tokens) + + return truncated_text + + +def predict(content, model_name): + response = client.chat.completions.create( + model=model_name, + messages=[{'role': 'user', 'content': content}], + frequency_penalty=0.1, + max_tokens=128, + logit_bias=None, + logprobs=None, + n=6, + presence_penalty=0.0, + seed=None, + stop=None, + stream=False, + temperature=0.8, + top_p=0.95, + ) + ans_list = [] + choices_list = response.choices + for c in choices_list: + content = c.message.content + ans_list.append(content) + final_ans = str(ans_list) + return final_ans + + +def bulid_prompt(description, old_version, old_code, new_version) -> str: + """ + build prompt + :param version: + :param description: + :param masked_code: + :param options: + :return: + """ + prompt = f""" + You are now a professional Python programming engineer. I will provide you with a code snippet and a description of its functionality, + including the dependencies and versions used in the code. Then, I will provide the same dependencies but with a specified new version. + Your task is to refactor the code using the methods provided by the specified new version and return the refactored code. + Please note that you only need to return the refactored code and enclose it with and : + ###Functionality description of the code + {description} + ###Dependency and old version + {old_version} + ###Old version code + {old_code} + ###Dependency and new version + {new_version} + ###Refactored new code + """ + + return prompt + + +json_path = '../data/test_data/VersiCode_migration.json' + + +with open(json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) +data_dict = lodict +data_list = data_dict + + +for data in data_list: + if 'model_output' in data: + print( + f'the {data_list.index(data) + 1} has already been predicted, skipping this data!' + ) + continue + try: + print(f'Predicting {data_list.index(data) + 1} ') + old_version = data['dependency'] + data['old_version'] # package == x.x.x + new_version = data['dependency'] + data['new_version'] # package == x.x.x + description = data['description'] # 功能描述 + old_code = data['old_code'] # mask后的代码 + + instruction = bulid_prompt(description, old_version, old_code, new_version) + truncated_text = truncate_text(instruction, max_tokens) + prediction = predict(truncated_text, model_name) + + data['model_output'] = prediction + except Exception as e: + print(f'error：{e}') + print('save current data') + save_folder_path = os.path.join( + '../data/result_data/code_migration', model_name + ) + if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) + save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + + with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(data_dict, fw, indent=4, ensure_ascii=False) + break + + +save_folder_path = os.path.join('../data/result_data/code_migration', model_name) +if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) +save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + +with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(data_dict, fw, indent=4, ensure_ascii=False) diff --git a/evaluation/benchmarks/versicode/inference_utils/api_test_block_completion.py b/evaluation/benchmarks/versicode/inference_utils/api_test_block_completion.py index 796672f0b0..b9bedab6e0 100644 --- a/evaluation/benchmarks/versicode/inference_utils/api_test_block_completion.py +++ b/evaluation/benchmarks/versicode/inference_utils/api_test_block_completion.py @@ -1,141 +1,141 @@ -""" -GPT performs line level generation prediction and truncates overly long tokens -""" -import json -import openai -from openai import OpenAI -import os -import tiktoken -max_tokens = 127000 #gpt3.5 is 16ktoken gpt4o is 128k -model_name = "" - -os.environ["OPENAI_API_KEY"] = "" -client = OpenAI() - -def truncate_text(text, max_tokens): - encoding = tiktoken.get_encoding("cl100k_base") - disallowed_special = () - - tokens = encoding.encode(text, disallowed_special=disallowed_special) - print(len(tokens)) - - if len(tokens) > max_tokens: - tokens = tokens[:max_tokens] - - truncated_text = encoding.decode(tokens) - - return truncated_text - -def predict(content, model_name): - response = client.chat.completions.create( - model=model_name, - messages=[ - { - "role": "user", - "content": content - } - ], - frequency_penalty=0.1, - max_tokens=128, - logit_bias=None, - logprobs=None, - n=6, - presence_penalty=0.0, - seed=None, - stop=None, - stream=False, - temperature=0.8, - top_p=0.95 - ) - ans_list = [] - choices_list = response.choices - for c in choices_list: - content = c.message.content - ans_list.append(content) - final_ans = str(ans_list) - return final_ans - -def bulid_prompt(version, description) -> str: - """ - build prompt - :param version: - :param description: - :param masked_code: - :param options: - :return: - """ - prompt = f''' - You are a professional Python engineer, and I will provide functional descriptions and versions of specified dependency packages. - You need to write code in Python to implement this feature based on the functional description and using the dependency package and version I specified. - Please note that you only need to return the code that implements the function, and do not return any other content. - Please use and to enclose the generated code. Here is an example: - ###Function Description： - The function of this code is to print the results predicted by calling the model using vllm. - ###dependeny and version： - vllm==0.3.3 - ###response: - - for output in outputs: - prompt = output.prompt - generated_text = output.outputs[0].text - print("Prompt,Generated text") - - - ###Function Description： - {description} - ###dependeny and version： - {version} - ###response: - - - ''' - return prompt - - -json_path = '../data/test_data/VersiCode_block_completion.json' - - -with open(json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) -data_dict = lodict -data_list = data_dict - - -for data in data_list: - if "model_output" in data: - print(f"the {data_list.index(data) + 1} has already been predicted, skipping this data!") - continue - try: - print(f"Predicting {data_list.index(data) + 1} ") - version = data['dependency'] + data['version'] # package == x.x.x - description = data['description'] # func description - - instruction = bulid_prompt(version, description) - truncated_text = truncate_text(instruction, max_tokens) - prediction = predict(truncated_text, model_name) - - data['model_output'] = prediction - except Exception as e: - print(f"error：{e}") - print("save current data") - save_folder_path = os.path.join('../data/result_data/block_completion', model_name) - if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) - save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - - with open(save_json_path, 'w', encoding='utf-8') as fw: - json.dump(data_dict, fw, indent=4, ensure_ascii=False) - break - - - -save_folder_path = os.path.join('../data/result_data/block_completion', model_name) -if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) -save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - -with open(save_json_path, 'w', encoding='utf-8')as fw: - json.dump(data_dict, fw, indent=4, ensure_ascii=False) - - - +""" +GPT performs line level generation prediction and truncates overly long tokens +""" + +import json +import os + +import tiktoken +from openai import OpenAI + +max_tokens = 127000 # gpt3.5 is 16ktoken gpt4o is 128k +model_name = '' + +os.environ['OPENAI_API_KEY'] = '' +client = OpenAI() + + +def truncate_text(text, max_tokens): + encoding = tiktoken.get_encoding('cl100k_base') + disallowed_special = () + + tokens = encoding.encode(text, disallowed_special=disallowed_special) + print(len(tokens)) + + if len(tokens) > max_tokens: + tokens = tokens[:max_tokens] + + truncated_text = encoding.decode(tokens) + + return truncated_text + + +def predict(content, model_name): + response = client.chat.completions.create( + model=model_name, + messages=[{'role': 'user', 'content': content}], + frequency_penalty=0.1, + max_tokens=128, + logit_bias=None, + logprobs=None, + n=6, + presence_penalty=0.0, + seed=None, + stop=None, + stream=False, + temperature=0.8, + top_p=0.95, + ) + ans_list = [] + choices_list = response.choices + for c in choices_list: + content = c.message.content + ans_list.append(content) + final_ans = str(ans_list) + return final_ans + + +def bulid_prompt(version, description) -> str: + """ + build prompt + :param version: + :param description: + :param masked_code: + :param options: + :return: + """ + prompt = f""" + You are a professional Python engineer, and I will provide functional descriptions and versions of specified dependency packages. + You need to write code in Python to implement this feature based on the functional description and using the dependency package and version I specified. + Please note that you only need to return the code that implements the function, and do not return any other content. + Please use and to enclose the generated code. Here is an example: + ###Function Description： + The function of this code is to print the results predicted by calling the model using vllm. + ###dependeny and version： + vllm==0.3.3 + ###response: + + for output in outputs: + prompt = output.prompt + generated_text = output.outputs[0].text + print("Prompt,Generated text") + + + ###Function Description： + {description} + ###dependeny and version： + {version} + ###response: + + + """ + return prompt + + +json_path = '../data/test_data/VersiCode_block_completion.json' + + +with open(json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) +data_dict = lodict +data_list = data_dict + + +for data in data_list: + if 'model_output' in data: + print( + f'the {data_list.index(data) + 1} has already been predicted, skipping this data!' + ) + continue + try: + print(f'Predicting {data_list.index(data) + 1} ') + version = data['dependency'] + data['version'] # package == x.x.x + description = data['description'] # func description + + instruction = bulid_prompt(version, description) + truncated_text = truncate_text(instruction, max_tokens) + prediction = predict(truncated_text, model_name) + + data['model_output'] = prediction + except Exception as e: + print(f'error：{e}') + print('save current data') + save_folder_path = os.path.join( + '../data/result_data/block_completion', model_name + ) + if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) + save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + + with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(data_dict, fw, indent=4, ensure_ascii=False) + break + + +save_folder_path = os.path.join('../data/result_data/block_completion', model_name) +if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) +save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + +with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(data_dict, fw, indent=4, ensure_ascii=False) diff --git a/evaluation/benchmarks/versicode/inference_utils/test_block.py b/evaluation/benchmarks/versicode/inference_utils/test_block.py index 1d34e55af9..1c0e7f2b15 100644 --- a/evaluation/benchmarks/versicode/inference_utils/test_block.py +++ b/evaluation/benchmarks/versicode/inference_utils/test_block.py @@ -1,118 +1,129 @@ -""" -block completion -""" -import copy -import json -import os -from vllm import LLM, SamplingParams -import tiktoken -import time -import gc -import torch -from multiprocessing import Process - -# os.environ["CUDA_VISIBLE_DEVICES"] = "0,1" - -def truncate_text(text, max_tokens): - encoding = tiktoken.get_encoding("cl100k_base") - disallowed_special = () - - tokens = encoding.encode(text, disallowed_special=disallowed_special) - print(len(tokens)) - - if len(tokens) > max_tokens: - tokens = tokens[:max_tokens] - - truncated_text = encoding.decode(tokens) - - return truncated_text - -model_list = ['/data2/base models/starcoder2-15b', '/data2/base models/CodeGemma-7B'] - -def run_inference(model_name, origin_data_list): - temp_data_list = copy.deepcopy(origin_data_list) - test_list = [] - for data in temp_data_list: - version = data['dependency'] + data['version'] # package == x.x.x - description = data['description'] # func description - - instruction = bulid_prompt(version, description) - test_list.append(instruction) - - sampling_params = SamplingParams(n=6, temperature=0.8, top_p=0.95, max_tokens=64) - llm = LLM(model=model_name, tensor_parallel_size=4, gpu_memory_utilization=0.9, swap_space=20) - - outputs = llm.generate(test_list, sampling_params) - for output in outputs: - requests_id = int(output.request_id) - temp_ans_list = [] - output_list = output.outputs - for o in output_list: - text = o.text - temp_ans_list.append(text) - - temp_data_list[requests_id]['model_output'] = str(temp_ans_list) - - save_folder_path = os.path.join('../data/result_data/block_completion', model_name.split('/')[-1]) - if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) - - save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - - with open(save_json_path, 'w', encoding='utf-8') as fw: - json.dump(temp_data_list, fw, indent=4, ensure_ascii=False) - - gc.collect() - torch.cuda.empty_cache() - - -def bulid_prompt(version, description) -> str: - """ - build prompt - :param version: - :param description: - :param masked_code: - :param options: - :return: - """ - prompt = f''' - You are a professional Python engineer, and I will provide functional descriptions and versions of specified dependency packages. - You need to write code in Python to implement this feature based on the functional description and using the dependency package and version I specified. - Please note that you only need to return the code that implements the function, and do not return any other content. - Please use and to enclose the generated code. Here is an example: - ###Function Description： - The function of this code is to print the results predicted by calling the model using vllm. - ###dependeny and version： - vllm==0.3.3 - ###response: - - for output in outputs: - prompt = output.prompt - generated_text = output.outputs[0].text - print("Prompt,Generated text") - - - ###Function Description： - {description} - ###dependeny and version： - {version} - ###response: - - - ''' - return prompt - - -json_path = '../data/test_data/VersiCode_block_completion.json' - -with open(json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - -origin_data_list = lodict - -for model_name in model_list: - process = Process(target=run_inference, args=(model_name, origin_data_list)) - process.start() - process.join() - time.sleep(120) - +""" +block completion +""" + +import copy +import gc +import json +import os +import time +from multiprocessing import Process + +import tiktoken +import torch +from vllm import LLM, SamplingParams + +# os.environ["CUDA_VISIBLE_DEVICES"] = "0,1" + + +def truncate_text(text, max_tokens): + encoding = tiktoken.get_encoding('cl100k_base') + disallowed_special = () + + tokens = encoding.encode(text, disallowed_special=disallowed_special) + print(len(tokens)) + + if len(tokens) > max_tokens: + tokens = tokens[:max_tokens] + + truncated_text = encoding.decode(tokens) + + return truncated_text + + +model_list = ['/data2/base models/starcoder2-15b', '/data2/base models/CodeGemma-7B'] + + +def run_inference(model_name, origin_data_list): + temp_data_list = copy.deepcopy(origin_data_list) + test_list = [] + for data in temp_data_list: + version = data['dependency'] + data['version'] # package == x.x.x + description = data['description'] # func description + + instruction = bulid_prompt(version, description) + test_list.append(instruction) + + sampling_params = SamplingParams(n=6, temperature=0.8, top_p=0.95, max_tokens=64) + llm = LLM( + model=model_name, + tensor_parallel_size=4, + gpu_memory_utilization=0.9, + swap_space=20, + ) + + outputs = llm.generate(test_list, sampling_params) + for output in outputs: + requests_id = int(output.request_id) + temp_ans_list = [] + output_list = output.outputs + for o in output_list: + text = o.text + temp_ans_list.append(text) + + temp_data_list[requests_id]['model_output'] = str(temp_ans_list) + + save_folder_path = os.path.join( + '../data/result_data/block_completion', model_name.split('/')[-1] + ) + if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) + + save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + + with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(temp_data_list, fw, indent=4, ensure_ascii=False) + + gc.collect() + torch.cuda.empty_cache() + + +def bulid_prompt(version, description) -> str: + """ + build prompt + :param version: + :param description: + :param masked_code: + :param options: + :return: + """ + prompt = f""" + You are a professional Python engineer, and I will provide functional descriptions and versions of specified dependency packages. + You need to write code in Python to implement this feature based on the functional description and using the dependency package and version I specified. + Please note that you only need to return the code that implements the function, and do not return any other content. + Please use and to enclose the generated code. Here is an example: + ###Function Description： + The function of this code is to print the results predicted by calling the model using vllm. + ###dependeny and version： + vllm==0.3.3 + ###response: + + for output in outputs: + prompt = output.prompt + generated_text = output.outputs[0].text + print("Prompt,Generated text") + + + ###Function Description： + {description} + ###dependeny and version： + {version} + ###response: + + + """ + return prompt + + +json_path = '../data/test_data/VersiCode_block_completion.json' + +with open(json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + +origin_data_list = lodict + +for model_name in model_list: + process = Process(target=run_inference, args=(model_name, origin_data_list)) + process.start() + process.join() + time.sleep(120) diff --git a/evaluation/benchmarks/versicode/inference_utils/test_migration.py b/evaluation/benchmarks/versicode/inference_utils/test_migration.py index b088f69773..cf4ec66e0e 100644 --- a/evaluation/benchmarks/versicode/inference_utils/test_migration.py +++ b/evaluation/benchmarks/versicode/inference_utils/test_migration.py @@ -1,111 +1,122 @@ -""" -code migration -""" -import copy -import json -import os -from vllm import LLM, SamplingParams -import tiktoken -import time -import gc -import torch -from multiprocessing import Process - -# os.environ["CUDA_VISIBLE_DEVICES"] = "0,1" - -def truncate_text(text, max_tokens): - encoding = tiktoken.get_encoding("cl100k_base") - disallowed_special = () - - tokens = encoding.encode(text, disallowed_special=disallowed_special) - print(len(tokens)) - - if len(tokens) > max_tokens: - tokens = tokens[:max_tokens] - - truncated_text = encoding.decode(tokens) - - return truncated_text - -model_list = ['/data2/base models/starcoder2-15b', '/data2/base models/CodeGemma-7B'] - -def run_inference(model_name, origin_data_list): - temp_data_list = copy.deepcopy(origin_data_list) - test_list = [] - for data in temp_data_list: - old_version = data['dependency'] + data['old_version'] # package == x.x.x - new_version = data['dependency'] + data['new_version'] # package == x.x.x - description = data['description'] # 功能描述 - old_code = data['old_code'] # mask后的代码 - - instruction = bulid_prompt(description, old_version, old_code, new_version) - test_list.append(instruction) - - sampling_params = SamplingParams(n=6, temperature=0.8, top_p=0.95, max_tokens=512) - llm = LLM(model=model_name, tensor_parallel_size=4, gpu_memory_utilization=0.6, swap_space=40) - - outputs = llm.generate(test_list, sampling_params) - for output in outputs: - requests_id = int(output.request_id) - temp_ans_list = [] - output_list = output.outputs - for o in output_list: - text = o.text - temp_ans_list.append(text) - - temp_data_list[requests_id]['model_output'] = str(temp_ans_list) - - save_folder_path = os.path.join('../data/result_data/code_migration', model_name.split('/')[-1]) - if not os.path.exists(save_folder_path): - os.makedirs(save_folder_path) - - save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) - - with open(save_json_path, 'w', encoding='utf-8') as fw: - json.dump(temp_data_list, fw, indent=4, ensure_ascii=False) - - gc.collect() - torch.cuda.empty_cache() - - -def bulid_prompt(description, old_version, old_code, new_version) -> str: - """ - build prompt - :param version: - :param description: - :param masked_code: - :param options: - :return: - """ - prompt = f""" - You are now a professional Python programming engineer. I will provide you with a code snippet and a description of its functionality, - including the dependencies and versions used in the code. Then, I will provide the same dependencies but with a specified new version. - Your task is to refactor the code using the methods provided by the specified new version and return the refactored code. - Please note that you only need to return the refactored code and enclose it with and : - ###Functionality description of the code - {description} - ###Dependency and old version - {old_version} - ###Old version code - {old_code} - ###Dependency and new version - {new_version} - ###Refactored new code - """ - - return prompt - - -json_path = '../data/test_data/VersiCode_migration.json' - -with open(json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - -origin_data_list = lodict - -for model_name in model_list: - process = Process(target=run_inference, args=(model_name, origin_data_list)) - process.start() - process.join() - time.sleep(120) - +""" +code migration +""" + +import copy +import gc +import json +import os +import time +from multiprocessing import Process + +import tiktoken +import torch +from vllm import LLM, SamplingParams + +# os.environ["CUDA_VISIBLE_DEVICES"] = "0,1" + + +def truncate_text(text, max_tokens): + encoding = tiktoken.get_encoding('cl100k_base') + disallowed_special = () + + tokens = encoding.encode(text, disallowed_special=disallowed_special) + print(len(tokens)) + + if len(tokens) > max_tokens: + tokens = tokens[:max_tokens] + + truncated_text = encoding.decode(tokens) + + return truncated_text + + +model_list = ['/data2/base models/starcoder2-15b', '/data2/base models/CodeGemma-7B'] + + +def run_inference(model_name, origin_data_list): + temp_data_list = copy.deepcopy(origin_data_list) + test_list = [] + for data in temp_data_list: + old_version = data['dependency'] + data['old_version'] # package == x.x.x + new_version = data['dependency'] + data['new_version'] # package == x.x.x + description = data['description'] # 功能描述 + old_code = data['old_code'] # mask后的代码 + + instruction = bulid_prompt(description, old_version, old_code, new_version) + test_list.append(instruction) + + sampling_params = SamplingParams(n=6, temperature=0.8, top_p=0.95, max_tokens=512) + llm = LLM( + model=model_name, + tensor_parallel_size=4, + gpu_memory_utilization=0.6, + swap_space=40, + ) + + outputs = llm.generate(test_list, sampling_params) + for output in outputs: + requests_id = int(output.request_id) + temp_ans_list = [] + output_list = output.outputs + for o in output_list: + text = o.text + temp_ans_list.append(text) + + temp_data_list[requests_id]['model_output'] = str(temp_ans_list) + + save_folder_path = os.path.join( + '../data/result_data/code_migration', model_name.split('/')[-1] + ) + if not os.path.exists(save_folder_path): + os.makedirs(save_folder_path) + + save_json_path = os.path.join(save_folder_path, json_path.split('/')[-1]) + + with open(save_json_path, 'w', encoding='utf-8') as fw: + json.dump(temp_data_list, fw, indent=4, ensure_ascii=False) + + gc.collect() + torch.cuda.empty_cache() + + +def bulid_prompt(description, old_version, old_code, new_version) -> str: + """ + build prompt + :param version: + :param description: + :param masked_code: + :param options: + :return: + """ + prompt = f""" + You are now a professional Python programming engineer. I will provide you with a code snippet and a description of its functionality, + including the dependencies and versions used in the code. Then, I will provide the same dependencies but with a specified new version. + Your task is to refactor the code using the methods provided by the specified new version and return the refactored code. + Please note that you only need to return the refactored code and enclose it with and : + ###Functionality description of the code + {description} + ###Dependency and old version + {old_version} + ###Old version code + {old_code} + ###Dependency and new version + {new_version} + ###Refactored new code + """ + + return prompt + + +json_path = '../data/test_data/VersiCode_migration.json' + +with open(json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + +origin_data_list = lodict + +for model_name in model_list: + process = Process(target=run_inference, args=(model_name, origin_data_list)) + process.start() + process.join() + time.sleep(120) diff --git a/evaluation/benchmarks/versicode/metric/compute_ism_pm_score.py b/evaluation/benchmarks/versicode/metric/compute_ism_pm_score.py index b0f79f025b..9b044de47b 100644 --- a/evaluation/benchmarks/versicode/metric/compute_ism_pm_score.py +++ b/evaluation/benchmarks/versicode/metric/compute_ism_pm_score.py @@ -1,345 +1,356 @@ -""" -评测block的预测能力 -1、判断是否包含正确的函数名 -2、判断是否合法 -3、计算ISM，和PM -""" -import json -import tokenize -import io -import math -import ast -import re -import os - -def is_code_valid(code): - - try: - compile(code, '', 'exec') - return True - except: - return False - - -def longest_common_prefix_between_lists_with_elements(list1, list2): - """ - 计算两个字符串列表中元素的最长前缀匹配长度 - :param list1: - :param list2: - :return: - """ - max_prefix_length = 0 - max_prefix_elements = () - for str1 in list1: - for str2 in list2: - prefix_length = 0 - min_len = min(len(str1), len(str2)) - for i in range(min_len): - if str1[i] == str2[i]: - prefix_length += 1 - else: - break - if prefix_length > max_prefix_length: - max_prefix_length = prefix_length - max_prefix_elements = (str1, str2) - return max_prefix_length, max_prefix_elements - -def get_token(ans_code:str, output_code:str): - """ - 对代码进行词法分析，分解成标识符，返回两个标识符列表 - :param ans_code: - :param output_code: - :return: - """ - output_flag = True - ans_flag = True - try: - tokens_ans = tokenize.tokenize(io.BytesIO(ans_code.encode('utf-8')).readline) - except Exception as e: - tokens_ans = ans_code.splitlines() - ans_flag = False - - try: - tokens_output = tokenize.tokenize(io.BytesIO(output_code.encode('utf-8')).readline) - except Exception as e: - tokens_output = output_code.splitlines() - output_flag = False - - - identifiers_ans = [] - identifiers_output = [] - if ans_flag == True: - try: - for token in tokens_ans: - if token.type == tokenize.NAME: - identifiers_ans.append(token.string) - except Exception as e: - identifiers_ans = tokens_ans - else: - identifiers_ans = tokens_ans - - if output_flag == True: - try: - for to in tokens_output: - if to.type == tokenize.NAME: - identifiers_output.append(to.string) - except Exception as e: - identifiers_output = tokens_output - else: - identifiers_output = tokens_output - - - return identifiers_ans, identifiers_output - - -def get_token_per_line(code: str): - """ - 对每一行代码进行词法分析，记录每一行的标识符 - :param code: 代码字符串 - :return: 每一行的标识符列表组成的列表 - """ - lines = code.split('\n') # 将代码按行分割成列表 - identifiers_per_line = [] # 用于存储每一行的标识符列表的列表 - - for line in lines: - tokens = tokenize.tokenize(io.BytesIO(line.encode('utf-8')).readline) - identifiers = [] - try: - for token in tokens: - if token.type == tokenize.NAME: - identifiers.append(token.string) - except: - identifiers = line.split(' ') - identifiers_per_line.append(identifiers) - - return identifiers_per_line - - - -def get_ISM(answer_code:str, model_output_list:list, asnwer_name:str)->list: - """ - 计算ISM，返回一个有序的得分列表 - :return: - """ - score_list = [] - for code in model_output_list: - if '```python' in code: - code = code.replace('```python', '') - code = code.replace('```', '') - if not re.search(rf'\b{re.escape(asnwer_name)}\b', code) or is_code_valid(code) == False: - score_list.append(0) - continue - - # if asnwer_name not in code: - # score_list.append(0) - # continue - - identifiers_ans, identifiers_output = get_token(answer_code, code) - max_len, elements = longest_common_prefix_between_lists_with_elements(identifiers_ans, identifiers_output) - if max_len != 0: - base_element_len = max(len(elements[0]), len(elements[1])) - temp_score = max_len/base_element_len - score_list.append(temp_score) - else: - score_list.append(0) - # base_element_len = max(len(elements[0]), len(elements[1])) - # temp_score = max_len/base_element_len - # score_list.append(temp_score) - - score_list = sorted(score_list, reverse=True) - return score_list - -def get_ISM_without_verification(answer_code:str, model_output_list:list, asnwer_name:str)->list: - """ - 计算ISM，返回一个有序的得分列表 - :return: - """ - score_list = [] - for code in model_output_list: - - if asnwer_name not in code: - score_list.append(0) - continue - - # if asnwer_name not in code: - # score_list.append(0) - # continue - - identifiers_ans, identifiers_output = get_token(answer_code, code) - max_len, elements = longest_common_prefix_between_lists_with_elements(identifiers_ans, identifiers_output) - if max_len != 0: - base_element_len = max(len(elements[0]), len(elements[1])) - temp_score = max_len/base_element_len - score_list.append(temp_score) - else: - score_list.append(0) - # base_element_len = max(len(elements[0]), len(elements[1])) - # temp_score = max_len/base_element_len - # score_list.append(temp_score) - - score_list = sorted(score_list, reverse=True) - return score_list - -def longest_common_prefix_with_lengths(list1, list2): - """ - 计算两个二维列表中每个子列表的最长前缀匹配长度，并记录拥有最长前缀匹配长度的两个子列表的长度 - :param list1: 第一个二维列表 - :param list2: 第二个二维列表 - :return: 最长前缀匹配长度以及拥有最长前缀匹配长度的两个子列表的长度 - """ - max_length = 0 - len_list1 = 0 - len_list2 = 0 - for i, sublist1 in enumerate(list1): - for j, sublist2 in enumerate(list2): - match_length = 0 - min_length = min(len(sublist1), len(sublist2)) - for k in range(min_length): - if sublist1[k] == sublist2[k]: - match_length += 1 - else: - break - if match_length > max_length: - max_length = match_length - len_list1 = len(sublist1) - len_list2 = len(sublist2) - return max_length, len_list1, len_list2 - - -def get_PM(answer_code:str, model_output_list:list, asnwer_name:str)->list: - """ - 计算PM，返回一个有序的得分列表 - :return: - """ - score_list = [] - for code in model_output_list: - if '```python' in code: - code = code.replace('```python', '') - code = code.replace('```', '') - if not re.search(rf'\b{re.escape(asnwer_name)}\b', code) or is_code_valid(code) == False: - - # if asnwer_name not in code or is_code_valid(code) == False: - score_list.append(0) - continue - - # if asnwer_name not in code: - # score_list.append(0) - # continue - - ans_list = get_token_per_line(answer_code) - output_token_list = get_token_per_line(code) - max_len, len1, len2 = longest_common_prefix_with_lengths(ans_list, output_token_list) - base_element_len = max(len1, len2) - - if base_element_len != 0: - temp_score = max_len/base_element_len - score_list.append(temp_score) - else: - score_list.append(0) - - score_list = sorted(score_list, reverse=True) - return score_list - -def get_score(score_list:list, k): - """ - 计算score@n,k - :param score_list: - :param k: - :return: - """ - n = len(score_list) - sum = 0 - final = n-k+1 - for i in range(1, final+1): - sum += math.comb(n-i, k-1) * score_list[i-1] - - final_score = sum/math.comb(n, k) - - return final_score - - -k = 1 -task = 'block' # block or line -json_name = f"Versicode_{task}_completion.json" - -folder_path = f'../data/result_data/{task}_completion' -model_list = os.listdir(folder_path) - -for model in model_list: - model_json_path = os.path.join(folder_path, model, json_name) - with open(model_json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - data_dict = lodict - data_list = data_dict - data_len = len(data_list) - sum_ISM = 0 - sum_PM = 0 - - for data in data_list: - # model_output_list = eval(data['model_output']) - model_output_list = eval(data['model_output_clear'])[:1] - temp_list = [] - for o in model_output_list: - temp_out = o.replace('```python', '') - temp_out = temp_out.replace('```', '') - temp_list.append(temp_out) - model_output_list = temp_list - answer_code = data['code'] - answer_name = data['core_token'] - # - # answer_code = data['new_code'] #code editing - # answer_name = data['new_name'] #code editing - - # answer_code = data['old_code'] # code editing new to old - # answer_name = data['old_name'] # code editing new to old - # - ISM_score_list = get_ISM(answer_code, model_output_list, answer_name) - # ISM_score_without_verification_list = get_ISM_without_verification(answer_code, model_output_list, answer_name) #新增 - PM_score_list = get_PM(answer_code, model_output_list, answer_name) - - # if not ISM_score_without_verification_list == ISM_score_list:#新增 - # for s in ISM_score_list:#新增 - # if s != ISM_score_without_verification_list[ISM_score_list.index(s)]:#新增 - # print('元数据如下')#新增 - # print(data)#新增 - # print('答案如下')#新增 - # print(model_output_list[ISM_score_list.index(s)])#新增 - - # flag = int(input('输入1继续，0退出'))#新增 - # if flag == 1: - # continue - - - ISM_score = get_score(ISM_score_list, k) - PM_score = get_score(PM_score_list, k) - - sum_ISM += ISM_score - sum_PM += PM_score - # print(f"ISM分数：{ISM_score}") - # print(f"PM分数：{PM_score}") - - print(f"{model}, {task} completion task, ISM@{k} score: {sum_ISM/data_len}") - print(f"{model}, {task} completion task, PM@{k} score: {sum_PM/data_len}") - - - -# def get_token(ans_code:str, output_code:str): -# """ -# 对代码进行词法分析，分解成标识符，返回两个标识符列表 -# :param ans_code: -# :param output_code: -# :return: -# """ -# tokens_ans = tokenize.tokenize(io.BytesIO(ans_code.encode('utf-8')).readline) -# tokens_output = tokenize.tokenize(io.BytesIO(output_code.encode('utf-8')).readline) -# identifiers_ans = [] -# identifiers_output = [] -# for token in tokens_ans: -# if token.type == tokenize.NAME: -# identifiers_ans.append(token.string) -# -# for to in tokens_output: -# if to.type == tokenize.NAME: -# identifiers_output.append(to.string) -# -# return identifiers_ans, identifiers_output \ No newline at end of file +""" +评测block的预测能力 +1、判断是否包含正确的函数名 +2、判断是否合法 +3、计算ISM，和PM +""" + +import io +import json +import math +import os +import re +import tokenize + + +def is_code_valid(code): + try: + compile(code, '', 'exec') + return True + except Exception: + return False + + +def longest_common_prefix_between_lists_with_elements(list1, list2): + """ + 计算两个字符串列表中元素的最长前缀匹配长度 + :param list1: + :param list2: + :return: + """ + max_prefix_length = 0 + max_prefix_elements = () + for str1 in list1: + for str2 in list2: + prefix_length = 0 + min_len = min(len(str1), len(str2)) + for i in range(min_len): + if str1[i] == str2[i]: + prefix_length += 1 + else: + break + if prefix_length > max_prefix_length: + max_prefix_length = prefix_length + max_prefix_elements = (str1, str2) + return max_prefix_length, max_prefix_elements + + +def get_token(ans_code: str, output_code: str): + """ + 对代码进行词法分析，分解成标识符，返回两个标识符列表 + :param ans_code: + :param output_code: + :return: + """ + output_flag = True + ans_flag = True + try: + tokens_ans = tokenize.tokenize(io.BytesIO(ans_code.encode('utf-8')).readline) + except Exception: + tokens_ans = ans_code.splitlines() + ans_flag = False + + try: + tokens_output = tokenize.tokenize( + io.BytesIO(output_code.encode('utf-8')).readline + ) + except Exception: + tokens_output = output_code.splitlines() + output_flag = False + + identifiers_ans = [] + identifiers_output = [] + if ans_flag: + try: + for token in tokens_ans: + if token.type == tokenize.NAME: + identifiers_ans.append(token.string) + except Exception: + identifiers_ans = tokens_ans + else: + identifiers_ans = tokens_ans + + if output_flag: + try: + for to in tokens_output: + if to.type == tokenize.NAME: + identifiers_output.append(to.string) + except Exception: + identifiers_output = tokens_output + else: + identifiers_output = tokens_output + + return identifiers_ans, identifiers_output + + +def get_token_per_line(code: str): + """ + 对每一行代码进行词法分析，记录每一行的标识符 + :param code: 代码字符串 + :return: 每一行的标识符列表组成的列表 + """ + lines = code.split('\n') # 将代码按行分割成列表 + identifiers_per_line = [] # 用于存储每一行的标识符列表的列表 + + for line in lines: + tokens = tokenize.tokenize(io.BytesIO(line.encode('utf-8')).readline) + identifiers = [] + try: + for token in tokens: + if token.type == tokenize.NAME: + identifiers.append(token.string) + except Exception: + identifiers = line.split(' ') + identifiers_per_line.append(identifiers) + + return identifiers_per_line + + +def get_ISM(answer_code: str, model_output_list: list, asnwer_name: str) -> list: + """ + 计算ISM，返回一个有序的得分列表 + :return: + """ + score_list = [] + for code in model_output_list: + if '```python' in code: + code = code.replace('```python', '') + code = code.replace('```', '') + if not re.search(rf'\b{re.escape(asnwer_name)}\b', code) or not is_code_valid( + code + ): + score_list.append(0) + continue + + # if asnwer_name not in code: + # score_list.append(0) + # continue + + identifiers_ans, identifiers_output = get_token(answer_code, code) + max_len, elements = longest_common_prefix_between_lists_with_elements( + identifiers_ans, identifiers_output + ) + if max_len != 0: + base_element_len = max(len(elements[0]), len(elements[1])) + temp_score = max_len / base_element_len + score_list.append(temp_score) + else: + score_list.append(0) + # base_element_len = max(len(elements[0]), len(elements[1])) + # temp_score = max_len/base_element_len + # score_list.append(temp_score) + + score_list = sorted(score_list, reverse=True) + return score_list + + +def get_ISM_without_verification( + answer_code: str, model_output_list: list, asnwer_name: str +) -> list: + """ + 计算ISM，返回一个有序的得分列表 + :return: + """ + score_list = [] + for code in model_output_list: + if asnwer_name not in code: + score_list.append(0) + continue + + # if asnwer_name not in code: + # score_list.append(0) + # continue + + identifiers_ans, identifiers_output = get_token(answer_code, code) + max_len, elements = longest_common_prefix_between_lists_with_elements( + identifiers_ans, identifiers_output + ) + if max_len != 0: + base_element_len = max(len(elements[0]), len(elements[1])) + temp_score = max_len / base_element_len + score_list.append(temp_score) + else: + score_list.append(0) + # base_element_len = max(len(elements[0]), len(elements[1])) + # temp_score = max_len/base_element_len + # score_list.append(temp_score) + + score_list = sorted(score_list, reverse=True) + return score_list + + +def longest_common_prefix_with_lengths(list1, list2): + """ + 计算两个二维列表中每个子列表的最长前缀匹配长度，并记录拥有最长前缀匹配长度的两个子列表的长度 + :param list1: 第一个二维列表 + :param list2: 第二个二维列表 + :return: 最长前缀匹配长度以及拥有最长前缀匹配长度的两个子列表的长度 + """ + max_length = 0 + len_list1 = 0 + len_list2 = 0 + for i, sublist1 in enumerate(list1): + for j, sublist2 in enumerate(list2): + match_length = 0 + min_length = min(len(sublist1), len(sublist2)) + for k in range(min_length): + if sublist1[k] == sublist2[k]: + match_length += 1 + else: + break + if match_length > max_length: + max_length = match_length + len_list1 = len(sublist1) + len_list2 = len(sublist2) + return max_length, len_list1, len_list2 + + +def get_PM(answer_code: str, model_output_list: list, asnwer_name: str) -> list: + """ + 计算PM，返回一个有序的得分列表 + :return: + """ + score_list = [] + for code in model_output_list: + if '```python' in code: + code = code.replace('```python', '') + code = code.replace('```', '') + if not re.search(rf'\b{re.escape(asnwer_name)}\b', code) or not is_code_valid( + code + ): + # if asnwer_name not in code or is_code_valid(code) == False: + score_list.append(0) + continue + + # if asnwer_name not in code: + # score_list.append(0) + # continue + + ans_list = get_token_per_line(answer_code) + output_token_list = get_token_per_line(code) + max_len, len1, len2 = longest_common_prefix_with_lengths( + ans_list, output_token_list + ) + base_element_len = max(len1, len2) + + if base_element_len != 0: + temp_score = max_len / base_element_len + score_list.append(temp_score) + else: + score_list.append(0) + + score_list = sorted(score_list, reverse=True) + return score_list + + +def get_score(score_list: list, k): + """ + 计算score@n,k + :param score_list: + :param k: + :return: + """ + n = len(score_list) + sum = 0 + final = n - k + 1 + for i in range(1, final + 1): + sum += math.comb(n - i, k - 1) * score_list[i - 1] + + final_score = sum / math.comb(n, k) + + return final_score + + +k = 1 +task = 'block' # block or line +json_name = f'Versicode_{task}_completion.json' + +folder_path = f'../data/result_data/{task}_completion' +model_list = os.listdir(folder_path) + +for model in model_list: + model_json_path = os.path.join(folder_path, model, json_name) + with open(model_json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + data_dict = lodict + data_list = data_dict + data_len = len(data_list) + sum_ISM = 0 + sum_PM = 0 + + for data in data_list: + # model_output_list = eval(data['model_output']) + model_output_list = eval(data['model_output_clear'])[:1] + temp_list = [] + for o in model_output_list: + temp_out = o.replace('```python', '') + temp_out = temp_out.replace('```', '') + temp_list.append(temp_out) + model_output_list = temp_list + answer_code = data['code'] + answer_name = data['core_token'] + # + # answer_code = data['new_code'] #code editing + # answer_name = data['new_name'] #code editing + + # answer_code = data['old_code'] # code editing new to old + # answer_name = data['old_name'] # code editing new to old + # + ISM_score_list = get_ISM(answer_code, model_output_list, answer_name) + # ISM_score_without_verification_list = get_ISM_without_verification(answer_code, model_output_list, answer_name) #新增 + PM_score_list = get_PM(answer_code, model_output_list, answer_name) + + # if not ISM_score_without_verification_list == ISM_score_list:#新增 + # for s in ISM_score_list:#新增 + # if s != ISM_score_without_verification_list[ISM_score_list.index(s)]:#新增 + # print('元数据如下')#新增 + # print(data)#新增 + # print('答案如下')#新增 + # print(model_output_list[ISM_score_list.index(s)])#新增 + + # flag = int(input('输入1继续，0退出'))#新增 + # if flag == 1: + # continue + + ISM_score = get_score(ISM_score_list, k) + PM_score = get_score(PM_score_list, k) + + sum_ISM += ISM_score + sum_PM += PM_score + # print(f"ISM分数：{ISM_score}") + # print(f"PM分数：{PM_score}") + + print(f'{model}, {task} completion task, ISM@{k} score: {sum_ISM / data_len}') + print(f'{model}, {task} completion task, PM@{k} score: {sum_PM / data_len}') + + +# def get_token(ans_code:str, output_code:str): +# """ +# 对代码进行词法分析，分解成标识符，返回两个标识符列表 +# :param ans_code: +# :param output_code: +# :return: +# """ +# tokens_ans = tokenize.tokenize(io.BytesIO(ans_code.encode('utf-8')).readline) +# tokens_output = tokenize.tokenize(io.BytesIO(output_code.encode('utf-8')).readline) +# identifiers_ans = [] +# identifiers_output = [] +# for token in tokens_ans: +# if token.type == tokenize.NAME: +# identifiers_ans.append(token.string) +# +# for to in tokens_output: +# if to.type == tokenize.NAME: +# identifiers_output.append(to.string) +# +# return identifiers_ans, identifiers_output diff --git a/evaluation/benchmarks/versicode/metric/compute_migration_cdc_score.py b/evaluation/benchmarks/versicode/metric/compute_migration_cdc_score.py index 836470c6a3..ab51ffbe1a 100644 --- a/evaluation/benchmarks/versicode/metric/compute_migration_cdc_score.py +++ b/evaluation/benchmarks/versicode/metric/compute_migration_cdc_score.py @@ -1,165 +1,198 @@ -""" -Calculate the cdc score for migration -""" -import os -import json -import math -import re -import warnings -# warnings.filterwarnings("ignore", category=SyntaxWarning) - -def is_correct_parameter_count(function_name, correct_code, test_code): - """ - 判断参数数量是否一致 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 获取正确代码中的参数数量 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - expected_count = len(correct_param_list) - else: - expected_count = 0 # 如果没有参数，期望数量为0 - - # 在需要判断的代码中查找函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - return len(test_param_list) == expected_count # 检查参数数量 - else: - # 如果没有括号，检查函数名是否在字符串中 - return expected_count == 0 and function_name in test_code - -def check_keyword_parameters(function_name, correct_code, test_code): - """ - 判断关键词参数赋值是否正确使用 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 正则表达式匹配正确代码中的函数调用 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - - # 检查待检测代码中的函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - - # 确保待检测的每个参数都以关键字参数形式赋值 - for correct_param in correct_param_list: - if '=' in correct_param: # 仅当正确代码中有关键词参数 - param_name = correct_param.split('=')[0].strip() - if not any(param_name in test_param and '=' in test_param for test_param in test_param_list): - return False # 如果对应参数不是关键词参数，则返回False - - return True # 所有关键字参数匹配 - - return False # 如果没有匹配，返回False - -def with_correct(answer_code:str, model_output:str)->bool: - """ - 当answer是with结构时，判断模型生成的是不是with结构 - :param answer_code: - :param model_output: - :return: - """ - # return True - if not answer_code.startswith('with') and not model_output.startswith('with'): - return True - elif answer_code.startswith('with') and model_output.startswith('with'): - return True - else: - return False - -def compute_block_score_k(answer:str, model_output:list, k:int, model_filled_code, core_line_in_core_block, core_line_in_output_clear): - """ - cdc需要满足五个条件，em只需要满足第一个条件 - """ - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid(model_filled_code[index]) and is_correct_parameter_count(answer, core_line_in_core_block, core_line_in_output_clear[index]) and with_correct(core_line_in_core_block, core_line_in_output_clear[index]) and check_keyword_parameters(answer, core_line_in_core_block, core_line_in_output_clear[index]):#block - # if re.search(rf'\b{re.escape(answer)}\b', code):#block - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - - -def is_code_valid(code): - - try: - compile(code, '', 'exec') - return True - except: - return False - -def compute_score_k(answer:str, model_output:list, k:int): - - c = 0 - n = len(model_output) - for output in model_output: - if '```python' in output: - output = output.replace('```python', '') - output = output.replace('```', '') - # if answer == output: - - if re.search(rf'\b{re.escape(answer)}\b', output) and is_code_valid(output) == True: - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -k = 1 #cdc@k -json_name = 'VersiCode_migration.json' -task = 'migration' -folder_path = f'../data/result_data/code_migration' - -model_list = os.listdir(folder_path) -for model in model_list: - # if model != 'gpt-4o': - # continue - model_json_path = os.path.join(folder_path, model, json_name) - with open(model_json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - data_list = lodict - - score_list = [] - for data in data_list: - answer = data['new_name']# old -> new - model_output = data[f'model_output_clear']# old -> new - - model_filled_code = model_output - # core_line_in_core_block = data['core_line_in_new_core_block']# old -> new - core_line_in_core_block = data['core_line_in_code'] # old -> new - core_line_in_output_clear = data['core_line_in_output_clear']# old -> new - - - score_list.append(compute_block_score_k(answer, model_output, k, model_filled_code, core_line_in_core_block, core_line_in_output_clear)) - - final_score = sum(score_list)/len(score_list) - print(f"{model}, {task} task, cdc@{k} score: {final_score}") +""" +Calculate the cdc score for migration +""" + +import json +import math +import os +import re + +# warnings.filterwarnings("ignore", category=SyntaxWarning) + + +def is_correct_parameter_count(function_name, correct_code, test_code): + """ + 判断参数数量是否一致 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 获取正确代码中的参数数量 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + expected_count = len(correct_param_list) + else: + expected_count = 0 # 如果没有参数，期望数量为0 + + # 在需要判断的代码中查找函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + return len(test_param_list) == expected_count # 检查参数数量 + else: + # 如果没有括号，检查函数名是否在字符串中 + return expected_count == 0 and function_name in test_code + + +def check_keyword_parameters(function_name, correct_code, test_code): + """ + 判断关键词参数赋值是否正确使用 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 正则表达式匹配正确代码中的函数调用 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + + # 检查待检测代码中的函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + + # 确保待检测的每个参数都以关键字参数形式赋值 + for correct_param in correct_param_list: + if '=' in correct_param: # 仅当正确代码中有关键词参数 + param_name = correct_param.split('=')[0].strip() + if not any( + param_name in test_param and '=' in test_param + for test_param in test_param_list + ): + return False # 如果对应参数不是关键词参数，则返回False + + return True # 所有关键字参数匹配 + + return False # 如果没有匹配，返回False + + +def with_correct(answer_code: str, model_output: str) -> bool: + """ + 当answer是with结构时，判断模型生成的是不是with结构 + :param answer_code: + :param model_output: + :return: + """ + # return True + if not answer_code.startswith('with') and not model_output.startswith('with'): + return True + elif answer_code.startswith('with') and model_output.startswith('with'): + return True + else: + return False + + +def compute_block_score_k( + answer: str, + model_output: list, + k: int, + model_filled_code, + core_line_in_core_block, + core_line_in_output_clear, +): + """ + cdc需要满足五个条件，em只需要满足第一个条件 + """ + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if ( + re.search(rf'\b{re.escape(answer)}\b', code) + and is_code_valid(model_filled_code[index]) + and is_correct_parameter_count( + answer, core_line_in_core_block, core_line_in_output_clear[index] + ) + and with_correct(core_line_in_core_block, core_line_in_output_clear[index]) + and check_keyword_parameters( + answer, core_line_in_core_block, core_line_in_output_clear[index] + ) + ): # block + # if re.search(rf'\b{re.escape(answer)}\b', code):#block + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +def is_code_valid(code): + try: + compile(code, '', 'exec') + return True + except Exception: + return False + + +def compute_score_k(answer: str, model_output: list, k: int): + c = 0 + n = len(model_output) + for output in model_output: + if '```python' in output: + output = output.replace('```python', '') + output = output.replace('```', '') + # if answer == output: + + if re.search(rf'\b{re.escape(answer)}\b', output) and is_code_valid(output): + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +k = 1 # cdc@k +json_name = 'VersiCode_migration.json' +task = 'migration' +folder_path = '../data/result_data/code_migration' + +model_list = os.listdir(folder_path) +for model in model_list: + # if model != 'gpt-4o': + # continue + model_json_path = os.path.join(folder_path, model, json_name) + with open(model_json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + data_list = lodict + + score_list = [] + for data in data_list: + answer = data['new_name'] # old -> new + model_output = data['model_output_clear'] # old -> new + + model_filled_code = model_output + # core_line_in_core_block = data['core_line_in_new_core_block']# old -> new + core_line_in_core_block = data['core_line_in_code'] # old -> new + core_line_in_output_clear = data['core_line_in_output_clear'] # old -> new + + score_list.append( + compute_block_score_k( + answer, + model_output, + k, + model_filled_code, + core_line_in_core_block, + core_line_in_output_clear, + ) + ) + + final_score = sum(score_list) / len(score_list) + print(f'{model}, {task} task, cdc@{k} score: {final_score}') diff --git a/evaluation/benchmarks/versicode/metric/compute_versicode_cdc_score.py b/evaluation/benchmarks/versicode/metric/compute_versicode_cdc_score.py index 81c3cc4dfa..c9d6389a64 100644 --- a/evaluation/benchmarks/versicode/metric/compute_versicode_cdc_score.py +++ b/evaluation/benchmarks/versicode/metric/compute_versicode_cdc_score.py @@ -1,175 +1,225 @@ -""" -Calculate the cdc score for line and block -""" -import os -import json -import math -import re -import warnings -# warnings.filterwarnings("ignore", category=SyntaxWarning) - -def is_code_valid(code): - - try: - compile(code, '', 'exec') - return True - except: - return False - -def is_correct_parameter_count(function_name, correct_code, test_code): - """ - 判断参数数量是否一致 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 获取正确代码中的参数数量 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - expected_count = len(correct_param_list) - else: - expected_count = 0 # 如果没有参数，期望数量为0 - - # 在需要判断的代码中查找函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - return len(test_param_list) == expected_count # 检查参数数量 - else: - # 如果没有括号，检查函数名是否在字符串中 - return expected_count == 0 and function_name in test_code - -def check_keyword_parameters(function_name, correct_code, test_code): - """ - 判断关键词参数赋值是否正确使用 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 正则表达式匹配正确代码中的函数调用 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - - # 检查待检测代码中的函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - - # 确保待检测的每个参数都以关键字参数形式赋值 - for correct_param in correct_param_list: - if '=' in correct_param: # 仅当正确代码中有关键词参数 - param_name = correct_param.split('=')[0].strip() - if not any(param_name in test_param and '=' in test_param for test_param in test_param_list): - return False # 如果对应参数不是关键词参数，则返回False - - return True # 所有关键字参数匹配 - - return False # 如果没有匹配，返回False - -def with_correct(answer_code:str, model_output:str)->bool: - """ - 当answer是with结构时，判断模型生成的是不是with结构 - :param answer_code: - :param model_output: - :return: - """ - # return True - if not answer_code.startswith('with') and not model_output.startswith('with'): - return True - elif answer_code.startswith('with') and model_output.startswith('with'): - return True - else: - return False - -def compute_line_score_k(answer:str, model_output:list, k:int, model_filled_code, core_line): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid(model_filled_code[index]) == True and is_correct_parameter_count(answer, core_line, code) and with_correct(core_line, code) and check_keyword_parameters(answer, core_line, code):#line - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -def compute_block_score_k(answer:str, model_output:list, k:int, model_filled_code, core_line_in_core_block, core_line_in_output_clear): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid(model_filled_code[index]) and is_correct_parameter_count(answer, core_line_in_core_block, core_line_in_output_clear[index]) and with_correct(core_line_in_core_block, core_line_in_output_clear[index]) and check_keyword_parameters(answer, core_line_in_core_block, core_line_in_output_clear[index]):#block - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -def compute_score_k(answer:str, model_output:list, k:int): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid(code):#block - # if re.search(rf'\b{re.escape(answer)}\b', code):#line - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -k = 3 #cdc@k -task = 'block' # line or block -json_name = f"Versicode_{task}_completion.json" - -folder_path = f'../data/result_data/{task}_completion' -model_list = os.listdir(folder_path) - -for model in model_list: - model_json_path = os.path.join(folder_path, model, json_name) - with open(model_json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - data_list = lodict - - if task == 'line': - score_list = [] - for data in data_list: - answer = data['core_token'] - model_output = eval(data['model_output_clear']) - model_filled_code = [data['masked_code'].replace('', i) for i in model_output] - core_line = data['core_line'] - score_list.append(compute_line_score_k(answer, model_output, k, model_filled_code, core_line)) - else: - score_list = [] - for data in data_list: - answer = data['core_token'] - model_output = eval(data['model_output_clear']) - model_filled_code = eval(data['model_output_clear']) - core_line = data['core_line'] - core_line_in_output_clear = data['core_line_in_output_clear'] - score_list.append(compute_block_score_k(answer, model_output, k, model_filled_code, core_line, core_line_in_output_clear)) - - final_score = sum(score_list)/len(score_list) - print(f"{model}, {task} completion task, cdc@{k} score: {final_score}") +""" +Calculate the cdc score for line and block +""" + +import json +import math +import os +import re + +# warnings.filterwarnings("ignore", category=SyntaxWarning) + + +def is_code_valid(code): + try: + compile(code, '', 'exec') + return True + except Exception: + return False + + +def is_correct_parameter_count(function_name, correct_code, test_code): + """ + 判断参数数量是否一致 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 获取正确代码中的参数数量 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + expected_count = len(correct_param_list) + else: + expected_count = 0 # 如果没有参数，期望数量为0 + + # 在需要判断的代码中查找函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + return len(test_param_list) == expected_count # 检查参数数量 + else: + # 如果没有括号，检查函数名是否在字符串中 + return expected_count == 0 and function_name in test_code + + +def check_keyword_parameters(function_name, correct_code, test_code): + """ + 判断关键词参数赋值是否正确使用 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 正则表达式匹配正确代码中的函数调用 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + + # 检查待检测代码中的函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + + # 确保待检测的每个参数都以关键字参数形式赋值 + for correct_param in correct_param_list: + if '=' in correct_param: # 仅当正确代码中有关键词参数 + param_name = correct_param.split('=')[0].strip() + if not any( + param_name in test_param and '=' in test_param + for test_param in test_param_list + ): + return False # 如果对应参数不是关键词参数，则返回False + + return True # 所有关键字参数匹配 + + return False # 如果没有匹配，返回False + + +def with_correct(answer_code: str, model_output: str) -> bool: + """ + 当answer是with结构时，判断模型生成的是不是with结构 + :param answer_code: + :param model_output: + :return: + """ + # return True + if not answer_code.startswith('with') and not model_output.startswith('with'): + return True + elif answer_code.startswith('with') and model_output.startswith('with'): + return True + else: + return False + + +def compute_line_score_k( + answer: str, model_output: list, k: int, model_filled_code, core_line +): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if ( + re.search(rf'\b{re.escape(answer)}\b', code) + and is_code_valid(model_filled_code[index]) + and is_correct_parameter_count(answer, core_line, code) + and with_correct(core_line, code) + and check_keyword_parameters(answer, core_line, code) + ): # line + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +def compute_block_score_k( + answer: str, + model_output: list, + k: int, + model_filled_code, + core_line_in_core_block, + core_line_in_output_clear, +): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if ( + re.search(rf'\b{re.escape(answer)}\b', code) + and is_code_valid(model_filled_code[index]) + and is_correct_parameter_count( + answer, core_line_in_core_block, core_line_in_output_clear[index] + ) + and with_correct(core_line_in_core_block, core_line_in_output_clear[index]) + and check_keyword_parameters( + answer, core_line_in_core_block, core_line_in_output_clear[index] + ) + ): # block + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +def compute_score_k(answer: str, model_output: list, k: int): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid( + code + ): # block + # if re.search(rf'\b{re.escape(answer)}\b', code):#line + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +k = 3 # cdc@k +task = 'block' # line or block +json_name = f'Versicode_{task}_completion.json' + +folder_path = f'../data/result_data/{task}_completion' +model_list = os.listdir(folder_path) + +for model in model_list: + model_json_path = os.path.join(folder_path, model, json_name) + with open(model_json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + data_list = lodict + + if task == 'line': + score_list = [] + for data in data_list: + answer = data['core_token'] + model_output = eval(data['model_output_clear']) + model_filled_code = [ + data['masked_code'].replace('', i) for i in model_output + ] + core_line = data['core_line'] + score_list.append( + compute_line_score_k( + answer, model_output, k, model_filled_code, core_line + ) + ) + else: + score_list = [] + for data in data_list: + answer = data['core_token'] + model_output = eval(data['model_output_clear']) + model_filled_code = eval(data['model_output_clear']) + core_line = data['core_line'] + core_line_in_output_clear = data['core_line_in_output_clear'] + score_list.append( + compute_block_score_k( + answer, + model_output, + k, + model_filled_code, + core_line, + core_line_in_output_clear, + ) + ) + + final_score = sum(score_list) / len(score_list) + print(f'{model}, {task} completion task, cdc@{k} score: {final_score}') diff --git a/evaluation/benchmarks/versicode/metric/compute_versicode_em_score.py b/evaluation/benchmarks/versicode/metric/compute_versicode_em_score.py index bb3a363fad..255c7e7714 100644 --- a/evaluation/benchmarks/versicode/metric/compute_versicode_em_score.py +++ b/evaluation/benchmarks/versicode/metric/compute_versicode_em_score.py @@ -1,175 +1,209 @@ -""" -Calculate the cdc score for line and block -""" -import os -import json -import math -import re -import warnings -# warnings.filterwarnings("ignore", category=SyntaxWarning) - -def is_code_valid(code): - - try: - compile(code, '', 'exec') - return True - except: - return False - -def is_correct_parameter_count(function_name, correct_code, test_code): - """ - 判断参数数量是否一致 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 获取正确代码中的参数数量 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - expected_count = len(correct_param_list) - else: - expected_count = 0 # 如果没有参数，期望数量为0 - - # 在需要判断的代码中查找函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - return len(test_param_list) == expected_count # 检查参数数量 - else: - # 如果没有括号，检查函数名是否在字符串中 - return expected_count == 0 and function_name in test_code - -def check_keyword_parameters(function_name, correct_code, test_code): - """ - 判断关键词参数赋值是否正确使用 - :param function_name: - :param correct_code: - :param test_code: - :return: - """ - # 正则表达式匹配正确代码中的函数调用 - # return True - pattern = rf'{function_name}\((.*?)\)' - correct_match = re.search(pattern, correct_code) - - if correct_match: - correct_params = correct_match.group(1).strip() - correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] - - # 检查待检测代码中的函数调用 - test_match = re.search(pattern, test_code) - - if test_match: - test_params = test_match.group(1).strip() - test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] - - # 确保待检测的每个参数都以关键字参数形式赋值 - for correct_param in correct_param_list: - if '=' in correct_param: # 仅当正确代码中有关键词参数 - param_name = correct_param.split('=')[0].strip() - if not any(param_name in test_param and '=' in test_param for test_param in test_param_list): - return False # 如果对应参数不是关键词参数，则返回False - - return True # 所有关键字参数匹配 - - return False # 如果没有匹配，返回False - -def with_correct(answer_code:str, model_output:str)->bool: - """ - 当answer是with结构时，判断模型生成的是不是with结构 - :param answer_code: - :param model_output: - :return: - """ - # return True - if not answer_code.startswith('with') and not model_output.startswith('with'): - return True - elif answer_code.startswith('with') and model_output.startswith('with'): - return True - else: - return False - -def compute_line_score_k(answer:str, model_output:list, k:int, model_filled_code, core_line): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code):#line - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -def compute_block_score_k(answer:str, model_output:list, k:int, model_filled_code, core_line_in_core_block, core_line_in_output_clear): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code):#block - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -def compute_score_k(answer:str, model_output:list, k:int): - - c = 0 - n = len(model_output) - for index, code in enumerate(model_output): - if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid(code):#block - # if re.search(rf'\b{re.escape(answer)}\b', code):#line - c += 1 - if n-c < k: - return 1.0 - - score = 1 - (math.comb(n - c, k))/(math.comb(n, k)) - - return score - -k = 3 #em@k -task = 'block' # line or block -json_name = f"Versicode_{task}_completion.json" - -folder_path = f'../data/result_data/{task}_completion' -model_list = os.listdir(folder_path) - -for model in model_list: - model_json_path = os.path.join(folder_path, model, json_name) - with open(model_json_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) - data_list = lodict - - if task == 'line': - score_list = [] - for data in data_list: - answer = data['core_token'] - model_output = eval(data['model_output_clear']) - model_filled_code = [data['masked_code'].replace('', i) for i in model_output] - core_line = data['core_line'] - score_list.append(compute_line_score_k(answer, model_output, k, model_filled_code, core_line)) - else: - score_list = [] - for data in data_list: - answer = data['core_token'] - model_output = eval(data['model_output_clear']) - model_filled_code = eval(data['model_output_clear']) - core_line = data['core_line'] - core_line_in_output_clear = data['core_line_in_output_clear'] - score_list.append(compute_block_score_k(answer, model_output, k, model_filled_code, core_line, core_line_in_output_clear)) - - final_score = sum(score_list)/len(score_list) - print(f"{model}, {task} completion task, em@{k} score: {final_score}") +""" +Calculate the cdc score for line and block +""" + +import json +import math +import os +import re + +# warnings.filterwarnings("ignore", category=SyntaxWarning) + + +def is_code_valid(code): + try: + compile(code, '', 'exec') + return True + except Exception: + return False + + +def is_correct_parameter_count(function_name, correct_code, test_code): + """ + 判断参数数量是否一致 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 获取正确代码中的参数数量 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + expected_count = len(correct_param_list) + else: + expected_count = 0 # 如果没有参数，期望数量为0 + + # 在需要判断的代码中查找函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + return len(test_param_list) == expected_count # 检查参数数量 + else: + # 如果没有括号，检查函数名是否在字符串中 + return expected_count == 0 and function_name in test_code + + +def check_keyword_parameters(function_name, correct_code, test_code): + """ + 判断关键词参数赋值是否正确使用 + :param function_name: + :param correct_code: + :param test_code: + :return: + """ + # 正则表达式匹配正确代码中的函数调用 + # return True + pattern = rf'{function_name}\((.*?)\)' + correct_match = re.search(pattern, correct_code) + + if correct_match: + correct_params = correct_match.group(1).strip() + correct_param_list = [p.strip() for p in correct_params.split(',') if p.strip()] + + # 检查待检测代码中的函数调用 + test_match = re.search(pattern, test_code) + + if test_match: + test_params = test_match.group(1).strip() + test_param_list = [p.strip() for p in test_params.split(',') if p.strip()] + + # 确保待检测的每个参数都以关键字参数形式赋值 + for correct_param in correct_param_list: + if '=' in correct_param: # 仅当正确代码中有关键词参数 + param_name = correct_param.split('=')[0].strip() + if not any( + param_name in test_param and '=' in test_param + for test_param in test_param_list + ): + return False # 如果对应参数不是关键词参数，则返回False + + return True # 所有关键字参数匹配 + + return False # 如果没有匹配，返回False + + +def with_correct(answer_code: str, model_output: str) -> bool: + """ + 当answer是with结构时，判断模型生成的是不是with结构 + :param answer_code: + :param model_output: + :return: + """ + # return True + if not answer_code.startswith('with') and not model_output.startswith('with'): + return True + elif answer_code.startswith('with') and model_output.startswith('with'): + return True + else: + return False + + +def compute_line_score_k( + answer: str, model_output: list, k: int, model_filled_code, core_line +): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if re.search(rf'\b{re.escape(answer)}\b', code): # line + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +def compute_block_score_k( + answer: str, + model_output: list, + k: int, + model_filled_code, + core_line_in_core_block, + core_line_in_output_clear, +): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if re.search(rf'\b{re.escape(answer)}\b', code): # block + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +def compute_score_k(answer: str, model_output: list, k: int): + c = 0 + n = len(model_output) + for index, code in enumerate(model_output): + if re.search(rf'\b{re.escape(answer)}\b', code) and is_code_valid( + code + ): # block + # if re.search(rf'\b{re.escape(answer)}\b', code):#line + c += 1 + if n - c < k: + return 1.0 + + score = 1 - (math.comb(n - c, k)) / (math.comb(n, k)) + + return score + + +k = 3 # em@k +task = 'block' # line or block +json_name = f'Versicode_{task}_completion.json' + +folder_path = f'../data/result_data/{task}_completion' +model_list = os.listdir(folder_path) + +for model in model_list: + model_json_path = os.path.join(folder_path, model, json_name) + with open(model_json_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) + data_list = lodict + + if task == 'line': + score_list = [] + for data in data_list: + answer = data['core_token'] + model_output = eval(data['model_output_clear']) + model_filled_code = [ + data['masked_code'].replace('', i) for i in model_output + ] + core_line = data['core_line'] + score_list.append( + compute_line_score_k( + answer, model_output, k, model_filled_code, core_line + ) + ) + else: + score_list = [] + for data in data_list: + answer = data['core_token'] + model_output = eval(data['model_output_clear']) + model_filled_code = eval(data['model_output_clear']) + core_line = data['core_line'] + core_line_in_output_clear = data['core_line_in_output_clear'] + score_list.append( + compute_block_score_k( + answer, + model_output, + k, + model_filled_code, + core_line, + core_line_in_output_clear, + ) + ) + + final_score = sum(score_list) / len(score_list) + print(f'{model}, {task} completion task, em@{k} score: {final_score}') diff --git a/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_block_versicode.py b/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_block_versicode.py index 78632625a5..75cb42b631 100644 --- a/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_block_versicode.py +++ b/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_block_versicode.py @@ -1,107 +1,99 @@ -""" -Find the line of code generated by the model using the block in the version code -""" -import os -import re -import json -import random - -def process_line_mask(code_snippet, core_token): - if not core_token: - - return None, None - - - replaced_lines = {} - lines = code_snippet.split("\n") - - - in_multi_line_comment = False - - - for i, line in enumerate(lines): - if in_multi_line_comment: - - if ('"""' in line or "'''" in line) and not re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - in_multi_line_comment = False - continue - elif line.strip().startswith("#"): - - continue - elif re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - - continue - elif ('"""' in line or "'''" in line) and not re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - - in_multi_line_comment = True - continue - else: - - if re.search(r'\bdef\s+task_function\b', line): - continue - - - if re.search(r'\b{}\b(?!\s*=)'.format(re.escape(core_token)), line): - - replaced_lines.update({i: line}) - - if replaced_lines: - random_line_location = random.choice(list(replaced_lines.keys())) - - masked_line = lines[random_line_location] - leading_spaces = re.match(r'^\s*', masked_line).group(0) - masked_line = masked_line.strip() - lines[random_line_location] = leading_spaces + "" - - masked_code = '\n'.join(lines) - - return masked_code, masked_line - - return None, None - - -def load_json(file_path): - with open(file_path, 'r', encoding='utf-8') as f: - data = json.load(f) - return data - - -def save_json(file_path, data): - with open(file_path, 'w', encoding='utf-8') as f: - json.dump(data, f, ensure_ascii=False, indent=4) - - - -if __name__ == "__main__": - model_list = os.listdir('../data/result_data/block_completion') - for model in model_list: - - input_json_file = f'../data/result_data/block_completion/{model}/VersiCode_block_completion.json' - output_json_file = input_json_file - data = load_json(input_json_file) - - for item in data: - core_token = item['core_token'] - code = item['code'] - - _, core_line_in_code = process_line_mask(code, core_token) - if core_line_in_code: - item['core_line_in_code'] = core_line_in_code - else: - item['core_line_in_code'] = "N/A" - - model_output_clear = item['model_output_clear'] - core_line_in_output_list = [] - - for entry in eval(model_output_clear): - _, core_line_in_output = process_line_mask(entry, core_token) - if core_line_in_output: - core_line_in_output_list.append(core_line_in_output) - else: - core_line_in_output_list.append("N/A") - - item['core_line_in_output_clear'] = core_line_in_output_list - - save_json(output_json_file, data) - print("Done!") - +""" +Find the line of code generated by the model using the block in the version code +""" + +import json +import os +import random +import re + + +def process_line_mask(code_snippet, core_token): + if not core_token: + return None, None + + replaced_lines = {} + lines = code_snippet.split('\n') + + in_multi_line_comment = False + + for i, line in enumerate(lines): + if in_multi_line_comment: + if ('"""' in line or "'''" in line) and not re.findall( + r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line + ): + in_multi_line_comment = False + continue + elif line.strip().startswith('#'): + continue + elif re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): + continue + elif ('"""' in line or "'''" in line) and not re.findall( + r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line + ): + in_multi_line_comment = True + continue + else: + if re.search(r'\bdef\s+task_function\b', line): + continue + + if re.search(r'\b{}\b(?!\s*=)'.format(re.escape(core_token)), line): + replaced_lines.update({i: line}) + + if replaced_lines: + random_line_location = random.choice(list(replaced_lines.keys())) + + masked_line = lines[random_line_location] + leading_spaces = re.match(r'^\s*', masked_line).group(0) + masked_line = masked_line.strip() + lines[random_line_location] = leading_spaces + '' + + masked_code = '\n'.join(lines) + + return masked_code, masked_line + + return None, None + + +def load_json(file_path): + with open(file_path, 'r', encoding='utf-8') as f: + data = json.load(f) + return data + + +def save_json(file_path, data): + with open(file_path, 'w', encoding='utf-8') as f: + json.dump(data, f, ensure_ascii=False, indent=4) + + +if __name__ == '__main__': + model_list = os.listdir('../data/result_data/block_completion') + for model in model_list: + input_json_file = f'../data/result_data/block_completion/{model}/VersiCode_block_completion.json' + output_json_file = input_json_file + data = load_json(input_json_file) + + for item in data: + core_token = item['core_token'] + code = item['code'] + + _, core_line_in_code = process_line_mask(code, core_token) + if core_line_in_code: + item['core_line_in_code'] = core_line_in_code + else: + item['core_line_in_code'] = 'N/A' + + model_output_clear = item['model_output_clear'] + core_line_in_output_list = [] + + for entry in eval(model_output_clear): + _, core_line_in_output = process_line_mask(entry, core_token) + if core_line_in_output: + core_line_in_output_list.append(core_line_in_output) + else: + core_line_in_output_list.append('N/A') + + item['core_line_in_output_clear'] = core_line_in_output_list + + save_json(output_json_file, data) + print('Done!') diff --git a/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_migration_versicode.py b/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_migration_versicode.py index bc730fed86..cc2f65f1c7 100644 --- a/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_migration_versicode.py +++ b/evaluation/benchmarks/versicode/output_processing/choose_core_line_from_migration_versicode.py @@ -1,108 +1,102 @@ -""" -Find the line of code generated by the model using the block in the version code -""" -import os -import re -import json -import random - -def process_line_mask(code_snippet, core_token): - if not core_token: - - return None, None - - - replaced_lines = {} - lines = code_snippet.split("\n") - - - in_multi_line_comment = False - - - for i, line in enumerate(lines): - if in_multi_line_comment: - - if ('"""' in line or "'''" in line) and not re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - in_multi_line_comment = False - continue - elif line.strip().startswith("#"): - - continue - elif re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - - continue - elif ('"""' in line or "'''" in line) and not re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): - - in_multi_line_comment = True - continue - else: - - if re.search(r'\bdef\s+task_function\b', line): - continue - - - if re.search(r'\b{}\b(?!\s*=)'.format(re.escape(core_token)), line): - - replaced_lines.update({i: line}) - - if replaced_lines: - random_line_location = random.choice(list(replaced_lines.keys())) - - masked_line = lines[random_line_location] - leading_spaces = re.match(r'^\s*', masked_line).group(0) - masked_line = masked_line.strip() - lines[random_line_location] = leading_spaces + "" - - masked_code = '\n'.join(lines) - - return masked_code, masked_line - - return None, None - - -def load_json(file_path): - with open(file_path, 'r', encoding='utf-8') as f: - data = json.load(f) - return data - - -def save_json(file_path, data): - with open(file_path, 'w', encoding='utf-8') as f: - json.dump(data, f, ensure_ascii=False, indent=4) - - - -if __name__ == "__main__": - model_list = os.listdir('../data/result_data/code_migration') - for model in model_list: - - input_json_file = f'../data/result_data/code_migration/{model}/VersiCode_migration.json' - output_json_file = input_json_file - data = load_json(input_json_file) - - for item in data: - core_token = item['old_name'] - code = item['old_code'] - - _, core_line_in_code = process_line_mask(code, core_token) - if core_line_in_code: - item['core_line_in_code'] = core_line_in_code - else: - item['core_line_in_code'] = "N/A" - - model_output_clear = item['model_output_clear'] - core_line_in_output_list = [] - - core_token = item['new_name'] - for entry in eval(model_output_clear): - _, core_line_in_output = process_line_mask(entry, core_token) - if core_line_in_output: - core_line_in_output_list.append(core_line_in_output) - else: - core_line_in_output_list.append("N/A") - - item['core_line_in_output_clear'] = core_line_in_output_list - - save_json(output_json_file, data) - print("Done!") - +""" +Find the line of code generated by the model using the block in the version code +""" + +import json +import os +import random +import re + + +def process_line_mask(code_snippet, core_token): + if not core_token: + return None, None + + replaced_lines = {} + lines = code_snippet.split('\n') + + in_multi_line_comment = False + + for i, line in enumerate(lines): + if in_multi_line_comment: + if ('"""' in line or "'''" in line) and not re.findall( + r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line + ): + in_multi_line_comment = False + continue + elif line.strip().startswith('#'): + continue + elif re.findall(r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line): + continue + elif ('"""' in line or "'''" in line) and not re.findall( + r"'''(.*?)'''|\"\"\"(.*?)\"\"\"", line + ): + in_multi_line_comment = True + continue + else: + if re.search(r'\bdef\s+task_function\b', line): + continue + + if re.search(r'\b{}\b(?!\s*=)'.format(re.escape(core_token)), line): + replaced_lines.update({i: line}) + + if replaced_lines: + random_line_location = random.choice(list(replaced_lines.keys())) + + masked_line = lines[random_line_location] + leading_spaces = re.match(r'^\s*', masked_line).group(0) + masked_line = masked_line.strip() + lines[random_line_location] = leading_spaces + '' + + masked_code = '\n'.join(lines) + + return masked_code, masked_line + + return None, None + + +def load_json(file_path): + with open(file_path, 'r', encoding='utf-8') as f: + data = json.load(f) + return data + + +def save_json(file_path, data): + with open(file_path, 'w', encoding='utf-8') as f: + json.dump(data, f, ensure_ascii=False, indent=4) + + +if __name__ == '__main__': + model_list = os.listdir('../data/result_data/code_migration') + for model in model_list: + input_json_file = ( + f'../data/result_data/code_migration/{model}/VersiCode_migration.json' + ) + output_json_file = input_json_file + data = load_json(input_json_file) + + for item in data: + core_token = item['old_name'] + code = item['old_code'] + + _, core_line_in_code = process_line_mask(code, core_token) + if core_line_in_code: + item['core_line_in_code'] = core_line_in_code + else: + item['core_line_in_code'] = 'N/A' + + model_output_clear = item['model_output_clear'] + core_line_in_output_list = [] + + core_token = item['new_name'] + for entry in eval(model_output_clear): + _, core_line_in_output = process_line_mask(entry, core_token) + if core_line_in_output: + core_line_in_output_list.append(core_line_in_output) + else: + core_line_in_output_list.append('N/A') + + item['core_line_in_output_clear'] = core_line_in_output_list + + save_json(output_json_file, data) + print('Done!') diff --git a/evaluation/benchmarks/versicode/output_processing/clear_ans.py b/evaluation/benchmarks/versicode/output_processing/clear_ans.py index b6d72c1ac0..01060c80e7 100644 --- a/evaluation/benchmarks/versicode/output_processing/clear_ans.py +++ b/evaluation/benchmarks/versicode/output_processing/clear_ans.py @@ -1,36 +1,38 @@ -""" -Clear theandgenerated by the model in inference -""" - -import json -import os - -model_name = '' -task = 'block_completion' - -result_path = f'../data/result_data/{task}/{model_name}/VersiCode_block_completion.json' #Modify the file according to the task format - - -with open(result_path, 'r', encoding='utf-8')as fr: - lodict = json.load(fr) -data_dict = lodict -data_list = data_dict - -for data in data_list: - temp_list = [] - model_output_list = eval(data['model_output']) - for output in model_output_list: - - if "" in output and "" in output: - start_index = output.find("") + len("") - end_index = output.find("") - content = output[start_index:end_index].replace('```python', '').replace('```', '') - else: - content = "no_answer" - - temp_list.append(content) - - data['model_output_clear'] = str(temp_list) - -with open(result_path, 'w', encoding='utf-8')as fw: - json.dump(data_dict, fw, indent=4, ensure_ascii=False) \ No newline at end of file +""" +Clear theandgenerated by the model in inference +""" + +import json + +model_name = '' +task = 'block_completion' + +result_path = f'../data/result_data/{task}/{model_name}/VersiCode_block_completion.json' # Modify the file according to the task format + + +with open(result_path, 'r', encoding='utf-8') as fr: + lodict = json.load(fr) +data_dict = lodict +data_list = data_dict + +for data in data_list: + temp_list = [] + model_output_list = eval(data['model_output']) + for output in model_output_list: + if '' in output and '' in output: + start_index = output.find('') + len('') + end_index = output.find('') + content = ( + output[start_index:end_index] + .replace('```python', '') + .replace('```', '') + ) + else: + content = 'no_answer' + + temp_list.append(content) + + data['model_output_clear'] = str(temp_list) + +with open(result_path, 'w', encoding='utf-8') as fw: + json.dump(data_dict, fw, indent=4, ensure_ascii=False) diff --git a/frontend/__tests__/components/features/settings/api-keys-manager.test.tsx b/frontend/__tests__/components/features/settings/api-keys-manager.test.tsx index 711c50a194..6c3f9884a9 100644 --- a/frontend/__tests__/components/features/settings/api-keys-manager.test.tsx +++ b/frontend/__tests__/components/features/settings/api-keys-manager.test.tsx @@ -16,8 +16,8 @@ vi.mock("react-i18next", async () => { if (i18nKey === "SETTINGS$API_KEYS_DESCRIPTION") { return ( - API keys allow you to authenticate with the OpenHands API programmatically. - Keep your API keys secure; anyone with your API key can access your account. + API keys allow you to authenticate with the OpenHands API programmatically. + Keep your API keys secure; anyone with your API key can access your account. For more information on how to use the API, see our {components.a} ); @@ -48,7 +48,7 @@ describe("ApiKeysManager", () => { it("should render the API documentation link", () => { renderComponent(); - + // Find the link to the API documentation const link = screen.getByRole("link"); expect(link).toBeInTheDocument(); @@ -56,4 +56,4 @@ describe("ApiKeysManager", () => { expect(link).toHaveAttribute("target", "_blank"); expect(link).toHaveAttribute("rel", "noopener noreferrer"); }); -}); \ No newline at end of file +}); diff --git a/frontend/__tests__/utils/check-home-hardcoded-strings.test.tsx b/frontend/__tests__/utils/check-home-hardcoded-strings.test.tsx index a9470fdd2c..f0920417c9 100644 --- a/frontend/__tests__/utils/check-home-hardcoded-strings.test.tsx +++ b/frontend/__tests__/utils/check-home-hardcoded-strings.test.tsx @@ -39,4 +39,4 @@ describe("Check for hardcoded English strings in Home components", () => { expect(text).not.toContain(str); }); }); -}); \ No newline at end of file +}); diff --git a/frontend/public/mockServiceWorker.js b/frontend/public/mockServiceWorker.js index 0c8e0df6af..de7bc0f292 100644 --- a/frontend/public/mockServiceWorker.js +++ b/frontend/public/mockServiceWorker.js @@ -5,24 +5,23 @@ * Mock Service Worker. * @see https://github.com/mswjs/msw * - Please do NOT modify this file. - * - Please do NOT serve this file on production. */ -const PACKAGE_VERSION = '2.8.4' -const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f' +const PACKAGE_VERSION = '2.10.2' +const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af' const IS_MOCKED_RESPONSE = Symbol('isMockedResponse') const activeClientIds = new Set() -self.addEventListener('install', function () { +addEventListener('install', function () { self.skipWaiting() }) -self.addEventListener('activate', function (event) { +addEventListener('activate', function (event) { event.waitUntil(self.clients.claim()) }) -self.addEventListener('message', async function (event) { - const clientId = event.source.id +addEventListener('message', async function (event) { + const clientId = Reflect.get(event.source || {}, 'id') if (!clientId || !self.clients) { return @@ -94,17 +93,18 @@ self.addEventListener('message', async function (event) { } }) -self.addEventListener('fetch', function (event) { - const { request } = event - +addEventListener('fetch', function (event) { // Bypass navigation requests. - if (request.mode === 'navigate') { + if (event.request.mode === 'navigate') { return } // Opening the DevTools triggers the "only-if-cached" request // that cannot be handled by the worker. Bypass such requests. - if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') { + if ( + event.request.cache === 'only-if-cached' && + event.request.mode !== 'same-origin' + ) { return } @@ -115,48 +115,62 @@ self.addEventListener('fetch', function (event) { return } - // Generate unique request ID. const requestId = crypto.randomUUID() event.respondWith(handleRequest(event, requestId)) }) +/** + * @param {FetchEvent} event + * @param {string} requestId + */ async function handleRequest(event, requestId) { const client = await resolveMainClient(event) + const requestCloneForEvents = event.request.clone() const response = await getResponse(event, client, requestId) // Send back the response clone for the "response:*" life-cycle events. // Ensure MSW is active and ready to handle the message, otherwise // this message will pend indefinitely. if (client && activeClientIds.has(client.id)) { - ;(async function () { - const responseClone = response.clone() + const serializedRequest = await serializeRequest(requestCloneForEvents) - sendToClient( - client, - { - type: 'RESPONSE', - payload: { - requestId, - isMockedResponse: IS_MOCKED_RESPONSE in response, + // Clone the response so both the client and the library could consume it. + const responseClone = response.clone() + + sendToClient( + client, + { + type: 'RESPONSE', + payload: { + isMockedResponse: IS_MOCKED_RESPONSE in response, + request: { + id: requestId, + ...serializedRequest, + }, + response: { type: responseClone.type, status: responseClone.status, statusText: responseClone.statusText, - body: responseClone.body, headers: Object.fromEntries(responseClone.headers.entries()), + body: responseClone.body, }, }, - [responseClone.body], - ) - })() + }, + responseClone.body ? [serializedRequest.body, responseClone.body] : [], + ) } return response } -// Resolve the main client for the given event. -// Client that issues a request doesn't necessarily equal the client -// that registered the worker. It's with the latter the worker should -// communicate with during the response resolving phase. +/** + * Resolve the main client for the given event. + * Client that issues a request doesn't necessarily equal the client + * that registered the worker. It's with the latter the worker should + * communicate with during the response resolving phase. + * @param {FetchEvent} event + * @returns {Promise} + */ async function resolveMainClient(event) { const client = await self.clients.get(event.clientId) @@ -184,12 +198,16 @@ async function resolveMainClient(event) { }) } +/** + * @param {FetchEvent} event + * @param {Client | undefined} client + * @param {string} requestId + * @returns {Promise} + */ async function getResponse(event, client, requestId) { - const { request } = event - // Clone the request because it might've been already used // (i.e. its body has been read and sent to the client). - const requestClone = request.clone() + const requestClone = event.request.clone() function passthrough() { // Cast the request headers to a new Headers instance @@ -230,29 +248,17 @@ async function getResponse(event, client, requestId) { } // Notify the client that a request has been intercepted. - const requestBuffer = await request.arrayBuffer() + const serializedRequest = await serializeRequest(event.request) const clientMessage = await sendToClient( client, { type: 'REQUEST', payload: { id: requestId, - url: request.url, - mode: request.mode, - method: request.method, - headers: Object.fromEntries(request.headers.entries()), - cache: request.cache, - credentials: request.credentials, - destination: request.destination, - integrity: request.integrity, - redirect: request.redirect, - referrer: request.referrer, - referrerPolicy: request.referrerPolicy, - body: requestBuffer, - keepalive: request.keepalive, + ...serializedRequest, }, }, - [requestBuffer], + [serializedRequest.body], ) switch (clientMessage.type) { @@ -268,6 +274,12 @@ async function getResponse(event, client, requestId) { return passthrough() } +/** + * @param {Client} client + * @param {any} message + * @param {Array} transferrables + * @returns {Promise} + */ function sendToClient(client, message, transferrables = []) { return new Promise((resolve, reject) => { const channel = new MessageChannel() @@ -280,14 +292,18 @@ function sendToClient(client, message, transferrables = []) { resolve(event.data) } - client.postMessage( - message, - [channel.port2].concat(transferrables.filter(Boolean)), - ) + client.postMessage(message, [ + channel.port2, + ...transferrables.filter(Boolean), + ]) }) } -async function respondWithMock(response) { +/** + * @param {Response} response + * @returns {Response} + */ +function respondWithMock(response) { // Setting response status code to 0 is a no-op. // However, when responding with a "Response.error()", the produced Response // instance will have status code set to 0. Since it's not possible to create @@ -305,3 +321,24 @@ async function respondWithMock(response) { return mockedResponse } + +/** + * @param {Request} request + */ +async function serializeRequest(request) { + return { + url: request.url, + mode: request.mode, + method: request.method, + headers: Object.fromEntries(request.headers.entries()), + cache: request.cache, + credentials: request.credentials, + destination: request.destination, + integrity: request.integrity, + redirect: request.redirect, + referrer: request.referrer, + referrerPolicy: request.referrerPolicy, + body: await request.arrayBuffer(), + keepalive: request.keepalive, + } +} diff --git a/frontend/scripts/check-translation-completeness.cjs b/frontend/scripts/check-translation-completeness.cjs index e855e0e763..6717059cec 100755 --- a/frontend/scripts/check-translation-completeness.cjs +++ b/frontend/scripts/check-translation-completeness.cjs @@ -60,11 +60,11 @@ Object.entries(translationJson).forEach(([key, translations]) => { if (Object.keys(missingTranslations).length > 0) { console.error('\x1b[31m%s\x1b[0m', 'ERROR: Missing translations detected'); console.error(`Found ${Object.keys(missingTranslations).length} translation keys with missing languages:`); - + Object.entries(missingTranslations).forEach(([key, langs]) => { console.error(`- Key "${key}" is missing translations for: ${langs.join(', ')}`); }); - + console.error('\nPlease add the missing translations before committing.'); } @@ -72,11 +72,11 @@ if (Object.keys(missingTranslations).length > 0) { if (Object.keys(extraLanguages).length > 0) { console.error('\x1b[31m%s\x1b[0m', 'ERROR: Extra languages detected'); console.error(`Found ${Object.keys(extraLanguages).length} translation keys with extra languages not in AvailableLanguages:`); - + Object.entries(extraLanguages).forEach(([key, langs]) => { console.error(`- Key "${key}" has translations for unsupported languages: ${langs.join(', ')}`); }); - + console.error('\nPlease remove the extra languages before committing.'); } @@ -85,4 +85,4 @@ if (hasErrors) { process.exit(1); } else { console.log('\x1b[32m%s\x1b[0m', 'All translation keys have complete language coverage!'); -} \ No newline at end of file +} diff --git a/frontend/tests/repo-selection-form.test.tsx b/frontend/tests/repo-selection-form.test.tsx index 642b933620..3d63a1af9d 100644 --- a/frontend/tests/repo-selection-form.test.tsx +++ b/frontend/tests/repo-selection-form.test.tsx @@ -19,10 +19,10 @@ vi.mock("react-i18next", () => ({ describe("RepositorySelectionForm", () => { const mockOnRepoSelection = vi.fn(); - + beforeEach(() => { vi.resetAllMocks(); - + // Mock the hooks with default values (useUserRepositories as any).mockReturnValue({ data: [ @@ -32,7 +32,7 @@ describe("RepositorySelectionForm", () => { isLoading: false, isError: false, }); - + (useRepositoryBranches as any).mockReturnValue({ data: [ { name: "main" }, @@ -41,90 +41,90 @@ describe("RepositorySelectionForm", () => { isLoading: false, isError: false, }); - + (useCreateConversation as any).mockReturnValue({ mutate: vi.fn(), isPending: false, isSuccess: false, }); - + (useIsCreatingConversation as any).mockReturnValue(false); }); - + it("should clear selected branch when input is empty", async () => { render(); - + // First select a repository to enable the branch dropdown const repoDropdown = screen.getByTestId("repository-dropdown"); fireEvent.change(repoDropdown, { target: { value: "test/repo1" } }); - + // Get the branch dropdown and verify it's enabled const branchDropdown = screen.getByTestId("branch-dropdown"); expect(branchDropdown).not.toBeDisabled(); - + // Simulate deleting all text in the branch input fireEvent.change(branchDropdown, { target: { value: "" } }); - + // Verify the branch input is cleared (no selected branch) expect(branchDropdown).toHaveValue(""); }); - + it("should clear selected branch when input contains only whitespace", async () => { render(); - + // First select a repository to enable the branch dropdown const repoDropdown = screen.getByTestId("repository-dropdown"); fireEvent.change(repoDropdown, { target: { value: "test/repo1" } }); - + // Get the branch dropdown and verify it's enabled const branchDropdown = screen.getByTestId("branch-dropdown"); expect(branchDropdown).not.toBeDisabled(); - + // Simulate entering only whitespace in the branch input fireEvent.change(branchDropdown, { target: { value: " " } }); - + // Verify the branch input is cleared (no selected branch) expect(branchDropdown).toHaveValue(""); }); it("should keep branch empty after being cleared even with auto-selection", async () => { render(); - + // First select a repository to enable the branch dropdown const repoDropdown = screen.getByTestId("repository-dropdown"); fireEvent.change(repoDropdown, { target: { value: "test/repo1" } }); - + // Get the branch dropdown and verify it's enabled const branchDropdown = screen.getByTestId("branch-dropdown"); expect(branchDropdown).not.toBeDisabled(); - + // The branch should be auto-selected to "main" initially expect(branchDropdown).toHaveValue("main"); - + // Simulate deleting all text in the branch input fireEvent.change(branchDropdown, { target: { value: "" } }); - + // Verify the branch input is cleared (no selected branch) expect(branchDropdown).toHaveValue(""); - + // Trigger a re-render by changing something else fireEvent.change(repoDropdown, { target: { value: "test/repo2" } }); fireEvent.change(repoDropdown, { target: { value: "test/repo1" } }); - + // The branch should be auto-selected to "main" again after repo change expect(branchDropdown).toHaveValue("main"); - + // Clear it again fireEvent.change(branchDropdown, { target: { value: "" } }); - + // Verify it stays empty expect(branchDropdown).toHaveValue(""); - + // Simulate a component update without changing repos // This would normally trigger the useEffect if our fix wasn't working fireEvent.blur(branchDropdown); - + // Verify it still stays empty expect(branchDropdown).toHaveValue(""); }); -}); \ No newline at end of file +}); diff --git a/openhands/agenthub/visualbrowsing_agent/visualbrowsing_agent.py b/openhands/agenthub/visualbrowsing_agent/visualbrowsing_agent.py index 171ec677ba..3d35d25122 100644 --- a/openhands/agenthub/visualbrowsing_agent/visualbrowsing_agent.py +++ b/openhands/agenthub/visualbrowsing_agent/visualbrowsing_agent.py @@ -208,7 +208,9 @@ Note: # for visualwebarena, webarena and miniwob++ eval, we need to retrieve the initial observation already in browser env # initialize and retrieve the first observation by issuing an noop OP # For non-benchmark browsing, the browser env starts with a blank page, and the agent is expected to first navigate to desired websites - return BrowseInteractiveAction(browser_actions='noop(1000)', return_axtree=True) + return BrowseInteractiveAction( + browser_actions='noop(1000)', return_axtree=True + ) for event in state.view: if isinstance(event, BrowseInteractiveAction): diff --git a/openhands/core/config/mcp_config.py b/openhands/core/config/mcp_config.py index a3fdc93c33..9fdd839e5b 100644 --- a/openhands/core/config/mcp_config.py +++ b/openhands/core/config/mcp_config.py @@ -54,6 +54,7 @@ class MCPStdioServerConfig(BaseModel): and set(self.env.items()) == set(other.env.items()) ) + class MCPSHTTPServerConfig(BaseModel): url: str api_key: str | None = None diff --git a/openhands/integrations/github/github_service.py b/openhands/integrations/github/github_service.py index c3dc447444..1ffb608f81 100644 --- a/openhands/integrations/github/github_service.py +++ b/openhands/integrations/github/github_service.py @@ -39,6 +39,7 @@ class GitHubService(BaseGitService, GitService): The class is instantiated via get_impl() in openhands.server.shared.py. """ + BASE_URL = 'https://api.github.com' token: SecretStr = SecretStr('') refresh = False @@ -508,7 +509,6 @@ class GitHubService(BaseGitService, GitService): return response['html_url'] - github_service_cls = os.environ.get( 'OPENHANDS_GITHUB_SERVICE_CLS', 'openhands.integrations.github.github_service.GitHubService', diff --git a/openhands/integrations/gitlab/gitlab_service.py b/openhands/integrations/gitlab/gitlab_service.py index 6126152a9a..0a458423dd 100644 --- a/openhands/integrations/gitlab/gitlab_service.py +++ b/openhands/integrations/gitlab/gitlab_service.py @@ -32,6 +32,7 @@ class GitLabService(BaseGitService, GitService): The class is instantiated via get_impl() in openhands.server.shared.py. """ + BASE_URL = 'https://gitlab.com/api/v4' GRAPHQL_URL = 'https://gitlab.com/api/graphql' token: SecretStr = SecretStr('') @@ -482,9 +483,7 @@ class GitLabService(BaseGitService, GitService): # Set default description if none provided if not description: - description = ( - f'Merging changes from {source_branch} into {target_branch}' - ) + description = f'Merging changes from {source_branch} into {target_branch}' # Prepare the request payload payload = { @@ -499,11 +498,9 @@ class GitLabService(BaseGitService, GitService): url=url, params=payload, method=RequestMethod.POST ) - return response['web_url'] - gitlab_service_cls = os.environ.get( 'OPENHANDS_GITLAB_SERVICE_CLS', 'openhands.integrations.gitlab.gitlab_service.GitLabService', diff --git a/openhands/integrations/templates/resolver/gitlab/issue_comment_prompt.j2 b/openhands/integrations/templates/resolver/gitlab/issue_comment_prompt.j2 index 352927cfd7..a84b0bdbc7 100644 --- a/openhands/integrations/templates/resolver/gitlab/issue_comment_prompt.j2 +++ b/openhands/integrations/templates/resolver/gitlab/issue_comment_prompt.j2 @@ -1 +1 @@ -{{ issue_comment }} \ No newline at end of file +{{ issue_comment }} diff --git a/openhands/integrations/templates/resolver/gitlab/issue_labeled_prompt.j2 b/openhands/integrations/templates/resolver/gitlab/issue_labeled_prompt.j2 index eece89fec2..358ed79a74 100644 --- a/openhands/integrations/templates/resolver/gitlab/issue_labeled_prompt.j2 +++ b/openhands/integrations/templates/resolver/gitlab/issue_labeled_prompt.j2 @@ -1 +1 @@ -Please fix issue number #{{ issue_number }} in your repository. \ No newline at end of file +Please fix issue number #{{ issue_number }} in your repository. diff --git a/openhands/runtime/impl/docker/docker_runtime.py b/openhands/runtime/impl/docker/docker_runtime.py index 5a31e6f863..9553933475 100644 --- a/openhands/runtime/impl/docker/docker_runtime.py +++ b/openhands/runtime/impl/docker/docker_runtime.py @@ -1,7 +1,7 @@ import os +import typing from functools import lru_cache from typing import Callable -import typing from uuid import UUID import docker @@ -283,7 +283,9 @@ class DockerRuntime(ActionExecutionClient): self.api_url = f'{self.config.sandbox.local_runtime_url}:{self._container_port}' use_host_network = self.config.sandbox.use_host_network - network_mode: typing.Literal['host'] | None = 'host' if use_host_network else None + network_mode: typing.Literal['host'] | None = ( + 'host' if use_host_network else None + ) # Initialize port mappings port_mapping: dict[str, list[dict[str, str]]] | None = None @@ -356,7 +358,7 @@ class DockerRuntime(ActionExecutionClient): try: if self.runtime_container_image is None: - raise ValueError("Runtime container image is not set") + raise ValueError('Runtime container image is not set') self.container = self.docker_client.containers.run( self.runtime_container_image, command=command, diff --git a/openhands/runtime/impl/remote/remote_runtime.py b/openhands/runtime/impl/remote/remote_runtime.py index 31e7b3fcea..f61d5acdae 100644 --- a/openhands/runtime/impl/remote/remote_runtime.py +++ b/openhands/runtime/impl/remote/remote_runtime.py @@ -363,7 +363,7 @@ class RemoteRuntime(ActionExecutionClient): self._session_api_key = start_response['session_api_key'] self.log( 'debug', - f'Session API key setted', + 'Session API key set', ) @property diff --git a/openhands/runtime/mcp/proxy/manager.py b/openhands/runtime/mcp/proxy/manager.py index 6df455478d..5a4bb69ae1 100644 --- a/openhands/runtime/mcp/proxy/manager.py +++ b/openhands/runtime/mcp/proxy/manager.py @@ -59,7 +59,7 @@ class MCPProxyManager: """ if len(self.config['mcpServers']) == 0: logger.info( - f"No MCP servers configured for FastMCP Proxy, skipping initialization." + 'No MCP servers configured for FastMCP Proxy, skipping initialization.' ) return None @@ -70,7 +70,7 @@ class MCPProxyManager: api_key=self.api_key, ) - logger.info(f"FastMCP Proxy initialized successfully") + logger.info('FastMCP Proxy initialized successfully') async def mount_to_app( self, app: FastAPI, allow_origins: Optional[list[str]] = None @@ -83,9 +83,7 @@ class MCPProxyManager: allow_origins: List of allowed origins for CORS """ if len(self.config['mcpServers']) == 0: - logger.info( - f"No MCP servers configured for FastMCP Proxy, skipping mount." - ) + logger.info('No MCP servers configured for FastMCP Proxy, skipping mount.') return if not self.proxy: @@ -101,8 +99,7 @@ class MCPProxyManager: app.routes.remove('/mcp') app.mount('/', mcp_app) - logger.info(f"Mounted FastMCP Proxy app at /mcp") - + logger.info('Mounted FastMCP Proxy app at /mcp') async def update_and_remount( self, @@ -122,10 +119,7 @@ class MCPProxyManager: tools: List of tool configurations allow_origins: List of allowed origins for CORS """ - tools = { - t.name: t.model_dump() - for t in stdio_servers - } + tools = {t.name: t.model_dump() for t in stdio_servers} self.config['mcpServers'] = tools del self.proxy diff --git a/openhands/runtime/utils/edit.py b/openhands/runtime/utils/edit.py index b71b6ba0de..2d70586ed2 100644 --- a/openhands/runtime/utils/edit.py +++ b/openhands/runtime/utils/edit.py @@ -27,7 +27,7 @@ from openhands.llm.metrics import Metrics from openhands.utils.chunk_localizer import Chunk, get_top_k_chunk_matches USER_MSG = """ -Code changes will be provided in the form of a draft. You will need to apply the draft to the original code. +Code changes will be provided in the form of a draft. You will need to apply the draft to the original code. The original code will be enclosed within `` tags. The draft will be enclosed within `` tags. You need to output the update code within `` tags. @@ -48,8 +48,8 @@ def _extract_code(string: str) -> str | None: content = str(matches[0]) if content.startswith('#EDIT:'): - #Remove first line - content = content[content.find('\n') + 1:] + # Remove first line + content = content[content.find('\n') + 1 :] return content diff --git a/openhands/runtime/utils/system.py b/openhands/runtime/utils/system.py index 61cc95b4d8..171a6575c2 100644 --- a/openhands/runtime/utils/system.py +++ b/openhands/runtime/utils/system.py @@ -1,7 +1,7 @@ import random import socket import time -from openhands.core.logger import openhands_logger as logger + def check_port_available(port: int) -> bool: sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) diff --git a/openhands/server/config/server_config.py b/openhands/server/config/server_config.py index f020d2c1da..ba5e24cb3f 100644 --- a/openhands/server/config/server_config.py +++ b/openhands/server/config/server_config.py @@ -53,7 +53,7 @@ def load_server_config() -> ServerConfig: logger.info(f'Using config class {config_cls}') server_config_cls = get_impl(ServerConfig, config_cls) - server_config : ServerConfig = server_config_cls() + server_config: ServerConfig = server_config_cls() server_config.verify_config() return server_config diff --git a/openhands/server/conversation_manager/standalone_conversation_manager.py b/openhands/server/conversation_manager/standalone_conversation_manager.py index 6fdfa46211..9a372ad080 100644 --- a/openhands/server/conversation_manager/standalone_conversation_manager.py +++ b/openhands/server/conversation_manager/standalone_conversation_manager.py @@ -15,7 +15,7 @@ from openhands.events.stream import EventStreamSubscriber, session_exists from openhands.server.config.server_config import ServerConfig from openhands.server.data_models.agent_loop_info import AgentLoopInfo from openhands.server.monitoring import MonitoringListener -from openhands.server.session.agent_session import AgentSession, WAIT_TIME_BEFORE_CLOSE +from openhands.server.session.agent_session import WAIT_TIME_BEFORE_CLOSE, AgentSession from openhands.server.session.conversation import ServerConversation from openhands.server.session.session import ROOM_KEY, Session from openhands.storage.conversation.conversation_store import ConversationStore @@ -508,7 +508,9 @@ class StandaloneConversationManager(ConversationManager): session_api_key=None, event_store=session.agent_session.event_stream, status=_get_status_from_session(session), - runtime_status=getattr(session.agent_session.runtime, 'runtime_status', None), + runtime_status=getattr( + session.agent_session.runtime, 'runtime_status', None + ), ) def _get_conversation_url(self, conversation_id: str): diff --git a/openhands/server/data_models/conversation_info.py b/openhands/server/data_models/conversation_info.py index d8a22f8c63..9899fc8b23 100644 --- a/openhands/server/data_models/conversation_info.py +++ b/openhands/server/data_models/conversation_info.py @@ -1,7 +1,6 @@ from dataclasses import dataclass, field from datetime import datetime, timezone -from openhands.core.schema.agent import AgentState from openhands.integrations.service_types import ProviderType from openhands.runtime.runtime_status import RuntimeStatus from openhands.storage.data_models.conversation_metadata import ConversationTrigger diff --git a/openhands/server/routes/conversation.py b/openhands/server/routes/conversation.py index 5fbb1dc205..58e164b97b 100644 --- a/openhands/server/routes/conversation.py +++ b/openhands/server/routes/conversation.py @@ -5,13 +5,13 @@ from pydantic import BaseModel from openhands.core.logger import openhands_logger as logger from openhands.events.event_filter import EventFilter from openhands.events.serialization.event import event_to_dict +from openhands.memory.memory import Memory +from openhands.microagent.types import InputMetadata from openhands.runtime.base import Runtime from openhands.server.dependencies import get_dependencies from openhands.server.session.conversation import ServerConversation from openhands.server.shared import conversation_manager from openhands.server.utils import get_conversation -from openhands.microagent.types import InputMetadata -from openhands.memory.memory import Memory app = APIRouter( prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies() @@ -216,7 +216,11 @@ async def get_microagents( content=agent.content, triggers=[], inputs=agent.metadata.inputs, - tools=[server.name for server in agent.metadata.mcp_tools.stdio_servers] if agent.metadata.mcp_tools else [], + tools=[ + server.name for server in agent.metadata.mcp_tools.stdio_servers + ] + if agent.metadata.mcp_tools + else [], ) ) @@ -229,7 +233,11 @@ async def get_microagents( content=agent.content, triggers=agent.triggers, inputs=agent.metadata.inputs, - tools=[server.name for server in agent.metadata.mcp_tools.stdio_servers] if agent.metadata.mcp_tools else [], + tools=[ + server.name for server in agent.metadata.mcp_tools.stdio_servers + ] + if agent.metadata.mcp_tools + else [], ) ) diff --git a/openhands/server/routes/feedback.py b/openhands/server/routes/feedback.py index 88d9e01dac..b376235e2e 100644 --- a/openhands/server/routes/feedback.py +++ b/openhands/server/routes/feedback.py @@ -6,15 +6,19 @@ from openhands.events.async_event_store_wrapper import AsyncEventStoreWrapper from openhands.events.serialization import event_to_dict from openhands.server.data_models.feedback import FeedbackDataModel, store_feedback from openhands.server.dependencies import get_dependencies +from openhands.server.session.conversation import ServerConversation from openhands.server.utils import get_conversation from openhands.utils.async_utils import call_sync_from_async -from openhands.server.session.conversation import ServerConversation -app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies()) +app = APIRouter( + prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies() +) @app.post('/submit-feedback') -async def submit_feedback(request: Request, conversation: ServerConversation = Depends(get_conversation)) -> JSONResponse: +async def submit_feedback( + request: Request, conversation: ServerConversation = Depends(get_conversation) +) -> JSONResponse: """Submit user feedback. This function stores the provided feedback data. @@ -37,9 +41,7 @@ async def submit_feedback(request: Request, conversation: ServerConversation = D # Assuming the storage service is already configured in the backend # and there is a function to handle the storage. body = await request.json() - async_store = AsyncEventStoreWrapper( - conversation.event_stream, filter_hidden=True - ) + async_store = AsyncEventStoreWrapper(conversation.event_stream, filter_hidden=True) trajectory = [] async for event in async_store: trajectory.append(event_to_dict(event)) diff --git a/openhands/server/routes/files.py b/openhands/server/routes/files.py index d6ae4dd161..1c283549b2 100644 --- a/openhands/server/routes/files.py +++ b/openhands/server/routes/files.py @@ -5,7 +5,6 @@ from fastapi import ( APIRouter, Depends, HTTPException, - Request, status, ) from fastapi.responses import FileResponse, JSONResponse @@ -27,17 +26,15 @@ from openhands.server.dependencies import get_dependencies from openhands.server.file_config import ( FILES_TO_IGNORE, ) -from openhands.server.shared import ( - ConversationStoreImpl, - config, -) +from openhands.server.session.conversation import ServerConversation from openhands.server.user_auth import get_user_id from openhands.server.utils import get_conversation, get_conversation_store from openhands.storage.conversation.conversation_store import ConversationStore from openhands.utils.async_utils import call_sync_from_async -from openhands.server.session.conversation import ServerConversation -app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies()) +app = APIRouter( + prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies() +) @app.get( @@ -50,7 +47,7 @@ app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_ ) async def list_files( conversation: ServerConversation = Depends(get_conversation), - path: str | None = None + path: str | None = None, ) -> list[str] | JSONResponse: """List files in the specified path. @@ -132,7 +129,9 @@ async def list_files( 415: {'description': 'Unsupported media type', 'model': dict}, }, ) -async def select_file(file: str, conversation: ServerConversation = Depends(get_conversation)) -> FileResponse | JSONResponse: +async def select_file( + file: str, conversation: ServerConversation = Depends(get_conversation) +) -> FileResponse | JSONResponse: """Retrieve the content of a specified file. To select a file: @@ -196,7 +195,9 @@ async def select_file(file: str, conversation: ServerConversation = Depends(get_ 500: {'description': 'Error zipping workspace', 'model': dict}, }, ) -def zip_current_workspace(conversation: ServerConversation = Depends(get_conversation)) -> FileResponse | JSONResponse: +def zip_current_workspace( + conversation: ServerConversation = Depends(get_conversation), +) -> FileResponse | JSONResponse: try: logger.debug('Zipping workspace') runtime: Runtime = conversation.runtime diff --git a/openhands/server/routes/manage_conversations.py b/openhands/server/routes/manage_conversations.py index f8855b038f..ea8359b5e1 100644 --- a/openhands/server/routes/manage_conversations.py +++ b/openhands/server/routes/manage_conversations.py @@ -1,6 +1,6 @@ import itertools -import re import os +import re import uuid from datetime import datetime, timezone @@ -9,19 +9,18 @@ from fastapi.responses import JSONResponse from jinja2 import Environment, FileSystemLoader from pydantic import BaseModel, Field -from openhands.events.event_filter import EventFilter -from openhands.events.stream import EventStream +from openhands.core.config.llm_config import LLMConfig +from openhands.core.logger import openhands_logger as logger from openhands.events.action import ( ChangeAgentStateAction, NullAction, ) +from openhands.events.event_filter import EventFilter from openhands.events.observation import ( - NullObservation, AgentStateChangedObservation, + NullObservation, ) - -from openhands.core.config.llm_config import LLMConfig -from openhands.core.logger import openhands_logger as logger +from openhands.events.stream import EventStream from openhands.integrations.provider import ( PROVIDER_TOKEN_TYPE, ProviderHandler, @@ -38,10 +37,9 @@ from openhands.server.data_models.conversation_info import ConversationInfo from openhands.server.data_models.conversation_info_result_set import ( ConversationInfoResultSet, ) -from openhands.server.services.conversation_service import create_new_conversation -from openhands.server.session.conversation import ServerConversation from openhands.server.dependencies import get_dependencies from openhands.server.services.conversation_service import create_new_conversation +from openhands.server.session.conversation import ServerConversation from openhands.server.shared import ( ConversationStoreImpl, config, @@ -53,11 +51,12 @@ from openhands.server.user_auth import ( get_provider_tokens, get_user_id, get_user_secrets, - get_user_settings_store, get_user_settings, + get_user_settings_store, ) from openhands.server.user_auth.user_auth import AuthType -from openhands.server.utils import get_conversation_store, get_conversation as get_conversation_object +from openhands.server.utils import get_conversation as get_conversation_object +from openhands.server.utils import get_conversation_store from openhands.storage.conversation.conversation_store import ConversationStore from openhands.storage.data_models.conversation_metadata import ( ConversationMetadata, @@ -295,7 +294,7 @@ async def delete_conversation( async def get_prompt( event_id: int, user_settings: SettingsStore = Depends(get_user_settings_store), - conversation: ServerConversation | None = Depends(get_conversation_object) + conversation: ServerConversation | None = Depends(get_conversation_object), ): if conversation is None: return JSONResponse( @@ -409,7 +408,6 @@ async def start_conversation( logger.info(f'Starting conversation: {conversation_id}') try: - # Check that the conversation exists try: await conversation_store.get_metadata(conversation_id) @@ -463,10 +461,17 @@ async def stop_conversation( try: # Check if the conversation is running - agent_loop_info = await conversation_manager.get_agent_loop_info(user_id=user_id, filter_to_sids={conversation_id}) - conversation_status = agent_loop_info[0].status if agent_loop_info else ConversationStatus.STOPPED + agent_loop_info = await conversation_manager.get_agent_loop_info( + user_id=user_id, filter_to_sids={conversation_id} + ) + conversation_status = ( + agent_loop_info[0].status if agent_loop_info else ConversationStatus.STOPPED + ) - if conversation_status not in (ConversationStatus.STARTING, ConversationStatus.RUNNING): + if conversation_status not in ( + ConversationStatus.STARTING, + ConversationStatus.RUNNING, + ): return ConversationResponse( status='ok', conversation_id=conversation_id, @@ -505,9 +510,13 @@ def _get_contextual_events(event_stream: EventStream, event_id: int) -> str: agent_event_filter = EventFilter( exclude_hidden=True, - exclude_types=(NullAction, NullObservation, ChangeAgentStateAction, AgentStateChangedObservation + exclude_types=( + NullAction, + NullObservation, + ChangeAgentStateAction, + AgentStateChangedObservation, ), - ) # the types of events that can be in an agent's history + ) # the types of events that can be in an agent's history # from event_id - context_size to event_id.. context_before = event_stream.search_events( diff --git a/openhands/server/routes/mcp.py b/openhands/server/routes/mcp.py index 50fc0b84eb..606a3c7d48 100644 --- a/openhands/server/routes/mcp.py +++ b/openhands/server/routes/mcp.py @@ -87,7 +87,7 @@ async def create_pr( target_branch: Annotated[str, Field(description='Target branch on repo')], title: Annotated[str, Field(description='PR Title')], body: Annotated[str | None, Field(description='PR body')], - draft: Annotated[bool, Field(description='Whether PR opened is a draft')] = True + draft: Annotated[bool, Field(description='Whether PR opened is a draft')] = True, ) -> str: """Open a PR in GitHub""" @@ -127,7 +127,7 @@ async def create_pr( target_branch=target_branch, title=title, body=body, - draft=draft + draft=draft, ) if conversation_id: @@ -148,7 +148,12 @@ async def create_mr( ], source_branch: Annotated[str, Field(description='Source branch on repo')], target_branch: Annotated[str, Field(description='Target branch on repo')], - title: Annotated[str, Field(description='MR Title. Start title with `DRAFT:` or `WIP:` if applicable.')], + title: Annotated[ + str, + Field( + description='MR Title. Start title with `DRAFT:` or `WIP:` if applicable.' + ), + ], description: Annotated[str | None, Field(description='MR description')], ) -> str: """Open a MR in GitLab""" diff --git a/openhands/server/routes/security.py b/openhands/server/routes/security.py index 7cc16bf241..aebf976d57 100644 --- a/openhands/server/routes/security.py +++ b/openhands/server/routes/security.py @@ -8,14 +8,18 @@ from fastapi import ( ) from openhands.server.dependencies import get_dependencies -from openhands.server.utils import get_conversation from openhands.server.session.conversation import ServerConversation +from openhands.server.utils import get_conversation -app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies()) +app = APIRouter( + prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies() +) @app.route('/security/{path:path}', methods=['GET', 'POST', 'PUT', 'DELETE']) -async def security_api(request: Request, conversation: ServerConversation = Depends(get_conversation)) -> Response: +async def security_api( + request: Request, conversation: ServerConversation = Depends(get_conversation) +) -> Response: """Catch-all route for security analyzer API requests. Each request is handled directly to the security analyzer. @@ -35,6 +39,4 @@ async def security_api(request: Request, conversation: ServerConversation = Depe detail='Security analyzer not initialized', ) - return await conversation.security_analyzer.handle_api_request( - request - ) + return await conversation.security_analyzer.handle_api_request(request) diff --git a/openhands/server/routes/trajectory.py b/openhands/server/routes/trajectory.py index 3f3015e868..c812feb988 100644 --- a/openhands/server/routes/trajectory.py +++ b/openhands/server/routes/trajectory.py @@ -1,18 +1,22 @@ -from fastapi import APIRouter, Depends, Request, status +from fastapi import APIRouter, Depends, status from fastapi.responses import JSONResponse from openhands.core.logger import openhands_logger as logger from openhands.events.async_event_store_wrapper import AsyncEventStoreWrapper from openhands.events.serialization import event_to_trajectory from openhands.server.dependencies import get_dependencies -from openhands.server.utils import get_conversation from openhands.server.session.conversation import ServerConversation +from openhands.server.utils import get_conversation -app = APIRouter(prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies()) +app = APIRouter( + prefix='/api/conversations/{conversation_id}', dependencies=get_dependencies() +) @app.get('/trajectory') -async def get_trajectory(conversation: ServerConversation = Depends(get_conversation)) -> JSONResponse: +async def get_trajectory( + conversation: ServerConversation = Depends(get_conversation), +) -> JSONResponse: """Get trajectory. This function retrieves the current trajectory and returns it. diff --git a/openhands/server/services/conversation_service.py b/openhands/server/services/conversation_service.py index 9f1856d13c..9a0050f25e 100644 --- a/openhands/server/services/conversation_service.py +++ b/openhands/server/services/conversation_service.py @@ -1,4 +1,3 @@ -import os import uuid from typing import Any @@ -80,7 +79,6 @@ async def create_new_conversation( session_init_args['conversation_instructions'] = conversation_instructions conversation_init_data = ConversationInitData(**session_init_args) - logger.info('Loading conversation store') conversation_store = await ConversationStoreImpl.get_instance(config, user_id) logger.info('ServerConversation store loaded') @@ -90,13 +88,14 @@ async def create_new_conversation( conversation_id = uuid.uuid4().hex if not await conversation_store.exists(conversation_id): - logger.info( f'New conversation ID: {conversation_id}', extra={'user_id': user_id, 'session_id': conversation_id}, ) - conversation_init_data = ExperimentManagerImpl.run_conversation_variant_test(user_id, conversation_id, conversation_init_data) + conversation_init_data = ExperimentManagerImpl.run_conversation_variant_test( + user_id, conversation_id, conversation_init_data + ) conversation_title = get_default_conversation_title(conversation_id) logger.info(f'Saving metadata for conversation {conversation_id}') diff --git a/openhands/server/session/agent_session.py b/openhands/server/session/agent_session.py index b2d47ba520..2441e77c5d 100644 --- a/openhands/server/session/agent_session.py +++ b/openhands/server/session/agent_session.py @@ -197,23 +197,21 @@ class AgentSession: finally: self._starting = False success = finished and runtime_connected - duration = (time.time() - started_at) + duration = time.time() - started_at log_metadata = { 'signal': 'agent_session_start', 'success': success, 'duration': duration, - 'restored_state': restored_state + 'restored_state': restored_state, } if success: self.logger.info( - f'Agent session start succeeded in {duration}s', - extra=log_metadata + f'Agent session start succeeded in {duration}s', extra=log_metadata ) else: self.logger.error( - f'Agent session start failed in {duration}s', - extra=log_metadata + f'Agent session start failed in {duration}s', extra=log_metadata ) async def close(self) -> None: diff --git a/openhands/storage/conversation/file_conversation_store.py b/openhands/storage/conversation/file_conversation_store.py index 03e0a62ec9..77fcc38508 100644 --- a/openhands/storage/conversation/file_conversation_store.py +++ b/openhands/storage/conversation/file_conversation_store.py @@ -105,7 +105,12 @@ class FileConversationStore(ConversationStore): async def get_instance( cls, config: OpenHandsConfig, user_id: str | None ) -> FileConversationStore: - file_store = get_file_store(config.file_store, config.file_store_path, config.file_store_web_hook_url, config.file_store_web_hook_headers) + file_store = get_file_store( + config.file_store, + config.file_store_path, + config.file_store_web_hook_url, + config.file_store_web_hook_headers, + ) return FileConversationStore(file_store) diff --git a/openhands/storage/secrets/file_secrets_store.py b/openhands/storage/secrets/file_secrets_store.py index 05268a97c3..be27bc16c8 100644 --- a/openhands/storage/secrets/file_secrets_store.py +++ b/openhands/storage/secrets/file_secrets_store.py @@ -43,6 +43,6 @@ class FileSecretsStore(SecretsStore): config.file_store, config.file_store_path, config.file_store_web_hook_url, - config.file_store_web_hook_headers + config.file_store_web_hook_headers, ) return FileSecretsStore(file_store) diff --git a/openhands/storage/settings/file_settings_store.py b/openhands/storage/settings/file_settings_store.py index 97b288dbfc..6cc45cfe4a 100644 --- a/openhands/storage/settings/file_settings_store.py +++ b/openhands/storage/settings/file_settings_store.py @@ -37,6 +37,6 @@ class FileSettingsStore(SettingsStore): config.file_store, config.file_store_path, config.file_store_web_hook_url, - config.file_store_web_hook_headers + config.file_store_web_hook_headers, ) return FileSettingsStore(file_store) diff --git a/tests/unit/frontend/test_translation_completeness.py b/tests/unit/frontend/test_translation_completeness.py index 8b6f8666fa..25ba8ca8a8 100644 --- a/tests/unit/frontend/test_translation_completeness.py +++ b/tests/unit/frontend/test_translation_completeness.py @@ -10,24 +10,36 @@ class TestTranslationCompleteness(unittest.TestCase): def test_translation_completeness_check_runs(self): """Test that the translation completeness check script can be executed.""" - frontend_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))), "frontend") - script_path = os.path.join(frontend_dir, "scripts", "check-translation-completeness.cjs") - + frontend_dir = os.path.join( + os.path.dirname( + os.path.dirname(os.path.dirname(os.path.dirname(__file__))) + ), + 'frontend', + ) + script_path = os.path.join( + frontend_dir, 'scripts', 'check-translation-completeness.cjs' + ) + # Verify the script exists - self.assertTrue(os.path.exists(script_path), f"Script not found at {script_path}") - + self.assertTrue( + os.path.exists(script_path), f'Script not found at {script_path}' + ) + # Verify the script is executable - self.assertTrue(os.access(script_path, os.X_OK), f"Script at {script_path} is not executable") - + self.assertTrue( + os.access(script_path, os.X_OK), + f'Script at {script_path} is not executable', + ) + # Run the script (it may fail due to missing translations, but we just want to verify it runs) try: subprocess.run( - ["node", script_path], - cwd=frontend_dir, - check=False, - capture_output=True, - text=True + ['node', script_path], + cwd=frontend_dir, + check=False, + capture_output=True, + text=True, ) # We don't assert on the return code because it might fail due to missing translations except Exception as e: - self.fail(f"Failed to run translation completeness check: {e}") \ No newline at end of file + self.fail(f'Failed to run translation completeness check: {e}') diff --git a/tests/unit/resolver/github/test_resolve_issues.py b/tests/unit/resolver/github/test_resolve_issues.py index 08eb16be75..7444a46909 100644 --- a/tests/unit/resolver/github/test_resolve_issues.py +++ b/tests/unit/resolver/github/test_resolve_issues.py @@ -100,7 +100,6 @@ def mock_conversation_instructions_template(): return 'Instructions: {{ repo_instruction }}' - @pytest.fixture def mock_followup_prompt_template(): return 'Issue context: {{ issues }}\n\nReview comments: {{ review_comments }}\n\nReview threads: {{ review_threads }}\n\nFiles: {{ files }}\n\nThread comments: {{ thread_context }}\n\nPlease fix this issue.' @@ -532,7 +531,11 @@ async def test_process_issue( handler_instance.guess_success.assert_not_called() -def test_get_instruction(mock_user_instructions_template, mock_conversation_instructions_template, mock_followup_prompt_template): +def test_get_instruction( + mock_user_instructions_template, + mock_conversation_instructions_template, + mock_followup_prompt_template, +): issue = Issue( owner='test_owner', repo='test_repo', @@ -545,7 +548,10 @@ def test_get_instruction(mock_user_instructions_template, mock_conversation_inst GithubIssueHandler('owner', 'repo', 'token'), mock_llm_config ) instruction, conversation_instructions, images_urls = issue_handler.get_instruction( - issue, mock_user_instructions_template, mock_conversation_instructions_template, None + issue, + mock_user_instructions_template, + mock_conversation_instructions_template, + None, ) expected_instruction = 'Issue: Test Issue\n\nThis is a test issue refer to image ![First Image](https://sampleimage.com/image1.png)\n\nPlease fix this issue.' @@ -576,7 +582,10 @@ def test_get_instruction(mock_user_instructions_template, mock_conversation_inst GithubPRHandler('owner', 'repo', 'token'), mock_llm_config ) instruction, conversation_instructions, images_urls = pr_handler.get_instruction( - issue, mock_followup_prompt_template, mock_conversation_instructions_template, None + issue, + mock_followup_prompt_template, + mock_conversation_instructions_template, + None, ) expected_instruction = "Issue context: [\n \"Issue 1 fix the type\"\n]\n\nReview comments: None\n\nReview threads: [\n \"There is still a typo 'pthon' instead of 'python'\"\n]\n\nFiles: []\n\nThread comments: I've left review comments, please address them\n---\nThis is a valid concern.\n\nPlease fix this issue." @@ -601,7 +610,9 @@ def test_file_instruction(): with open('openhands/resolver/prompts/resolve/basic.jinja', 'r') as f: prompt = f.read() - with open('openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r') as f: + with open( + 'openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r' + ) as f: conversation_instructions_template = f.read() # Test without thread comments @@ -610,7 +621,7 @@ def test_file_instruction(): GithubIssueHandler('owner', 'repo', 'token'), mock_llm_config ) instruction, conversation_instructions, images_urls = issue_handler.get_instruction( - issue, prompt,conversation_instructions_template, None + issue, prompt, conversation_instructions_template, None ) expected_instruction = """Please fix the following issue for the repository in /workspace. An environment has been set up for you to start working. You may assume all necessary tools are installed. @@ -620,7 +631,6 @@ Test Issue This is a test issue ![image](https://sampleimage.com/sample.png)""" - expected_conversation_instructions = """IMPORTANT: You should ONLY interact with the environment provided to you AND NEVER ASK FOR HUMAN HELP. You SHOULD INCLUDE PROPER INDENTATION in your edit commands. @@ -644,7 +654,9 @@ def test_file_instruction_with_repo_instruction(): with open('openhands/resolver/prompts/resolve/basic.jinja', 'r') as f: prompt = f.read() - with open('openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r') as f: + with open( + 'openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r' + ) as f: conversation_instructions_prompt = f.read() # load repo instruction from openhands/resolver/prompts/repo_instructions/all-hands-ai___openhands-resolver.txt @@ -662,7 +674,6 @@ def test_file_instruction_with_repo_instruction(): issue, prompt, conversation_instructions_prompt, repo_instruction ) - expected_instruction = """Please fix the following issue for the repository in /workspace. An environment has been set up for you to start working. You may assume all necessary tools are installed. @@ -683,7 +694,6 @@ This is a Python repo for openhands-resolver, a library that attempts to resolve When you think you have fixed the issue through code changes, please finish the interaction.""" - assert instruction == expected_instruction assert conversation_instructions == expected_conversation_instructions assert conversation_instructions is not None @@ -785,7 +795,9 @@ def test_instruction_with_thread_comments(): with open('openhands/resolver/prompts/resolve/basic.jinja', 'r') as f: prompt = f.read() - with open('openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r') as f: + with open( + 'openhands/resolver/prompts/resolve/basic-conversation-instructions.jinja', 'r' + ) as f: conversation_instructions_template = f.read() llm_config = LLMConfig(model='test', api_key='test') diff --git a/tests/unit/resolver/test_issue_handler_factory.py b/tests/unit/resolver/test_issue_handler_factory.py index 56262ed9e5..1e994bfa71 100644 --- a/tests/unit/resolver/test_issue_handler_factory.py +++ b/tests/unit/resolver/test_issue_handler_factory.py @@ -1,6 +1,3 @@ -from typing import Type -from unittest.mock import MagicMock - import pytest from pydantic import SecretStr @@ -8,11 +5,11 @@ from openhands.core.config import LLMConfig from openhands.integrations.provider import ProviderType from openhands.resolver.interfaces.github import GithubIssueHandler, GithubPRHandler from openhands.resolver.interfaces.gitlab import GitlabIssueHandler, GitlabPRHandler -from openhands.resolver.issue_handler_factory import IssueHandlerFactory from openhands.resolver.interfaces.issue_definitions import ( ServiceContextIssue, ServiceContextPR, ) +from openhands.resolver.issue_handler_factory import IssueHandlerFactory @pytest.fixture @@ -45,33 +42,29 @@ test_cases = [ @pytest.mark.parametrize( - 'platform,issue_type,expected_context_type,expected_handler_type', - test_cases + 'platform,issue_type,expected_context_type,expected_handler_type', test_cases ) def test_handler_creation( factory_params, platform: ProviderType, issue_type: str, - expected_context_type: Type, - expected_handler_type: Type, + expected_context_type: type, + expected_handler_type: type, ): factory = IssueHandlerFactory( - **factory_params, - platform=platform, - issue_type=issue_type + **factory_params, platform=platform, issue_type=issue_type ) - + handler = factory.create() - + assert isinstance(handler, expected_context_type) assert isinstance(handler._strategy, expected_handler_type) + def test_invalid_issue_type(factory_params): factory = IssueHandlerFactory( - **factory_params, - platform=ProviderType.GITHUB, - issue_type='invalid' + **factory_params, platform=ProviderType.GITHUB, issue_type='invalid' ) - + with pytest.raises(ValueError, match='Invalid issue type: invalid'): - factory.create() \ No newline at end of file + factory.create() diff --git a/tests/unit/resolver/test_resolve_issue.py b/tests/unit/resolver/test_resolve_issue.py index a64be425fa..d11c351288 100644 --- a/tests/unit/resolver/test_resolve_issue.py +++ b/tests/unit/resolver/test_resolve_issue.py @@ -2,7 +2,7 @@ from unittest import mock import pytest -from openhands.core.config import SandboxConfig,OpenHandsConfig +from openhands.core.config import OpenHandsConfig, SandboxConfig from openhands.events.action import CmdRunAction from openhands.resolver.issue_resolver import IssueResolver @@ -36,7 +36,8 @@ def test_setup_sandbox_config_default(): ) assert_sandbox_config( - openhands_config.sandbox, runtime_container_image='ghcr.io/all-hands-ai/runtime:mock-nikolaik' + openhands_config.sandbox, + runtime_container_image='ghcr.io/all-hands-ai/runtime:mock-nikolaik', ) @@ -68,7 +69,9 @@ def test_setup_sandbox_config_base_only(): ) assert_sandbox_config( - openhands_config.sandbox, base_container_image=base_image, runtime_container_image=None + openhands_config.sandbox, + base_container_image=base_image, + runtime_container_image=None, ) @@ -84,7 +87,9 @@ def test_setup_sandbox_config_runtime_only(): is_experimental=False, ) - assert_sandbox_config(openhands_config.sandbox, runtime_container_image=runtime_image) + assert_sandbox_config( + openhands_config.sandbox, runtime_container_image=runtime_image + ) def test_setup_sandbox_config_experimental(): @@ -117,7 +122,9 @@ def test_setup_sandbox_config_gitlab_ci(mock_get_unique_uid, mock_getuid): is_experimental=False, ) - assert_sandbox_config(openhands_config.sandbox, local_runtime_url='http://localhost') + assert_sandbox_config( + openhands_config.sandbox, local_runtime_url='http://localhost' + ) @mock.patch('openhands.resolver.issue_resolver.os.getuid', return_value=1000) @@ -134,7 +141,9 @@ def test_setup_sandbox_config_gitlab_ci_non_root(mock_getuid): is_experimental=False, ) - assert_sandbox_config(openhands_config.sandbox, local_runtime_url='http://localhost') + assert_sandbox_config( + openhands_config.sandbox, local_runtime_url='http://localhost' + ) @mock.patch('openhands.events.observation.CmdOutputObservation')