Update app.py

app.py

@@ -3,41 +3,27 @@ import random
 import string
 import time
 from typing import Any
-
-#new
-import freeGPT
+from freeGPT import gpt3
 from asyncio import run
-#/new
-
 from flask import Flask, request
 from flask_cors import CORS
-
 from g4f import ChatCompletion, Provider
-
 app = Flask(__name__)
 CORS(app)
-
 @app.route("/")
 def main():
     return """Just iqai.ru for more!!!"""
-
 @app.route("/chat/completions", methods=["POST"])
-def chat_completions():
-    model = request.get_json().get("model", "gpt-3.5-turbo")
-    stream = request.get_json().get("stream", False)
-    messages = request.get_json().get("messages")
-    
-    #old
-    #response = ChatCompletion.create(model=model, messages=messages)
-    #/old
-
-    #new
-    response = freeGPT.gpt3.Completion().create(messages)
-    #/new
-    
+def chatcompletions():
+    data = request.get_json()
+    model = data.get("model", "gpt-3.5-turbo")
+    stream = data.get("stream", False)
+    messages = data.get("messages")
+    if messages is None:
+        return {"error": "No messages provided"}, 400
+    response = gpt3.Completion.create(prompt=messages)
     completion_id = "".join(random.choices(string.ascii_letters + string.digits, k=28))
     completion_timestamp = int(time.time())
-
     if not stream:
         return {
             "id": f"chatcmpl-{completion_id}",
@@ -51,16 +37,15 @@ def chat_completions():
                         "role": "assistant",
                         "content": response,
                     },
-                    "finish_reason": "stop",
+                    "finishreason": "stop",
                 }
             ],
             "usage": {
-                "prompt_tokens": None,
-                "completion_tokens": None,
-                "total_tokens": None,
+                "prompttokens": None,
+                "completiontokens": None,
+                "totaltokens": None,
             },
         }
-
     def streaming():
         for chunk in response:
             completion_data = {
@@ -74,15 +59,13 @@ def chat_completions():
                         "delta": {
                             "content": chunk,
                         },
-                        "finish_reason": None,
+                        "finishreason": None,
                     }
                 ],
             }
-
             content = json.dumps(completion_data, separators=(",", ":"))
-            yield f"data: {content}\n\n"
+            yield f"data: {content}nn"
             time.sleep(0.1)
-
         end_completion_data: dict[str, Any] = {
             "id": f"chatcmpl-{completion_id}",
             "object": "chat.completion.chunk",
@@ -92,15 +75,12 @@ def chat_completions():
                 {
                     "index": 0,
                     "delta": {},
-                    "finish_reason": "stop",
+                    "finishreason": "stop",
                 }
             ],
         }
         content = json.dumps(end_completion_data, separators=(",", ":"))
-        yield f"data: {content}\n\n"
-
+        yield f"data: {content}nn"
     return app.response_class(streaming(), mimetype="text/event-stream")
-
-
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=7860, debug=False)
+    app.run(host="0.0.0.0", port=7860, debug=False)