Upload main.py

main.py

@@ -628,25 +628,16 @@ def chatgpt_model(item: ChatgptModel):
 @app.post("/ryuzaki/chatgpt3-turbo", response_model=SuccessResponse, responses={422: {"model": ErrorStatus}})
 def chatgpt3_turbo(item: Chatgpt3Texts):
     if item.is_openai_original:
-        openai.api_key = item.api_key
-        openai.api_base = SOURCE_OPENAI_ACCESS_URL
-        chat_completion = openai.ChatCompletion.create(
-            model="gpt-3.5-turbo",
-            messages=[{"role": "user", "content": item.query}],
-            stream=True
+        GPTbase = SOURCE_OPENAI_ACCESS_URL
+        response = OpenAiToken(api_key=item.api_key, api_base=GPTbase).chat_message_turbo(
+            query=item.query,
+            model="gpt-3.5-turbo"
+        )
+        answer = response["choices"][0]["message"]["content"]
+        return SuccessResponse(
+            status="True",
+            randydev={"message": answer}
         )
-        if isinstance(chat_completion, dict):
-            answer = chat_completion.choices[0].message.content
-        else:
-            answer = ""
-            for token in chat_completion:
-                content = token["choices"][0]["delta"].get("content")
-                if content is not None:
-                    answer += content
-                    return SuccessResponse(
-                        status="True",
-                        randydev={"message": answer}
-                    )
     else:
         url = "https://lexica.qewertyy.me/models"
         params = {"model_id": 5, "prompt": item.query}
@@ -665,25 +656,16 @@ def chatgpt4_turbo(
     item: OpenaiTexts,
     api_key: None = Depends(validate_api_key)
 ):
-    openai.api_key = item.api_key
-    openai.api_base = SOURCE_OPENAI_ACCESS_URL
-    chat_completion = openai.ChatCompletion.create(
-        model="gpt-4-turbo",
-        messages=[{"role": "user", "content": item.query}],
-        stream=True
+    GPTbase = SOURCE_OPENAI_ACCESS_URL
+    response = OpenAiToken(api_key=item.api_key, api_base=GPTbase).chat_message_turbo(
+        query=item.query,
+        model="gpt-4-turbo"
+    )
+    answer = response["choices"][0]["message"]["content"]
+    return SuccessResponse(
+        status="True",
+        randydev={"message": answer}
     )
-    if isinstance(chat_completion, dict):
-        answer = chat_completion.choices[0].message.content
-    else:
-        answer = ""
-        for token in chat_completion:
-            content = token["choices"][0]["delta"].get("content")
-            if content is not None:
-                answer += content
-                return SuccessResponse(
-                    status="True",
-                    randydev={"message": answer}
-                )
 
 @app.post("/ryuzaki/google-ai", response_model=SuccessResponse, responses={422: {"model": ErrorStatus}})
 def v1beta3_google_ai(