8 files changed, 43 insertions, 26 deletions

diff --git a/g4f/Provider/Aivvm.py b/g4f/Provider/Aivvm.py
index dbfc588d..b2d7c139 100644
--- a/g4f/Provider/Aivvm.py
+++ b/g4f/Provider/Aivvm.py
@@ -41,7 +41,7 @@ class Aivvm(AsyncGeneratorProvider):
         headers = {
             "User-Agent"         : "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
             "Accept"             : "*/*",
-            "Accept-language"    : "en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3",
+            "Accept-Language"    : "en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3",
             "Origin"             : cls.url,
             "Referer"            : cls.url + "/",
             "Sec-Fetch-Dest"     : "empty",
diff --git a/g4f/Provider/Bard.py b/g4f/Provider/Bard.py
index 2137d820..4e076378 100644
--- a/g4f/Provider/Bard.py
+++ b/g4f/Provider/Bard.py
@@ -13,6 +13,7 @@ class Bard(AsyncProvider):
     url = "https://bard.google.com"
     needs_auth = True
     working = True
+    _snlm0e = None
 
     @classmethod
     async def create_async(
@@ -31,7 +32,6 @@ class Bard(AsyncProvider):
 
         headers = {
             'authority': 'bard.google.com',
-            'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
             'origin': 'https://bard.google.com',
             'referer': 'https://bard.google.com/',
             'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
@@ -42,13 +42,14 @@ class Bard(AsyncProvider):
             cookies=cookies,
             headers=headers
         ) as session:
-            async with session.get(cls.url, proxy=proxy) as response:
-                text = await response.text()
+            if not cls._snlm0e:
+                async with session.get(cls.url, proxy=proxy) as response:
+                    text = await response.text()
 
-            match = re.search(r'SNlM0e\":\"(.*?)\"', text)
-            if not match:
-                raise RuntimeError("No snlm0e value.")
-            snlm0e = match.group(1)
+                match = re.search(r'SNlM0e\":\"(.*?)\"', text)
+                if not match:
+                    raise RuntimeError("No snlm0e value.")
+                cls._snlm0e = match.group(1)
             
             params = {
                 'bl': 'boq_assistant-bard-web-server_20230326.21_p0',
@@ -57,7 +58,7 @@ class Bard(AsyncProvider):
             }
 
             data = {
-                'at': snlm0e,
+                'at': cls._snlm0e,
                 'f.req': json.dumps([None, json.dumps([[prompt]])])
             }
 
diff --git a/g4f/Provider/ChatgptLogin.py b/g4f/Provider/ChatgptLogin.py
index 8b868f8e..3eb55a64 100644
--- a/g4f/Provider/ChatgptLogin.py
+++ b/g4f/Provider/ChatgptLogin.py
@@ -52,7 +52,14 @@ class ChatgptLogin(AsyncProvider):
             }
             async with session.post("https://opchatgpts.net/wp-admin/admin-ajax.php", data=data) as response:
                 response.raise_for_status()
-                return (await response.json())["data"]
+                data = await response.json()
+                if "data" in data:
+                    return data["data"]
+                elif "msg" in data:
+                    raise RuntimeError(data["msg"])
+                else:
+                    raise RuntimeError(f"Response: {data}")
+
 
     @classmethod
     @property
diff --git a/g4f/Provider/CodeLinkAva.py b/g4f/Provider/CodeLinkAva.py
index 3ab4e264..e3b3eb3e 100644
--- a/g4f/Provider/CodeLinkAva.py
+++ b/g4f/Provider/CodeLinkAva.py
@@ -40,11 +40,12 @@ class CodeLinkAva(AsyncGeneratorProvider):
             }
             async with session.post("https://ava-alpha-api.codelink.io/api/chat", json=data) as response:
                 response.raise_for_status()
-                start = "data: "
                 async for line in response.content:
                     line = line.decode()
-                    if line.startswith("data: ") and not line.startswith("data: [DONE]"):
-                        line = json.loads(line[len(start):-1])
+                    if line.startswith("data: "):
+                        if line.startswith("data: [DONE]"):
+                            break
+                        line = json.loads(line[6:-1])
                         content = line["choices"][0]["delta"].get("content")
                         if content:
                             yield content
diff --git a/g4f/Provider/H2o.py b/g4f/Provider/H2o.py
index 30090a58..d92bd6d1 100644
--- a/g4f/Provider/H2o.py
+++ b/g4f/Provider/H2o.py
@@ -23,7 +23,7 @@ class H2o(AsyncGeneratorProvider):
         **kwargs
     ) -> AsyncGenerator:
         model = model if model else cls.model
