From 9a7e8eff4da2a8e8b4b914ff760efffad2f48183 Mon Sep 17 00:00:00 2001 From: Talion Date: Mon, 6 May 2024 23:10:03 -0300 Subject: [PATCH] update testcase; add clear invalid diff output --- gpt_engineer/core/diff.py | 3 +- .../theo_case_chat | 66 +++++++++++++++++++ tests/core/test_salvage_correct_hunks.py | 6 +- 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/gpt_engineer/core/diff.py b/gpt_engineer/core/diff.py index d3b70f2e24..cdbfc32e38 100644 --- a/gpt_engineer/core/diff.py +++ b/gpt_engineer/core/diff.py @@ -354,7 +354,8 @@ def validate_and_correct(self, lines_dict: dict) -> List[str]: } is_valid = hunk.validate_and_correct(cut_lines_dict, problems) if not is_valid and len(problems) > 0: - print(f"Invalid hunk: {hunk.hunk_to_string()}") + for idx, val in enumerate(problems): + print(f"\nInvalid Hunk NO.{idx}---\n{val}\n---") self.hunks.remove(hunk) # now correct the numbers, assuming the start line pre-edit has been fixed hunk.hunk_len_pre_edit = ( diff --git a/tests/core/improve_function_test_cases/theo_case_chat b/tests/core/improve_function_test_cases/theo_case_chat index 16b1d90492..58fbf74fe2 100644 --- a/tests/core/improve_function_test_cases/theo_case_chat +++ b/tests/core/improve_function_test_cases/theo_case_chat @@ -1,3 +1,61 @@ +To add an entrypoint for running the API through the command line, we will create a new Python script that can be executed directly. This script will set up and run the FastAPI application using Uvicorn, which is an ASGI server. This approach allows you to run the server from the command line without directly using the `uvicorn` command. + +We will create a new file named `run.py` in the root directory. This file will import the FastAPI application from `main.py` and will use Uvicorn to run it. + +Here's the implementation: + +```diff +--- /dev/null ++++ run.py +@@ -0,0 +1,10 @@ ++import uvicorn ++from main import app ++ ++# This script can be used to run the FastAPI application from the command line. ++if __name__ == "__main__": ++ uvicorn.run(app, host="0.0.0.0", port=8000) +``` + +This script checks if it is being run as the main module and then starts the Uvicorn server with the FastAPI app. The server listens on all interfaces (`0.0.0.0`) and port `8000`. + +Additionally, we need to update the Dockerfile to ensure that the new script is correctly utilized when the Docker container is run. We will change the CMD directive to use `run.py` instead of directly calling `uvicorn`. + +```diff +--- dockerfile ++++ dockerfile +@@ -19,3 +19,3 @@ +-# Run app.py when the container launches +-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"] ++# Run run.py when the container launches ++CMD ["python", "run.py"] +``` + +This change in the Dockerfile ensures that when the Docker container is started, it uses the new `run.py` script to launch the application. This script sets up the Uvicorn server with the specified host and port settings. + +With these changes, you can now run the API both directly from the command line by executing `python run.py` and through Docker using the updated Dockerfile configuration. This setup provides flexibility for different deployment scenarios.Invalid hunk: @@ -19,3 +19,3 @@ +-# Run app.py when the container launches +-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"] ++# Run run.py when the container launches ++CMD ["python", "run.py"] + +To add an entrypoint for running the API through the command line, we will create a new Python script that can be executed directly. This script will set up and run the FastAPI application using Uvicorn, which is an ASGI server. This approach allows you to run the server from the command line without directly using the `uvicorn` command. + +We will create a new file named `run.py` in the root directory. This file will import the FastAPI application from `main.py` and will use Uvicorn to run it. + +Here's the implementation: + +```diff +--- /dev/null ++++ run.py +@@ -0,0 +1,10 @@ ++import uvicorn ++from main import app ++ ++# This script can be used to run the FastAPI application from the command line. ++if __name__ == "__main__": ++ uvicorn.run(app, host="0.0.0.0", port=8000) +``` + This script checks if it is being run as the main module and then starts the Uvicorn server with the FastAPI app. The server listens on all interfaces (`0.0.0.0`) and port `8000`. Additionally, we need to update the Dockerfile to ensure that the new script is correctly utilized when the Docker container is run. We will change the CMD directive to use `run.py` instead of directly calling `uvicorn`. @@ -11,3 +69,11 @@ Additionally, we need to update the Dockerfile to ensure that the new script is +# Run run.py when the container launches +CMD ["python", "run.py"] ``` + +This change in the Dockerfile ensures that when the Docker container is started, it uses the new `run.py` script to launch the application. This script sets up the Uvicorn server with the specified host and port settings. + +With these changes, you can now run the API both directly from the command line by executing `python run.py` and through Docker using the updated Dockerfile configuration. This setup provides flexibility for different deployment scenarios.Invalid hunk: @@ -19,3 +19,3 @@ +-# Run app.py when the container launches +-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"] ++# Run run.py when the container launches ++CMD ["python", "run.py"] diff --git a/tests/core/test_salvage_correct_hunks.py b/tests/core/test_salvage_correct_hunks.py index f104214add..b262de071a 100644 --- a/tests/core/test_salvage_correct_hunks.py +++ b/tests/core/test_salvage_correct_hunks.py @@ -88,7 +88,11 @@ def test_create_two_new_files(): def test_theo_case(): files = FilesDict({"dockerfile": get_file_content("theo_case_code")}) - salvage_correct_hunks(message_builder("theo_case_chat"), files, [], memory) + updated_files = salvage_correct_hunks( + message_builder("theo_case_chat"), files, [], memory + ) + print(updated_files["dockerfile"]) + print(updated_files["run.py"]) def test_clean_up_folder(clean_up_folder):