Commit graph

3232 commits

Author SHA1 Message Date
Joshua Vial
9aa7beff72 add feature for adding an image to context 2023-12-11 22:42:12 +13:00
Joshua Vial
90d5071709 fix failing tests 2023-12-11 22:37:23 +13:00
Joshua Vial
9ceaf97f08 making image code more robust 2023-12-11 22:25:35 +13:00
Joshua Vial
f9ba8e7b41 Remove unnecessary comment and method call in Commands class. 2023-12-11 22:24:02 +13:00
Joshua Vial
c919f9f0c6 handle switching to gpt4-vision-preview 2023-12-11 22:23:54 +13:00
Joshua Vial
90fb538015 fix logic for image switching 2023-12-11 22:23:32 +13:00
Joshua Vial
d0255ce2ae better logic for image handling 2023-12-11 22:23:03 +13:00
Joshua Vial
3d8599617d Switch to gpt-4-vision-preview if baseurl.host includes api.openai.com/ and gpt-4, otherwise strip out any image_url messages. 2023-12-11 20:56:20 +13:00
Joshua Vial
b7d90197a9 update openrouter model to work with new openai client 2023-12-11 20:50:27 +13:00
Joshua Vial
fe9423d7b8 merge in openai upgrade 2023-12-11 20:43:18 +13:00
Paul Gauthier
560759f0c0 show the repomap before the added files 2023-12-08 09:18:03 -08:00
Paul Gauthier
cab7460f94 catch 404s from azure on models.list 2023-12-07 07:44:21 -08:00
Paul Gauthier
ad092152d0 Revert "max_apply_update_errors = 1 for quick benchmark"
This reverts commit fd71b6a4a5.
2023-12-07 07:43:06 -08:00
Paul Gauthier
fd71b6a4a5 max_apply_update_errors = 1 for quick benchmark 2023-12-06 14:35:57 -08:00
Paul Gauthier
fb7a7acb73 Merge remote-tracking branch 'origin/main' 2023-12-06 14:15:46 -08:00
paul-gauthier
1f07c8f48d
Merge pull request #391 from paul-gauthier/openai-upgrade
Openai upgrade
2023-12-06 14:13:33 -08:00
Paul Gauthier
fc9e956340 added pre-commit to dev-reqs 2023-12-06 14:11:32 -08:00
Paul Gauthier
ff96369ed6 cleanup 2023-12-06 14:09:32 -08:00
Paul Gauthier
67e6fed9eb Merge branch 'main' into openai-upgrade 2023-12-06 09:32:32 -08:00
Paul Gauthier
bce0279ae6 fixed test_main_message_adds_to_input_history 2023-12-06 09:32:01 -08:00
Paul Gauthier
9d2f89dd75 fix test 2023-12-06 09:30:19 -08:00
Paul Gauthier
922a56b194 Merge branch 'main' into openai-upgrade 2023-12-06 09:26:05 -08:00
Paul Gauthier
b85ed45504 add deployment_id to AzureOpenAI call per @itlackey 2023-12-06 09:22:04 -08:00
Paul Gauthier
57ab2cc9da Revert "implement deployment id"
This reverts commit b107db98fa.
2023-12-06 09:20:53 -08:00
paul-gauthier
5cd0efecee
Merge pull request #380 from VariousForks/message_as_file_with_unittest 2023-12-05 15:03:57 -08:00
Your Name
4692a689fe Improvements: flag -f (not -mf); unitest improvements. 2023-12-05 23:55:10 +01:00
Your Name
13ac5f0b60 Add --message-file flag and unit test
This commit introduces the `--message-file` flag to the `aider` tool, allowing users to specify a file containing the message to send to GPT. This feature processes the reply and then exits, disabling the chat mode. The implementation includes reading the content of the specified file and using it as the prompt message.

Additionally, a unit test has been added to `tests/test_main.py` to ensure the correct functionality of the `--message-file` flag. The test includes necessary mocks to handle non-interactive environments and verifies that the tool behaves as expected when a message file is provided.

This enhancement improves the usability of the `aider` tool for users who prefer or require non-interactive execution, such as in scripting or automated workflows.
2023-12-05 23:55:10 +01:00
Your Name
743179a4bd aider: Add --message-file flag to specify a file containing the message to send GPT, process reply, then exit (disables chat mode).
# Aider chat conversation:

USER: Am I correct that currently if one wants to launch aider from commandline , the way to go is to use --message flag that allows providing prompt as command line parameter?

ASSISTANT: Yes, you are correct. The `--message` or `-m` flag can be used to provide a single message to send to GPT, process the reply, and then exit the application. This flag disables the interactive chat mode and is suitable for scripting or when you want to issue a single command without entering the interactive chat session.

USER: Is there a way to run prompt from command line like `--message` or `-m` however by providing prompt as file ?

ASSISTANT: Currently, there is no direct command-line option in the `aider` tool to provide a prompt from a file. The `--message` or `-m` flag only accepts a string as an argument. If you want to provide a prompt from a file, you would need to read the content of the file and pass it as a string to the `--message` flag.

However, this functionality can be added to the `aider` tool by implementing a new command-line option that reads the content of a specified file and uses it as the prompt message.

Would you like me to implement this feature for you? If so, please provide the `aider/main.py` file, and I will suggest the necessary changes.

USER: How would you name such flag to match current convention and how would you describe it?

ASSISTANT: Following the current naming convention used in the `aider` tool, a suitable name for the flag that allows providing a prompt from a file could be `--message-file` or `-mf`. This flag would be described as:

"Specify a file containing the message to send to GPT, process the reply, then exit (disables chat mode)."

This description aligns with the existing `--message` flag while clearly indicating that the input is expected to be a file containing the message rather than a direct string input.