-        headers = {"Referer": "https://gpt-gm.h2o.ai/"}
+        headers = {"Referer": cls.url + "/"}
 
         async with ClientSession(
             headers=headers
@@ -36,14 +36,14 @@ class H2o(AsyncGeneratorProvider):
                 "searchEnabled": "true",
             }
             async with session.post(
-                "https://gpt-gm.h2o.ai/settings",
+                f"{cls.url}/settings",
                 proxy=proxy,
                 data=data
             ) as response:
                 response.raise_for_status()
 
             async with session.post(
-                "https://gpt-gm.h2o.ai/conversation",
+                f"{cls.url}/conversation",
                 proxy=proxy,
                 json={"model": model},
             ) as response:
@@ -71,7 +71,7 @@ class H2o(AsyncGeneratorProvider):
                 },
             }
             async with session.post(
-                f"https://gpt-gm.h2o.ai/conversation/{conversationId}",
+                f"{cls.url}/conversation/{conversationId}",
                 proxy=proxy,
                 json=data
              ) as response:
@@ -83,6 +83,14 @@ class H2o(AsyncGeneratorProvider):
                         if not line["token"]["special"]:
                             yield line["token"]["text"]
 
+            async with session.delete(
+                f"{cls.url}/conversation/{conversationId}",
+                proxy=proxy,
+                json=data
+            ) as response:
+                response.raise_for_status()
+
+
     @classmethod
     @property
     def params(cls):
diff --git a/g4f/Provider/HuggingChat.py b/g4f/Provider/HuggingChat.py
index 85f879f3..7702c9dd 100644
--- a/g4f/Provider/HuggingChat.py
+++ b/g4f/Provider/HuggingChat.py
@@ -25,10 +25,10 @@ class HuggingChat(AsyncGeneratorProvider):
         **kwargs
     ) -> AsyncGenerator:
         model = model if model else cls.model
-        if not cookies:
-            cookies = get_cookies(".huggingface.co")
         if proxy and "://" not in proxy:
             proxy = f"http://{proxy}"
+        if not cookies:
+            cookies = get_cookies(".huggingface.co")
 
         headers = {
             'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
@@ -37,7 +37,7 @@ class HuggingChat(AsyncGeneratorProvider):
             cookies=cookies,
             headers=headers
         ) as session:
-            async with session.post("https://huggingface.co/chat/conversation", proxy=proxy, json={"model": model}) as response:
+            async with session.post(f"{cls.url}/conversation", proxy=proxy, json={"model": model}) as response:
                 conversation_id = (await response.json())["conversationId"]
 
             send = {
@@ -62,7 +62,7 @@ class HuggingChat(AsyncGeneratorProvider):
                     "web_search_id": ""
                 }
             }
-            async with session.post(f"https://huggingface.co/chat/conversation/{conversation_id}", proxy=proxy, json=send) as response:
+            async with session.post(f"{cls.url}/conversation/{conversation_id}", proxy=proxy, json=send) as response:
                 if not stream:
                     data = await response.json()
                     if "error" in data:
@@ -76,8 +76,6 @@ class HuggingChat(AsyncGeneratorProvider):
                     first = True
                     async for line in response.content:
                         line = line.decode("utf-8")
-                        if not line:
-                            continue
                         if line.startswith(start):
                             line = json.loads(line[len(start):-1])
                             if "token" not in line:
@@ -89,7 +87,7 @@ class HuggingChat(AsyncGeneratorProvider):
                                 else:
                                     yield line["token"]["text"]
                 
-            async with session.delete(f"https://huggingface.co/chat/conversation/{conversation_id}", proxy=proxy) as response:
+            async with session.delete(f"{cls.url}/conversation/{conversation_id}", proxy=proxy) as response:
                 response.raise_for_status()
 
 
diff --git a/g4f/Provider/Vitalentum.py b/g4f/Provider/Vitalentum.py
index 31ad8b80..d5265428 100644
--- a/g4f/Provider/Vitalentum.py
+++ b/g4f/Provider/Vitalentum.py
@@ -46,7 +46,9 @@ class Vitalentum(AsyncGeneratorProvider):
                 response.raise_for_status()
                 async for line in response.content:
                     line = line.decode()
-                    if line.startswith("data: ") and not line.startswith("data: [DONE]"):
+                    if line.startswith("data: "):
+                        if line.startswith("data: [DONE]"):
+                            break
                         line = json.loads(line[6:-1])
                         content = line["choices"][0]["delta"].get("content")
                         if content:
diff --git a/g4f/models.py b/g4f/models.py
index 9b01fa3c..1066e1aa 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -14,7 +14,7 @@ from .Provider   import (
     H2o 
 )
 
-@dataclass
+@dataclass(unsafe_hash=True)
 class Model:
     name: str
     base_provider: str