~ | Merge pull request #876 from Lin-jun-xiang/join_messages

~ | Following PEP8, use `.join()` to process `messages`

g4f/Provider/AItianhu.py

@@ -19,10 +19,8 @@ class AItianhu(BaseProvider):
         messages: list[dict[str, str]],
         stream: bool, **kwargs: Any) -> CreateResult:
         
-        base = ""
-        for message in messages:
-            base += "%s: %s\n" % (message["role"], message["content"])
-        base += "assistant:"
+        base = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        base += "\nassistant: "
 
         headers = {
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"

g4f/Provider/AiService.py

@@ -18,10 +18,8 @@ class AiService(BaseProvider):
         stream: bool,
         **kwargs: Any,
     ) -> CreateResult:
-        base = ""
-        for message in messages:
-            base += "%s: %s\n" % (message["role"], message["content"])
-        base += "assistant:"
+        base = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        base += "\nassistant: "
 
         headers = {
             "accept": "*/*",

g4f/Provider/Aichat.py

@@ -17,10 +17,8 @@ class Aichat(BaseProvider):
         messages: list[dict[str, str]],
         stream: bool, **kwargs: Any) -> CreateResult:
         
-        base = ""
-        for message in messages:
-            base += "%s: %s\n" % (message["role"], message["content"])
-        base += "assistant:"
+        chat = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        chat += "\nassistant: "
 
         headers = {
             "authority": "chat-gpt.org",

g4f/Provider/Bing.py

@@ -48,10 +48,7 @@ class Bing(AsyncGeneratorProvider):
         return stream_generate(prompt, context, cookies_dict)
 
 def create_context(messages: list[dict[str, str]]):
-    context = ""
-
-    for message in messages:
-        context += "[%s](#message)\n%s\n\n" % (message["role"], message["content"])
+    context = "".join(f"[{message['role']}](#message)\n{message['content']}\n\n" for message in messages)
 
     return context
 

g4f/Provider/ChatgptAi.py

@@ -19,10 +19,8 @@ class ChatgptAi(BaseProvider):
         messages: list[dict[str, str]],
         stream: bool, **kwargs: Any) -> CreateResult:
         
-        chat = ""
-        for message in messages:
-            chat += "%s: %s\n" % (message["role"], message["content"])
-        chat += "assistant: "
+        chat = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        chat += "\nassistant: "
 
         response = requests.get("https://chatgpt.ai/")
         nonce, post_id, _, bot_id = re.findall(

g4f/Provider/Theb.py

@@ -22,10 +22,8 @@ class Theb(BaseProvider):
         messages: list[dict[str, str]],
         stream: bool, **kwargs: Any) -> CreateResult:
         
-        conversation = ''
-        for message in messages:
-            conversation += '%s: %s\n' % (message['role'], message['content'])
-        conversation += 'assistant: '
+        conversation = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        conversation += "\nassistant: "
         
         auth = kwargs.get("auth", {
             "bearer_token":"free",

g4f/Provider/V50.py

@@ -21,11 +21,9 @@ class V50(BaseProvider):
         messages: list[dict[str, str]],
         stream: bool, **kwargs: Any) -> CreateResult:
         
-        conversation = ''
-        for message in messages:
-            conversation += '%s: %s\n' % (message['role'], message['content'])
-        
-        conversation += 'assistant: '
+        conversation = "\n".join(f"{message['role']}: {message['content']}" for message in messages)
+        conversation += "\nassistant: "
+
         payload = {
             "prompt"        : conversation,
             "options"       : {},