From 51706d39b0cfd6190156b26e653282b3eac2bc3d Mon Sep 17 00:00:00 2001
From: Tongliang Liao <xkszltl@gmail.com>
Date: Fri, 29 Aug 2025 04:37:09 -0700
Subject: [PATCH] Migrate exceptions to new OpenAI SDK.

---
 global_methods.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/global_methods.py b/global_methods.py
index 7ada78d..b24c754 100644
--- a/global_methods.py
+++ b/global_methods.py
@@ -109,7 +109,7 @@ def run_chatgpt(query, num_gen=1, num_tokens_request=1000,
                 messages = [
                         {"role": "system", "content": query}
                     ]
-                completion = openai.ChatCompletion.create(
+                completion = openai.chat.completions.create(
                     model="gpt-3.5-turbo",
                     temperature = temperature,
                     max_tokens = num_tokens_request,
@@ -117,7 +117,7 @@ def run_chatgpt(query, num_gen=1, num_tokens_request=1000,
                     messages = messages
                 )
             elif 'gpt-4' in model:
-                completion = openai.ChatCompletion.create(
+                completion = openai.chat.completions.create(
                     model=model,
                     temperature = temperature,
                     max_tokens = num_tokens_request,
@@ -129,21 +129,21 @@ def run_chatgpt(query, num_gen=1, num_tokens_request=1000,
             else:
                 print("Did not find model %s" % model)
                 raise ValueError
-        except openai.error.APIError as e:
+        except openai.APIError as e:
             #Handle API error here, e.g. retry or log
             print(f"OpenAI API returned an API Error: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)
             pass
-        except openai.error.APIConnectionError as e:
+        except openai.APIConnectionError as e:
             #Handle connection error here
             print(f"Failed to connect to OpenAI API: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)
             pass
-        except openai.error.RateLimitError as e:
+        except openai.RateLimitError as e:
             #Handle rate limit error (we recommend using exponential backoff)
             print(f"OpenAI API request exceeded rate limit: {e}")
             pass
-        except openai.error.ServiceUnavailableError as e:
+        except openai.APIStatusError as e:
             #Handle rate limit error (we recommend using exponential backoff)
             print(f"OpenAI API request exceeded rate limit: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)
@@ -188,28 +188,28 @@ def run_chatgpt_with_examples(query, examples, input, num_gen=1, num_tokens_requ
     while completion is None:
         wait_time = wait_time * 2
         try:
-            completion = openai.ChatCompletion.create(
+            completion = openai.chat.completions.create(
                 model="gpt-3.5-turbo" if not use_16k else "gpt-3.5-turbo-16k",
                 temperature = temperature,
                 max_tokens = num_tokens_request,
                 n=num_gen,
                 messages = messages
             )
-        except openai.error.APIError as e:
+        except openai.APIError as e:
             #Handle API error here, e.g. retry or log
             print(f"OpenAI API returned an API Error: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)
             pass
-        except openai.error.APIConnectionError as e:
+        except openai.APIConnectionError as e:
             #Handle connection error here
             print(f"Failed to connect to OpenAI API: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)
             pass
-        except openai.error.RateLimitError as e:
+        except openai.RateLimitError as e:
             #Handle rate limit error (we recommend using exponential backoff)
             print(f"OpenAI API request exceeded rate limit: {e}")
             pass
-        except openai.error.ServiceUnavailableError as e:
+        except openai.ServiceUnavailableError as e:
             #Handle rate limit error (we recommend using exponential backoff)
             print(f"OpenAI API request exceeded rate limit: {e}; waiting for {wait_time} seconds")
             time.sleep(wait_time)