Merge branch 'Aider-AI:main' into file-watcher-integration

HISTORY.md

@@ -1,13 +1,20 @@
 # Release history
 
-### main branch
-
-- Use `# ... AI?` comments to ask questions about your code.
-- New `--multiline` flag makes ENTER a soft newline and META-ENTER send the message, by @miradnanali.
-- Added "flash" alias for Gemini 2.0 Flash experimental model.
-- Improved clipboard error handling with helpful messages.
+### Aider v0.69.0
+
+- [Watch files](https://aider.chat/docs/usage/watch.html) improvements:
+  - Use `# ... AI?` comments to trigger aider and ask questions about your code.
+  - Now watches *all* files, not just certain source files.
+  - Use `# AI comments`, `// AI comments`, or `-- AI comments` to give aider instructions in any text file.
+- Full support for Gemini Flash 2.0 Exp:
+  - `aider --model flash` or `aider --model gemini/gemini-2.0-flash-exp`
+- [New `--multiline` flag and `/multiline-mode` command](https://aider.chat/docs/usage/commands.html#entering-multi-line-chat-messages) makes ENTER a soft newline and META-ENTER send the message, by @miradnanali.
+- `/copy-context <instructions>` now takes optional "instructions" when [copying code context to the clipboard](https://aider.chat/docs/usage/copypaste.html#copy-aiders-code-context-to-your-clipboard-paste-into-the-web-ui).
+- Improved clipboard error handling with helpful requirements install info.
+- Ask 5% of users if they want to opt-in to analytics.
 - `/voice` now lets you edit the transcribed text before sending.
-- Aider wrote 12% of the code in this release
+- Disabled auto-complete in Y/N prompts.
+- Aider wrote 68% of the code in this release.
 
 ### Aider v0.68.0
 

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.68.1.dev"
+__version__ = "0.69.1.dev"
 safe_version = __version__
 
 try:

aider/analytics.py

@@ -84,7 +84,7 @@ def need_to_ask(self, args_analytics):
         if not self.user_id:
             return False
 
-        PERCENT = 2.5
+        PERCENT = 5
         return self.is_uuid_in_percentage(self.user_id, PERCENT)
 
     def is_uuid_in_percentage(self, uuid_str, percent):

aider/commands.py

@@ -1417,12 +1417,13 @@ def cmd_copy_context(self, args=None):
                 else:
                     markdown += content + "\n\n"
 
-        markdown += """
+        args = args or ""
+        markdown += f"""
 Just tell me how to edit the files to make the changes.
 Don't give me back entire files.
 Just show me the edits I need to make.
 
-
+{args}
 """
 
         try:

aider/io.py

@@ -717,6 +717,7 @@ def is_valid_response(text):
                     res = self.prompt_session.prompt(
                         question,
                         style=style,
+                        complete_while_typing=False,
                     )
                 else:
                     res = input(question)

aider/resources/model-metadata.json

@@ -0,0 +1,38 @@
+{
+    "gemini-2.0-flash-exp": {
+        "max_tokens": 8192,
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 8192,
+        "max_images_per_prompt": 3000,
+        "max_videos_per_prompt": 10,
+        "max_video_length": 1,
+        "max_audio_length_hours": 8.4,
+        "max_audio_per_prompt": 1,
+        "max_pdf_size_mb": 30,
+        "litellm_provider": "vertex_ai-language-models",
+        "mode": "chat",
+        "supports_system_messages": true,
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_response_schema": true,
+        "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/gemini-v2"
+    },
+    "gemini-2.0-flash-exp": {
+        "max_tokens": 8192,
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 8192,
+        "max_images_per_prompt": 3000,
+        "max_videos_per_prompt": 10,
+        "max_video_length": 1,
+        "max_audio_length_hours": 8.4,
+        "max_audio_per_prompt": 1,
+        "max_pdf_size_mb": 30,
+        "litellm_provider": "gemini",
+        "mode": "chat",
+        "supports_system_messages": true,
+        "supports_function_calling": true,
+        "supports_vision": true,
+        "supports_response_schema": true,
+        "source": "https://cloud.google.com/vertex-ai/generative-ai/docs/gemini-v2"
+    },
+}

aider/website/HISTORY.md

@@ -1,7 +1,6 @@
 ---
 title: Release history
-parent: More info
-nav_order: 900
+nav_order: 925
 highlight_image: /assets/blame.jpg
 description: Release notes and stats on aider writing its own code.
 ---
@@ -24,14 +23,21 @@ cog.out(text)
 ]]]-->
 
 
-### main branch
+### Aider v0.69.0
 
-- Use `# ... AI?` comments to ask questions about your code.
-- New `--multiline` flag makes ENTER a soft newline and META-ENTER send the message, by @miradnanali.
-- Added "flash" alias for Gemini 2.0 Flash experimental model.
-- Improved clipboard error handling with helpful messages.
+- [Watch files](https://aider.chat/docs/usage/watch.html) improvements:
+  - Use `# ... AI?` comments to trigger aider and ask questions about your code.
+  - Now watches *all* files, not just certain source files.
+  - Use `# AI comments`, `// AI comments`, or `-- AI comments` to give aider instructions in any text file.
+- Full support for Gemini Flash 2.0 Exp:
+  - `aider --model flash` or `aider --model gemini/gemini-2.0-flash-exp`
+- [New `--multiline` flag and `/multiline-mode` command](https://aider.chat/docs/usage/commands.html#entering-multi-line-chat-messages) makes ENTER a soft newline and META-ENTER send the message, by @miradnanali.
+- `/copy-context <instructions>` now takes optional "instructions" when [copying code context to the clipboard](https://aider.chat/docs/usage/copypaste.html#copy-aiders-code-context-to-your-clipboard-paste-into-the-web-ui).
+- Improved clipboard error handling with helpful requirements install info.
+- Ask 5% of users if they want to opt-in to analytics.
 - `/voice` now lets you edit the transcribed text before sending.
-- Aider wrote 12% of the code in this release
+- Disabled auto-complete in Y/N prompts.
+- Aider wrote 68% of the code in this release.
 
 ### Aider v0.68.0
 

aider/website/_data/blame.yml

@@ -3252,8 +3252,8 @@
     Philippe de Reynal: 30
   start_tag: v0.65.0
   total_lines: 703
-- aider_percentage: 65.29
-  aider_total: 457
+- aider_percentage: 67.86
+  aider_total: 437
   end_date: '2024-12-06'
   end_tag: v0.67.0
   file_counts:
@@ -3314,18 +3314,12 @@
     tests/browser/test_browser.py:
       Paul Gauthier: 2
       Paul Gauthier (aider): 1
-    tests/fixtures/watch.js:
-      Paul Gauthier: 19
-      Paul Gauthier (aider): 16
-    tests/fixtures/watch.py:
-      Paul Gauthier: 17
-      Paul Gauthier (aider): 4
   grand_total:
-    Paul Gauthier: 243
-    Paul Gauthier (aider): 457
+    Paul Gauthier: 207
+    Paul Gauthier (aider): 437
   start_tag: v0.66.0
-  total_lines: 700
-- aider_percentage: 71.21
+  total_lines: 644
+- aider_percentage: 71.57
   aider_total: 428
   end_date: '2024-12-10'
   end_tag: v0.68.0
@@ -3403,10 +3397,63 @@
       Paul Gauthier (aider): 1
     tests/basic/test_watch.py:
       Paul Gauthier: 1
-    tests/fixtures/watch.js:
-      Paul Gauthier: 3
   grand_total:
-    Paul Gauthier: 173
+    Paul Gauthier: 170
     Paul Gauthier (aider): 428
   start_tag: v0.67.0
-  total_lines: 601
+  total_lines: 598
+- aider_percentage: 67.87
+  aider_total: 207
+  end_date: '2024-12-13'
+  end_tag: v0.69.0
+  file_counts:
+    .github/workflows/pages.yml:
+      Paul Gauthier: 2
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/analytics.py:
+      Paul Gauthier: 2
+    aider/args.py:
+      Mir Adnan ALI: 3
+      Paul Gauthier: 1
+    aider/coders/base_coder.py:
+      JeongJuhyeon: 1
+      Mir Adnan ALI: 3
+    aider/commands.py:
+      Mir Adnan ALI: 4
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 3
+    aider/io.py:
+      Mir Adnan ALI: 37
+      Paul Gauthier: 8
+      Paul Gauthier (aider): 3
+    aider/main.py:
+      Mir Adnan ALI: 1
+    aider/models.py:
+      Paul Gauthier: 7
+    aider/watch.py:
+      Paul Gauthier: 7
+      Paul Gauthier (aider): 47
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
+    benchmark/benchmark.py:
+      Paul Gauthier: 7
+      Paul Gauthier (aider): 7
+    scripts/blame.py:
+      Paul Gauthier (aider): 1
+    scripts/issues.py:
+      Paul Gauthier (aider): 58
+    scripts/update-history.py:
+      Paul Gauthier: 3
+    tests/basic/test_io.py:
+      Paul Gauthier (aider): 20
+    tests/basic/test_watch.py:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 68
+  grand_total:
+    JeongJuhyeon: 1
+    Mir Adnan ALI: 48
+    Paul Gauthier: 49
+    Paul Gauthier (aider): 207
+  start_tag: v0.68.0
+  total_lines: 305

aider/website/_posts/2024-05-24-self-assembly.md

@@ -1,20 +1,23 @@
 ---
-title: Aider has written 7% of its own code
-excerpt: Aider has written 7% of its own code, via 600+ commits that inserted 4.8K and deleted 1.5K lines of code.
+title: Aider has written 7% of its own code (outdated, now 70%)
+excerpt: This article is quite out dated. Aider is currently writing about 70% of the new code in each release.
 highlight_image: /assets/self-assembly.jpg
 nav_exclude: true
 ---
 {% if page.date %}
 <p class="post-date">{{ page.date | date: "%B %d, %Y" }}</p>
 {% endif %}
 
-# Aider has written 7% of its own code
+# Aider has written 7% of its own code (outdated, now 70%)
 
 [![self assembly](/assets/self-assembly.jpg)](https://aider.chat/assets/self-assembly.jpg)
 
 {: .note }
-This article is quite out dated. For current statistics, see
-[aider's release history](/HISTORY.html).
+This article is quite old and outdated. 
+Aider is currently writing about 70% of the new code
+in each release.
+See
+[aider's release history](/HISTORY.html) for the latest statistics.
 
 The
 [aider git repo](https://github.com/Aider-AI/aider)