summaryrefslogtreecommitdiffstats
path: root/g4f
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--g4f/Provider/Wewordle.py2
-rw-r--r--g4f/Provider/Ylokh.py10
-rw-r--r--g4f/requests.py10
3 files changed, 10 insertions, 12 deletions
diff --git a/g4f/Provider/Wewordle.py b/g4f/Provider/Wewordle.py
index a7bdc722..26d040c3 100644
--- a/g4f/Provider/Wewordle.py
+++ b/g4f/Provider/Wewordle.py
@@ -8,7 +8,7 @@ from .base_provider import AsyncProvider
class Wewordle(AsyncProvider):
url = "https://wewordle.org"
- working = True
+ working = False
supports_gpt_35_turbo = True
@classmethod
diff --git a/g4f/Provider/Ylokh.py b/g4f/Provider/Ylokh.py
index c7b92089..2187eb78 100644
--- a/g4f/Provider/Ylokh.py
+++ b/g4f/Provider/Ylokh.py
@@ -1,8 +1,8 @@
from __future__ import annotations
import json
-from aiohttp import ClientSession
+from ..requests import AsyncSession
from .base_provider import AsyncGeneratorProvider
from ..typing import AsyncGenerator
@@ -23,14 +23,8 @@ class Ylokh(AsyncGeneratorProvider):
) -> AsyncGenerator:
model = model if model else "gpt-3.5-turbo"
headers = {
- "User-Agent" : "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/116.0",
- "Accept" : "*/*",
- "Accept-language" : "de,en-US;q=0.7,en;q=0.3",
"Origin" : cls.url,
"Referer" : cls.url + "/",
- "Sec-Fetch-Dest" : "empty",
- "Sec-Fetch-Mode" : "cors",
- "Sec-Fetch-Site" : "same-origin",
}
data = {
"messages": messages,
@@ -43,7 +37,7 @@ class Ylokh(AsyncGeneratorProvider):
"stream": stream,
**kwargs
}
- async with ClientSession(
+ async with AsyncSession(
headers=headers
) as session:
async with session.post("https://chatapi.ylokh.xyz/v1/chat/completions", json=data, proxy=proxy) as response:
diff --git a/g4f/requests.py b/g4f/requests.py
index f6f2383b..6f4b587c 100644
--- a/g4f/requests.py
+++ b/g4f/requests.py
@@ -11,7 +11,7 @@ from curl_cffi.requests import Response
from curl_cffi import AsyncCurl
is_newer_0_5_9 = hasattr(AsyncCurl, "remove_handle")
-
+is_newer_0_5_8 = hasattr(BaseSession, "_set_cookies")
class StreamResponse:
def __init__(self, inner: Response, content: StreamReader, request):
@@ -46,6 +46,10 @@ class StreamRequest:
)
self.method = method
self.url = url
+ if "proxy" in kwargs:
+ proxy = kwargs.pop("proxy")
+ if proxy:
+ kwargs["proxies"] = {"http": proxy, "https": proxy}
self.options = kwargs
def on_content(self, data):
@@ -75,7 +79,7 @@ class StreamRequest:
self.handle = self.session.acurl._curl2future[self.curl]
self.handle.add_done_callback(self.on_done)
await self.enter
- if is_newer_0_5_9:
+ if is_newer_0_5_8:
response = self.session._parse_response(self.curl, _, header_buffer)
response.request = request
else:
@@ -91,7 +95,7 @@ class StreamRequest:
self.session.acurl.set_result(self.curl)
self.curl.clean_after_perform()
self.curl.reset()
- self.session.push_curl(self.curl)
+ self.session.push_curl(self.curl)
class AsyncSession(BaseSession):
def request(