From 36c1b1e0ddf8f5c15219a1df1d89780803634af9 Mon Sep 17 00:00:00 2001
From: Azalea Gui <me@hydev.org>
Date: Tue, 6 Feb 2024 05:26:45 -0500
Subject: [PATCH] [U] openai migrate

---
 tools/merge.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/merge.py b/tools/merge.py
index 4104b094..2a58d3fb 100644
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -3,7 +3,9 @@ import argparse
 import shlex
 from subprocess import check_call, check_output
 
-import openai
+from openai import OpenAI
+
+client = OpenAI()
 # Readline is used to fix left/right arrow keys in input(), do not remove as unused
 import readline
 
@@ -26,8 +28,7 @@ def gen_merge_msg(commits: str):
     openai_prompt = ("I just merged the following branch, what commit message can best summarize the changes below? "
                      "Please make sure it is less than 100 characters long.\n\n")
 
-    complete = openai.ChatCompletion.create(
-        model="gpt-4",
+    complete = client.chat.completions.create(model="gpt-4",
         messages=[
             {"role": "system",
              "content": "You are a senior software engineer helping with maintaining a game server repository."},
@@ -37,8 +38,7 @@ def gen_merge_msg(commits: str):
              "content": f'"{openai_example_response}"'},
             {"role": "user",
              "content": f"{openai_prompt}{commits}"},
-        ]
-    )
+        ])
 
     m = complete.choices[0].message.content
     return m.strip().strip('"')