Update OpenAI API version

codegpt/conversation.py

@@ -4,11 +4,11 @@
 
 
 class Model(Enum):
-    GPT_4 = "gpt-4-0613"
+    GPT_4 = "gpt-4-0125-preview"
 
 
 def argparse_model_type(model_str):
-    if model_str.lower() == "gpt-4-0613":
+    if model_str.lower() == "gpt-4-0125-preview":
         return Model.GPT_4
     else:
         raise argparse.ArgumentTypeError(f"Model {model_str} is not supported.")

codegpt/main.py

@@ -2,9 +2,6 @@
 import platform
 import re
 import subprocess
-import sys
-
-import openai
 from simple_term_menu import TerminalMenu
 
 from conversation import Conversation
@@ -34,13 +31,6 @@ def main():
         print("Sent this conversation to OpenAI:")
         print(conversation)
 
-    openai.api_key = os.environ.get("OPENAI_API_KEY")
-    if openai.api_key is None:
-        print("To use codegpt please set the OPENAI_API_KEY environment variable")
-        print("You can get an API key from https://beta.openai.com/account/api-keys")
-        print("To set the environment variable, run:")
-        print("export OPENAI_API_KEY=<your key>")
-        sys.exit(1)
 
     response = fetch_and_print_cmd(conversation)
 

codegpt/open_ai_adapter.py

@@ -1,6 +1,8 @@
 import sys
 
-import openai
+from openai import OpenAI
+
+client = OpenAI()
 
 from conversation import Conversation
 from limiter import limit_message_history_to, num_tokens_from_messages
@@ -9,16 +11,14 @@
 
 def _create_chat_completion(conversation, n, stream=False):
     limited_messages = limit_message_history_to(1000, conversation.messages)
-    return openai.ChatCompletion.create(
-        model=conversation.model.value,
-        messages=limited_messages,
-        temperature=0,
-        top_p=0.2,
-        frequency_penalty=0,
-        presence_penalty=0,
-        n=n,
-        stream=stream,
-    )
+    return client.chat.completions.create(model=conversation.model.value,
+    messages=limited_messages,
+    temperature=0,
+    top_p=0.2,
+    frequency_penalty=0,
+    presence_penalty=0,
+    n=n,
+    stream=stream)
 
 
 def stream_cmd_into_terminal(conversation: Conversation, retries=0) -> str:
@@ -30,8 +30,8 @@ def stream_cmd_into_terminal(conversation: Conversation, retries=0) -> str:
         print(f"\033[94m> ", end='')
         cmd = ""
         for chunk in response:
-            if "content" in chunk["choices"][0]["delta"]:
-                cmd_delta = chunk["choices"][0]["delta"]["content"]
+            if chunk.choices[0].delta.content:
+                cmd_delta = chunk.choices[0].delta.content
                 cmd_delta = strip_cmd(cmd_delta)
                 print(cmd_delta, end='')
                 sys.stdout.flush()
@@ -40,4 +40,4 @@ def stream_cmd_into_terminal(conversation: Conversation, retries=0) -> str:
         return strip_cmd(cmd)
     except Exception as e:
         print(e)
-        return stream_cmd_into_terminal(conversation, retries + 1)
+        return stream_cmd_into_terminal(conversation, retries + 1)

requirements.txt

@@ -1,19 +1,30 @@
-certifi>=2022.12.7
-et-xmlfile>=1.1.0
-idna>=3.4
-numpy>=1.21.6
-openai>=0.27.0
-openpyxl>=3.0.10
-pandas>=1.3.5
-python-dateutil>=2.8.2
-pyperclip>=1.8.2
-pytz>=2022.6
-requests>=2.28.1
-six>=1.16.0
-tqdm>=4.64.1
-types-pytz>=2022.6.0.1
-typing_extensions>=4.4.0
-urllib3>=1.26.13
-simple_term_menu>=1.6.1; sys_platform == "linux" or sys_platform == "linux2" or sys_platform == "darwin"
-tiktoken~=0.3.2
-setuptools~=60.2.0
+annotated-types==0.6.0
+anyio==4.2.0
+certifi==2023.11.17
+charset-normalizer==3.3.2
+distro==1.9.0
+et-xmlfile==1.1.0
+h11==0.14.0
+httpcore==1.0.2
+httpx==0.26.0
+idna==3.6
+numpy==1.26.3
+openai==1.10.0
+openpyxl==3.1.2
+pandas==2.2.0
+pydantic==2.6.0
+pydantic_core==2.16.1
+pyperclip==1.8.2
+python-dateutil==2.8.2
+pytz==2023.4
+regex==2023.12.25
+requests==2.31.0
+simple-term-menu==1.6.4
+six==1.16.0
+sniffio==1.3.0
+tiktoken==0.3.3
+tqdm==4.66.1
+types-pytz==2023.4.0.20240130
+typing_extensions==4.9.0
+tzdata==2023.4
+urllib3==2.1.0