From 58d1f9291d44dd5fd64b904484172309795aa0a8 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Fri, 14 Jul 2023 14:07:42 -0700
Subject: [PATCH] Don't use openai.api_key global, refs #107

---
 llm/default_plugins/openai_models.py | 3 ++-
 setup.py                             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/llm/default_plugins/openai_models.py b/llm/default_plugins/openai_models.py
index 778e20d..c6d74c5 100644
--- a/llm/default_plugins/openai_models.py
+++ b/llm/default_plugins/openai_models.py
@@ -168,13 +168,13 @@ class Chat(Model):
         if prompt.system and prompt.system != current_system:
             messages.append({"role": "system", "content": prompt.system})
         messages.append({"role": "user", "content": prompt.prompt})
-        openai.api_key = self.key
         response._prompt_json = {"messages": messages}
         if stream:
             completion = openai.ChatCompletion.create(
                 model=prompt.model.model_id,
                 messages=messages,
                 stream=True,
+                api_key=self.key,
                 **not_nulls(prompt.options),
             )
             chunks = []
@@ -188,6 +188,7 @@ class Chat(Model):
             completion = openai.ChatCompletion.create(
                 model=prompt.model.model_id,
                 messages=messages,
+                api_key=self.key,
                 stream=False,
             )
             response.response_json = completion.to_dict_recursive()
diff --git a/setup.py b/setup.py
index 45cecf6..824d5f4 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
         "pluggy",
         "python-ulid",
         "setuptools",
-        "pip"
+        "pip",
     ],
     extras_require={
         "test": [