From 618addd001077d9e4ed4d2a7aa03769a0ee0901b Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Tue, 12 Sep 2023 04:40:10 +0200 Subject: Disable not working providers: EasyChat, Equing, GetGpt, Liaobots and Wuguokai No and random best provider for a model Update providers in Readme --- g4f/Provider/EasyChat.py | 2 +- g4f/Provider/Equing.py | 6 +++--- g4f/Provider/GetGpt.py | 2 +- g4f/Provider/Liaobots.py | 2 +- g4f/Provider/Wuguokai.py | 11 +++-------- 5 files changed, 9 insertions(+), 14 deletions(-) (limited to 'g4f/Provider') diff --git a/g4f/Provider/EasyChat.py b/g4f/Provider/EasyChat.py index 946d4a4d..dae5196d 100644 --- a/g4f/Provider/EasyChat.py +++ b/g4f/Provider/EasyChat.py @@ -13,7 +13,7 @@ class EasyChat(BaseProvider): url: str = "https://free.easychat.work" supports_stream = True supports_gpt_35_turbo = True - working = True + working = False @staticmethod def create_completion( diff --git a/g4f/Provider/Equing.py b/g4f/Provider/Equing.py index 0ebb93a5..261c53c0 100644 --- a/g4f/Provider/Equing.py +++ b/g4f/Provider/Equing.py @@ -6,12 +6,12 @@ from abc import ABC, abstractmethod import requests from ..typing import Any, CreateResult +from .base_provider import BaseProvider -class Equing(ABC): +class Equing(BaseProvider): url: str = 'https://next.eqing.tech/' - working = True - needs_auth = False + working = False supports_stream = True supports_gpt_35_turbo = True supports_gpt_4 = False diff --git a/g4f/Provider/GetGpt.py b/g4f/Provider/GetGpt.py index 74e772b0..b96efaac 100644 --- a/g4f/Provider/GetGpt.py +++ b/g4f/Provider/GetGpt.py @@ -14,7 +14,7 @@ from .base_provider import BaseProvider class GetGpt(BaseProvider): url = 'https://chat.getgpt.world/' supports_stream = True - working = True + working = False supports_gpt_35_turbo = True @staticmethod diff --git a/g4f/Provider/Liaobots.py b/g4f/Provider/Liaobots.py index 2cc5ff99..33224d2e 100644 --- a/g4f/Provider/Liaobots.py +++ b/g4f/Provider/Liaobots.py @@ -31,7 +31,7 @@ models = { class Liaobots(AsyncGeneratorProvider): url = "https://liaobots.com" - working = True + working = False supports_gpt_35_turbo = True supports_gpt_4 = True _auth_code = None diff --git a/g4f/Provider/Wuguokai.py b/g4f/Provider/Wuguokai.py index a9614626..0a46f6ee 100644 --- a/g4f/Provider/Wuguokai.py +++ b/g4f/Provider/Wuguokai.py @@ -5,13 +5,13 @@ import random import requests from ..typing import Any, CreateResult -from .base_provider import BaseProvider +from .base_provider import BaseProvider, format_prompt class Wuguokai(BaseProvider): url = 'https://chat.wuguokai.xyz' supports_gpt_35_turbo = True - working = True + working = False @staticmethod def create_completion( @@ -20,11 +20,6 @@ class Wuguokai(BaseProvider): stream: bool, **kwargs: Any, ) -> CreateResult: - base = '' - for message in messages: - base += '%s: %s\n' % (message['role'], message['content']) - base += 'assistant:' - headers = { 'authority': 'ai-api.wuguokai.xyz', 'accept': 'application/json, text/plain, */*', @@ -41,7 +36,7 @@ class Wuguokai(BaseProvider): 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36' } data ={ - "prompt": base, + "prompt": format_prompt(messages), "options": {}, "userId": f"#/chat/{random.randint(1,99999999)}", "usingContext": True -- cgit v1.2.3