Merge branch 'main' into mixpanel

aider/models.py

@@ -3,6 +3,7 @@ import importlib
 import json
 import math
 import os
+import platform
 import sys
 from dataclasses import dataclass, fields
 from pathlib import Path
@@ -674,6 +675,13 @@ def sanity_check_model(io, model):
         io.tool_error(f"Model {model}: Missing these environment variables:")
         for key in model.missing_keys:
             io.tool_error(f"- {key}")
+
+        if platform.system() == "Windows" or True:
+            io.tool_output(
+                "If you just set these environment variables using `setx` you may need to restart"
+                " your terminal or command prompt for the changes to take effect."
+            )
+
     elif not model.keys_in_environment:
         show = True
         io.tool_output(f"Model {model}: Unknown which environment variables are required.")

aider/website/HISTORY.md

@@ -26,6 +26,7 @@ cog.out(text)
 - Web scraper is more robust if page never idles.
 - Improved token and cost reporting for infinite output.
 - Improvements and bug fixes for `/read` only files.
+- Switched from `setup.py` to `pyproject.toml`, by @branchvincent.
 - Bug fix to persist files added during `/ask`.
 - Bug fix for chat history size in `/tokens`.
 

aider/website/_includes/model-warnings.md

@@ -44,6 +44,10 @@ Model azure/gpt-4-turbo: Missing these environment variables:
 - AZURE_API_KEY
 ```
 
+{: .tip }
+On Windows, 
+if you just set these environment variables using `setx` you may need to restart your terminal or
+command prompt for the changes to take effect.
 
 
 ## Unknown which environment variables are required