diff options
author | kqlio67 <166700875+kqlio67@users.noreply.github.com> | 2024-08-01 00:32:50 +0200 |
---|---|---|
committer | kqlio67 <166700875+kqlio67@users.noreply.github.com> | 2024-08-01 00:32:50 +0200 |
commit | 93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8 (patch) | |
tree | 203d4138d994e03f0e9954cb74d52d70963c4904 /g4f | |
parent | Adding a new FreeNetfly provider (diff) | |
download | gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar.gz gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar.bz2 gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar.lz gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar.xz gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.tar.zst gpt4free-93fa8960fead232b0bf9d44e0d2c5bcfbf5726f8.zip |
Diffstat (limited to 'g4f')
-rw-r--r-- | g4f/Provider/MagickPenAsk.py | 50 | ||||
-rw-r--r-- | g4f/Provider/MagickPenChat.py | 50 | ||||
-rw-r--r-- | g4f/Provider/TeachAnything.py | 62 | ||||
-rw-r--r-- | g4f/Provider/__init__.py | 3 | ||||
-rw-r--r-- | g4f/models.py | 10 |
5 files changed, 171 insertions, 4 deletions
diff --git a/g4f/Provider/MagickPenAsk.py b/g4f/Provider/MagickPenAsk.py new file mode 100644 index 00000000..54058228 --- /dev/null +++ b/g4f/Provider/MagickPenAsk.py @@ -0,0 +1,50 @@ +from __future__ import annotations + +from aiohttp import ClientSession + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin +from .helper import format_prompt + + +class MagickPenAsk(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://api.magickpen.com" + api_endpoint = "/ask" + working = True + supports_gpt_4 = True + default_model = "gpt-4o" + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "application/json, text/plain, */*", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "dnt": "1", + "origin": "https://magickpen.com", + "priority": "u=1, i", + "referer": "https://magickpen.com/", + "sec-ch-ua": '"Not/A)Brand";v="8", "Chromium";v="126"', + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": '"Linux"', + "sec-fetch-dest": "empty", + "sec-fetch-mode": "cors", + "sec-fetch-site": "same-site", + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36" + } + async with ClientSession(headers=headers) as session: + data = { + "query": format_prompt(messages), + "plan": "Pay as you go" + } + async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content: + if chunk: + yield chunk.decode() diff --git a/g4f/Provider/MagickPenChat.py b/g4f/Provider/MagickPenChat.py new file mode 100644 index 00000000..6c30028a --- /dev/null +++ b/g4f/Provider/MagickPenChat.py @@ -0,0 +1,50 @@ +from __future__ import annotations + +from aiohttp import ClientSession + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin +from .helper import format_prompt + + +class MagickPenChat(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://api.magickpen.com" + api_endpoint = "/chat/free" + working = True + supports_gpt_4 = True + default_model = "gpt-4o-mini" + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "application/json, text/plain, */*", + "accept-language": "en-US,en;q=0.9", + "access-control-allow-origin": "*", + "content-type": "application/json", + "dnt": "1", + "origin": "https://magickpen.com", + "priority": "u=1, i", + "referer": "https://magickpen.com/", + "sec-ch-ua": '"Not/A)Brand";v="8", "Chromium";v="126"', + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": '"Linux"', + "sec-fetch-dest": "empty", + "sec-fetch-mode": "cors", + "sec-fetch-site": "same-site", + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36" + } + async with ClientSession(headers=headers) as session: + data = { + "history": [{"role": "user", "content": format_prompt(messages)}] + } + async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content: + if chunk: + yield chunk.decode() diff --git a/g4f/Provider/TeachAnything.py b/g4f/Provider/TeachAnything.py new file mode 100644 index 00000000..908dd56e --- /dev/null +++ b/g4f/Provider/TeachAnything.py @@ -0,0 +1,62 @@ +from __future__ import annotations + +from typing import Any, Dict + +from aiohttp import ClientSession, ClientTimeout + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin +from .helper import format_prompt + + +class TeachAnything(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://www.teach-anything.com" + api_endpoint = "/api/generate" + working = True + default_model = "llama-3-70b-instruct" + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str | None = None, + **kwargs: Any + ) -> AsyncResult: + headers = cls._get_headers() + + async with ClientSession(headers=headers) as session: + prompt = format_prompt(messages) + data = {"prompt": prompt} + + timeout = ClientTimeout(total=60) + + async with session.post( + f"{cls.url}{cls.api_endpoint}", + json=data, + proxy=proxy, + timeout=timeout + ) as response: + response.raise_for_status() + async for chunk in response.content.iter_any(): + if chunk: + yield chunk.decode() + + @staticmethod + def _get_headers() -> Dict[str, str]: + return { + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "dnt": "1", + "origin": "https://www.teach-anything.com", + "priority": "u=1, i", + "referer": "https://www.teach-anything.com/", + "sec-ch-ua": '"Not/A)Brand";v="8", "Chromium";v="126"', + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": '"Linux"', + "sec-fetch-dest": "empty", + "sec-fetch-mode": "cors", + "sec-fetch-site": "same-origin", + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36" + } diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 0c512060..8bbf71b3 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -40,6 +40,8 @@ from .Liaobots import Liaobots from .LiteIcoding import LiteIcoding from .Llama import Llama from .Local import Local +from .MagickPenAsk import MagickPenAsk +from .MagickPenChat import MagickPenChat from .Marsyoo import Marsyoo from .MetaAI import MetaAI from .MetaAIAccount import MetaAIAccount @@ -50,6 +52,7 @@ from .Pizzagpt import Pizzagpt from .Reka import Reka from .Replicate import Replicate from .ReplicateHome import ReplicateHome +from .TeachAnything import TeachAnything from .Vercel import Vercel from .WhiteRabbitNeo import WhiteRabbitNeo from .You import You diff --git a/g4f/models.py b/g4f/models.py index 0ad87514..b6b54792 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -27,6 +27,8 @@ from .Provider import ( Koala, Liaobots, LiteIcoding, + MagickPenAsk, + MagickPenChat, Marsyoo, MetaAI, OpenaiChat, @@ -36,6 +38,7 @@ from .Provider import ( Reka, Replicate, ReplicateHome, + TeachAnything, You, ) @@ -109,7 +112,6 @@ gpt_35_turbo = Model( Koala, ChatgptFree, FreeChatgpt, - DDG, AI365VIP, Pizzagpt, Allyfy, @@ -136,7 +138,7 @@ gpt_4o = Model( name = 'gpt-4o', base_provider = 'openai', best_provider = IterListProvider([ - You, Liaobots, Chatgpt4o, AI365VIP, OpenaiChat, Marsyoo, LiteIcoding + You, Liaobots, Chatgpt4o, AI365VIP, OpenaiChat, Marsyoo, LiteIcoding, MagickPenAsk, ]) ) @@ -144,7 +146,7 @@ gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'openai', best_provider = IterListProvider([ - Liaobots, OpenaiChat, You, FreeNetfly + DDG, Liaobots, OpenaiChat, You, FreeNetfly, MagickPenChat, ]) ) @@ -179,7 +181,7 @@ llama_3_70b_instruct = Model( llama_3_70b_instruct = Model( name = "meta/meta-llama-3-70b-instruct", base_provider = "meta", - best_provider = IterListProvider([ReplicateHome]) + best_provider = IterListProvider([ReplicateHome, TeachAnything]) ) llama_3_70b_chat_hf = Model( |