From 92e1ec6f4ff3d43c951444e1a76024367e215734 Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Sat, 7 Oct 2023 21:21:34 +0100 Subject: [PATCH] ~ | `v-0.1.5.5` Aiivm working again --- g4f/Provider/{deprecated => }/Aivvm.py | 10 +++++++--- g4f/Provider/__init__.py | 2 ++ g4f/Provider/deprecated/__init__.py | 3 +-- g4f/__init__.py | 1 - 4 files changed, 10 insertions(+), 6 deletions(-) rename g4f/Provider/{deprecated => }/Aivvm.py (88%) diff --git a/g4f/Provider/deprecated/Aivvm.py b/g4f/Provider/Aivvm.py similarity index 88% rename from g4f/Provider/deprecated/Aivvm.py rename to g4f/Provider/Aivvm.py index bceb6faf..1a3b6f0b 100644 --- a/g4f/Provider/deprecated/Aivvm.py +++ b/g4f/Provider/Aivvm.py @@ -1,8 +1,8 @@ from __future__ import annotations -from ...requests import StreamSession -from ..base_provider import AsyncGeneratorProvider -from ...typing import AsyncGenerator +from ..requests import StreamSession +from .base_provider import AsyncGeneratorProvider +from ..typing import AsyncGenerator # to recreate this easily, send a post request to https://chat.aivvm.com/api/models models = { @@ -20,6 +20,7 @@ class Aivvm(AsyncGeneratorProvider): url = 'https://chat.aivvm.com' supports_gpt_35_turbo = True supports_gpt_4 = True + working = True @classmethod async def create_async_generator( @@ -51,6 +52,9 @@ class Aivvm(AsyncGeneratorProvider): async with session.post(f"{cls.url}/api/chat", json=json_data) as response: response.raise_for_status() async for chunk in response.iter_content(): + if b'Access denied | chat.aivvm.com used Cloudflare' in chunk: + raise ValueError("Rate Limit | use another provider") + yield chunk.decode() @classmethod diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 7609744e..c7513c35 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -4,6 +4,7 @@ from .AiAsk import AiAsk from .Aibn import Aibn from .Aichat import Aichat from .Ails import Ails +from .Aivvm import Aivvm from .AItianhu import AItianhu from .AItianhuSpace import AItianhuSpace from .Bing import Bing @@ -46,6 +47,7 @@ __all__ = [ 'Aibn', 'Aichat', 'Ails', + 'Aivvm', 'AiService', 'AItianhu', 'AItianhuSpace', diff --git a/g4f/Provider/deprecated/__init__.py b/g4f/Provider/deprecated/__init__.py index d6b93e8d..5c66c87f 100644 --- a/g4f/Provider/deprecated/__init__.py +++ b/g4f/Provider/deprecated/__init__.py @@ -11,5 +11,4 @@ from .Equing import Equing from .Wuguokai import Wuguokai from .V50 import V50 from .FastGpt import FastGpt -from .ChatgptLogin import ChatgptLogin -from .Aivvm import Aivvm \ No newline at end of file +from .ChatgptLogin import ChatgptLogin \ No newline at end of file diff --git a/g4f/__init__.py b/g4f/__init__.py index 586a6d2e..bd4bfde0 100644 --- a/g4f/__init__.py +++ b/g4f/__init__.py @@ -1,5 +1,4 @@ from __future__ import annotations - from requests import get from g4f.models import Model, ModelUtils from .Provider import BaseProvider