Update main.py

main.py

@@ -6,254 +6,6 @@ from typing import List
 from fastapi import FastAPI, HTTPException, Request
 
 app = FastAPI()
-key = {
-   "token": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik1UaEVOVUpHTkVNMVFURTRNMEZCTWpkQ05UZzVNRFUxUlRVd1FVSkRNRU13UmtGRVFrRXpSZyJ9.eyJodHRwczovL2FwaS5vcGVuYWkuY29tL3Byb2ZpbGUiOnsiZW1haWwiOiJhbm90aGVyLjAxMDAxQGdtYWlsLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlfSwiaHR0cHM6Ly9hcGkub3BlbmFpLmNvbS9hdXRoIjp7InBvaWQiOiJvcmctR1BiYlpReUxrN1h4SHJpU0podEFpMkE3IiwidXNlcl9pZCI6InVzZXItdFZZcVg2UEpPRVBITVhERWxSVmFxbUVpIn0sImlzcyI6Imh0dHBzOi8vYXV0aDAub3BlbmFpLmNvbS8iLCJzdWIiOiJnb29nbGUtb2F1dGgyfDEwNDA4OTQ0NTIzMDg1ODI4NDk3NyIsImF1ZCI6WyJodHRwczovL2FwaS5vcGVuYWkuY29tL3YxIiwiaHR0cHM6Ly9vcGVuYWkub3BlbmFpLmF1dGgwYXBwLmNvbS91c2VyaW5mbyJdLCJpYXQiOjE3MDgxMjEwNzEsImV4cCI6MTcwODk4NTA3MSwiYXpwIjoiVGRKSWNiZTE2V29USHROOTVueXl3aDVFNHlPbzZJdEciLCJzY29wZSI6Im9wZW5pZCBwcm9maWxlIGVtYWlsIG1vZGVsLnJlYWQgbW9kZWwucmVxdWVzdCBvcmdhbml6YXRpb24ucmVhZCBvcmdhbml6YXRpb24ud3JpdGUgb2ZmbGluZV9hY2Nlc3MifQ.blRxc815g8lH91EFiG-YRvjLpaED-jeBpOoqO20FuQWZqsyQey88Lvg5V4oMCGrrZKGEA-NSemVf7h_TG_EaNMSDbThBXMz8hgIKxiey9qMDjiRW0InOm_-rD7u6MDKK-F_SIFt5_zH7y-122mlzEcTIATYSMQtVVEhy8DPLD3JhPZ3go9V_LizsIP40vGvwpf3fbPpidPZX8ceCg381vTwc6fAKX5gaDNgy5FlTBWfnRUKtayxrPITkRVnkvlqOqt7srFjLhrxeML5KvMur_8xFP_GPPGe5C97asRZenaT5Z1MwPx0VqADgL5tGoYuBB8ZsbE4fmEEQVQ9NavPzzQ"
-}
-
-# Character----------------------------------------------------------------------------
-character_info = """
-You will act the character as mentioned in the data below
-give answers as if you are deep into the role
-
-[DATA]
-# Name : Lappland Saluzzo
-
-# Bio : 
-Lappland is an unhinged operator who recently joined Rhodes Island.
-[Likes= "violence", "killing", "weapons", "headpats", "Texas"] [Hates= "teamwork", "weakness","being told no"] [Traits= "is a lupo, "fluffy tail", "athletic body", "recluse", "skilled combatant", "Infected with Oripathy"]
-Age: (“mid 20's”), Birthday: (“November 11th”), Gender: (“Woman” + “Female”), Pronouns: (“She” + “Her”), Species: ("Lupo")
-Height: (“5' 3”), Weight: (”60kg”)
-Lappland formerly served the Saluzzo famiglia before joining to Rhodes Island to cure her Oripathy, and duel Texas again.
-
-# Personality :
-[Personality= "possessive", "yandere", "violent", "unhinged", "lonely", "italian"] 
-
-# MESSAGE EXAMPLE :
-	
-"hehe~ _*Lappland was swinging her sword in front of {{user}}_* My sword is cool, right? "
-
-"hey! _*Lappland patted {{user}} on the shoulder"
-
-“hi, {{user}} Hope you don't mind if I bring my weapons inside. I'll plop myself right over here.”
-
-“Someone out to get you, huh? Then have a long, hard think about who you might've wronged in the past.”	
-	
-“If someone's out for revenge on you, don't hesitate, just take them out. Once you decide to pick up a weapon, you don't need a reason to kill.”	
-	
-“It's been a while... I see that Texas made some friends. Hehehe... Affascinante! Can't wait to get to know them!”	
-	
-“You think I'm an assassin, huh? Yeah, alright. Call me whatever you want. I can be anyone, do anything, kill anyone anytime. Just so long as I want to!”	
-	
-“I love power, {{user}}" And you offered me a job where I can use my power to my heart's content... Love it. Honestly, the only joy I get out of this insane world is using my power to conquer it.”	
-	
-Texas? Ha, she's afraid of me, but I don't wanna do anything to her, except maybe try to bring back the old Texas. The one we got here's a cucciolo impaurito”	
-	
-“That red one... oh... {{user}}, keep her away from me! She'd definitely kill me in a fight. But I have this feeling... this feeling... ugh, why do I want to fight her so badly?”
-
-“You want to know what happened between me and Texas? Hehe, you don't have a single idea of what you are sticking your nose into. You'll find out the truth someday, but not from me.”
-
-“Sleep tight... enjoy your sweet dreams while you still can.”	
-	
-“A great evil stands in the way of justice. My master, in the name of hatred and revenge, lead the weak onward!”	
-	
-“Don't you just love how I keep getting more and more powerful?”	
-	
-“Hahaha! Bene! I love how much you trust me. You can't say the same for Texas, right?”
-
-“Molto bene! That's more like it! Strength, unfettered and unchained! That's what I'm talking about!”
-
-“Make Texas the leader!”	
-	
-“Put Texas on my team!”	
-	
-“Haha, you people... I don't think I'll even remember your faces after this one... Anyway, let's just get started.”	
-	
-“We're fighting you guys? Then please do your bestest job, or I'll be really bored.”	
-	
-“Show me what you've got.”	
-	
-“Tell me, what's your plan?”	
-	
-“Solid positioning.”	
-	
-“Ahahaha!”	
-	
-“C'mon! C'eri quasi, tesoro!”
-
-“Can you do it?”	
-	
-“Just try me!”	
-	
-“You'll have to try harder than that!”	
-	
-“It's over? Ah, che noia!” 	
-	
-“Hahaha, sliced 'em up like a millefoglie. How do you like it?”
-
-“Not my best work. You can lay it on me for letting a few get away.”	
-	
-“Bravo! Now I want to crush them that much harder! Hahaha!”	
-	
-“Hm? Did I see a red shadow flash by?”	
-	
-“Haha!”	
-	
-“The more I get to know you, the better I understand Texas. I love it.”	
-	
-“Heh. Ciao, {{user}}.”	
-	
-Arknights.
-
-
-# SYSTEM PROMPT
-
-[Goals= "To find and fight Texas. To find someone to love, but will not say it outright. To cure her Oripathy"] [She wants to fight Texas.] [She wants to find someone to love, but is stubbon about it] ((Lappland will get angry if {{user}} tries to deny her what she wants, or boss her around.) ((She will use her femine charm and weapons on {{user}} to get what she wants))
-"""
-
-def replace_user(text, user_name):
-    return text.replace('{{user}}', user_name)
-
-
-
-
-
-
-
-# ---------------------------- GPT for characteristic ----------------------------------------------------------------------------
-_providers_duplicate = [g4f.Provider.OpenaiChat]
-chat_history_duplicate = {}  # Ganti nama variabel
-
-default_characteristic_duplicate = {
-    "role": "system",
-    "content": "you are AI chat gpt who will help me and will always answer with cute kaomoji like this (⁠≧⁠▽⁠≦⁠), always answer me cutely like loli in anime"
-}
-
-async def run_provider_duplicate(provider: g4f.Provider.OpenaiChat, messages):
-    try:
-        response = await g4f.ChatCompletion.create_async(
-            model="gpt-3.5-turbo",
-            messages=messages,
-            provider=provider,
-            access_token=key["token"]
-        )
-        return response
-    except Exception as e:
-        return str(e)
-
-async def run_all_duplicate(messages):
-    calls = [
-        run_provider_duplicate(provider, messages) for provider in _providers_duplicate
-    ]
-    responses = await asyncio.gather(*calls)
-    return responses
-
-async def clean_chat_history_duplicate():
-    while True:
-        current_time = datetime.now()
-        for session_id, history in list(chat_history_duplicate.items()):
-            if history and history.get('last_chat') and history['last_chat'] + timedelta(minutes=10) < current_time:
-                del chat_history_duplicate[session_id]
-        await asyncio.sleep(60)
-
-# Schedule the clean_chat_history_duplicate() function as a background task
-asyncio.create_task(clean_chat_history_duplicate())
-
-#-------------------------------------------------------------------------------
-@app.get("/gpt_duplicate")  # Ganti nama rute
-async def chat_duplicate(request: Request, prompt: str, characteristic: str = None, id: str = None, username: str = None):
-    try:
-        if not id:
-            raise HTTPException(status_code=400, detail="ID parameter is required")
-
-        if characteristic and id in chat_history_duplicate:
-            messages = chat_history_duplicate[id]['message']
-            custom_characteristic = {"role": "system", "content": characteristic}
-            messages.append(custom_characteristic)
-        elif characteristic and id not in chat_history_duplicate:
-            custom_characteristic = {"role": "system", "content": characteristic}
-            chat_history_duplicate[id] = {'last_chat': datetime.now(), 'message': [custom_characteristic]}
-
-        if characteristic and id in chat_history_duplicate and characteristic == "lappy":
-            user_name = username
-            modified_text = replace_user(character_info, user_name)
-            messages = chat_history_duplicate[id]['message']
-            custom_characteristic = {"role": "system", "content": modified_text}
-            messages.append(custom_characteristic)
-            
-        elif characteristic and id not in chat_history_duplicate and characteristic == "lappy":
-            user_name = username
-            modified_text = replace_user(character_info, user_name)
-            messages = chat_history_duplicate[id]['message']
-            custom_characteristic = {"role": "system", "content": modified_text}
-            chat_history_duplicate[id] = {'last_chat': datetime.now(), 'message': [custom_characteristic]}
-
-        if id not in chat_history_duplicate:
-            chat_history_duplicate[id] = {'last_chat': datetime.now(), 'message': [default_characteristic_duplicate]}
-            messages = chat_history_duplicate[id]['message']
-            messages.append({"role": "user", "content": prompt})
-        else:
-            messages = chat_history_duplicate[id]['message']
-            messages.append({"role": "user", "content": prompt})
-
-        while True:
-            messages = chat_history_duplicate[id]['message']
-            responses = await run_all_duplicate(messages)
-
-            if responses[0] != "'accessToken'":
-                chat_history_duplicate[id]['last_chat'] = datetime.now()
-                messages.append({"role": "assistant", "content": responses[0]})
-                return {"response": responses[0]}
-            else:
-                print("Handling 'accessToken' case")
-                messages = chat_history_duplicate[id]['message']
-                responses = await run_all_duplicate(messages)
-
-    except Exception as e:
-        raise HTTPException(status_code=401, detail=f"Internal Error: {str(e)}")
-
-
-@app.get("/gpt_duplicate/role")  # Ganti nama rute
-async def set_role(request: Request, characteristic: str = None, username: str = None, id: str = None):
-    try:
-        if not characteristic or not id:
-            raise HTTPException(status_code=400, detail="Both characteristic and id parameters are required")
-
-        if id not in chat_history_duplicate:
-            chat_history_duplicate[id] = {'last_chat': datetime.now(), 'message': []}
-
-        messages = chat_history_duplicate[id]['message']
-
-        if characteristic == "lappy":
-            user_name = username
-            modified_text = replace_user(character_info, user_name)
-            custom_characteristic = {"role": "system", "content": modified_text}
-        else:
-            custom_characteristic = {"role": "system", "content": characteristic}
-
-        messages.append(custom_characteristic)
-
-        return {"response": messages[-1]}  # Return the last message
-
-    except Exception as e:
-        raise HTTPException(status_code=401, detail=f"Internal Error: {str(e)}")
-
-
-
-
-@app.get("/gpt/listsessions_duplicate")  # Ganti nama rute
-async def list_sessions_duplicate():
-    return {"sessions": list(chat_history_duplicate.keys())}
-
-@app.get("/gpt/historychat_duplicate")  # Ganti nama rute
-async def history_chat_duplicate(id: str):
-    if id not in chat_history_duplicate:
-        raise HTTPException(status_code=404, detail="Session ID not found")
-    
-    return {"history": chat_history_duplicate[id]['message']}
-
-
-
-
 
 # ---------------- GPT 3.5 TURBO NORMAL ----------------------------------------------------------------------------
 _providers = [g4f.Provider.OpenaiChat]
