Attempt at fixing Bedrock support

Author: nicovank

README.md

@@ -15,25 +15,25 @@ Go, Java, LaTeX, PHP, Python, Ruby, Rust, Swift, and TypeScript.
 
 ## Installation
 
- >  [!NOTE]
- >
- >  CWhy needs to be connected to an [OpenAI account](https://openai.com/api/).
- >  _Your account will need to have a positive balance for this to work_
- >  ([check your OpenAI balance](https://platform.openai.com/usage)).
- >  [Get an OpenAI key here](https://platform.openai.com/api-keys).
- > 
- >  You may need to purchase $0.50 - $1 in OpenAI credits depending on when your API account was created.
- > 
- >  Once you have an API key, set it as an environment variable called `OPENAI_API_KEY`.
- > 
- >  ```bash
- >  # On Linux/MacOS:
- >  export OPENAI_API_KEY=<your-api-key>
- >  
- >  # On Windows:
- >  $env:OPENAI_API_KEY=<your-api-key>
- >  ```
- 
+> [!NOTE]
+>
+> CWhy needs to be connected to an [OpenAI account](https://openai.com/api/).
+> _Your account will need to have a positive balance for this to work_
+> ([check your OpenAI balance](https://platform.openai.com/usage)).
+> [Get an OpenAI key here](https://platform.openai.com/api-keys).
+>
+> You may need to purchase $0.50 - $1 in OpenAI credits depending on when your API account was created.
+>
+> Once you have an API key, set it as an environment variable called `OPENAI_API_KEY`.
+>
+> ```bash
+> # On Linux/MacOS:
+> export OPENAI_API_KEY=<your-api-key>
+>
+> # On Windows:
+> $env:OPENAI_API_KEY=<your-api-key>
+> ```
+
 ```bash
 python3 -m pip install cwhy
 ```
@@ -60,16 +60,19 @@ If your provider does not support OpenAI style API calls, such as AWS Bedrock wh
 using the [LiteLLM Proxy Server](https://docs.litellm.ai/docs/simple_proxy).
 
 ```bash
-pip install 'litellm[proxy]'
+# In a separate terminal:
 # Set AWS_ACCESS_KEY_ID, AWS_REGION_NAME, and AWS_SECRET_ACCESS_KEY.
-litellm --model bedrock/anthropic.claude-v2
+pip install --upgrade 'litellm[proxy]'
+litellm --model bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0 --port 4000
+
+# Back in the debugging terminal:
 export OPENAI_BASE_URL=http://0.0.0.0:4000
 cwhy --- clang++ tests/c++/missing-hash.cpp
 ```
 
 Note that when using the LiteLLM Proxy, CWhy's `--llm` argument will be ignored completely.
 
-## Usage 
+## Usage
 
 ### Linux/MacOS
 
@@ -125,9 +128,9 @@ An example action YAML file covering all three platforms
 
 These options can be displayed with `cwhy --help`.
 
- -  `--llm`: pick a specific OpenAI LLM. CWhy has been tested with `gpt-3.5-turbo` and `gpt-4`.
- -  `--timeout`: pick a different timeout than the default for API calls.
- -  `--show-prompt` (debug): print prompts before calling the API.
+- `--llm`: pick a specific OpenAI LLM. CWhy has been tested with `gpt-3.5-turbo` and `gpt-4`.
+- `--timeout`: pick a different timeout than the default for API calls.
+- `--show-prompt` (debug): print prompts before calling the API.
 
 ## Examples
 
@@ -207,6 +210,7 @@ In file included from /usr/lib/gcc/x86_64-linux-gnu/10/../../../../include/c++/1
                ^~~~~~~
 3 errors generated.
 ```
+
 </details>
 
 And here's the English-language explanation from `cwhy`:
@@ -243,7 +247,6 @@ std::unordered_set<std::pair<int, int>, PairHash> visited;
 With this change, the code should now compile and work as expected.
 ````
 
-
 ### Rust
 
 ```

src/cwhy/explain.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 import sys
 
 import llm_utils
@@ -69,12 +70,37 @@ def evaluate(client: openai.OpenAI, args: argparse.Namespace, stdin: str) -> Non
 
 
 def explain(args: argparse.Namespace, stdin: str) -> None:
-    try:
-        client = openai.OpenAI()
-    except openai.OpenAIError as e:
-        print("Please set the OPENAI_API_KEY environment variable.")
+    if (
+        "OPENAI_BASE_URL" in os.environ
+        and "api.openai.com" not in os.environ["OPENAI_BASE_URL"]
+    ):
+        # Pass a dummy API key on purpose:
+        # None would make the OpenAI client throw an error.
+        # A blank string will cause an invalid HTTP header error.
+        client = openai.OpenAI(
+            api_key=os.environ.get("OPENAI_API_KEY", "OPENAI_API_KEY")
+        )
+    elif "OPENAI_API_KEY" not in os.environ:
+        print("The OPENAI_API_KEY environment variable is not set.")
         print("You can get an API key at https://platform.openai.com/account/api-keys.")
+        if all(
+            k in os.environ
+            for k in ("AWS_ACCESS_KEY_ID", "AWS_REGION_NAME", "AWS_SECRET_ACCESS_KEY")
+        ):
+            print()
+            print(
+                "Found AWS credentials. To use Amazon Bedrock, run the following commands:"
+            )
+            print("```")
+            print("pip install --upgrade 'litellm[proxy]'")
+            print(
+                "litellm --model bedrock/anthropic.claude-opus-4-20250514-v1:0 --port 4000"
+            )
+            print("export OPENAI_BASE_URL=http://0.0.0.0:4000")
+            print("```")
         return
+    else:
+        client = openai.OpenAI()
 
     evaluate(client, args, stdin)