USER: could you please add such flag?

ASSISTANT: To add the `--message-file` flag to the `aider` tool, we need to modify the `aider/main.py` file. Please add the `aider/main.py` file to the chat so I can provide you with the necessary changes.

USER: could you please add such flag?

ASSISTANT: To add the `--message-file` flag to the `aider` tool, we need to modify the `aider/main.py` file. Please add the `aider/main.py` file to the chat so I can provide you with the necessary changes.

USER: could you please add such flag?

ASSISTANT: To add the `--message-file` flag to the `aider` tool, we need to modify the `aider/main.py` file. Please add the `aider/main.py` file to the chat so I can provide you with the necessary changes.

USER: I added these *read-write* files: /home/gw-t490/github/VariousForks/aider-patching-for-pull-requests/aider/main.py

ASSISTANT: Great, now that you've added the `aider/main.py` file, I will provide you with the necessary changes to implement the `--message-file` flag.

We will need to:

1. Add a new command-line argument `--message-file` to the argument parser.
2. Read the content of the file specified by `--message-file` and pass it to the `coder.run()` method.

Here are the *SEARCH/REPLACE* blocks for the changes:

aider/main.py
```python
<<<<<<< SEARCH
    other_group.add_argument(
        "--message",
        "--msg",
        "-m",
        metavar="COMMAND",
        help="Specify a single message to send GPT, process reply then exit (disables chat mode)",
    )
=======
    other_group.add_argument(
        "--message",
        "--msg",
        "-m",
        metavar="COMMAND",
        help="Specify a single message to send GPT, process reply then exit (disables chat mode)",
    )
    other_group.add_argument(
        "--message-file",
        "-mf",
        metavar="MESSAGE_FILE",
        help="Specify a file containing the message to send GPT, process reply, then exit (disables chat mode)",
    )
>>>>>>> REPLACE
```

aider/main.py
```python
<<<<<<< SEARCH
    if args.message:
        io.tool_output()
        coder.run(with_message=args.message)
    else:
        coder.run()
=======
    if args.message:
        io.tool_output()
        coder.run(with_message=args.message)
    elif args.message_file:
        try:
            with open(args.message_file, 'r', encoding='utf-8') as file:
                message_from_file = file.read()
            io.tool_output()
            coder.run(with_message=message_from_file)
        except FileNotFoundError:
            io.tool_error(f"Message file not found: {args.message_file}")
            return 1
        except IOError as e:
            io.tool_error(f"Error reading message file: {e}")
            return 1
    else:
        coder.run()
>>>>>>> REPLACE
```

These changes will add the `--message-file` flag to the argument parser and handle the case where a message file is provided. If the file is found and can be read, its content will be used as the message to send to GPT. If there is an error reading the file, an error message will be displayed, and the program will exit with a status code of 1.
2023-12-05 23:55:10 +01:00
paul-gauthier
93236e2e7e
Merge pull request #378 from VariousForks/log_message_arg_patch_2023-11-27_unit_test
Fixes #374 - logging add_to_input_history if args.message is used. (and unit test)
2023-12-05 13:19:44 -08:00
Paul Gauthier
b107db98fa implement deployment id 2023-12-05 11:31:17 -08:00
Paul Gauthier
bf03f43b44 fixed benchmark 2023-12-05 11:21:11 -08:00
Paul Gauthier
d92a93221c fixed test_wholefile 2023-12-05 11:11:48 -08:00
Paul Gauthier
5b21d5704a fixed test_sendchat 2023-12-05 11:08:14 -08:00
Paul Gauthier
2ed0c8fb66 fixed test_repo 2023-12-05 10:58:44 -08:00
Paul Gauthier
a68d3d8a20 fixed test_models 2023-12-05 10:56:03 -08:00
Paul Gauthier
23e6c4ee55 fixed test_coder 2023-12-05 10:51:50 -08:00
Paul Gauthier
fb07b784f6 move to gpt-3.5-turbo-1106 2023-12-05 10:28:27 -08:00
Paul Gauthier
6ebc142377 roughed in openai 1.x 2023-12-05 07:37:05 -08:00
Your Name
3e81cb1c6b Fixes #374 - test_main.py += unit test for --message flag.
Fixes https://github.com/paul-gauthier/aider/issues/374
2023-11-30 13:20:22 +01:00
Your Name
015ffa13e1 Fixes #374 - logging add_to_input_history if args.message is used.
Fixes https://github.com/paul-gauthier/aider/issues/374
2023-11-30 13:19:54 +01:00
Joshua Vial
91bbb0a02c TODOs for making image code robust 2023-11-30 11:09:56 +13:00
Joshua Vial
dc6aeb638d gpt-4-vision-preiview can receive 128k tokens 2023-11-29 23:26:02 +13:00
Joshua Vial
58ba202b51 compiling requirements.txt 2023-11-29 22:57:31 +13:00
Joshua Vial
d8f33a8124 Auto switch to gpt-4-vision-preview if image files added to context 2023-11-29 22:48:45 +13:00
Paul Gauthier
fd34766aa9 copy 2023-11-28 09:07:24 -08:00
Paul Gauthier
b26a4aa5d2 Updated install to reference MattFlower's VSCode plugin #68 2023-11-27 15:06:55 -08:00
Paul Gauthier
ef8ced4cac added more kind words 2023-11-27 11:53:39 -08:00
Paul Gauthier
ec95cd2d76 allow longer conversation histories for models with larger context windows 2023-11-27 10:55:36 -08:00
Paul Gauthier
4192e78bcd Merge remote-tracking branch 'origin/main' 2023-11-27 10:47:15 -08:00
paul-gauthier
390c2dcea0
Merge pull request #371 from zestysoft/fix-benchmark-docs 2023-11-25 13:19:30 -08:00