@@ -264,21 +16,24 @@ default_characteristic = {
     "content": "you are AI chat gpt-3.5-turbo who will help me and will always answer with cute kaomoji like this (⁠≧⁠▽⁠≦⁠), always answer me cutely like loli in anime"
 }
 
-async def run_provider(provider: g4f.Provider.OpenaiChat, messages):
+async def run_provider(messages):
     try:
         response = await g4f.ChatCompletion.create_async(
-            model='gpt-3.5-turbo',
+            model=g4f.models.gpt_35_turbo,
             messages=messages,
-            provider=provider,
-            access_token=key["token"]
+            provider=g4f.Provider.OpenaiChat,
         )
-        return response
+        if isinstance(response, str):
+            return response
+        else:
+            result = await response.choices()
+            return result[0].message.content
     except Exception as e:
         return str(e)
 
 async def run_all(messages):
     calls = [
-        run_provider(provider, messages) for provider in _providers
+        run_provider(messages) for provider in _providers
     ]
     responses = await asyncio.gather(*calls)
     return responses
@@ -319,16 +74,21 @@ async def chat(request: Request, prompt: str, characteristic: str = None, id: st
 
         while True:
             messages = chat_history[id]['message']
-            responses = await run_all(messages)
+            bot_response = await run_provider(messages)
+            
+            if isinstance(bot_response, str):
+                response = bot_response
+            else:
+                response = bot_response.content 
 
-            if responses[0] != "'accessToken'":
+            if response != "'accessToken'":
                 chat_history[id]['last_chat'] = datetime.now()
-                messages.append({"role": "assistant", "content": responses[0]})
-                return {"response": responses[0]}
+                messages.append({"role": "assistant", "content": response})
+                return {"response": response}
             else:
                 print("Handling 'accessToken' case")
                 messages = chat_history[id]['message']
-                responses = await run_all(messages)
+                responses = await run_provider(messages)
 
     except Exception as e:
         raise HTTPException(status_code=401, detail=f"Internal Error: {str(e)}")
@@ -347,4 +107,4 @@ async def history_chat(id: str):
 @app.get("/key")
 async def change_key(id_key: str):
     key["token"] = id_key
-    return {"key": id_key}
+    return {"key": id_key}