diff options
author | Tekky <98614666+xtekky@users.noreply.github.com> | 2023-08-25 18:17:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-25 18:17:38 +0200 |
commit | 80f85e851e384e27d07252199f7d0b424b2d1193 (patch) | |
tree | 2c6323a6acba8bf830d5ba49895c831523e23b08 /g4f | |
parent | Merge pull request #833 from hlohaus/bing (diff) | |
parent | Ails Supplementary Identification of Unusual Response Content (diff) | |
download | gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar.gz gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar.bz2 gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar.lz gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar.xz gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.tar.zst gpt4free-80f85e851e384e27d07252199f7d0b424b2d1193.zip |
Diffstat (limited to 'g4f')
-rw-r--r-- | g4f/Provider/Ails.py | 2 | ||||
-rw-r--r-- | g4f/Provider/You.py | 13 | ||||
-rw-r--r-- | g4f/Provider/Yqcloud.py | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/g4f/Provider/Ails.py b/g4f/Provider/Ails.py index 52b3745d..6665b677 100644 --- a/g4f/Provider/Ails.py +++ b/g4f/Provider/Ails.py @@ -72,6 +72,8 @@ class Ails(BaseProvider): if b"content" in token: completion_chunk = json.loads(token.decode().replace("data: ", "")) token = completion_chunk["choices"][0]["delta"].get("content") + if "ai.ls" in token.lower() or "ai.ci" in token.lower(): + raise Exception("Response Error: " + token) if token != None: yield token diff --git a/g4f/Provider/You.py b/g4f/Provider/You.py index 0d8114a8..a8de7dec 100644 --- a/g4f/Provider/You.py +++ b/g4f/Provider/You.py @@ -19,7 +19,7 @@ class You(BaseProvider): stream: bool, **kwargs: Any, ) -> CreateResult: - url_param = _create_url_param(messages) + url_param = _create_url_param(messages, kwargs.get("history", [])) headers = _create_header() url = f"https://you.com/api/streamingSearch?{url_param}" response = requests.get( @@ -28,12 +28,15 @@ class You(BaseProvider): impersonate="chrome107", ) response.raise_for_status() - yield _parse_output(response.text) + yield _parse_output(response.text).encode().decode("unicode_escape") -def _create_url_param(messages: list[dict[str, str]]): - prompt = messages.pop()["content"] - chat = _convert_chat(messages) +def _create_url_param(messages: list[dict[str, str]], history: list[dict[str, str]]): + prompt = "" + for message in messages: + prompt += "%s: %s\n" % (message["role"], message["content"]) + prompt += "assistant:" + chat = _convert_chat(history) param = {"q": prompt, "domain": "youchat", "chat": chat} return urllib.parse.urlencode(param) diff --git a/g4f/Provider/Yqcloud.py b/g4f/Provider/Yqcloud.py index a3147c2d..82ece2d5 100644 --- a/g4f/Provider/Yqcloud.py +++ b/g4f/Provider/Yqcloud.py @@ -35,7 +35,10 @@ def _create_header(): def _create_payload(messages: list[dict[str, str]]): - prompt = messages[-1]["content"] + prompt = "" + for message in messages: + prompt += "%s: %s\n" % (message["role"], message["content"]) + prompt += "assistant:" return { "prompt": prompt, "network": True, |