From b8a7e04e61720ae7654241e6b2091491592ff258 Mon Sep 17 00:00:00 2001 From: BioBootloader Date: Mon, 24 Apr 2023 09:21:14 -0700 Subject: [PATCH] improve project structure --- README.md | 6 +++--- buggy_script.js => examples/buggy_script.js | 0 tests/__init__.py | 0 wolverine/__init__.py | 1 + wolverine/__main__.py | 6 ++++++ wolverine.py => wolverine/wolverine.py | 7 +------ 6 files changed, 11 insertions(+), 9 deletions(-) rename buggy_script.js => examples/buggy_script.js (100%) create mode 100644 tests/__init__.py create mode 100644 wolverine/__init__.py create mode 100644 wolverine/__main__.py rename wolverine.py => wolverine/wolverine.py (99%) diff --git a/README.md b/README.md index 2b81dd1..66c9f0b 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,11 @@ _warning!_ By default wolverine uses GPT-4 and may make many repeated calls to t To run with gpt-4 (the default, tested option): - python wolverine.py examples/buggy_script.py "subtract" 20 3 + python -m wolverine examples/buggy_script.py "subtract" 20 3 You can also run with other models, but be warned they may not adhere to the edit format as well: - python wolverine.py --model=gpt-3.5-turbo buggy_script.py "subtract" 20 3 + python -m wolverine --model=gpt-3.5-turbo examples/buggy_script.py "subtract" 20 3 If you want to use GPT-3.5 by default instead of GPT-4 uncomment the default model line in `.env`: @@ -35,7 +35,7 @@ If you want to use GPT-3.5 by default instead of GPT-4 uncomment the default mod You can also use flag `--confirm=True` which will ask you `yes or no` before making changes to the file. If flag is not used then it will apply the changes to the file - python wolverine.py buggy_script.py "subtract" 20 3 --confirm=True + python -m wolverine examples/buggy_script.py "subtract" 20 3 --confirm=True ## Future Plans diff --git a/buggy_script.js b/examples/buggy_script.js similarity index 100% rename from buggy_script.js rename to examples/buggy_script.js diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/wolverine/__init__.py b/wolverine/__init__.py new file mode 100644 index 0000000..9d157c1 --- /dev/null +++ b/wolverine/__init__.py @@ -0,0 +1 @@ +from .wolverine import apply_changes, json_validated_response diff --git a/wolverine/__main__.py b/wolverine/__main__.py new file mode 100644 index 0000000..d800804 --- /dev/null +++ b/wolverine/__main__.py @@ -0,0 +1,6 @@ +import fire + +from .wolverine import main + +if __name__ == "__main__": + fire.Fire(main) diff --git a/wolverine.py b/wolverine/wolverine.py similarity index 99% rename from wolverine.py rename to wolverine/wolverine.py index 26ba088..527f0f2 100644 --- a/wolverine.py +++ b/wolverine/wolverine.py @@ -1,5 +1,4 @@ import difflib -import fire import json import os import shutil @@ -20,6 +19,7 @@ DEFAULT_MODEL = os.environ.get("DEFAULT_MODEL", "gpt-4") with open("prompt.txt") as f: SYSTEM_PROMPT = f.read() + def run_script(script_name, script_args): script_args = [str(arg) for arg in script_args] """ @@ -224,8 +224,3 @@ def main(script_name, *script_args, revert=False, model=DEFAULT_MODEL, confirm=F apply_changes(script_name, json_response, confirm=confirm) cprint("Changes applied. Rerunning...", "blue") - - -if __name__ == "__main__": - fire.Fire(main) -