From efd75a11b871d61ac31b0e274acdfb33daba361d Mon Sep 17 00:00:00 2001
From: abc <98614666+xtekky@users.noreply.github.com>
Date: Sun, 27 Aug 2023 17:37:44 +0200
Subject: ~ | code styling

---
 g4f/Provider/Lockchat.py | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

(limited to 'g4f/Provider/Lockchat.py')

diff --git a/g4f/Provider/Lockchat.py b/g4f/Provider/Lockchat.py
index 974d1331..3c1ce0d1 100644
--- a/g4f/Provider/Lockchat.py
+++ b/g4f/Provider/Lockchat.py
@@ -1,52 +1,46 @@
-import json
+import json, requests
 
-import requests
-
-from ..typing import Any, CreateResult
+from ..typing       import Any, CreateResult
 from .base_provider import BaseProvider
 
 
 class Lockchat(BaseProvider):
-    url = "http://supertest.lockchat.app"
-    supports_stream = True
+    url: str              = "http://supertest.lockchat.app"
+    supports_stream       = True
     supports_gpt_35_turbo = True
-    supports_gpt_4 = True
+    supports_gpt_4        = True
 
     @staticmethod
     def create_completion(
         model: str,
         messages: list[dict[str, str]],
-        stream: bool,
-        **kwargs: Any,
-    ) -> CreateResult:
+        stream: bool, **kwargs: Any) -> CreateResult:
+
         temperature = float(kwargs.get("temperature", 0.7))
         payload = {
             "temperature": temperature,
-            "messages": messages,
-            "model": model,
-            "stream": True,
+            "messages"   : messages,
+            "model"      : model,
+            "stream"     : True,
         }
 
         headers = {
             "user-agent": "ChatX/39 CFNetwork/1408.0.4 Darwin/22.5.0",
         }
-        response = requests.post(
-            "http://supertest.lockchat.app/v1/chat/completions",
-            json=payload,
-            headers=headers,
-            stream=True,
-        )
+        response = requests.post("http://supertest.lockchat.app/v1/chat/completions",
+                                 json=payload, headers=headers, stream=True)
+        
         response.raise_for_status()
         for token in response.iter_lines():
             if b"The model: `gpt-4` does not exist" in token:
                 print("error, retrying...")
                 Lockchat.create_completion(
-                    model=model,
-                    messages=messages,
-                    stream=stream,
-                    temperature=temperature,
-                    **kwargs,
-                )
+                    model       = model,
+                    messages    = messages,
+                    stream      = stream,
+                    temperature = temperature,
+                    **kwargs)
+            
             if b"content" in token:
                 token = json.loads(token.decode("utf-8").split("data: ")[1])
                 token = token["choices"][0]["delta"].get("content")
-- 
cgit v1.2.3


From 901595b10f08972ee3ac5fc08c346dbb561a7d62 Mon Sep 17 00:00:00 2001
From: msi-JunXiang <jimmy871117@gmail.com>
Date: Sun, 3 Sep 2023 16:26:26 +0800
Subject: type hints

Use `from __future__ import annotations avoid `dict` and `list` cause "TypeErro: 'type' object is not subscriptable".

Refer to the following Stack Overflow discussions for more information:
1.
https://stackoverflow.com/questions/75202610/typeerror-type-object-is-not-subscriptable-python
2.
https://stackoverflow.com/questions/59101121/type-hint-for-a-dict-gives-typeerror-type-object-is-not-subscriptable
---
 g4f/Provider/Lockchat.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'g4f/Provider/Lockchat.py')

diff --git a/g4f/Provider/Lockchat.py b/g4f/Provider/Lockchat.py
index 3c1ce0d1..c15eec8d 100644
--- a/g4f/Provider/Lockchat.py
+++ b/g4f/Provider/Lockchat.py
@@ -1,6 +1,10 @@
-import json, requests
+from __future__ import annotations
 
-from ..typing       import Any, CreateResult
+import json
+
+import requests
+
+from ..typing import Any, CreateResult
 from .base_provider import BaseProvider
 
 
-- 
cgit v1.2.3