From 8adaf3320206cc5bf45d49cb06d1a1111a2e24be Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 12:35:55 +0200 Subject: feat(g4f/client/async_client.py): refactor for async client implementation --- g4f/client/AsyncClient.py | 38 ++++++++++++++++++++++++++++++++++++++ g4f/client/__init__.py | 3 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 g4f/client/AsyncClient.py diff --git a/g4f/client/AsyncClient.py b/g4f/client/AsyncClient.py new file mode 100644 index 00000000..fd2cc353 --- /dev/null +++ b/g4f/client/AsyncClient.py @@ -0,0 +1,38 @@ +from __future__ import annotations + +from .Client import Client, Chat, Images, Completions +from .Client import async_iter_response, async_iter_append_model_and_provider +from aiohttp import ClientSession +from typing import Union, AsyncIterator + +class AsyncClient(Client): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.chat = AsyncChat(self) + self._images = AsyncImages(self) + + @property + def images(self) -> 'AsyncImages': + return self._images + +class AsyncCompletions(Completions): + async def async_create(self, *args, **kwargs) -> Union['ChatCompletion', AsyncIterator['ChatCompletionChunk']]: + response = await super().async_create(*args, **kwargs) + async for result in response: + return result + +class AsyncChat(Chat): + def __init__(self, client: AsyncClient): + self.completions = AsyncCompletions(client) + +class AsyncImages(Images): + async def async_generate(self, *args, **kwargs) -> 'ImagesResponse': + return await super().async_generate(*args, **kwargs) + + async def _fetch_image(self, url: str) -> bytes: + async with ClientSession() as session: + async with session.get(url) as resp: + if resp.status == 200: + return await resp.read() + else: + raise Exception(f"Failed to fetch image from {url}, status code {resp.status}") diff --git a/g4f/client/__init__.py b/g4f/client/__init__.py index d1e7e298..0d4685cc 100644 --- a/g4f/client/__init__.py +++ b/g4f/client/__init__.py @@ -1,2 +1,3 @@ from .stubs import ChatCompletion, ChatCompletionChunk, ImagesResponse -from .client import Client, AsyncClient +from .client import Client +from .client import AsyncClient -- cgit v1.2.3 From b100bff8c850090dad1ff520bdaf2e7683e52788 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 12:40:52 +0200 Subject: feat(README.md): update readme for enhanced clarity and structure --- README.md | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ed8fd61d..6eeeb430 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ + ![248433934-7886223b-c1d1-4260-82aa-da5741f303bb](https://github.com/xtekky/gpt4free/assets/98614666/ea012c87-76e0-496a-8ac4-e2de090cc6c9) xtekky%2Fgpt4free | Trendshift @@ -28,7 +29,7 @@ docker pull hlohaus789/g4f ``` ## 🆕 What's New - - **For comprehensive details on new features and updates, please refer to our [Releases](https://github.com/xtekky/gpt4free/releases) page** + - **For comprehensive details on new features and updates, please refer to our** [Releases](https://github.com/xtekky/gpt4free/releases) **page** - **Installation Guide for Windows (.exe):** 💻 [Installation Guide for Windows (.exe)](#installation-guide-for-windows-exe) - **Join our Telegram Channel:** 📨 [telegram.me/g4f_channel](https://telegram.me/g4f_channel) - **Join our Discord Group:** 💬 [discord.gg/XfybzPXPH5](https://discord.gg/5E39JUWUFa) @@ -70,6 +71,13 @@ Is your site on this repository and you want to take it down? Send an email to t - [Interference API](#interference-api) - [Local Inference](docs/local.md) - [Configuration](#configuration) + - [Full Documentation for Python API](#full-documentation-for-python-api) + - **New:** + - [Async Client API from G4F](docs/async_client.md) + - [Client API like the OpenAI Python library](docs/client.md) + - **Legacy** + - [Legacy API with python modules](docs/legacy/legacy.md) + - [Legacy AsyncClient API from G4F](docs/legacy/legacy_async_client.md) - [🚀 Providers and Models](docs/providers-and-models.md) - [🔗 Powered by gpt4free](#-powered-by-gpt4free) - [🤝 Contribute](#-contribute) @@ -194,10 +202,14 @@ print(f"Generated image URL: {image_url}") [![Image with cat](/docs/cat.jpeg)](docs/client.md) -**Full Documentation for Python API** - - **Async Client API from G4F:** [/docs/async_client](docs/async_client.md) - - **Client API like the OpenAI Python library:** [/docs/client](docs/client.md) - - **Legacy API with python modules:** [/docs/legacy](docs/legacy.md) +#### **Full Documentation for Python API** + - **New:** + - **Async Client API from G4F:** [/docs/async_client](docs/async_client.md) + - **Client API like the OpenAI Python library:** [/docs/client](docs/client.md) + + - **Legacy:** + - **Legacy API with python modules:** [/docs/legacy/legacy](docs/legacy/legacy.md) + - **Legacy AsyncClient API from G4F:** [/docs/async_client](docs/legacy/legacy_async_client.md) #### Web UI **To start the web interface, type the following codes in python:** @@ -290,20 +302,18 @@ To utilize the OpenaiChat provider, a .har file is required from https://chatgpt - Place the exported .har file in the `./har_and_cookies` directory if you are using Docker. Alternatively, you can store it in any preferred location within your current working directory. -Note: Ensure that your .har file is stored securely, as it may contain sensitive information. +> **Note:** Ensure that your .har file is stored securely, as it may contain sensitive information. #### Using Proxy If you want to hide or change your IP address for the providers, you can set a proxy globally via an environment variable: -- On macOS and Linux: - +**- On macOS and Linux:** ```bash export G4F_PROXY="http://host:port" ``` -- On Windows: - +**- On Windows:** ```bash set G4F_PROXY=http://host:port ``` @@ -770,10 +780,10 @@ set G4F_PROXY=http://host:port We welcome contributions from the community. Whether you're adding new providers or features, or simply fixing typos and making small improvements, your input is valued. Creating a pull request is all it takes – our co-pilot will handle the code review process. Once all changes have been addressed, we'll merge the pull request into the main branch and release the updates at a later time. ###### Guide: How do i create a new Provider? - - Read: [Create Provider Guide](docs/guides/create_provider.md) + - **Read:** [Create Provider Guide](docs/guides/create_provider.md) ###### Guide: How can AI help me with writing code? - - Read: [AI Assistance Guide](docs/guides/help_me.md) + - **Read:** [AI Assistance Guide](docs/guides/help_me.md) ## 🙌 Contributors A list of all contributors is available [here](https://github.com/xtekky/gpt4free/graphs/contributors) -- cgit v1.2.3 From b80c397e160187d6343cb01e71d8110e3b651db7 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 12:41:29 +0200 Subject: Update (g4f/models.py) --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/models.py b/g4f/models.py index 32a12d10..bea09f28 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -792,7 +792,7 @@ playground_v2_5 = Model( flux = Model( name = 'flux', base_provider = 'Flux AI', - best_provider = IterListProvider([Airforce, Blackbox]) + best_provider = IterListProvider([Blackbox, Airforce]) ) -- cgit v1.2.3 From 308d4a7f035113b27e5b267c27a8a3bba842735d Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 12:42:01 +0200 Subject: Update (docs/) --- docs/legacy.md | 200 ------------------- docs/legacy/legacy.md | 200 +++++++++++++++++++ docs/legacy/legacy_async_client.md | 380 +++++++++++++++++++++++++++++++++++++ 3 files changed, 580 insertions(+), 200 deletions(-) delete mode 100644 docs/legacy.md create mode 100644 docs/legacy/legacy.md create mode 100644 docs/legacy/legacy_async_client.md diff --git a/docs/legacy.md b/docs/legacy.md deleted file mode 100644 index d5cd5a36..00000000 --- a/docs/legacy.md +++ /dev/null @@ -1,200 +0,0 @@ -### G4F - Legacy API - -#### ChatCompletion - -```python -import g4f - -g4f.debug.logging = True # Enable debug logging -g4f.debug.version_check = False # Disable automatic version checking -print(g4f.Provider.Bing.params) # Print supported args for Bing - -# Using automatic a provider for the given model -## Streamed completion -response = g4f.ChatCompletion.create( - model="gpt-3.5-turbo", - messages=[{"role": "user", "content": "Hello"}], - stream=True, -) -for message in response: - print(message, flush=True, end='') - -## Normal response -response = g4f.ChatCompletion.create( - model=g4f.models.gpt_4, - messages=[{"role": "user", "content": "Hello"}], -) # Alternative model setting - -print(response) -``` - -##### Completion - -```python -import g4f - -allowed_models = [ - 'code-davinci-002', - 'text-ada-001', - 'text-babbage-001', - 'text-curie-001', - 'text-davinci-002', - 'text-davinci-003' -] - -response = g4f.Completion.create( - model='text-davinci-003', - prompt='say this is a test' -) - -print(response) -``` - -##### Providers - -```python -import g4f - -# Print all available providers -print([ - provider.__name__ - for provider in g4f.Provider.__providers__ - if provider.working -]) - -# Execute with a specific provider -response = g4f.ChatCompletion.create( - model="gpt-3.5-turbo", - provider=g4f.Provider.Aichat, - messages=[{"role": "user", "content": "Hello"}], - stream=True, -) -for message in response: - print(message) -``` - - -##### Image Upload & Generation - -Image upload and generation are supported by three main providers: - -- **Bing & Other GPT-4 Providers:** Utilizes Microsoft's Image Creator. -- **Google Gemini:** Available for free accounts with IP addresses outside Europe. -- **OpenaiChat with GPT-4:** Accessible for users with a Plus subscription. - -```python -import g4f - -# Setting up the request for image creation -response = g4f.ChatCompletion.create( - model=g4f.models.default, # Using the default model - provider=g4f.Provider.Gemini, # Specifying the provider as Gemini - messages=[{"role": "user", "content": "Create an image like this"}], - image=open("images/g4f.png", "rb"), # Image input can be a data URI, bytes, PIL Image, or IO object - image_name="g4f.png" # Optional: specifying the filename -) - -# Displaying the response -print(response) - -from g4f.image import ImageResponse - -# Get image links from response -for chunk in g4f.ChatCompletion.create( - model=g4f.models.default, # Using the default model - provider=g4f.Provider.OpenaiChat, # Specifying the provider as OpenaiChat - messages=[{"role": "user", "content": "Create images with dogs"}], - access_token="...", # Need a access token from a plus user - stream=True, - ignore_stream=True -): - if isinstance(chunk, ImageResponse): - print(chunk.images) # Print generated image links - print(chunk.alt) # Print used prompt for image generation -``` - -##### Using Browser - -Some providers using a browser to bypass the bot protection. They using the selenium webdriver to control the browser. The browser settings and the login data are saved in a custom directory. If the headless mode is enabled, the browser windows are loaded invisibly. For performance reasons, it is recommended to reuse the browser instances and close them yourself at the end: - -```python -import g4f -from undetected_chromedriver import Chrome, ChromeOptions -from g4f.Provider import ( - Bard, - Poe, - AItianhuSpace, - MyShell, - PerplexityAi, -) - -options = ChromeOptions() -options.add_argument("--incognito"); -webdriver = Chrome(options=options, headless=True) -for idx in range(10): - response = g4f.ChatCompletion.create( - model=g4f.models.default, - provider=g4f.Provider.MyShell, - messages=[{"role": "user", "content": "Suggest me a name."}], - webdriver=webdriver - ) - print(f"{idx}:", response) -webdriver.quit() -``` - -##### Async Support - -To enhance speed and overall performance, execute providers asynchronously. The total execution time will be determined by the duration of the slowest provider's execution. - -```python -import g4f -import asyncio - -_providers = [ - g4f.Provider.Aichat, - g4f.Provider.ChatBase, - g4f.Provider.Bing, - g4f.Provider.GptGo, - g4f.Provider.You, - g4f.Provider.Yqcloud, -] - -async def run_provider(provider: g4f.Provider.BaseProvider): - try: - response = await g4f.ChatCompletion.create_async( - model=g4f.models.default, - messages=[{"role": "user", "content": "Hello"}], - provider=provider, - ) - print(f"{provider.__name__}:", response) - except Exception as e: - print(f"{provider.__name__}:", e) - -async def run_all(): - calls = [ - run_provider(provider) for provider in _providers - ] - await asyncio.gather(*calls) - -asyncio.run(run_all()) -``` - -##### Proxy and Timeout Support - -All providers support specifying a proxy and increasing timeout in the create functions. - -```python -import g4f - -response = g4f.ChatCompletion.create( - model=g4f.models.default, - messages=[{"role": "user", "content": "Hello"}], - proxy="http://host:port", - # or socks5://user:pass@host:port - timeout=120, # in secs -) - -print(f"Result:", response) -``` - -[Return to Home](/) \ No newline at end of file diff --git a/docs/legacy/legacy.md b/docs/legacy/legacy.md new file mode 100644 index 00000000..d5cd5a36 --- /dev/null +++ b/docs/legacy/legacy.md @@ -0,0 +1,200 @@ +### G4F - Legacy API + +#### ChatCompletion + +```python +import g4f + +g4f.debug.logging = True # Enable debug logging +g4f.debug.version_check = False # Disable automatic version checking +print(g4f.Provider.Bing.params) # Print supported args for Bing + +# Using automatic a provider for the given model +## Streamed completion +response = g4f.ChatCompletion.create( + model="gpt-3.5-turbo", + messages=[{"role": "user", "content": "Hello"}], + stream=True, +) +for message in response: + print(message, flush=True, end='') + +## Normal response +response = g4f.ChatCompletion.create( + model=g4f.models.gpt_4, + messages=[{"role": "user", "content": "Hello"}], +) # Alternative model setting + +print(response) +``` + +##### Completion + +```python +import g4f + +allowed_models = [ + 'code-davinci-002', + 'text-ada-001', + 'text-babbage-001', + 'text-curie-001', + 'text-davinci-002', + 'text-davinci-003' +] + +response = g4f.Completion.create( + model='text-davinci-003', + prompt='say this is a test' +) + +print(response) +``` + +##### Providers + +```python +import g4f + +# Print all available providers +print([ + provider.__name__ + for provider in g4f.Provider.__providers__ + if provider.working +]) + +# Execute with a specific provider +response = g4f.ChatCompletion.create( + model="gpt-3.5-turbo", + provider=g4f.Provider.Aichat, + messages=[{"role": "user", "content": "Hello"}], + stream=True, +) +for message in response: + print(message) +``` + + +##### Image Upload & Generation + +Image upload and generation are supported by three main providers: + +- **Bing & Other GPT-4 Providers:** Utilizes Microsoft's Image Creator. +- **Google Gemini:** Available for free accounts with IP addresses outside Europe. +- **OpenaiChat with GPT-4:** Accessible for users with a Plus subscription. + +```python +import g4f + +# Setting up the request for image creation +response = g4f.ChatCompletion.create( + model=g4f.models.default, # Using the default model + provider=g4f.Provider.Gemini, # Specifying the provider as Gemini + messages=[{"role": "user", "content": "Create an image like this"}], + image=open("images/g4f.png", "rb"), # Image input can be a data URI, bytes, PIL Image, or IO object + image_name="g4f.png" # Optional: specifying the filename +) + +# Displaying the response +print(response) + +from g4f.image import ImageResponse + +# Get image links from response +for chunk in g4f.ChatCompletion.create( + model=g4f.models.default, # Using the default model + provider=g4f.Provider.OpenaiChat, # Specifying the provider as OpenaiChat + messages=[{"role": "user", "content": "Create images with dogs"}], + access_token="...", # Need a access token from a plus user + stream=True, + ignore_stream=True +): + if isinstance(chunk, ImageResponse): + print(chunk.images) # Print generated image links + print(chunk.alt) # Print used prompt for image generation +``` + +##### Using Browser + +Some providers using a browser to bypass the bot protection. They using the selenium webdriver to control the browser. The browser settings and the login data are saved in a custom directory. If the headless mode is enabled, the browser windows are loaded invisibly. For performance reasons, it is recommended to reuse the browser instances and close them yourself at the end: + +```python +import g4f +from undetected_chromedriver import Chrome, ChromeOptions +from g4f.Provider import ( + Bard, + Poe, + AItianhuSpace, + MyShell, + PerplexityAi, +) + +options = ChromeOptions() +options.add_argument("--incognito"); +webdriver = Chrome(options=options, headless=True) +for idx in range(10): + response = g4f.ChatCompletion.create( + model=g4f.models.default, + provider=g4f.Provider.MyShell, + messages=[{"role": "user", "content": "Suggest me a name."}], + webdriver=webdriver + ) + print(f"{idx}:", response) +webdriver.quit() +``` + +##### Async Support + +To enhance speed and overall performance, execute providers asynchronously. The total execution time will be determined by the duration of the slowest provider's execution. + +```python +import g4f +import asyncio + +_providers = [ + g4f.Provider.Aichat, + g4f.Provider.ChatBase, + g4f.Provider.Bing, + g4f.Provider.GptGo, + g4f.Provider.You, + g4f.Provider.Yqcloud, +] + +async def run_provider(provider: g4f.Provider.BaseProvider): + try: + response = await g4f.ChatCompletion.create_async( + model=g4f.models.default, + messages=[{"role": "user", "content": "Hello"}], + provider=provider, + ) + print(f"{provider.__name__}:", response) + except Exception as e: + print(f"{provider.__name__}:", e) + +async def run_all(): + calls = [ + run_provider(provider) for provider in _providers + ] + await asyncio.gather(*calls) + +asyncio.run(run_all()) +``` + +##### Proxy and Timeout Support + +All providers support specifying a proxy and increasing timeout in the create functions. + +```python +import g4f + +response = g4f.ChatCompletion.create( + model=g4f.models.default, + messages=[{"role": "user", "content": "Hello"}], + proxy="http://host:port", + # or socks5://user:pass@host:port + timeout=120, # in secs +) + +print(f"Result:", response) +``` + +[Return to Home](/) \ No newline at end of file diff --git a/docs/legacy/legacy_async_client.md b/docs/legacy/legacy_async_client.md new file mode 100644 index 00000000..5ddc2671 --- /dev/null +++ b/docs/legacy/legacy_async_client.md @@ -0,0 +1,380 @@ +# G4F - Legacy AsyncClient API Guide + +**IMPORTANT: This guide refers to the old implementation of AsyncClient. The new version of G4F now supports both synchronous and asynchronous operations through a unified interface. Please refer to the [new AsyncClient documentation](https://github.com/xtekky/gpt4free/blob/main/docs/async_client.md) for the latest information.** + +This guide provides comprehensive information on how to use the G4F AsyncClient API, including setup, usage examples, best practices, and important considerations for optimal performance. + +## Compatibility Note +The G4F AsyncClient API is designed to be compatible with the OpenAI API, making it easy for developers familiar with OpenAI's interface to transition to G4F. However, please note that this is the old version, and you should migrate to the new implementation for better support and features. + +## Table of Contents + - [Introduction](#introduction) + - [Key Features](#key-features) + - [Getting Started](#getting-started) + - [Initializing the Client](#initializing-the-client) + - [Creating Chat Completions](#creating-chat-completions) + - [Configuration](#configuration) + - [Usage Examples](#usage-examples) + - [Text Completions](#text-completions) + - [Streaming Completions](#streaming-completions) + - [Using a Vision Model](#using-a-vision-model) + - [Image Generation](#image-generation) + - [Concurrent Tasks](#concurrent-tasks-with-asynciogather) + - [Available Models and Providers](#available-models-and-providers) + - [Error Handling and Best Practices](#error-handling-and-best-practices) + - [Rate Limiting and API Usage](#rate-limiting-and-api-usage) + - [Conclusion](#conclusion) + +## Introduction +This is the old version: The G4F AsyncClient API is an asynchronous version of the standard G4F Client API. It offers the same functionality as the synchronous API but with improved performance due to its asynchronous nature. This guide will walk you through the key features and usage of the G4F AsyncClient API. + +## Key Features + - **Custom Providers**: Use custom providers for enhanced flexibility. + - **ChatCompletion Interface**: Interact with chat models through the ChatCompletion class. + - **Streaming Responses**: Get responses iteratively as they are received. + - **Non-Streaming Responses**: Generate complete responses in a single call. + - **Image Generation and Vision Models**: Support for image-related tasks. + +## Getting Started +**To ignore DeprecationWarnings related to the AsyncClient, you can use the following code:*** +```python +import warnings + +# Ignore DeprecationWarning for AsyncClient +warnings.filterwarnings("ignore", category=DeprecationWarning, module="g4f.client") +``` + +### Initializing the Client +**To use the G4F `Client`, create a new instance:** +```python +from g4f.client import AsyncClient +from g4f.Provider import OpenaiChat, Gemini + +client = AsyncClient( + provider=OpenaiChat, + image_provider=Gemini, + # Add other parameters as needed +) +``` + +## Creating Chat Completions +**Here's an improved example of creating chat completions:** +```python +response = await async_client.chat.completions.create( + model="gpt-3.5-turbo", + messages=[ + { + "role": "user", + "content": "Say this is a test" + } + ] + # Add other parameters as needed +) +``` + +**This example:** + - Asks a specific question `Say this is a test` + - Configures various parameters like temperature and max_tokens for more control over the output + - Disables streaming for a complete response + +You can adjust these parameters based on your specific needs. + +### Configuration +**Configure the `AsyncClient` with additional settings:** +```python +client = Client( + api_key="your_api_key_here", + proxies="http://user:pass@host", + # Add other parameters as needed +) +``` + +## Usage Examples +### Text Completions +**Generate text completions using the ChatCompletions endpoint:** +```python +import asyncio +import warnings +from g4f.client import AsyncClient + +# Ігноруємо DeprecationWarning +warnings.filterwarnings("ignore", category=DeprecationWarning) + +async def main(): + client = AsyncClient() + + response = await client.chat.completions.async_create( + model="gpt-3.5-turbo", + messages=[ + { + "role": "user", + "content": "Say this is a test" + } + ] + ) + + print(response.choices[0].message.content) + +asyncio.run(main()) +``` + +### Streaming Completions +**Process responses incrementally as they are generated:** +```python +import asyncio +from g4f.client import AsyncClient + +async def main(): + client = AsyncClient() + + stream = await client.chat.completions.async_create( + model="gpt-4", + messages=[ + { + "role": "user", + "content": "Say this is a test" + } + ], + stream=True, + ) + + async for chunk in stream: + if chunk.choices[0].delta.content: + print(chunk.choices[0].delta.content, end="") + +asyncio.run(main()) +``` + +### Using a Vision Model +**Analyze an image and generate a description:** +```python +import g4f +import requests +import asyncio +from g4f.client import AsyncClient + +async def main(): + client = AsyncClient() + + image = requests.get("https://raw.githubusercontent.com/xtekky/gpt4free/refs/heads/main/docs/cat.jpeg", stream=True).raw + + response = await client.chat.completions.async_create( + model=g4f.models.default, + provider=g4f.Provider.Bing, + messages=[ + { + "role": "user", + "content": "What's in this image?" + } + ], + image=image + ) + + print(response.choices[0].message.content) + +asyncio.run(main()) +``` + +### Image Generation +**Generate images using a specified prompt:** +```python +import asyncio +from g4f.client import AsyncClient + +async def main(): + client = AsyncClient() + + response = await client.images.async_generate( + prompt="a white siamese cat", + model="flux" + ) + + image_url = response.data[0].url + print(f"Generated image URL: {image_url}") + +asyncio.run(main()) +``` + +#### Base64 Response Format +```python +import asyncio +from g4f.client import AsyncClient + +async def main(): + client = AsyncClient() + + response = await client.images.async_generate( + prompt="a white siamese cat", + model="flux", + response_format="b64_json" + ) + + base64_text = response.data[0].b64_json + print(base64_text) + +asyncio.run(main()) +``` + +### Concurrent Tasks with asyncio.gather +**Execute multiple tasks concurrently:** +```python +import asyncio +import warnings +from g4f.client import AsyncClient + +# Ignore DeprecationWarning for AsyncClient +warnings.filterwarnings("ignore", category=DeprecationWarning, module="g4f.client") + +async def main(): + client = AsyncClient() + + task1 = client.chat.completions.async_create( + model="gpt-3.5-turbo", + messages=[ + { + "role": "user", + "content": "Say this is a test" + } + ] + ) + + task2 = client.images.async_generate( + model="flux", + prompt="a white siamese cat" + ) + + chat_response, image_response = await asyncio.gather(task1, task2) + + print("Chat Response:") + print(chat_response.choices[0].message.content) + + print("Image Response:") + print(image_response.data[0].url) + +asyncio.run(main()) +``` + +## Available Models and Providers +This is the old version: The G4F AsyncClient supports a wide range of AI models and providers, allowing you to choose the best option for your specific use case. +**Here's a brief overview of the available models and providers:** + +### Models + - GPT-3.5-Turbo + - GPT-4 + - DALL-E 3 + - Gemini + - Claude (Anthropic) + - And more... + +### Providers + - OpenAI + - Google (for Gemini) + - Anthropic + - Bing + - Custom providers + +**To use a specific model or provider, specify it when creating the client or in the API call:** +```python +client = AsyncClient(provider=g4f.Provider.OpenaiChat) + +# or + +response = await client.chat.completions.async_create( + model="gpt-4", + provider=g4f.Provider.Bing, + messages=[ + { + "role": "user", + "content": "Hello, world!" + } + ] +) +``` + +## Error Handling and Best Practices +Implementing proper error handling and following best practices is crucial when working with the G4F AsyncClient API. This ensures your application remains robust and can gracefully handle various scenarios. **Here are some key practices to follow:** + +1. **Use try-except blocks to catch and handle exceptions:** +```python +try: + response = await client.chat.completions.async_create( + model="gpt-3.5-turbo", + messages=[ + { + "role": "user", + "content": "Hello, world!" + } + ] + ) +except Exception as e: + print(f"An error occurred: {e}") +``` + +2. **Check the response status and handle different scenarios:** +```python +if response.choices: + print(response.choices[0].message.content) +else: + print("No response generated") +``` + +3. **Implement retries for transient errors:** +```python +import asyncio +from tenacity import retry, stop_after_attempt, wait_exponential + +@retry(stop=stop_after_attempt(3), wait=wait_exponential(multiplier=1, min=4, max=10)) +async def make_api_call(): + # Your API call here + pass +``` + +## Rate Limiting and API Usage +This is the old version: When working with the G4F AsyncClient API, it's important to implement rate limiting and monitor your API usage. This helps ensure fair usage, prevents overloading the service, and optimizes your application's performance. **Here are some key strategies to consider:** + +1. **Implement rate limiting in your application:** +```python +import asyncio +from aiolimiter import AsyncLimiter + +rate_limit = AsyncLimiter(max_rate=10, time_period=1) # 10 requests per second + +async def make_api_call(): + async with rate_limit: + # Your API call here + pass +``` + +2. **Monitor your API usage and implement logging:** +```python +import logging + +logging.basicConfig(level=logging.INFO) +logger = logging.getLogger(__name__) + +async def make_api_call(): + try: + response = await client.chat.completions.async_create(...) + logger.info(f"API call successful. Tokens used: {response.usage.total_tokens}") + except Exception as e: + logger.error(f"API call failed: {e}") +``` + +3. **Use caching to reduce API calls for repeated queries:** +```python +from functools import lru_cache + +@lru_cache(maxsize=100) +def get_cached_response(query): + # Your API call here + pass +``` + +## Conclusion +This is the old version: The G4F AsyncClient API provides a powerful and flexible way to interact with various AI models asynchronously. By leveraging its features and following best practices, you can build efficient and responsive applications that harness the power of AI for text generation, image analysis, and image creation. + +Remember to handle errors gracefully, implement rate limiting, and monitor your API usage to ensure optimal performance and reliability in your applications. + +--- + +[Return to Home](/) -- cgit v1.2.3 From b11cf3ab4babb0493856c194a542b7b70d1a7728 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 14:09:16 +0200 Subject: feat(g4f/client/client.py): integrate ModelUtils for model retrieval --- g4f/client/client.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/g4f/client/client.py b/g4f/client/client.py index 8e195213..07db107a 100644 --- a/g4f/client/client.py +++ b/g4f/client/client.py @@ -184,8 +184,12 @@ class Completions: ignore_stream: bool = False, **kwargs ) -> Union[ChatCompletion, Iterator[ChatCompletionChunk]]: - model, provider = get_model_and_provider( - model, + # We use ModelUtils to obtain the model object. + model_instance = ModelUtils.get_model(model) + + # We receive the model and the provider. + model_name, provider = get_model_and_provider( + model_instance.name, # We use the model name from the object. self.provider if provider is None else provider, stream, ignored, @@ -196,9 +200,8 @@ class Completions: stop = [stop] if isinstance(stop, str) else stop if asyncio.iscoroutinefunction(provider.create_completion): - # Run the asynchronous function in an event loop response = asyncio.run(provider.create_completion( - model, + model_name, # We use a model based on the object. messages, stream=stream, **filter_none( @@ -211,7 +214,7 @@ class Completions: )) else: response = provider.create_completion( - model, + model_name, # We use a model from the object. messages, stream=stream, **filter_none( @@ -225,21 +228,19 @@ class Completions: if stream: if hasattr(response, '__aiter__'): - # It's an async generator, wrap it into a sync iterator response = to_sync_iter(response) - # Now 'response' is an iterator response = iter_response(response, stream, response_format, max_tokens, stop) response = iter_append_model_and_provider(response) return response else: if hasattr(response, '__aiter__'): - # If response is an async generator, collect it into a list response = list(to_sync_iter(response)) response = iter_response(response, stream, response_format, max_tokens, stop) response = iter_append_model_and_provider(response) return next(response) + async def async_create( self, messages: Messages, -- cgit v1.2.3 From 6e72483617b7e66d08952844e8dce6e096929c26 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 14:10:57 +0200 Subject: feat(g4f/models.py): add versioning support for model retrieval --- g4f/models.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/g4f/models.py b/g4f/models.py index bea09f28..2378079b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -891,6 +891,17 @@ any_dark = Model( ) + +class ModelVersions: + # Global Prefixes for All Models + GLOBAL_PREFIXES = [":latest"] + + # Specific Prefixes for Particular Models + MODEL_SPECIFIC_PREFIXES = { + #frozenset(["gpt-3.5-turbo", "gpt-4"]): [":custom1", ":custom2"] + #frozenset(["gpt-3.5-turbo"]): [":custom"], + } + class ModelUtils: """ Utility class for mapping string identifiers to Model instances. @@ -1163,4 +1174,35 @@ class ModelUtils: 'any-dark': any_dark, } + @classmethod + def get_model(cls, model_name: str) -> Model: + # Checking for specific prefixes + for model_set, specific_prefixes in ModelVersions.MODEL_SPECIFIC_PREFIXES.items(): + for prefix in specific_prefixes: + if model_name.endswith(prefix): + base_name = model_name[:-len(prefix)] + if base_name in model_set: + return cls.convert.get(base_name, None) + + # Check for global prefixes + for prefix in ModelVersions.GLOBAL_PREFIXES: + if model_name.endswith(prefix): + base_name = model_name[:-len(prefix)] + return cls.convert.get(base_name, None) + + # Check without prefix + if model_name in cls.convert: + return cls.convert[model_name] + + raise KeyError(f"Model {model_name} not found") + + @classmethod + def get_available_versions(cls, model_name: str) -> list[str]: + # Obtaining prefixes for a specific model + prefixes = ModelVersions.GLOBAL_PREFIXES.copy() + for model_set, specific_prefixes in ModelVersions.MODEL_SPECIFIC_PREFIXES.items(): + if model_name in model_set: + prefixes.extend(specific_prefixes) + return prefixes + _all_models = list(ModelUtils.convert.keys()) -- cgit v1.2.3 From e6627d8d30fe7dfcf2a111b444f2abb5c4ead1ac Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 16:25:55 +0200 Subject: The prefix function has been removed --- g4f/client/client.py | 17 ++++++++--------- g4f/models.py | 42 ------------------------------------------ 2 files changed, 8 insertions(+), 51 deletions(-) diff --git a/g4f/client/client.py b/g4f/client/client.py index 07db107a..8e195213 100644 --- a/g4f/client/client.py +++ b/g4f/client/client.py @@ -184,12 +184,8 @@ class Completions: ignore_stream: bool = False, **kwargs ) -> Union[ChatCompletion, Iterator[ChatCompletionChunk]]: - # We use ModelUtils to obtain the model object. - model_instance = ModelUtils.get_model(model) - - # We receive the model and the provider. - model_name, provider = get_model_and_provider( - model_instance.name, # We use the model name from the object. + model, provider = get_model_and_provider( + model, self.provider if provider is None else provider, stream, ignored, @@ -200,8 +196,9 @@ class Completions: stop = [stop] if isinstance(stop, str) else stop if asyncio.iscoroutinefunction(provider.create_completion): + # Run the asynchronous function in an event loop response = asyncio.run(provider.create_completion( - model_name, # We use a model based on the object. + model, messages, stream=stream, **filter_none( @@ -214,7 +211,7 @@ class Completions: )) else: response = provider.create_completion( - model_name, # We use a model from the object. + model, messages, stream=stream, **filter_none( @@ -228,19 +225,21 @@ class Completions: if stream: if hasattr(response, '__aiter__'): + # It's an async generator, wrap it into a sync iterator response = to_sync_iter(response) + # Now 'response' is an iterator response = iter_response(response, stream, response_format, max_tokens, stop) response = iter_append_model_and_provider(response) return response else: if hasattr(response, '__aiter__'): + # If response is an async generator, collect it into a list response = list(to_sync_iter(response)) response = iter_response(response, stream, response_format, max_tokens, stop) response = iter_append_model_and_provider(response) return next(response) - async def async_create( self, messages: Messages, diff --git a/g4f/models.py b/g4f/models.py index 2378079b..bea09f28 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -891,17 +891,6 @@ any_dark = Model( ) - -class ModelVersions: - # Global Prefixes for All Models - GLOBAL_PREFIXES = [":latest"] - - # Specific Prefixes for Particular Models - MODEL_SPECIFIC_PREFIXES = { - #frozenset(["gpt-3.5-turbo", "gpt-4"]): [":custom1", ":custom2"] - #frozenset(["gpt-3.5-turbo"]): [":custom"], - } - class ModelUtils: """ Utility class for mapping string identifiers to Model instances. @@ -1174,35 +1163,4 @@ class ModelUtils: 'any-dark': any_dark, } - @classmethod - def get_model(cls, model_name: str) -> Model: - # Checking for specific prefixes - for model_set, specific_prefixes in ModelVersions.MODEL_SPECIFIC_PREFIXES.items(): - for prefix in specific_prefixes: - if model_name.endswith(prefix): - base_name = model_name[:-len(prefix)] - if base_name in model_set: - return cls.convert.get(base_name, None) - - # Check for global prefixes - for prefix in ModelVersions.GLOBAL_PREFIXES: - if model_name.endswith(prefix): - base_name = model_name[:-len(prefix)] - return cls.convert.get(base_name, None) - - # Check without prefix - if model_name in cls.convert: - return cls.convert[model_name] - - raise KeyError(f"Model {model_name} not found") - - @classmethod - def get_available_versions(cls, model_name: str) -> list[str]: - # Obtaining prefixes for a specific model - prefixes = ModelVersions.GLOBAL_PREFIXES.copy() - for model_set, specific_prefixes in ModelVersions.MODEL_SPECIFIC_PREFIXES.items(): - if model_name in model_set: - prefixes.extend(specific_prefixes) - return prefixes - _all_models = list(ModelUtils.convert.keys()) -- cgit v1.2.3 From a0087269b3f3fa21f6862904e5a5b64a33fb40ea Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 30 Oct 2024 18:25:40 +0200 Subject: feat(g4f/api/__init__.py): support both ':' and '-' in model prefixes --- g4f/api/__init__.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py index 754a48f1..25694942 100644 --- a/g4f/api/__init__.py +++ b/g4f/api/__init__.py @@ -165,6 +165,19 @@ class Api: @self.app.post("/v1/chat/completions") async def chat_completions(config: ChatCompletionsConfig, request: Request = None, provider: str = None): try: + # Find the last delimiter with ':' or '-' + if ':' in config.model: + model_parts = config.model.rsplit(":", 1) + elif '-' in config.model: + model_parts = config.model.rsplit("-", 1) + else: + model_parts = [config.model] # There is no prefix. + + base_model = model_parts[0] # We use the base model name + model_prefix = model_parts[1] if len(model_parts) > 1 else None + + config.model = base_model # Update the configuration to the basic model + config.provider = provider if config.provider is None else config.provider if config.api_key is None and request is not None: auth_header = request.headers.get("Authorization") @@ -229,6 +242,7 @@ class Api: async def completions(): return Response(content=json.dumps({'info': 'Not working yet.'}, indent=4), media_type="application/json") + def format_exception(e: Exception, config: Union[ChatCompletionsConfig, ImageGenerationConfig]) -> str: last_provider = g4f.get_last_provider(True) return json.dumps({ -- cgit v1.2.3 From 0d05825a7195234cc680797e3b5ea005a27071ea Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 31 Oct 2024 00:34:49 +0200 Subject: feat(api): support async streaming in chat completions --- g4f/api/__init__.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py index 25694942..fadeb0d8 100644 --- a/g4f/api/__init__.py +++ b/g4f/api/__init__.py @@ -165,19 +165,6 @@ class Api: @self.app.post("/v1/chat/completions") async def chat_completions(config: ChatCompletionsConfig, request: Request = None, provider: str = None): try: - # Find the last delimiter with ':' or '-' - if ':' in config.model: - model_parts = config.model.rsplit(":", 1) - elif '-' in config.model: - model_parts = config.model.rsplit("-", 1) - else: - model_parts = [config.model] # There is no prefix. - - base_model = model_parts[0] # We use the base model name - model_prefix = model_parts[1] if len(model_parts) > 1 else None - - config.model = base_model # Update the configuration to the basic model - config.provider = provider if config.provider is None else config.provider if config.api_key is None and request is not None: auth_header = request.headers.get("Authorization") @@ -206,9 +193,13 @@ class Api: return JSONResponse(response_list[0].to_json()) # Streaming response + async def async_generator(sync_gen): + for item in sync_gen: + yield item + async def streaming(): try: - async for chunk in response: + async for chunk in async_generator(response): yield f"data: {json.dumps(chunk.to_json())}\n\n" except GeneratorExit: pass @@ -242,7 +233,6 @@ class Api: async def completions(): return Response(content=json.dumps({'info': 'Not working yet.'}, indent=4), media_type="application/json") - def format_exception(e: Exception, config: Union[ChatCompletionsConfig, ImageGenerationConfig]) -> str: last_provider = g4f.get_last_provider(True) return json.dumps({ -- cgit v1.2.3 From 39b0c457b77a8d109c0269fb0be9c18bbb5ec258 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 31 Oct 2024 09:44:22 +0200 Subject: fix(g4f/gui/client/index.html): Update Discord link in sidebar --- g4f/gui/client/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html index 7e8ef09c..6a7b5668 100644 --- a/g4f/gui/client/index.html +++ b/g4f/gui/client/index.html @@ -72,7 +72,7 @@
- discord ~ discord.gg/XfybzPXPH5 + discord ~ discord.gg/5E39JUWUFa
-- cgit v1.2.3 From b467e5d758228085230265f5aa7c0b7c1e226d0d Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 31 Oct 2024 10:47:29 +0200 Subject: fix(README.md): Update image generation model to flux --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6eeeb430..53f759f4 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ from g4f.client import Client client = Client() response = client.images.generate( - model="dall-e-3", + model="flux", prompt="a white siamese cat", # Add any other necessary parameters ) -- cgit v1.2.3 From 933dce93bb6a77832565fc521a5fbf0b72d32f8d Mon Sep 17 00:00:00 2001 From: rkihacker Date: Fri, 1 Nov 2024 19:32:11 +0500 Subject: remove model prefix for claude --- g4f/Provider/Blackbox.py | 1 - 1 file changed, 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 4052893a..0013800e 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -88,7 +88,6 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): model_prefixes = { 'gpt-4o': '@GPT-4o', 'gemini-pro': '@Gemini-PRO', - 'claude-sonnet-3.5': '@Claude-Sonnet-3.5', 'PythonAgent': '@Python Agent', 'JavaAgent': '@Java Agent', 'JavaScriptAgent': '@JavaScript Agent', -- cgit v1.2.3 From 11bec81dc49412bf4ff10b5e09d452766ee043d4 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 18:01:29 +0200 Subject: Update (g4f/Provider/Airforce.py) --- docs/providers-and-models.md | 12 +- g4f/Provider/Airforce.py | 250 +++------------------- g4f/Provider/airforce/AirforceChat.py | 375 +++++++++++++++++++++++++++++++++ g4f/Provider/airforce/AirforceImage.py | 97 +++++++++ g4f/Provider/airforce/__init__.py | 2 + g4f/models.py | 239 +++++++++++---------- 6 files changed, 647 insertions(+), 328 deletions(-) create mode 100644 g4f/Provider/airforce/AirforceChat.py create mode 100644 g4f/Provider/airforce/AirforceImage.py create mode 100644 g4f/Provider/airforce/__init__.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index b3dbd9f1..2cdbf90c 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -16,12 +16,12 @@ This document provides an overview of various AI providers and models, including | Provider | Text Models | Image Models | Vision Models | Stream | Status | Auth | |----------|-------------|--------------|---------------|--------|--------|------| |[ai4chat.co](https://www.ai4chat.co)|`g4f.Provider.Ai4Chat`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chat.ai365vip.com](https://chat.ai365vip.com)|`g4f.Provider.AI365VIP`|`gpt-3.5-turbo, gpt-4o`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[chat.ai365vip.com](https://chat.ai365vip.com)|`g4f.Provider.AI365VIP`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[aichatfree.info](https://aichatfree.info)|`g4f.Provider.AIChatFree`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aichatonline.org](https://aichatonline.org)|`g4f.Provider.AiChatOnline`|`gpt-4o-mini`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[ai-chats.org](https://ai-chats.org)|`g4f.Provider.AiChats`|`gpt-4`|`dalle`|❌|?|![Captcha](https://img.shields.io/badge/Captcha-f48d37)|❌| |[api.airforce](https://api.airforce)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, gpt-4o, claude-3-haiku, claude-3-sonnet, claude-3-5-sonnet, claude-3-opus, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, mixtral-8x7b mixtral-8x22b, mistral-7b, qwen-1.5-7b, qwen-1.5-14b, qwen-1.5-72b, qwen-1.5-110b, qwen-2-72b, gemma-2b, gemma-2-9b, gemma-2-27b, gemini-flash, gemini-pro, deepseek, mixtral-8x7b-dpo, yi-34b, wizardlm-2-8x22b, solar-10.7b, mythomax-l2-13b, cosmosrp`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|`gpt-4o, gpt-4o-mini, o1, o1-mini, claude-3.5-sonnet, llama-3.2-90b, llama-3.1-405b, gemini-pro`|`flux-pro, flux-realism, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -131,6 +131,8 @@ This document provides an overview of various AI providers and models, including |mistral-nemo|Mistral AI|2+ Providers|[huggingface.co](https://huggingface.co/mistralai/Mistral-Nemo-Instruct-2407)| |mistral-large|Mistral AI|2+ Providers|[mistral.ai](https://mistral.ai/news/mistral-large-2407/)| |mixtral-8x7b-dpo|NousResearch|1+ Providers|[huggingface.co](https://huggingface.co/NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO)| +|hermes-2-dpo|NousResearch|1+ Providers|[huggingface.co](https://huggingface.co/NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO)| +|hermes-2|NousResearch|1+ Providers|[huggingface.co](https://huggingface.co/NousResearch/Hermes-2-Pro-Mistral-7B)| |yi-34b|NousResearch|1+ Providers|[huggingface.co](https://huggingface.co/NousResearch/Nous-Hermes-2-Yi-34B)| |hermes-3|NousResearch|2+ Providers|[huggingface.co](https://huggingface.co/NousResearch/Hermes-3-Llama-3.1-8B)| |gemini|Google DeepMind|1+ Providers|[deepmind.google](http://deepmind.google/technologies/gemini/)| @@ -170,7 +172,7 @@ This document provides an overview of various AI providers and models, including |solar-10-7b|Upstage|1+ Providers|[huggingface.co](https://huggingface.co/upstage/SOLAR-10.7B-Instruct-v1.0)| |solar-pro|Upstage|1+ Providers|[huggingface.co](https://huggingface.co/upstage/solar-pro-preview-instruct)| |pi|Inflection|1+ Providers|[inflection.ai](https://inflection.ai/blog/inflection-2-5)| -|deepseek|DeepSeek|1+ Providers|[deepseek.com](https://www.deepseek.com/)| +|deepseek-coder|DeepSeek|1+ Providers|[huggingface.co](https://huggingface.co/deepseek-ai/DeepSeek-Coder-V2-Instruct)| |wizardlm-2-7b|WizardLM|1+ Providers|[huggingface.co](https://huggingface.co/dreamgen/WizardLM-2-7B)| |wizardlm-2-8x22b|WizardLM|2+ Providers|[huggingface.co](https://huggingface.co/alpindale/WizardLM-2-8x22B)| |sh-n-7b|Together|1+ Providers|[huggingface.co](https://huggingface.co/togethercomputer/StripedHyena-Nous-7B)| @@ -190,6 +192,10 @@ This document provides an overview of various AI providers and models, including |german-7b|TheBloke|1+ Providers|[huggingface.co](https://huggingface.co/TheBloke/DiscoLM_German_7b_v1-GGUF)| |tinyllama-1.1b|TinyLlama|1+ Providers|[huggingface.co](https://huggingface.co/TinyLlama/TinyLlama-1.1B-Chat-v1.0)| |cybertron-7b|TheBloke|1+ Providers|[huggingface.co](https://huggingface.co/fblgit/una-cybertron-7b-v2-bf16)| +|openhermes-2.5|Teknium|1+ Providers|[huggingface.co](https://huggingface.co/datasets/teknium/OpenHermes-2.5)| +|lfm-40b|Liquid|1+ Providers|[liquid.ai](https://www.liquid.ai/liquid-foundation-models)| +|zephyr-7b|HuggingFaceH4|1+ Providers|[huggingface.co](https://huggingface.co/HuggingFaceH4/zephyr-7b-beta)| + ### Image Models | Model | Base Provider | Providers | Website | diff --git a/g4f/Provider/Airforce.py b/g4f/Provider/Airforce.py index 015766f4..b7819f9a 100644 --- a/g4f/Provider/Airforce.py +++ b/g4f/Provider/Airforce.py @@ -1,105 +1,30 @@ from __future__ import annotations -import random -import json -import re +from typing import Any, Dict +import inspect + from aiohttp import ClientSession + from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..image import ImageResponse - -def split_long_message(message: str, max_length: int = 4000) -> list[str]: - return [message[i:i+max_length] for i in range(0, len(message), max_length)] +from .helper import format_prompt +from .airforce.AirforceChat import AirforceChat +from .airforce.AirforceImage import AirforceImage class Airforce(AsyncGeneratorProvider, ProviderModelMixin): url = "https://api.airforce" - image_api_endpoint = "https://api.airforce/imagine2" - text_api_endpoint = "https://api.airforce/chat/completions" + api_endpoint_completions = AirforceChat.api_endpoint_completions + api_endpoint_imagine2 = AirforceImage.api_endpoint_imagine2 working = True + supports_stream = AirforceChat.supports_stream + supports_system_message = AirforceChat.supports_system_message + supports_message_history = AirforceChat.supports_message_history - default_model = 'llama-3-70b-chat' - - supports_stream = True - supports_system_message = True - supports_message_history = True - - text_models = [ - 'claude-3-haiku-20240307', - 'claude-3-sonnet-20240229', - 'claude-3-5-sonnet-20240620', - 'claude-3-opus-20240229', - 'chatgpt-4o-latest', - 'gpt-4', - 'gpt-4-turbo', - 'gpt-4o-mini-2024-07-18', - 'gpt-4o-mini', - 'gpt-3.5-turbo', - 'gpt-3.5-turbo-0125', - 'gpt-3.5-turbo-1106', - default_model, - 'llama-3-70b-chat-turbo', - 'llama-3-8b-chat', - 'llama-3-8b-chat-turbo', - 'llama-3-70b-chat-lite', - 'llama-3-8b-chat-lite', - 'llama-2-13b-chat', - 'llama-3.1-405b-turbo', - 'llama-3.1-70b-turbo', - 'llama-3.1-8b-turbo', - 'LlamaGuard-2-8b', - 'Llama-Guard-7b', - 'Llama-3.2-90B-Vision-Instruct-Turbo', - 'Mixtral-8x7B-Instruct-v0.1', - 'Mixtral-8x22B-Instruct-v0.1', - 'Mistral-7B-Instruct-v0.1', - 'Mistral-7B-Instruct-v0.2', - 'Mistral-7B-Instruct-v0.3', - 'Qwen1.5-7B-Chat', - 'Qwen1.5-14B-Chat', - 'Qwen1.5-72B-Chat', - 'Qwen1.5-110B-Chat', - 'Qwen2-72B-Instruct', - 'gemma-2b-it', - 'gemma-2-9b-it', - 'gemma-2-27b-it', - 'gemini-1.5-flash', - 'gemini-1.5-pro', - 'deepseek-llm-67b-chat', - 'Nous-Hermes-2-Mixtral-8x7B-DPO', - 'Nous-Hermes-2-Yi-34B', - 'WizardLM-2-8x22B', - 'SOLAR-10.7B-Instruct-v1.0', - 'MythoMax-L2-13b', - 'cosmosrp', - ] - - image_models = [ - 'flux', - 'flux-realism', - 'flux-anime', - 'flux-3d', - 'flux-disney', - 'flux-pixel', - 'flux-4o', - 'any-dark', - ] - - models = [ - *text_models, - *image_models, - ] + default_model = AirforceChat.default_model + models = [*AirforceChat.text_models, *AirforceImage.image_models] model_aliases = { - "claude-3-haiku": "claude-3-haiku-20240307", - "claude-3-sonnet": "claude-3-sonnet-20240229", - "gpt-4o": "chatgpt-4o-latest", - "llama-3-70b": "llama-3-70b-chat", - "llama-3-8b": "llama-3-8b-chat", - "mixtral-8x7b": "Mixtral-8x7B-Instruct-v0.1", - "qwen-1.5-7b": "Qwen1.5-7B-Chat", - "gemma-2b": "gemma-2b-it", - "gemini-flash": "gemini-1.5-flash", - "mythomax-l2-13b": "MythoMax-L2-13b", - "solar-10.7b": "SOLAR-10.7B-Instruct-v1.0", + **AirforceChat.model_aliases, + **AirforceImage.model_aliases } @classmethod @@ -107,139 +32,28 @@ class Airforce(AsyncGeneratorProvider, ProviderModelMixin): if model in cls.models: return model elif model in cls.model_aliases: - return cls.model_aliases.get(model, cls.default_model) + return cls.model_aliases[model] else: return cls.default_model @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - seed: int = None, - size: str = "1:1", - stream: bool = False, - **kwargs - ) -> AsyncResult: + async def create_async_generator(cls, model: str, messages: Messages, **kwargs) -> AsyncResult: model = cls.get_model(model) + + provider = AirforceChat if model in AirforceChat.text_models else AirforceImage - if model in cls.image_models: - async for result in cls._generate_image(model, messages, proxy, seed, size): - yield result - elif model in cls.text_models: - async for result in cls._generate_text(model, messages, proxy, stream): - yield result - - @classmethod - async def _generate_image( - cls, - model: str, - messages: Messages, - proxy: str = None, - seed: int = None, - size: str = "1:1", - **kwargs - ) -> AsyncResult: - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "origin": "https://llmplayground.net", - "user-agent": "Mozilla/5.0" - } - - if seed is None: - seed = random.randint(0, 100000) - - prompt = messages[-1]['content'] - - async with ClientSession(headers=headers) as session: - params = { - "model": model, - "prompt": prompt, - "size": size, - "seed": seed - } - async with session.get(f"{cls.image_api_endpoint}", params=params, proxy=proxy) as response: - response.raise_for_status() - content_type = response.headers.get('Content-Type', '').lower() + if model not in provider.models: + raise ValueError(f"Unsupported model: {model}") - if 'application/json' in content_type: - async for chunk in response.content.iter_chunked(1024): - if chunk: - yield chunk.decode('utf-8') - elif 'image' in content_type: - image_data = b"" - async for chunk in response.content.iter_chunked(1024): - if chunk: - image_data += chunk - image_url = f"{cls.image_api_endpoint}?model={model}&prompt={prompt}&size={size}&seed={seed}" - alt_text = f"Generated image for prompt: {prompt}" - yield ImageResponse(images=image_url, alt=alt_text) - - @classmethod - async def _generate_text( - cls, - model: str, - messages: Messages, - proxy: str = None, - stream: bool = False, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "authorization": "Bearer missing api key", - "content-type": "application/json", - "user-agent": "Mozilla/5.0" - } + # Get the signature of the provider's create_async_generator method + sig = inspect.signature(provider.create_async_generator) + + # Filter kwargs to only include parameters that the provider's method accepts + filtered_kwargs = {k: v for k, v in kwargs.items() if k in sig.parameters} - async with ClientSession(headers=headers) as session: - formatted_prompt = cls._format_messages(messages) - prompt_parts = split_long_message(formatted_prompt) - full_response = "" + # Add model and messages to filtered_kwargs + filtered_kwargs['model'] = model + filtered_kwargs['messages'] = messages - for part in prompt_parts: - data = { - "messages": [{"role": "user", "content": part}], - "model": model, - "max_tokens": 4096, - "temperature": 1, - "top_p": 1, - "stream": stream - } - async with session.post(cls.text_api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - part_response = "" - if stream: - async for line in response.content: - if line: - line = line.decode('utf-8').strip() - if line.startswith("data: ") and line != "data: [DONE]": - json_data = json.loads(line[6:]) - content = json_data['choices'][0]['delta'].get('content', '') - part_response += content - else: - json_data = await response.json() - content = json_data['choices'][0]['message']['content'] - part_response = content - - part_response = re.sub( - r"One message exceeds the \d+chars per message limit\..+https:\/\/discord\.com\/invite\/\S+", - '', - part_response - ) - - part_response = re.sub( - r"Rate limit \(\d+\/minute\) exceeded\. Join our discord for more: .+https:\/\/discord\.com\/invite\/\S+", - '', - part_response - ) - - full_response += part_response - yield full_response - - @classmethod - def _format_messages(cls, messages: Messages) -> str: - return " ".join([msg['content'] for msg in messages]) + async for result in provider.create_async_generator(**filtered_kwargs): + yield result diff --git a/g4f/Provider/airforce/AirforceChat.py b/g4f/Provider/airforce/AirforceChat.py new file mode 100644 index 00000000..b4b1eca3 --- /dev/null +++ b/g4f/Provider/airforce/AirforceChat.py @@ -0,0 +1,375 @@ +from __future__ import annotations +import re +from aiohttp import ClientSession +import json +from typing import List + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt + +def clean_response(text: str) -> str: + """Clean response from unwanted patterns.""" + patterns = [ + r"One message exceeds the \d+chars per message limit\..+https:\/\/discord\.com\/invite\/\S+", + r"Rate limit \(\d+\/minute\) exceeded\. Join our discord for more: .+https:\/\/discord\.com\/invite\/\S+", + r"Rate limit \(\d+\/hour\) exceeded\. Join our discord for more: https:\/\/discord\.com\/invite\/\S+", + r"", # zephyr-7b-beta + ] + + for pattern in patterns: + text = re.sub(pattern, '', text) + return text.strip() + +def split_message(message: dict, chunk_size: int = 995) -> List[dict]: + """Split a message into chunks of specified size.""" + content = message.get('content', '') + if len(content) <= chunk_size: + return [message] + + chunks = [] + while content: + chunk = content[:chunk_size] + content = content[chunk_size:] + chunks.append({ + 'role': message['role'], + 'content': chunk + }) + return chunks + +def split_messages(messages: Messages, chunk_size: int = 995) -> Messages: + """Split all messages that exceed chunk_size into smaller messages.""" + result = [] + for message in messages: + result.extend(split_message(message, chunk_size)) + return result + +class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): + label = "AirForce Chat" + api_endpoint_completions = "https://api.airforce/chat/completions" # Замініть на реальний ендпоінт + supports_stream = True + supports_system_message = True + supports_message_history = True + + default_model = 'llama-3-70b-chat' + text_models = [ + # anthropic + 'claude-3-haiku-20240307', + 'claude-3-sonnet-20240229', + 'claude-3-5-sonnet-20240620', + 'claude-3-5-sonnet-20241022', + 'claude-3-opus-20240229', + + # openai + 'chatgpt-4o-latest', + 'gpt-4', + 'gpt-4-turbo', + 'gpt-4o-2024-05-13', + 'gpt-4o-mini-2024-07-18', + 'gpt-4o-mini', + 'gpt-4o-2024-08-06', + 'gpt-3.5-turbo', + 'gpt-3.5-turbo-0125', + 'gpt-3.5-turbo-1106', + 'gpt-4o', + 'gpt-4-turbo-2024-04-09', + 'gpt-4-0125-preview', + 'gpt-4-1106-preview', + + # meta-llama + default_model, + 'llama-3-70b-chat-turbo', + 'llama-3-8b-chat', + 'llama-3-8b-chat-turbo', + 'llama-3-70b-chat-lite', + 'llama-3-8b-chat-lite', + 'llama-2-13b-chat', + 'llama-3.1-405b-turbo', + 'llama-3.1-70b-turbo', + 'llama-3.1-8b-turbo', + 'LlamaGuard-2-8b', + 'llamaguard-7b', + 'Llama-Vision-Free', + 'Llama-Guard-7b', + 'Llama-3.2-90B-Vision-Instruct-Turbo', + 'Meta-Llama-Guard-3-8B', + 'Llama-3.2-11B-Vision-Instruct-Turbo', + 'Llama-Guard-3-11B-Vision-Turbo', + 'Llama-3.2-3B-Instruct-Turbo', + 'Llama-3.2-1B-Instruct-Turbo', + 'llama-2-7b-chat-int8', + 'llama-2-7b-chat-fp16', + 'Llama 3.1 405B Instruct', + 'Llama 3.1 70B Instruct', + 'Llama 3.1 8B Instruct', + + # mistral-ai + 'Mixtral-8x7B-Instruct-v0.1', + 'Mixtral-8x22B-Instruct-v0.1', + 'Mistral-7B-Instruct-v0.1', + 'Mistral-7B-Instruct-v0.2', + 'Mistral-7B-Instruct-v0.3', + + # Gryphe + 'MythoMax-L2-13b-Lite', + 'MythoMax-L2-13b', + + # openchat + 'openchat-3.5-0106', + + # qwen + #'Qwen1.5-72B-Chat', Пуста відповідь + #'Qwen1.5-110B-Chat', Пуста відповідь + 'Qwen2-72B-Instruct', + 'Qwen2.5-7B-Instruct-Turbo', + 'Qwen2.5-72B-Instruct-Turbo', + + # google + 'gemma-2b-it', + 'gemma-2-9b-it', + 'gemma-2-27b-it', + + # gemini + 'gemini-1.5-flash', + 'gemini-1.5-pro', + + # databricks + 'dbrx-instruct', + + # deepseek-ai + 'deepseek-coder-6.7b-base', + 'deepseek-coder-6.7b-instruct', + 'deepseek-math-7b-instruct', + + # NousResearch + 'deepseek-math-7b-instruct', + 'Nous-Hermes-2-Mixtral-8x7B-DPO', + 'hermes-2-pro-mistral-7b', + + # teknium + 'openhermes-2.5-mistral-7b', + + # microsoft + 'WizardLM-2-8x22B', + 'phi-2', + + # upstage + 'SOLAR-10.7B-Instruct-v1.0', + + # pawan + 'cosmosrp', + + # liquid + 'lfm-40b-moe', + + # DiscoResearch + 'discolm-german-7b-v1', + + # tiiuae + 'falcon-7b-instruct', + + # defog + 'sqlcoder-7b-2', + + # tinyllama + 'tinyllama-1.1b-chat', + + # HuggingFaceH4 + 'zephyr-7b-beta', + ] + + models = [*text_models] + + model_aliases = { + # anthropic + "claude-3-haiku": "claude-3-haiku-20240307", + "claude-3-sonnet": "claude-3-sonnet-20240229", + "claude-3.5-sonnet": "claude-3-5-sonnet-20240620", + "claude-3.5-sonnet": "claude-3-5-sonnet-20241022", + "claude-3-opus": "claude-3-opus-20240229", + + # openai + "gpt-4o": "chatgpt-4o-latest", + #"gpt-4": "gpt-4", + #"gpt-4-turbo": "gpt-4-turbo", + "gpt-4o": "gpt-4o-2024-05-13", + "gpt-4o-mini": "gpt-4o-mini-2024-07-18", + #"gpt-4o-mini": "gpt-4o-mini", + "gpt-4o": "gpt-4o-2024-08-06", + "gpt-3.5-turbo": "gpt-3.5-turbo", + "gpt-3.5-turbo": "gpt-3.5-turbo-0125", + "gpt-3.5-turbo": "gpt-3.5-turbo-1106", + #"gpt-4o": "gpt-4o", + "gpt-4-turbo": "gpt-4-turbo-2024-04-09", + "gpt-4": "gpt-4-0125-preview", + "gpt-4": "gpt-4-1106-preview", + + # meta-llama + "llama-3-70b": "llama-3-70b-chat", + "llama-3-8b": "llama-3-8b-chat", + "llama-3-8b": "llama-3-8b-chat-turbo", + "llama-3-70b": "llama-3-70b-chat-lite", + "llama-3-8b": "llama-3-8b-chat-lite", + "llama-2-13b": "llama-2-13b-chat", + "llama-3.1-405b": "llama-3.1-405b-turbo", + "llama-3.1-70b": "llama-3.1-70b-turbo", + "llama-3.1-8b": "llama-3.1-8b-turbo", + "llamaguard-2-8b": "LlamaGuard-2-8b", + "llamaguard-7b": "llamaguard-7b", + #"llama_vision_free": "Llama-Vision-Free", # Unknown + "llamaguard-7b": "Llama-Guard-7b", + "llama-3.2-90b": "Llama-3.2-90B-Vision-Instruct-Turbo", + "llamaguard-3-8b": "Meta-Llama-Guard-3-8B", + "llama-3.2-11b": "Llama-3.2-11B-Vision-Instruct-Turbo", + "llamaguard-3-11b": "Llama-Guard-3-11B-Vision-Turbo", + "llama-3.2-3b": "Llama-3.2-3B-Instruct-Turbo", + "llama-3.2-1b": "Llama-3.2-1B-Instruct-Turbo", + "llama-2-7b": "llama-2-7b-chat-int8", + "llama-2-7b": "llama-2-7b-chat-fp16", + "llama-3.1-405b": "Llama 3.1 405B Instruct", + "llama-3.1-70b": "Llama 3.1 70B Instruct", + "llama-3.1-8b": "Llama 3.1 8B Instruct", + + # mistral-ai + "mixtral-8x7b": "Mixtral-8x7B-Instruct-v0.1", + "mixtral-8x22b": "Mixtral-8x22B-Instruct-v0.1", + "mixtral-8x7b": "Mistral-7B-Instruct-v0.1", + "mixtral-8x7b": "Mistral-7B-Instruct-v0.2", + "mixtral-8x7b": "Mistral-7B-Instruct-v0.3", + + # Gryphe + "mythomax-13b": "MythoMax-L2-13b-Lite", + "mythomax-13b": "MythoMax-L2-13b", + + # openchat + "openchat-3.5": "openchat-3.5-0106", + + # qwen + #"qwen-1.5-72b": "Qwen1.5-72B-Chat", # Empty answer + #"qwen-1.5-110b": "Qwen1.5-110B-Chat", # Empty answer + "qwen-2-72b": "Qwen2-72B-Instruct", + "qwen-2-5-7b": "Qwen2.5-7B-Instruct-Turbo", + "qwen-2-5-72b": "Qwen2.5-72B-Instruct-Turbo", + + # google + "gemma-2b": "gemma-2b-it", + "gemma-2-9b": "gemma-2-9b-it", + "gemma-2b-27b": "gemma-2-27b-it", + + # gemini + "gemini-flash": "gemini-1.5-flash", + "gemini-pro": "gemini-1.5-pro", + + # databricks + "dbrx-instruct": "dbrx-instruct", + + # deepseek-ai + #"deepseek-coder": "deepseek-coder-6.7b-base", + "deepseek-coder": "deepseek-coder-6.7b-instruct", + #"deepseek-math": "deepseek-math-7b-instruct", + + # NousResearch + #"deepseek-math": "deepseek-math-7b-instruct", + "hermes-2-dpo": "Nous-Hermes-2-Mixtral-8x7B-DPO", + "hermes-2": "hermes-2-pro-mistral-7b", + + # teknium + "openhermes-2.5": "openhermes-2.5-mistral-7b", + + # microsoft + "wizardlm-2-8x22b": "WizardLM-2-8x22B", + #"phi-2": "phi-2", + + # upstage + "solar-10-7b": "SOLAR-10.7B-Instruct-v1.0", + + # pawan + #"cosmosrp": "cosmosrp", + + # liquid + "lfm-40b": "lfm-40b-moe", + + # DiscoResearch + "german-7b": "discolm-german-7b-v1", + + # tiiuae + #"falcon-7b": "falcon-7b-instruct", + + # defog + #"sqlcoder-7b": "sqlcoder-7b-2", + + # tinyllama + #"tinyllama-1b": "tinyllama-1.1b-chat", + + # HuggingFaceH4 + "zephyr-7b": "zephyr-7b-beta", + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + stream: bool = False, + proxy: str = None, + max_tokens: str = 4096, + temperature: str = 1, + top_p: str = 1, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + chunked_messages = split_messages(messages) + + headers = { + 'accept': '*/*', + 'accept-language': 'en-US,en;q=0.9', + 'authorization': 'Bearer missing api key', + 'cache-control': 'no-cache', + 'content-type': 'application/json', + 'origin': 'https://llmplayground.net', + 'pragma': 'no-cache', + 'priority': 'u=1, i', + 'referer': 'https://llmplayground.net/', + 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"Linux"', + 'sec-fetch-dest': 'empty', + 'sec-fetch-mode': 'cors', + 'sec-fetch-site': 'cross-site', + 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' + } + + data = { + "messages": chunked_messages, + "model": model, + "max_tokens": max_tokens, + "temperature": temperature, + "top_p": top_p, + "stream": stream + } + + async with ClientSession(headers=headers) as session: + async with session.post(cls.api_endpoint_completions, json=data, proxy=proxy) as response: + response.raise_for_status() + text = "" + if stream: + async for line in response.content: + line = line.decode('utf-8') + if line.startswith('data: '): + json_str = line[6:] + try: + chunk = json.loads(json_str) + if 'choices' in chunk and chunk['choices']: + content = chunk['choices'][0].get('delta', {}).get('content', '') + text += content # Збираємо дельти + except json.JSONDecodeError as e: + print(f"Error decoding JSON: {json_str}, Error: {e}") + elif line.strip() == "[DONE]": + break + yield clean_response(text) + else: + response_json = await response.json() + text = response_json["choices"][0]["message"]["content"] + yield clean_response(text) + diff --git a/g4f/Provider/airforce/AirforceImage.py b/g4f/Provider/airforce/AirforceImage.py new file mode 100644 index 00000000..010d1a94 --- /dev/null +++ b/g4f/Provider/airforce/AirforceImage.py @@ -0,0 +1,97 @@ +from __future__ import annotations + +from aiohttp import ClientSession +import random + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ...image import ImageResponse + + +class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin): + label = "Airforce Image" + #url = "https://api.airforce" + api_endpoint_imagine2 = "https://api.airforce/imagine2" + #working = True + + default_model = 'flux' + image_models = [ + 'flux', + 'flux-realism', + 'flux-anime', + 'flux-3d', + 'flux-disney', + 'flux-pixel', + 'flux-4o', + 'any-dark', + 'stable-diffusion-xl-base', + 'stable-diffusion-xl-lightning', + ] + models = [*image_models] + + model_aliases = { + "sdxl": "stable-diffusion-xl-base", + "sdxl": "stable-diffusion-xl-lightning", + } + + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + size: str = '1:1', + proxy: str = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + headers = { + 'accept': '*/*', + 'accept-language': 'en-US,en;q=0.9', + 'authorization': 'Bearer missing api key', + 'cache-control': 'no-cache', + 'origin': 'https://llmplayground.net', + 'pragma': 'no-cache', + 'priority': 'u=1, i', + 'referer': 'https://llmplayground.net/', + 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"Linux"', + 'sec-fetch-dest': 'empty', + 'sec-fetch-mode': 'cors', + 'sec-fetch-site': 'cross-site', + 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' + } + + async with ClientSession(headers=headers) as session: + prompt = messages[-1]['content'] + seed = random.randint(0, 4294967295) + params = { + 'model': model, + 'prompt': prompt, + 'size': size, + 'seed': str(seed) + } + async with session.get(cls.api_endpoint_imagine2, params=params, proxy=proxy) as response: + response.raise_for_status() + if response.status == 200: + content_type = response.headers.get('Content-Type', '') + if 'image' in content_type: + image_url = str(response.url) + yield ImageResponse(image_url, alt="Airforce generated image") + else: + content = await response.text() + yield f"Unexpected content type: {content_type}\nResponse content: {content}" + else: + error_content = await response.text() + yield f"Error: {error_content}" diff --git a/g4f/Provider/airforce/__init__.py b/g4f/Provider/airforce/__init__.py new file mode 100644 index 00000000..5ffa6d31 --- /dev/null +++ b/g4f/Provider/airforce/__init__.py @@ -0,0 +1,2 @@ +from .AirforceChat import AirforceChat +from .AirforceImage import AirforceImage diff --git a/g4f/models.py b/g4f/models.py index bea09f28..ae3d430d 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -130,7 +130,7 @@ gpt_3 = Model( gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([Allyfy, NexraChatGPT, Airforce, DarkAI, Liaobots]) + best_provider = IterListProvider([Allyfy, NexraChatGPT, DarkAI, Airforce, Liaobots]) ) # gpt-4 @@ -191,7 +191,7 @@ meta = Model( llama_2_7b = Model( name = "llama-2-7b", base_provider = "Meta Llama", - best_provider = Cloudflare + best_provider = IterListProvider([Cloudflare, Airforce]) ) llama_2_13b = Model( @@ -217,13 +217,13 @@ llama_3_70b = Model( llama_3_1_8b = Model( name = "llama-3.1-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, Airforce, GizAI, PerplexityLabs]) + best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, GizAI, Airforce, PerplexityLabs]) ) llama_3_1_70b = Model( name = "llama-3.1-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([DDG, HuggingChat, Blackbox, FreeGpt, TeachAnything, Free2GPT, DeepInfraChat, DarkAI, Airforce, AiMathGPT, RubiksAI, GizAI, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([DDG, HuggingChat, Blackbox, FreeGpt, TeachAnything, Free2GPT, DeepInfraChat, DarkAI, AiMathGPT, RubiksAI, GizAI, Airforce, HuggingFace, PerplexityLabs]) ) llama_3_1_405b = Model( @@ -236,19 +236,19 @@ llama_3_1_405b = Model( llama_3_2_1b = Model( name = "llama-3.2-1b", base_provider = "Meta Llama", - best_provider = Cloudflare + best_provider = IterListProvider([Cloudflare, Airforce]) ) llama_3_2_3b = Model( name = "llama-3.2-3b", base_provider = "Meta Llama", - best_provider = Cloudflare + best_provider = IterListProvider([Cloudflare, Airforce]) ) llama_3_2_11b = Model( name = "llama-3.2-11b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, HuggingChat, HuggingFace]) + best_provider = IterListProvider([Cloudflare, HuggingChat, Airforce, HuggingFace]) ) llama_3_2_90b = Model( @@ -271,6 +271,18 @@ llamaguard_2_8b = Model( best_provider = Airforce ) +llamaguard_3_8b = Model( + name = "llamaguard-3-8b", + base_provider = "Meta Llama", + best_provider = Airforce +) + +llamaguard_3_11b = Model( + name = "llamaguard-3-11b", + base_provider = "Meta Llama", + best_provider = Airforce +) + ### Mistral ### mistral_7b = Model( @@ -305,14 +317,14 @@ mistral_large = Model( ### NousResearch ### -mixtral_8x7b_dpo = Model( - name = "mixtral-8x7b-dpo", +hermes_2 = Model( + name = "hermes-2", base_provider = "NousResearch", best_provider = Airforce ) -yi_34b = Model( - name = "yi-34b", +hermes_2_dpo = Model( + name = "hermes-2-dpo", base_provider = "NousResearch", best_provider = Airforce ) @@ -328,7 +340,7 @@ hermes_3 = Model( phi_2 = Model( name = "phi-2", base_provider = "Microsoft", - best_provider = Cloudflare + best_provider = IterListProvider([Cloudflare, Airforce]) ) phi_3_medium_4k = Model( @@ -364,10 +376,10 @@ gemini = Model( ) # gemma -gemma_2b_9b = Model( - name = 'gemma-2b-9b', +gemma_2b = Model( + name = 'gemma-2b', base_provider = 'Google', - best_provider = Airforce + best_provider = IterListProvider([ReplicateHome, Airforce]) ) gemma_2b_27b = Model( @@ -376,12 +388,6 @@ gemma_2b_27b = Model( best_provider = IterListProvider([DeepInfraChat, Airforce]) ) -gemma_2b = Model( - name = 'gemma-2b', - base_provider = 'Google', - best_provider = IterListProvider([ReplicateHome, Airforce]) -) - gemma_7b = Model( name = 'gemma-7b', base_provider = 'Google', @@ -389,18 +395,18 @@ gemma_7b = Model( ) # gemma 2 -gemma_2_27b = Model( - name = 'gemma-2-27b', - base_provider = 'Google', - best_provider = Airforce -) - gemma_2 = Model( name = 'gemma-2', base_provider = 'Google', best_provider = ChatHub ) +gemma_2_9b = Model( + name = 'gemma-2-9b', + base_provider = 'Google', + best_provider = Airforce +) + ### Anthropic ### claude_2_1 = Model( @@ -413,26 +419,26 @@ claude_2_1 = Model( claude_3_opus = Model( name = 'claude-3-opus', base_provider = 'Anthropic', - best_provider = IterListProvider([Airforce, Liaobots]) + best_provider = IterListProvider([Liaobots]) ) claude_3_sonnet = Model( name = 'claude-3-sonnet', base_provider = 'Anthropic', - best_provider = IterListProvider([Airforce, Liaobots]) + best_provider = IterListProvider([Liaobots]) ) claude_3_haiku = Model( name = 'claude-3-haiku', base_provider = 'Anthropic', - best_provider = IterListProvider([DDG, Airforce, GizAI, Liaobots]) + best_provider = IterListProvider([DDG, GizAI, Liaobots]) ) # claude 3.5 claude_3_5_sonnet = Model( name = 'claude-3.5-sonnet', base_provider = 'Anthropic', - best_provider = IterListProvider([Blackbox, Editee, AmigoChat, Airforce, GizAI, Liaobots]) + best_provider = IterListProvider([Blackbox, Editee, AmigoChat, GizAI, Liaobots]) ) @@ -493,40 +499,34 @@ qwen_1_5_0_5b = Model( qwen_1_5_7b = Model( name = 'qwen-1.5-7b', base_provider = 'Qwen', - best_provider = IterListProvider([Cloudflare, Airforce]) + best_provider = IterListProvider([Cloudflare]) ) qwen_1_5_14b = Model( name = 'qwen-1.5-14b', base_provider = 'Qwen', - best_provider = IterListProvider([FreeChatgpt, Cloudflare, Airforce]) + best_provider = IterListProvider([FreeChatgpt, Cloudflare]) ) -qwen_1_5_72b = Model( - name = 'qwen-1.5-72b', +# qwen 2 +qwen_2_72b = Model( + name = 'qwen-2-72b', base_provider = 'Qwen', - best_provider = Airforce + best_provider = IterListProvider([DeepInfraChat, HuggingChat, Airforce, HuggingFace]) ) -qwen_1_5_110b = Model( - name = 'qwen-1.5-110b', +qwen_2_5_7b = Model( + name = 'qwen-2-5-7b', base_provider = 'Qwen', best_provider = Airforce ) -qwen_1_5_1_8b = Model( - name = 'qwen-1.5-1.8b', +qwen_2_5_72b = Model( + name = 'qwen-2-5-72b', base_provider = 'Qwen', best_provider = Airforce ) -# qwen 2 -qwen_2_72b = Model( - name = 'qwen-2-72b', - base_provider = 'Qwen', - best_provider = IterListProvider([DeepInfraChat, HuggingChat, Airforce, HuggingFace]) -) - qwen = Model( name = 'qwen', base_provider = 'Qwen', @@ -556,18 +556,18 @@ yi_1_5_9b = Model( ) ### Upstage ### -solar_1_mini = Model( - name = 'solar-1-mini', - base_provider = 'Upstage', - best_provider = Upstage -) - solar_10_7b = Model( name = 'solar-10-7b', base_provider = 'Upstage', best_provider = Airforce ) +solar_mini = Model( + name = 'solar-mini', + base_provider = 'Upstage', + best_provider = Upstage +) + solar_pro = Model( name = 'solar-pro', base_provider = 'Upstage', @@ -583,8 +583,8 @@ pi = Model( ) ### DeepSeek ### -deepseek = Model( - name = 'deepseek', +deepseek_coder = Model( + name = 'deepseek-coder', base_provider = 'DeepSeek', best_provider = Airforce ) @@ -630,7 +630,7 @@ lzlv_70b = Model( openchat_3_5 = Model( name = 'openchat-3.5', base_provider = 'OpenChat', - best_provider = Cloudflare + best_provider = IterListProvider([Cloudflare]) ) openchat_3_6_8b = Model( @@ -683,23 +683,6 @@ sonar_chat = Model( best_provider = PerplexityLabs ) - -### Gryphe ### -mythomax_l2_13b = Model( - name = 'mythomax-l2-13b', - base_provider = 'Gryphe', - best_provider = Airforce -) - - -### Pawan ### -cosmosrp = Model( - name = 'cosmosrp', - base_provider = 'Pawan', - best_provider = Airforce -) - - ### TheBloke ### german_7b = Model( name = 'german-7b', @@ -708,14 +691,6 @@ german_7b = Model( ) -### Tinyllama ### -tinyllama_1_1b = Model( - name = 'tinyllama-1.1b', - base_provider = 'Tinyllama', - best_provider = Cloudflare -) - - ### Fblgit ### cybertron_7b = Model( name = 'cybertron-7b', @@ -723,6 +698,7 @@ cybertron_7b = Model( best_provider = Cloudflare ) + ### Nvidia ### nemotron_70b = Model( name = 'nemotron-70b', @@ -731,6 +707,46 @@ nemotron_70b = Model( ) +### Teknium ### +openhermes_2_5 = Model( + name = 'openhermes-2.5', + base_provider = 'Teknium', + best_provider = Airforce +) + + +### Pawan ### +cosmosrp = Model( + name = 'cosmosrp', + base_provider = 'Pawan', + best_provider = Airforce +) + + +### Liquid ### +lfm_40b = Model( + name = 'lfm-40b', + base_provider = 'Liquid', + best_provider = Airforce +) + + +### DiscoResearch ### +german_7b = Model( + name = 'german-7b', + base_provider = 'DiscoResearch', + best_provider = Airforce +) + + +### HuggingFaceH4 ### +zephyr_7b = Model( + name = 'zephyr-7b', + base_provider = 'HuggingFaceH4', + best_provider = Airforce +) + + ############# ### Image ### @@ -754,7 +770,7 @@ sdxl_lora = Model( sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', - best_provider = IterListProvider([ReplicateHome]) + best_provider = IterListProvider([ReplicateHome, Airforce]) ) @@ -947,6 +963,8 @@ class ModelUtils: # llamaguard 'llamaguard-7b': llamaguard_7b, 'llamaguard-2-8b': llamaguard_2_8b, +'llamaguard-3-8b': llamaguard_3_8b, +'llamaguard-3-11b': llamaguard_3_11b, ### Mistral ### @@ -958,17 +976,17 @@ class ModelUtils: ### NousResearch ### -'mixtral-8x7b-dpo': mixtral_8x7b_dpo, +'hermes-2': hermes_2, +'hermes-2-dpo': hermes_2_dpo, 'hermes-3': hermes_3, - -'yi-34b': yi_34b, - - + + ### Microsoft ### 'phi-2': phi_2, 'phi_3_medium-4k': phi_3_medium_4k, 'phi-3.5-mini': phi_3_5_mini, + ### Google ### # gemini 'gemini': gemini, @@ -977,13 +995,12 @@ class ModelUtils: # gemma 'gemma-2b': gemma_2b, -'gemma-2b-9b': gemma_2b_9b, 'gemma-2b-27b': gemma_2b_27b, 'gemma-7b': gemma_7b, # gemma-2 'gemma-2': gemma_2, -'gemma-2-27b': gemma_2_27b, +'gemma-2-9b': gemma_2_9b, ### Anthropic ### @@ -1028,10 +1045,9 @@ class ModelUtils: 'qwen-1.5-0.5b': qwen_1_5_0_5b, 'qwen-1.5-7b': qwen_1_5_7b, 'qwen-1.5-14b': qwen_1_5_14b, -'qwen-1.5-72b': qwen_1_5_72b, -'qwen-1.5-110b': qwen_1_5_110b, -'qwen-1.5-1.8b': qwen_1_5_1_8b, 'qwen-2-72b': qwen_2_72b, +'qwen-2-5-7b': qwen_2_5_7b, +'qwen-2-5-72b': qwen_2_5_72b, ### Zhipu AI ### @@ -1044,16 +1060,17 @@ class ModelUtils: ### Upstage ### -'solar-mini': solar_1_mini, 'solar-10-7b': solar_10_7b, +'solar-mini': solar_mini, 'solar-pro': solar_pro, ### Inflection ### 'pi': pi, + ### DeepSeek ### -'deepseek': deepseek, +'deepseek-coder': deepseek_coder, ### Yorickvp ### @@ -1094,30 +1111,38 @@ class ModelUtils: ### Perplexity AI ### 'sonar-online': sonar_online, 'sonar-chat': sonar_chat, - - -### Gryphe ### -'mythomax-l2-13b': sonar_chat, - - -### Pawan ### -'cosmosrp': cosmosrp, - + ### TheBloke ### 'german-7b': german_7b, -### Tinyllama ### -'tinyllama-1.1b': tinyllama_1_1b, - - ### Fblgit ### 'cybertron-7b': cybertron_7b, ### Nvidia ### 'nemotron-70b': nemotron_70b, + + +### Teknium ### +'openhermes-2.5': openhermes_2_5, + + +### Pawan ### +'cosmosrp': cosmosrp, + + +### Liquid ### +'lfm-40b': lfm_40b, + + +### DiscoResearch ### +'german-7b': german_7b, + + +### HuggingFaceH4 ### +'zephyr-7b': zephyr_7b, -- cgit v1.2.3 From b0180bfc15d2ef78dca955799027f26cc281d293 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 18:09:27 +0200 Subject: Disconnected providers (g4f/Provider/AIChatFree.py g4f/Provider/AiChats.py) --- g4f/Provider/AIChatFree.py | 2 +- g4f/Provider/AiChats.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/g4f/Provider/AIChatFree.py b/g4f/Provider/AIChatFree.py index 71c04681..6f4b8560 100644 --- a/g4f/Provider/AIChatFree.py +++ b/g4f/Provider/AIChatFree.py @@ -14,7 +14,7 @@ from .base_provider import AsyncGeneratorProvider, ProviderModelMixin class AIChatFree(AsyncGeneratorProvider, ProviderModelMixin): url = "https://aichatfree.info/" - working = True + working = False supports_stream = True supports_message_history = True default_model = 'gemini-pro' diff --git a/g4f/Provider/AiChats.py b/g4f/Provider/AiChats.py index 08492e24..7ff25639 100644 --- a/g4f/Provider/AiChats.py +++ b/g4f/Provider/AiChats.py @@ -11,7 +11,7 @@ from .helper import format_prompt class AiChats(AsyncGeneratorProvider, ProviderModelMixin): url = "https://ai-chats.org" api_endpoint = "https://ai-chats.org/chat/send2/" - working = True + working = False supports_message_history = True default_model = 'gpt-4' models = ['gpt-4', 'dalle'] -- cgit v1.2.3 From bda8b53efe3eecb0761653f2de4901b25a24c8f1 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 18:17:05 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 2cdbf90c..1165959f 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -21,7 +21,7 @@ This document provides an overview of various AI providers and models, including |[aichatonline.org](https://aichatonline.org)|`g4f.Provider.AiChatOnline`|`gpt-4o-mini`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[ai-chats.org](https://ai-chats.org)|`g4f.Provider.AiChats`|`gpt-4`|`dalle`|❌|?|![Captcha](https://img.shields.io/badge/Captcha-f48d37)|❌| |[api.airforce](https://api.airforce)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|`gpt-4o, gpt-4o-mini, o1, o1-mini, claude-3.5-sonnet, llama-3.2-90b, llama-3.1-405b, gemini-pro`|`flux-pro, flux-realism, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -- cgit v1.2.3 From d018cd890d0b5f59190d87cc9512224de3fcfe20 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 21:16:46 +0200 Subject: Update (g4f/Provider/Blackbox.py) --- g4f/Provider/Blackbox.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 4052893a..d8c5a6c1 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -275,7 +275,8 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "visitFromDelta": False, "mobileClient": False, "webSearchMode": web_search, - "userSelectedModel": cls.userSelectedModel.get(model, model) + "userSelectedModel": cls.userSelectedModel.get(model, model), + "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc" } headers_chat = { -- cgit v1.2.3 From 42aba60eceb0a022e5dc79ddf6f391163dbb2cf5 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 22:53:15 +0200 Subject: Update (g4f/Provider/AIUncensored.py) --- g4f/Provider/AIUncensored.py | 148 ++++++++++++++++++++++--------------------- g4f/models.py | 4 +- 2 files changed, 79 insertions(+), 73 deletions(-) diff --git a/g4f/Provider/AIUncensored.py b/g4f/Provider/AIUncensored.py index d653191c..ce492b38 100644 --- a/g4f/Provider/AIUncensored.py +++ b/g4f/Provider/AIUncensored.py @@ -2,33 +2,49 @@ from __future__ import annotations import json from aiohttp import ClientSession +from itertools import cycle from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import format_prompt from ..image import ImageResponse + class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): url = "https://www.aiuncensored.info" + api_endpoints_text = [ + "https://twitterclone-i0wr.onrender.com/api/chat", + "https://twitterclone-4e8t.onrender.com/api/chat", + "https://twitterclone-8wd1.onrender.com/api/chat", + ] + api_endpoints_image = [ + "https://twitterclone-4e8t.onrender.com/api/image", + "https://twitterclone-i0wr.onrender.com/api/image", + "https://twitterclone-8wd1.onrender.com/api/image", + ] + api_endpoints_cycle_text = cycle(api_endpoints_text) + api_endpoints_cycle_image = cycle(api_endpoints_image) working = True supports_stream = True supports_system_message = True supports_message_history = True - default_model = 'ai_uncensored' - chat_models = [default_model] - image_models = ['ImageGenerator'] - models = [*chat_models, *image_models] - - api_endpoints = { - 'ai_uncensored': "https://twitterclone-i0wr.onrender.com/api/chat", - 'ImageGenerator': "https://twitterclone-4e8t.onrender.com/api/image" + default_model = 'TextGenerations' + text_models = [default_model] + image_models = ['ImageGenerations'] + models = [*text_models, *image_models] + + model_aliases = { + #"": "TextGenerations", + "flux": "ImageGenerations", } @classmethod def get_model(cls, model: str) -> str: if model in cls.models: return model + elif model in cls.model_aliases: + return cls.model_aliases[model] else: return cls.default_model @@ -38,75 +54,63 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): model: str, messages: Messages, proxy: str = None, - stream: bool = False, **kwargs ) -> AsyncResult: model = cls.get_model(model) - if model in cls.chat_models: - async with ClientSession(headers={"content-type": "application/json"}) as session: + headers = { + 'accept': '*/*', + 'accept-language': 'en-US,en;q=0.9', + 'cache-control': 'no-cache', + 'content-type': 'application/json', + 'origin': 'https://www.aiuncensored.info', + 'pragma': 'no-cache', + 'priority': 'u=1, i', + 'referer': 'https://www.aiuncensored.info/', + 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"Linux"', + 'sec-fetch-dest': 'empty', + 'sec-fetch-mode': 'cors', + 'sec-fetch-site': 'cross-site', + 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' + } + + async with ClientSession(headers=headers) as session: + if model in cls.image_models: + prompt = messages[-1]['content'] data = { - "messages": [ - {"role": "user", "content": format_prompt(messages)} - ], - "stream": stream + "prompt": prompt, } - async with session.post(cls.api_endpoints[model], json=data, proxy=proxy) as response: + api_endpoint = next(cls.api_endpoints_cycle_image) + async with session.post(api_endpoint, json=data, proxy=proxy) as response: response.raise_for_status() - if stream: - async for chunk in cls._handle_streaming_response(response): - yield chunk - else: - yield await cls._handle_non_streaming_response(response) - elif model in cls.image_models: - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": cls.url, - "pragma": "no-cache", - "priority": "u=1, i", - "referer": f"{cls.url}/", - "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-platform": '"Linux"', - "sec-fetch-dest": "empty", - "sec-fetch-mode": "cors", - "sec-fetch-site": "cross-site", - "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36" - } - async with ClientSession(headers=headers) as session: - prompt = messages[0]['content'] - data = {"prompt": prompt} - async with session.post(cls.api_endpoints[model], json=data, proxy=proxy) as response: + response_data = await response.json() + image_url = response_data['image_url'] + image_response = ImageResponse(images=image_url, alt=prompt) + yield image_response + elif model in cls.text_models: + data = { + "messages": [ + { + "role": "user", + "content": format_prompt(messages) + } + ] + } + api_endpoint = next(cls.api_endpoints_cycle_text) + async with session.post(api_endpoint, json=data, proxy=proxy) as response: response.raise_for_status() - result = await response.json() - image_url = result.get('image_url', '') - if image_url: - yield ImageResponse(image_url, alt=prompt) - else: - yield "Failed to generate image. Please try again." - - @classmethod - async def _handle_streaming_response(cls, response): - async for line in response.content: - line = line.decode('utf-8').strip() - if line.startswith("data: "): - if line == "data: [DONE]": - break - try: - json_data = json.loads(line[6:]) - if 'data' in json_data: - yield json_data['data'] - except json.JSONDecodeError: - pass - - @classmethod - async def _handle_non_streaming_response(cls, response): - response_json = await response.json() - return response_json.get('content', "Sorry, I couldn't generate a response.") - - @classmethod - def validate_response(cls, response: str) -> str: - return response + full_response = "" + async for line in response.content: + line = line.decode('utf-8') + if line.startswith("data: "): + try: + json_str = line[6:] + if json_str != "[DONE]": + data = json.loads(json_str) + if "data" in data: + full_response += data["data"] + yield data["data"] + except json.JSONDecodeError: + continue diff --git a/g4f/models.py b/g4f/models.py index ae3d430d..dd2b827d 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -8,6 +8,7 @@ from .Provider import ( AIChatFree, AiMathGPT, Airforce, + AIUncensored, Allyfy, AmigoChat, Bing, @@ -109,6 +110,7 @@ default = Model( Cloudflare, Editee, AiMathGPT, + AIUncensored, ]) ) @@ -808,7 +810,7 @@ playground_v2_5 = Model( flux = Model( name = 'flux', base_provider = 'Flux AI', - best_provider = IterListProvider([Blackbox, Airforce]) + best_provider = IterListProvider([Blackbox, AIUncensored, Airforce]) ) -- cgit v1.2.3 From c01e3b6b61ab377260dfa2b3254b58b77c0f762f Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 1 Nov 2024 23:43:58 +0200 Subject: Update (g4f/Provider/Allyfy.py) --- g4f/Provider/Allyfy.py | 88 +++++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 36 deletions(-) diff --git a/g4f/Provider/Allyfy.py b/g4f/Provider/Allyfy.py index bf607df4..53cf1da1 100644 --- a/g4f/Provider/Allyfy.py +++ b/g4f/Provider/Allyfy.py @@ -1,17 +1,28 @@ from __future__ import annotations - -from aiohttp import ClientSession +import aiohttp +import asyncio import json - +import uuid +from aiohttp import ClientSession from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import format_prompt -class Allyfy(AsyncGeneratorProvider): +class Allyfy(AsyncGeneratorProvider, ProviderModelMixin): url = "https://allyfy.chat" api_endpoint = "https://chatbot.allyfy.chat/api/v1/message/stream/super/chat" working = True + supports_stream = True + supports_system_message = True + supports_message_history = True + + default_model = 'gpt-3.5-turbo' + models = [default_model] + + @classmethod + def get_model(cls, model: str) -> str: + return cls.default_model @classmethod async def create_async_generator( @@ -21,50 +32,55 @@ class Allyfy(AsyncGeneratorProvider): proxy: str = None, **kwargs ) -> AsyncResult: + model = cls.get_model(model) + client_id = str(uuid.uuid4()) + headers = { - "accept": "text/event-stream", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json;charset=utf-8", - "dnt": "1", - "origin": "https://www.allyfy.chat", - "priority": "u=1, i", - "referer": "https://www.allyfy.chat/", - "referrer": "https://www.allyfy.chat", - 'sec-ch-ua': '"Not/A)Brand";v="8", "Chromium";v="126"', + 'accept': 'text/event-stream', + 'accept-language': 'en-US,en;q=0.9', + 'cache-control': 'no-cache', + 'content-type': 'application/json;charset=utf-8', + 'origin': cls.url, + 'pragma': 'no-cache', + 'priority': 'u=1, i', + 'referer': f"{cls.url}/", + 'referrer': cls.url, + 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', '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" + '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/130.0.0.0 Safari/537.36' } + async with ClientSession(headers=headers) as session: prompt = format_prompt(messages) data = { - "messages": [{"content": prompt, "role": "user"}], + "messages": messages, "content": prompt, "baseInfo": { - "clientId": "q08kdrde1115003lyedfoir6af0yy531", + "clientId": client_id, "pid": "38281", "channelId": "100000", "locale": "en-US", - "localZone": 180, + "localZone": 120, "packageName": "com.cch.allyfy.webh", } } - async with session.post(f"{cls.api_endpoint}", json=data, proxy=proxy) as response: + + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: response.raise_for_status() - full_response = [] - async for line in response.content: - line = line.decode().strip() - if line.startswith("data:"): - data_content = line[5:] - if data_content == "[DONE]": - break - try: - json_data = json.loads(data_content) - if "content" in json_data: - full_response.append(json_data["content"]) - except json.JSONDecodeError: - continue - yield "".join(full_response) + response_text = await response.text() + + filtered_response = [] + for line in response_text.splitlines(): + if line.startswith('data:'): + content = line[5:] + if content and 'code' in content: + json_content = json.loads(content) + if json_content['content']: + filtered_response.append(json_content['content']) + + final_response = ''.join(filtered_response) + yield final_response -- cgit v1.2.3 From e1b131290217308026e3bb321d90e9e4a54b0693 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 2 Nov 2024 13:50:28 +0200 Subject: Disconnected provider (g4f/Provider/AmigoChat.py) --- docs/providers-and-models.md | 2 +- g4f/Provider/AmigoChat.py | 2 +- g4f/models.py | 22 ++++++++++------------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 1165959f..b046b6f5 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -24,7 +24,7 @@ This document provides an overview of various AI providers and models, including |[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|`gpt-4o, gpt-4o-mini, o1, o1-mini, claude-3.5-sonnet, llama-3.2-90b, llama-3.1-405b, gemini-pro`|`flux-pro, flux-realism, dalle-3`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|✔|✔|❌|✔|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[openchat.team](https://openchat.team/)|`g4f.Provider.Aura`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| |[bing.com/images](https://www.bing.com/images/create)|`g4f.Provider.BingCreateImages`|`❌|✔|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| diff --git a/g4f/Provider/AmigoChat.py b/g4f/Provider/AmigoChat.py index f5027111..b086d5e1 100644 --- a/g4f/Provider/AmigoChat.py +++ b/g4f/Provider/AmigoChat.py @@ -13,7 +13,7 @@ class AmigoChat(AsyncGeneratorProvider, ProviderModelMixin): url = "https://amigochat.io/chat/" chat_api_endpoint = "https://api.amigochat.io/v1/chat/completions" image_api_endpoint = "https://api.amigochat.io/v1/images/generations" - working = True + working = False supports_stream = True supports_system_message = True supports_message_history = True diff --git a/g4f/models.py b/g4f/models.py index dd2b827d..944c4e9c 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -10,7 +10,6 @@ from .Provider import ( Airforce, AIUncensored, Allyfy, - AmigoChat, Bing, Blackbox, ChatGpt, @@ -105,7 +104,6 @@ default = Model( ChatHub, ChatGptEs, ChatHub, - AmigoChat, ChatifyAI, Cloudflare, Editee, @@ -139,13 +137,13 @@ gpt_35_turbo = Model( gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([NexraChatGPT, Blackbox, ChatGptEs, AmigoChat, DarkAI, Editee, GizAI, Airforce, Liaobots, OpenaiChat]) + best_provider = IterListProvider([NexraChatGPT, Blackbox, ChatGptEs, DarkAI, Editee, GizAI, Airforce, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, AmigoChat, RubiksAI, Liaobots, Airforce, GizAI, ChatgptFree, Koala, OpenaiChat, ChatGpt]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, Airforce, GizAI, ChatgptFree, Koala, OpenaiChat, ChatGpt]) ) gpt_4_turbo = Model( @@ -164,13 +162,13 @@ gpt_4 = Model( o1 = Model( name = 'o1', base_provider = 'OpenAI', - best_provider = AmigoChat + best_provider = None ) o1_mini = Model( name = 'o1-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([AmigoChat, GizAI]) + best_provider = IterListProvider([GizAI]) ) @@ -231,7 +229,7 @@ llama_3_1_70b = Model( llama_3_1_405b = Model( name = "llama-3.1-405b", base_provider = "Meta Llama", - best_provider = IterListProvider([DeepInfraChat, Blackbox, AmigoChat, DarkAI, Airforce]) + best_provider = IterListProvider([DeepInfraChat, Blackbox, DarkAI, Airforce]) ) # llama 3.2 @@ -256,7 +254,7 @@ llama_3_2_11b = Model( llama_3_2_90b = Model( name = "llama-3.2-90b", base_provider = "Meta Llama", - best_provider = IterListProvider([AmigoChat, Airforce]) + best_provider = IterListProvider([Airforce]) ) @@ -362,7 +360,7 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, AmigoChat, Editee, GizAI, Airforce, Liaobots]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, Editee, GizAI, Airforce, Liaobots]) ) gemini_flash = Model( @@ -440,7 +438,7 @@ claude_3_haiku = Model( claude_3_5_sonnet = Model( name = 'claude-3.5-sonnet', base_provider = 'Anthropic', - best_provider = IterListProvider([Blackbox, Editee, AmigoChat, GizAI, Liaobots]) + best_provider = IterListProvider([Blackbox, Editee, GizAI, Liaobots]) ) @@ -817,14 +815,14 @@ flux = Model( flux_pro = Model( name = 'flux-pro', base_provider = 'Flux AI', - best_provider = IterListProvider([NexraFluxPro, AmigoChat]) + best_provider = IterListProvider([NexraFluxPro]) ) flux_realism = Model( name = 'flux-realism', base_provider = 'Flux AI', - best_provider = IterListProvider([Airforce, AmigoChat]) + best_provider = IterListProvider([Airforce]) ) -- cgit v1.2.3 From 05625429ed6383a36389a79fe28dbb8a83463002 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 2 Nov 2024 14:06:50 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index b046b6f5..1c56244c 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -1,4 +1,5 @@ + # G4F - Providers and Models This document provides an overview of various AI providers and models, including text generation, image generation, and vision capabilities. It aims to help users navigate the diverse landscape of AI services and choose the most suitable option for their needs. @@ -9,6 +10,7 @@ This document provides an overview of various AI providers and models, including - [Text Models](#text-models) - [Image Models](#image-models) - [Vision Models](#vision-models) + - [Providers and vision models](#providers-and-vision-models) - [Conclusion and Usage Tips](#conclusion-and-usage-tips) --- @@ -25,7 +27,7 @@ This document provides an overview of various AI providers and models, including |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|✔|✔|❌|✔|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[openchat.team](https://openchat.team/)|`g4f.Provider.Aura`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| +|[openchat.team](https://openchat.team/)|`g4f.Provider.Aura`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| |[bing.com/images](https://www.bing.com/images/create)|`g4f.Provider.BingCreateImages`|`❌|✔|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, gpt-4o, gemini-pro, claude-3.5-sonnet`|`flux`|✔|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -33,8 +35,8 @@ This document provides an overview of various AI providers and models, including |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt4online.org](https://chatgpt4online.org)|`g4f.Provider.Chatgpt4Online`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chatgpt4o.one](https://chatgpt4o.one)|`g4f.Provider.Chatgpt4o`|✔|❌|❌|❌|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[chatgptfree.ai](https://chatgptfree.ai)|`g4f.Provider.ChatgptFree`|`gpt-4o-mini`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[chatgpt4o.one](https://chatgpt4o.one)|`g4f.Provider.Chatgpt4o`|✔|❌|❌|❌|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[chatgptfree.ai](https://chatgptfree.ai)|`g4f.Provider.ChatgptFree`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[app.chathub.gg](https://app.chathub.gg)|`g4f.Provider.ChatHub`|`llama-3.1-8b, mixtral-8x7b, gemma-2, sonar-online`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`german-7b, gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-11b, llama-3.2-1b, llama-3.2-3b, mistral-7b, openchat-3.5, phi-2, qwen-1.5-0.5b, qwen-1.5-1.8b, qwen-1.5-14b, qwen-1.5-7b, tinyllama-1.1b, cybertron-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -48,7 +50,7 @@ This document provides an overview of various AI providers and models, including |[chat10.free2gpt.xyz](chat10.free2gpt.xyz)|`g4f.Provider.Free2GPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chat.chatgpt.org.uk](https://chat.chatgpt.org.uk)|`g4f.Provider.FreeChatgpt`|`qwen-1.5-14b, sparkdesk-v1.1, qwen-2-7b, glm-4-9b, glm-3-6b, yi-1.5-9b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[freegptsnav.aifree.site](https://freegptsnav.aifree.site)|`g4f.Provider.FreeGpt`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[free.netfly.top](https://free.netfly.top)|`g4f.Provider.FreeNetfly`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[free.netfly.top](https://free.netfly.top)|`g4f.Provider.FreeNetfly`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[gemini.google.com](https://gemini.google.com)|`g4f.Provider.Gemini`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[ai.google.dev](https://ai.google.dev)|`g4f.Provider.GeminiPro`|✔|❌|✔|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[app.giz.ai](https://app.giz.ai/assistant/)|`g4f.Provider.GizAI`|`gemini-flash, gemini-pro, gpt-4o-mini, gpt-4o, claude-3.5-sonnet, claude-3-haiku, llama-3.1-70b, llama-3.1-8b, mistral-large`|`sdxl, sd-1.5, sd-3.5, dalle-3, flux-schnell, flux1-pro`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -57,7 +59,7 @@ This document provides an overview of various AI providers and models, including |[console.groq.com/playground](https://console.groq.com/playground)|`g4f.Provider.Groq`|✔|❌|❌|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[huggingface.co/chat](https://huggingface.co/chat)|`g4f.Provider.HuggingChat`|`llama-3.1-70b, command-r-plus, qwen-2-72b, llama-3.2-11b, hermes-3, mistral-nemo, phi-3.5-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[huggingface.co](https://huggingface.co/chat)|`g4f.Provider.HuggingFace`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[koala.sh/chat](https://koala.sh/chat)|`g4f.Provider.Koala`|`gpt-4o-mini`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[koala.sh/chat](https://koala.sh/chat)|`g4f.Provider.Koala`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[liaobots.work](https://liaobots.work)|`g4f.Provider.Liaobots`|`gpt-3.5-turbo, gpt-4o-mini, gpt-4o, gpt-4-turbo, grok-2, grok-2-mini, claude-3-opus, claude-3-sonnet, claude-3-5-sonnet, claude-3-haiku, claude-2.1, gemini-flash, gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[magickpen.com](https://magickpen.com)|`g4f.Provider.MagickPen`|`gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[meta.ai](https://www.meta.ai)|`g4f.Provider.MetaAI`|✔|✔|?|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| @@ -81,7 +83,7 @@ This document provides an overview of various AI providers and models, including |[chatgpt.com](https://chatgpt.com/)|`g4f.Provider.OpenaiChat`|`gpt-4o, gpt-4o-mini, gpt-4`|❌|✔||![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[www.perplexity.ai)](https://www.perplexity.ai)|`g4f.Provider.PerplexityAi`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[perplexity.ai](https://www.perplexity.ai)|`g4f.Provider.PerplexityApi`|✔|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| -|[labs.perplexity.ai](https://labs.perplexity.ai)|`g4f.Provider.PerplexityLabs`|`sonar-online, sonar-chat, llama-3.1-8b, llama-3.1-70b`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[labs.perplexity.ai](https://labs.perplexity.ai)|`g4f.Provider.PerplexityLabs`|`sonar-online, sonar-chat, llama-3.1-8b, llama-3.1-70b`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[pi.ai/talk](https://pi.ai/talk)|`g4f.Provider.Pi`|`pi`|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|❌| |[]()|`g4f.Provider.Pizzagpt`|`gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[poe.com](https://poe.com)|`g4f.Provider.Poe`|✔|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| @@ -230,6 +232,11 @@ This document provides an overview of various AI providers and models, including |blackboxai|Blackbox AI|1+ Providers|[docs.blackbox.chat](https://docs.blackbox.chat/blackbox-ai-1)| |minicpm-llama-3-v2.5|OpenBMB|1+ Providers | [huggingface.co](https://huggingface.co/openbmb/MiniCPM-Llama3-V-2_5)| +### Providers and vision models +| Provider | Base Provider | | Vision Models | Status | Auth | +|-------|---------------|-----------|---------|---------|---------| +| `g4f.Provider.Blackbox` | Blackbox AI | | `blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, gpt-4o, gemini-pro, claude-3.5-sonnet` | ![Active](https://img.shields.io/badge/Active-brightgreen) | ❌ | + ## Conclusion and Usage Tips This document provides a comprehensive overview of various AI providers and models available for text generation, image generation, and vision tasks. **When choosing a provider or model, consider the following factors:** 1. **Availability**: Check the status of the provider to ensure it's currently active and accessible. -- cgit v1.2.3 From e1d209ea802af3054dbf2b0bd10907c76f7f409a Mon Sep 17 00:00:00 2001 From: rkihacker Date: Sat, 2 Nov 2024 21:17:15 +0500 Subject: add new agent models --- g4f/Provider/Blackbox.py | 98 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 22 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index e2595b02..47b3c05c 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -29,28 +29,46 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): image_models = ['ImageGeneration'] models = [ default_model, - 'blackboxai-pro', - *image_models, - "llama-3.1-8b", - 'llama-3.1-70b', - 'llama-3.1-405b', - 'gpt-4o', - 'gemini-pro', - 'gemini-1.5-flash', - 'claude-sonnet-3.5', - 'PythonAgent', - 'JavaAgent', - 'JavaScriptAgent', - 'HTMLAgent', - 'GoogleCloudAgent', - 'AndroidDeveloper', - 'SwiftDeveloper', - 'Next.jsAgent', - 'MongoDBAgent', - 'PyTorchAgent', - 'ReactAgent', - 'XcodeAgent', - 'AngularJSAgent', + 'blackboxai-pro', + *image_models, + "llama-3.1-8b", + 'llama-3.1-70b', + 'llama-3.1-405b', + 'gpt-4o', + 'gemini-pro', + 'gemini-1.5-flash', + 'claude-sonnet-3.5', + 'PythonAgent', + 'JavaAgent', + 'JavaScriptAgent', + 'HTMLAgent', + 'GoogleCloudAgent', + 'AndroidDeveloper', + 'SwiftDeveloper', + 'Next.jsAgent', + 'MongoDBAgent', + 'PyTorchAgent', + 'ReactAgent', + 'XcodeAgent', + 'AngularJSAgent', + 'HerokuAgent', + 'GodotAgent', + 'GoAgent', + 'GitlabAgent', + 'GitAgent', + 'RepoMap', + 'FlaskAgent', + 'FirebaseAgent', + 'FastAPIAgent', + 'ErlangAgent', + 'ElectronAgent', + 'DockerAgent', + 'DigitalOceanAgent', + 'BitbucketAgent', + 'AzureAgent', + 'FlutterAgent', + 'YoutubeAgent', + 'builderAgent', ] agentMode = { @@ -58,6 +76,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): } trendingAgentMode = { + "blackboxai": {}, "blackboxai": {}, "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'}, "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"}, @@ -77,6 +96,24 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): 'ReactAgent': {'mode': True, 'id': "React Agent"}, 'XcodeAgent': {'mode': True, 'id': "Xcode Agent"}, 'AngularJSAgent': {'mode': True, 'id': "AngularJS Agent"}, + 'HerokuAgent': {'mode': True, 'id': "Heroku Agent"}, + 'GodotAgent': {'mode': True, 'id': "Godot Agent"}, + 'GoAgent': {'mode': True, 'id': "Go Agent"}, + 'GitlabAgent': {'mode': True, 'id': "Gitlab Agent"}, + 'GitAgent': {'mode': True, 'id': "Git Agent"}, + 'RepoMap': {'mode': True, 'id': "RepoMap"}, + 'FlaskAgent': {'mode': True, 'id': "FlaskAgentTrendID"}, + 'FirebaseAgent': {'mode': True, 'id': "FirebaseAgentTrendID"}, + 'FastAPIAgent': {'mode': True, 'id': "FastAPIAgentTrendID"}, + 'ErlangAgent': {'mode': True, 'id': "ErlangAgentTrendID"}, + 'ElectronAgent': {'mode': True, 'id': "ElectronAgentTrendID"}, + 'DockerAgent': {'mode': True, 'id': "DockerAgentTrendID"}, + 'DigitalOceanAgent': {'mode': True, 'id': "DigitalOceanAgentTrendID"}, + 'BitbucketAgent': {'mode': True, 'id': "BitbucketAgentTrendID"}, + 'AzureAgent': {'mode': True, 'id': "AzureAgentTrendID"}, + 'FlutterAgent': {'mode': True, 'id': "FlutterAgentTrendID"}, + 'YoutubeAgent': {'mode': True, 'id': "YoutubeAgentTrendID"}, + 'builderAgent': {'mode': True, 'id': "builderAgentTrendID"}, } userSelectedModel = { @@ -101,8 +138,25 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): 'ReactAgent': '@React Agent', 'XcodeAgent': '@Xcode Agent', 'AngularJSAgent': '@AngularJS Agent', + 'HerokuAgent': '@Heroku Agent', + 'GodotAgent': '@Godot Agent', + 'GoAgent': '@Go Agent', + 'GitlabAgent': '@Gitlab Agent', + 'GitAgent': '@Git Agent', 'blackboxai-pro': '@BLACKBOXAI-PRO', 'ImageGeneration': '@Image Generation', + 'FlaskAgent': '@Flask Agent', + 'FirebaseAgent': '@Firebase Agent', + 'FastAPIAgent': '@FastAPI Agent', + 'ErlangAgent': '@Erlang Agent', + 'ElectronAgent': '@Electron Agent', + 'DockerAgent': '@Docker Agent', + 'DigitalOceanAgent': '@DigitalOcean Agent', + 'BitbucketAgent': '@Bitbucket Agent', + 'AzureAgent': '@Azure Agent', + 'FlutterAgent': '@Flutter Agent', + 'YoutubeAgent': '@Youtube Agent', + 'builderAgent': '@builder Agent', } model_referers = { -- cgit v1.2.3 From cf47a99d6eb2cf4b5eb58387d3eb49264d98ff19 Mon Sep 17 00:00:00 2001 From: rkihacker Date: Sat, 2 Nov 2024 21:23:38 +0500 Subject: add new agent models --- g4f/Provider/Blackbox.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 47b3c05c..77cfdcc6 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -102,18 +102,18 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): 'GitlabAgent': {'mode': True, 'id': "Gitlab Agent"}, 'GitAgent': {'mode': True, 'id': "Git Agent"}, 'RepoMap': {'mode': True, 'id': "RepoMap"}, - 'FlaskAgent': {'mode': True, 'id': "FlaskAgentTrendID"}, - 'FirebaseAgent': {'mode': True, 'id': "FirebaseAgentTrendID"}, - 'FastAPIAgent': {'mode': True, 'id': "FastAPIAgentTrendID"}, - 'ErlangAgent': {'mode': True, 'id': "ErlangAgentTrendID"}, - 'ElectronAgent': {'mode': True, 'id': "ElectronAgentTrendID"}, - 'DockerAgent': {'mode': True, 'id': "DockerAgentTrendID"}, - 'DigitalOceanAgent': {'mode': True, 'id': "DigitalOceanAgentTrendID"}, - 'BitbucketAgent': {'mode': True, 'id': "BitbucketAgentTrendID"}, - 'AzureAgent': {'mode': True, 'id': "AzureAgentTrendID"}, - 'FlutterAgent': {'mode': True, 'id': "FlutterAgentTrendID"}, - 'YoutubeAgent': {'mode': True, 'id': "YoutubeAgentTrendID"}, - 'builderAgent': {'mode': True, 'id': "builderAgentTrendID"}, + 'FlaskAgent': {'mode': True, 'id': "Flask Agent"}, + 'FirebaseAgent': {'mode': True, 'id': "Firebase Agent"}, + 'FastAPIAgent': {'mode': True, 'id': "FastAPI Agent"}, + 'ErlangAgent': {'mode': True, 'id': "Erlang Agent"}, + 'ElectronAgent': {'mode': True, 'id': "Electron Agent"}, + 'DockerAgent': {'mode': True, 'id': "Docker Agent"}, + 'DigitalOceanAgent': {'mode': True, 'id': "DigitalOcean Agent"}, + 'BitbucketAgent': {'mode': True, 'id': "Bitbucket Agent"}, + 'AzureAgent': {'mode': True, 'id': "Azure Agent"}, + 'FlutterAgent': {'mode': True, 'id': "Flutter Agent"}, + 'YoutubeAgent': {'mode': True, 'id': "Youtube Agent"}, + 'builderAgent': {'mode': True, 'id': "builder Agent"}, } userSelectedModel = { -- cgit v1.2.3 From 36aecbd6de184ab4d3e6ce21fb45f43cb750f65a Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 3 Nov 2024 21:07:38 +0200 Subject: Update (g4f/Provider/Blackbox.py) --- g4f/Provider/Blackbox.py | 450 ++++++++++++----------------------------------- 1 file changed, 113 insertions(+), 337 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 77cfdcc6..e5c455d4 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -1,21 +1,15 @@ from __future__ import annotations -import asyncio -import aiohttp +from aiohttp import ClientSession import random import string import json -import uuid import re -from typing import Optional, AsyncGenerator, Union - -from aiohttp import ClientSession, ClientResponseError from ..typing import AsyncResult, Messages, ImageType from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from ..image import ImageResponse, to_data_uri - class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): label = "Blackbox AI" url = "https://www.blackbox.ai" @@ -24,154 +18,89 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): supports_stream = True supports_system_message = True supports_message_history = True - + default_model = 'blackboxai' - image_models = ['ImageGeneration'] - models = [ - default_model, - 'blackboxai-pro', - *image_models, - "llama-3.1-8b", - 'llama-3.1-70b', - 'llama-3.1-405b', - 'gpt-4o', - 'gemini-pro', - 'gemini-1.5-flash', - 'claude-sonnet-3.5', - 'PythonAgent', - 'JavaAgent', - 'JavaScriptAgent', - 'HTMLAgent', - 'GoogleCloudAgent', - 'AndroidDeveloper', - 'SwiftDeveloper', - 'Next.jsAgent', - 'MongoDBAgent', - 'PyTorchAgent', - 'ReactAgent', - 'XcodeAgent', - 'AngularJSAgent', - 'HerokuAgent', - 'GodotAgent', - 'GoAgent', - 'GitlabAgent', - 'GitAgent', - 'RepoMap', - 'FlaskAgent', - 'FirebaseAgent', - 'FastAPIAgent', - 'ErlangAgent', - 'ElectronAgent', - 'DockerAgent', - 'DigitalOceanAgent', - 'BitbucketAgent', - 'AzureAgent', - 'FlutterAgent', - 'YoutubeAgent', - 'builderAgent', - ] - + + image_models = ['Image Generation', 'repomap'] + + userSelectedModel = ['gpt-4o', 'gemini-pro', 'claude-sonnet-3.5', 'blackboxai-pro'] + agentMode = { - 'ImageGeneration': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "Image Generation"}, + 'Image Generation': {'mode': True, 'id': "ImageGenerationLV45LJp", 'name': "Image Generation"}, } - + trendingAgentMode = { - "blackboxai": {}, - "blackboxai": {}, "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'}, "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"}, 'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"}, - 'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405b"}, + # + 'Python Agent': {'mode': True, 'id': "Python Agent"}, + 'Java Agent': {'mode': True, 'id': "Java Agent"}, + 'JavaScript Agent': {'mode': True, 'id': "JavaScript Agent"}, + 'HTML Agent': {'mode': True, 'id': "HTML Agent"}, + 'Google Cloud Agent': {'mode': True, 'id': "Google Cloud Agent"}, + 'Android Developer': {'mode': True, 'id': "Android Developer"}, + 'Swift Developer': {'mode': True, 'id': "Swift Developer"}, + 'Next.js Agent': {'mode': True, 'id': "Next.js Agent"}, + 'MongoDB Agent': {'mode': True, 'id': "MongoDB Agent"}, + 'PyTorch Agent': {'mode': True, 'id': "PyTorch Agent"}, + 'React Agent': {'mode': True, 'id': "React Agent"}, + 'Xcode Agent': {'mode': True, 'id': "Xcode Agent"}, + 'AngularJS Agent': {'mode': True, 'id': "AngularJS Agent"}, 'blackboxai-pro': {'mode': True, 'id': "BLACKBOXAI-PRO"}, - 'PythonAgent': {'mode': True, 'id': "Python Agent"}, - 'JavaAgent': {'mode': True, 'id': "Java Agent"}, - 'JavaScriptAgent': {'mode': True, 'id': "JavaScript Agent"}, - 'HTMLAgent': {'mode': True, 'id': "HTML Agent"}, - 'GoogleCloudAgent': {'mode': True, 'id': "Google Cloud Agent"}, - 'AndroidDeveloper': {'mode': True, 'id': "Android Developer"}, - 'SwiftDeveloper': {'mode': True, 'id': "Swift Developer"}, - 'Next.jsAgent': {'mode': True, 'id': "Next.js Agent"}, - 'MongoDBAgent': {'mode': True, 'id': "MongoDB Agent"}, - 'PyTorchAgent': {'mode': True, 'id': "PyTorch Agent"}, - 'ReactAgent': {'mode': True, 'id': "React Agent"}, - 'XcodeAgent': {'mode': True, 'id': "Xcode Agent"}, - 'AngularJSAgent': {'mode': True, 'id': "AngularJS Agent"}, - 'HerokuAgent': {'mode': True, 'id': "Heroku Agent"}, - 'GodotAgent': {'mode': True, 'id': "Godot Agent"}, - 'GoAgent': {'mode': True, 'id': "Go Agent"}, - 'GitlabAgent': {'mode': True, 'id': "Gitlab Agent"}, - 'GitAgent': {'mode': True, 'id': "Git Agent"}, - 'RepoMap': {'mode': True, 'id': "RepoMap"}, - 'FlaskAgent': {'mode': True, 'id': "Flask Agent"}, - 'FirebaseAgent': {'mode': True, 'id': "Firebase Agent"}, - 'FastAPIAgent': {'mode': True, 'id': "FastAPI Agent"}, - 'ErlangAgent': {'mode': True, 'id': "Erlang Agent"}, - 'ElectronAgent': {'mode': True, 'id': "Electron Agent"}, - 'DockerAgent': {'mode': True, 'id': "Docker Agent"}, - 'DigitalOceanAgent': {'mode': True, 'id': "DigitalOcean Agent"}, - 'BitbucketAgent': {'mode': True, 'id': "Bitbucket Agent"}, - 'AzureAgent': {'mode': True, 'id': "Azure Agent"}, - 'FlutterAgent': {'mode': True, 'id': "Flutter Agent"}, - 'YoutubeAgent': {'mode': True, 'id': "Youtube Agent"}, - 'builderAgent': {'mode': True, 'id': "builder Agent"}, - } - - userSelectedModel = { - "gpt-4o": "gpt-4o", - "gemini-pro": "gemini-pro", - 'claude-sonnet-3.5': "claude-sonnet-3.5", - } - - model_prefixes = { - 'gpt-4o': '@GPT-4o', - 'gemini-pro': '@Gemini-PRO', - 'PythonAgent': '@Python Agent', - 'JavaAgent': '@Java Agent', - 'JavaScriptAgent': '@JavaScript Agent', - 'HTMLAgent': '@HTML Agent', - 'GoogleCloudAgent': '@Google Cloud Agent', - 'AndroidDeveloper': '@Android Developer', - 'SwiftDeveloper': '@Swift Developer', - 'Next.jsAgent': '@Next.js Agent', - 'MongoDBAgent': '@MongoDB Agent', - 'PyTorchAgent': '@PyTorch Agent', - 'ReactAgent': '@React Agent', - 'XcodeAgent': '@Xcode Agent', - 'AngularJSAgent': '@AngularJS Agent', - 'HerokuAgent': '@Heroku Agent', - 'GodotAgent': '@Godot Agent', - 'GoAgent': '@Go Agent', - 'GitlabAgent': '@Gitlab Agent', - 'GitAgent': '@Git Agent', - 'blackboxai-pro': '@BLACKBOXAI-PRO', - 'ImageGeneration': '@Image Generation', - 'FlaskAgent': '@Flask Agent', - 'FirebaseAgent': '@Firebase Agent', - 'FastAPIAgent': '@FastAPI Agent', - 'ErlangAgent': '@Erlang Agent', - 'ElectronAgent': '@Electron Agent', - 'DockerAgent': '@Docker Agent', - 'DigitalOceanAgent': '@DigitalOcean Agent', - 'BitbucketAgent': '@Bitbucket Agent', - 'AzureAgent': '@Azure Agent', - 'FlutterAgent': '@Flutter Agent', - 'YoutubeAgent': '@Youtube Agent', - 'builderAgent': '@builder Agent', - } - - model_referers = { - "blackboxai": "/?model=blackboxai", - "gpt-4o": "/?model=gpt-4o", - "gemini-pro": "/?model=gemini-pro", - "claude-sonnet-3.5": "/?model=claude-sonnet-3.5" + # + 'repomap': {'mode': True, 'id': "repomap"}, + # + 'Heroku Agent': {'mode': True, 'id': "Heroku Agent"}, + 'Godot Agent': {'mode': True, 'id': "Godot Agent"}, + 'Go Agent': {'mode': True, 'id': "Go Agent"}, + 'Gitlab Agent': {'mode': True, 'id': "Gitlab Agent"}, + 'Git Agent': {'mode': True, 'id': "Git Agent"}, + 'Flask Agent': {'mode': True, 'id': "Flask Agent"}, + 'Firebase Agent': {'mode': True, 'id': "Firebase Agent"}, + 'FastAPI Agent': {'mode': True, 'id': "FastAPI Agent"}, + 'Erlang Agent': {'mode': True, 'id': "Erlang Agent"}, + 'Electron Agent': {'mode': True, 'id': "Electron Agent"}, + 'Docker Agent': {'mode': True, 'id': "Docker Agent"}, + 'DigitalOcean Agent': {'mode': True, 'id': "DigitalOcean Agent"}, + 'Bitbucket Agent': {'mode': True, 'id': "Bitbucket Agent"}, + 'Azure Agent': {'mode': True, 'id': "Azure Agent"}, + 'Flutter Agent': {'mode': True, 'id': "Flutter Agent"}, + 'Youtube Agent': {'mode': True, 'id': "Youtube Agent"}, + 'builder Agent': {'mode': True, 'id': "builder Agent"}, } + + model_prefixes = {mode: f"@{value['id']}" for mode, value in trendingAgentMode.items() if mode not in ["gemini-1.5-flash", "llama-3.1-8b", "llama-3.1-70b", "repomap"]} + + models = [default_model, *userSelectedModel, *list(agentMode.keys()), *list(trendingAgentMode.keys())] + model_aliases = { "gemini-flash": "gemini-1.5-flash", "claude-3.5-sonnet": "claude-sonnet-3.5", - "flux": "ImageGeneration", + "flux": "Image Generation", } + @staticmethod + def generate_id(length=7): + characters = string.ascii_letters + string.digits + return ''.join(random.choice(characters) for _ in range(length)) + + @classmethod + def add_prefix_to_messages(cls, messages: Messages, model: str) -> Messages: + prefix = cls.model_prefixes.get(model, "") + if not prefix: + return messages + + new_messages = [] + for message in messages: + new_message = message.copy() + if message['role'] == 'user': + new_message['content'] = (prefix + " " + message['content']).strip() + new_messages.append(new_message) + + return new_messages + @classmethod def get_model(cls, model: str) -> str: if model in cls.models: @@ -181,140 +110,54 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): else: return cls.default_model - @staticmethod - def generate_random_string(length: int = 7) -> str: - characters = string.ascii_letters + string.digits - return ''.join(random.choices(characters, k=length)) - - @staticmethod - def generate_next_action() -> str: - return uuid.uuid4().hex - - @staticmethod - def generate_next_router_state_tree() -> str: - router_state = [ - "", - { - "children": [ - "(chat)", - { - "children": [ - "__PAGE__", - {} - ] - } - ] - }, - None, - None, - True - ] - return json.dumps(router_state) - - @staticmethod - def clean_response(text: str) -> str: - pattern = r'^\$\@\$v=undefined-rv1\$\@\$' - cleaned_text = re.sub(pattern, '', text) - return cleaned_text - @classmethod async def create_async_generator( cls, model: str, messages: Messages, - proxy: Optional[str] = None, + proxy: str = None, + web_search: bool = False, image: ImageType = None, image_name: str = None, - web_search: bool = False, **kwargs - ) -> AsyncGenerator[Union[str, ImageResponse], None]: - """ - Creates an asynchronous generator for streaming responses from Blackbox AI. - - Parameters: - model (str): Model to use for generating responses. - messages (Messages): Message history. - proxy (Optional[str]): Proxy URL, if needed. - image (ImageType): Image data to be processed, if any. - image_name (str): Name of the image file, if an image is provided. - web_search (bool): Enables or disables web search mode. - **kwargs: Additional keyword arguments. + ) -> AsyncResult: + model = cls.get_model(model) + message_id = cls.generate_id() + messages_with_prefix = cls.add_prefix_to_messages(messages, model) - Yields: - Union[str, ImageResponse]: Segments of the generated response or ImageResponse objects. - """ - if image is not None: - messages[-1]['data'] = { + messages_with_prefix[-1]['data'] = { 'fileText': '', 'imageBase64': to_data_uri(image), 'title': image_name } - messages[-1]['content'] = 'FILE:BB\n$#$\n\n$#$\n' + messages[-1]['content'] - - model = cls.get_model(model) - - chat_id = cls.generate_random_string() - next_action = cls.generate_next_action() - next_router_state_tree = cls.generate_next_router_state_tree() - agent_mode = cls.agentMode.get(model, {}) - trending_agent_mode = cls.trendingAgentMode.get(model, {}) - - prefix = cls.model_prefixes.get(model, "") - - formatted_prompt = "" - for message in messages: - role = message.get('role', '').capitalize() - content = message.get('content', '') - if role and content: - formatted_prompt += f"{role}: {content}\n" - - if prefix: - formatted_prompt = f"{prefix} {formatted_prompt}".strip() - - referer_path = cls.model_referers.get(model, f"/?model={model}") - referer_url = f"{cls.url}{referer_path}" - - common_headers = { + headers = { 'accept': '*/*', 'accept-language': 'en-US,en;q=0.9', 'cache-control': 'no-cache', + 'content-type': 'application/json', 'origin': cls.url, 'pragma': 'no-cache', 'priority': 'u=1, i', - 'sec-ch-ua': '"Chromium";v="129", "Not=A?Brand";v="8"', + 'referer': f'{cls.url}/', + 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', '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/129.0.0.0 Safari/537.36' - } - - headers_api_chat = { - 'Content-Type': 'application/json', - 'Referer': referer_url + 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' } - headers_api_chat_combined = {**common_headers, **headers_api_chat} - - payload_api_chat = { - "messages": [ - { - "id": chat_id, - "content": formatted_prompt, - "role": "user", - "data": messages[-1].get('data') - } - ], - "id": chat_id, + + data = { + "messages": messages_with_prefix, + "id": message_id, "previewToken": None, "userId": None, "codeModelMode": True, - "agentMode": agent_mode, - "trendingAgentMode": trending_agent_mode, + "agentMode": cls.agentMode.get(model, {}) if model in cls.agentMode else {}, + "trendingAgentMode": cls.trendingAgentMode.get(model, {}) if model in cls.trendingAgentMode else {}, "isMicMode": False, "userSystemPrompt": None, "maxTokens": 1024, @@ -327,100 +170,33 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "clickedForceWebSearch": False, "visitFromDelta": False, "mobileClient": False, + "userSelectedModel": model if model in cls.userSelectedModel else None, "webSearchMode": web_search, - "userSelectedModel": cls.userSelectedModel.get(model, model), "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc" } - headers_chat = { - 'Accept': 'text/x-component', - 'Content-Type': 'text/plain;charset=UTF-8', - 'Referer': f'{cls.url}/chat/{chat_id}?model={model}', - 'next-action': next_action, - 'next-router-state-tree': next_router_state_tree, - 'next-url': '/' - } - headers_chat_combined = {**common_headers, **headers_chat} - - data_chat = '[]' - - async with ClientSession(headers=common_headers) as session: - try: - async with session.post( - cls.api_endpoint, - headers=headers_api_chat_combined, - json=payload_api_chat, - proxy=proxy - ) as response_api_chat: - response_api_chat.raise_for_status() - text = await response_api_chat.text() - cleaned_response = cls.clean_response(text) - - if model in cls.image_models: - match = re.search(r'!\[.*?\]\((https?://[^\)]+)\)', cleaned_response) - if match: - image_url = match.group(1) - image_response = ImageResponse(images=image_url, alt="Generated Image") - yield image_response - else: - yield cleaned_response - else: - if web_search: - match = re.search(r'\$~~~\$(.*?)\$~~~\$', cleaned_response, re.DOTALL) - if match: - source_part = match.group(1).strip() - answer_part = cleaned_response[match.end():].strip() - try: - sources = json.loads(source_part) - source_formatted = "**Source:**\n" - for item in sources: - title = item.get('title', 'No Title') - link = item.get('link', '#') - position = item.get('position', '') - source_formatted += f"{position}. [{title}]({link})\n" - final_response = f"{answer_part}\n\n{source_formatted}" - except json.JSONDecodeError: - final_response = f"{answer_part}\n\nSource information is unavailable." - else: - final_response = cleaned_response - else: - if '$~~~$' in cleaned_response: - final_response = cleaned_response.split('$~~~$')[0].strip() - else: - final_response = cleaned_response - - yield final_response - except ClientResponseError as e: - error_text = f"Error {e.status}: {e.message}" - try: - error_response = await e.response.text() - cleaned_error = cls.clean_response(error_response) - error_text += f" - {cleaned_error}" - except Exception: - pass - yield error_text - except Exception as e: - yield f"Unexpected error during /api/chat request: {str(e)}" - - chat_url = f'{cls.url}/chat/{chat_id}?model={model}' - - try: - async with session.post( - chat_url, - headers=headers_chat_combined, - data=data_chat, - proxy=proxy - ) as response_chat: - response_chat.raise_for_status() - pass - except ClientResponseError as e: - error_text = f"Error {e.status}: {e.message}" - try: - error_response = await e.response.text() - cleaned_error = cls.clean_response(error_response) - error_text += f" - {cleaned_error}" - except Exception: - pass - yield error_text - except Exception as e: - yield f"Unexpected error during /chat/{chat_id} request: {str(e)}" + async with ClientSession(headers=headers) as session: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + response_text = await response.text() + + if model in cls.image_models: + image_matches = re.findall(r'!\[.*?\]\((https?://[^\)]+)\)', response_text) + if image_matches: + image_url = image_matches[0] + image_response = ImageResponse(images=[image_url], alt="Generated Image") + yield image_response + return + + json_match = re.search(r'\$~~~\$(.*?)\$~~~\$', response_text, re.DOTALL) + if json_match: + search_results = json.loads(json_match.group(1)) + answer = response_text.split('$~~~$')[-1].strip() + + formatted_response = f"{answer}\n\n**Source:**" + for i, result in enumerate(search_results, 1): + formatted_response += f"\n{i}. {result['title']}: {result['link']}" + + yield formatted_response + else: + yield response_text.strip() -- cgit v1.2.3 From de5793a8e132c6309c540291918d7bf3077358ae Mon Sep 17 00:00:00 2001 From: rkihacker Date: Mon, 4 Nov 2024 00:19:02 +0500 Subject: update llama-3.1-405b --- g4f/Provider/Blackbox.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index e5c455d4..ffd6890f 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -33,6 +33,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'}, "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"}, 'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"}, + 'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"}, # 'Python Agent': {'mode': True, 'id': "Python Agent"}, 'Java Agent': {'mode': True, 'id': "Java Agent"}, @@ -70,7 +71,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): 'builder Agent': {'mode': True, 'id': "builder Agent"}, } - model_prefixes = {mode: f"@{value['id']}" for mode, value in trendingAgentMode.items() if mode not in ["gemini-1.5-flash", "llama-3.1-8b", "llama-3.1-70b", "repomap"]} + model_prefixes = {mode: f"@{value['id']}" for mode, value in trendingAgentMode.items() if mode not in ["gemini-1.5-flash", "llama-3.1-8b", "llama-3.1-70b", "llama-3.1-405b", "repomap"]} models = [default_model, *userSelectedModel, *list(agentMode.keys()), *list(trendingAgentMode.keys())] -- cgit v1.2.3 From 8c7791aae38ef364182fc8676d2e7349f9341a4c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 4 Nov 2024 15:37:04 +0200 Subject: Update (docs/providers-and-models.md g4f/models.py g4f/Provider/GizAI.py) --- docs/providers-and-models.md | 11 ++-- g4f/Provider/GizAI.py | 120 ++++++++----------------------------------- g4f/models.py | 30 ++++------- 3 files changed, 36 insertions(+), 125 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 1c56244c..51f49f0c 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -30,7 +30,7 @@ This document provides an overview of various AI providers and models, including |[openchat.team](https://openchat.team/)|`g4f.Provider.Aura`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| |[bing.com/images](https://www.bing.com/images/create)|`g4f.Provider.BingCreateImages`|`❌|✔|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| -|[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, gpt-4o, gemini-pro, claude-3.5-sonnet`|`flux`|✔|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b, gpt-4o, gemini-pro, claude-3.5-sonnet`|`flux`|`blackboxai, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b, gpt-4o, gemini-pro`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgot.one](https://www.chatgot.one/)|`g4f.Provider.ChatGot`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -53,7 +53,7 @@ This document provides an overview of various AI providers and models, including |[free.netfly.top](https://free.netfly.top)|`g4f.Provider.FreeNetfly`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[gemini.google.com](https://gemini.google.com)|`g4f.Provider.Gemini`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[ai.google.dev](https://ai.google.dev)|`g4f.Provider.GeminiPro`|✔|❌|✔|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| -|[app.giz.ai](https://app.giz.ai/assistant/)|`g4f.Provider.GizAI`|`gemini-flash, gemini-pro, gpt-4o-mini, gpt-4o, claude-3.5-sonnet, claude-3-haiku, llama-3.1-70b, llama-3.1-8b, mistral-large`|`sdxl, sd-1.5, sd-3.5, dalle-3, flux-schnell, flux1-pro`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[app.giz.ai](https://app.giz.ai/assistant/)|`g4f.Provider.GizAI`|`gemini-flash`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[developers.sber.ru](https://developers.sber.ru/gigachat)|`g4f.Provider.GigaChat`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[gprochat.com](https://gprochat.com)|`g4f.Provider.GPROChat`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[console.groq.com/playground](https://console.groq.com/playground)|`g4f.Provider.Groq`|✔|❌|❌|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| @@ -112,8 +112,8 @@ This document provides an overview of various AI providers and models, including |gpt-4-turbo|OpenAI|3+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| |gpt-4o|OpenAI|10+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o)| |gpt-4o-mini|OpenAI|14+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o-mini)| -|o1|OpenAI|1+ Providers|[platform.openai.com](https://openai.com/index/introducing-openai-o1-preview/)| -|o1-mini|OpenAI|2+ Providers|[platform.openai.com](https://openai.com/index/openai-o1-mini-advancing-cost-efficient-reasoning/)| +|o1|OpenAI|0+ Providers|[platform.openai.com](https://openai.com/index/introducing-openai-o1-preview/)| +|o1-mini|OpenAI|0+ Providers|[platform.openai.com](https://openai.com/index/openai-o1-mini-advancing-cost-efficient-reasoning/)| |llama-2-7b|Meta Llama|1+ Providers|[huggingface.co](https://huggingface.co/meta-llama/Llama-2-7b)| |llama-2-13b|Meta Llama|1+ Providers|[llama.com](https://www.llama.com/llama2/)| |llama-3-8b|Meta Llama|4+ Providers|[ai.meta.com](https://ai.meta.com/blog/meta-llama-3/)| @@ -207,7 +207,6 @@ This document provides an overview of various AI providers and models, including |sdxl-turbo|Stability AI|1+ Providers|[huggingface.co](https://huggingface.co/stabilityai/sdxl-turbo)| |sd-1.5|Stability AI|1+ Providers|[huggingface.co](https://huggingface.co/runwayml/stable-diffusion-v1-5)| |sd-3|Stability AI|1+ Providers|[huggingface.co](https://huggingface.co/docs/diffusers/main/en/api/pipelines/stable_diffusion/stable_diffusion_3)| -|sd-3.5|Stability AI|1+ Providers|[stability.ai](https://stability.ai/news/introducing-stable-diffusion-3-5)| |playground-v2.5|Playground AI|1+ Providers|[huggingface.co](https://huggingface.co/playgroundai/playground-v2.5-1024px-aesthetic)| |flux|Black Forest Labs|2+ Providers|[github.com/black-forest-labs/flux](https://github.com/black-forest-labs/flux)| |flux-pro|Black Forest Labs|2+ Providers|[github.com/black-forest-labs/flux](https://github.com/black-forest-labs/flux)| @@ -235,7 +234,7 @@ This document provides an overview of various AI providers and models, including ### Providers and vision models | Provider | Base Provider | | Vision Models | Status | Auth | |-------|---------------|-----------|---------|---------|---------| -| `g4f.Provider.Blackbox` | Blackbox AI | | `blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, gpt-4o, gemini-pro, claude-3.5-sonnet` | ![Active](https://img.shields.io/badge/Active-brightgreen) | ❌ | +| `g4f.Provider.Blackbox` | Blackbox AI | | `blackboxai, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b, gpt-4o, gemini-pro` | ![Active](https://img.shields.io/badge/Active-brightgreen) | ❌ | ## Conclusion and Usage Tips This document provides a comprehensive overview of various AI providers and models available for text generation, image generation, and vision tasks. **When choosing a provider or model, consider the following factors:** diff --git a/g4f/Provider/GizAI.py b/g4f/Provider/GizAI.py index 127edc9e..a5ce0ec2 100644 --- a/g4f/Provider/GizAI.py +++ b/g4f/Provider/GizAI.py @@ -1,62 +1,24 @@ from __future__ import annotations -import json from aiohttp import ClientSession from ..typing import AsyncResult, Messages -from ..image import ImageResponse from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import format_prompt + class GizAI(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://app.giz.ai/assistant/" + url = "https://app.giz.ai" api_endpoint = "https://app.giz.ai/api/data/users/inferenceServer.infer" working = True - + supports_stream = False supports_system_message = True supports_message_history = True - # Chat models default_model = 'chat-gemini-flash' - chat_models = [ - default_model, - 'chat-gemini-pro', - 'chat-gpt4m', - 'chat-gpt4', - 'claude-sonnet', - 'claude-haiku', - 'llama-3-70b', - 'llama-3-8b', - 'mistral-large', - 'chat-o1-mini' - ] - - # Image models - image_models = [ - 'flux1', - 'sdxl', - 'sd', - 'sd35', - ] - - models = [*chat_models, *image_models] + models = [default_model] - model_aliases = { - # Chat model aliases - "gemini-flash": "chat-gemini-flash", - "gemini-pro": "chat-gemini-pro", - "gpt-4o-mini": "chat-gpt4m", - "gpt-4o": "chat-gpt4", - "claude-3.5-sonnet": "claude-sonnet", - "claude-3-haiku": "claude-haiku", - "llama-3.1-70b": "llama-3-70b", - "llama-3.1-8b": "llama-3-8b", - "o1-mini": "chat-o1-mini", - # Image model aliases - "sd-1.5": "sd", - "sd-3.5": "sd35", - "flux-schnell": "flux1", - } + model_aliases = {"gemini-flash": "chat-gemini-flash",} @classmethod def get_model(cls, model: str) -> str: @@ -67,10 +29,6 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin): else: return cls.default_model - @classmethod - def is_image_model(cls, model: str) -> bool: - return model in cls.image_models - @classmethod async def create_async_generator( cls, @@ -87,7 +45,8 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin): 'Cache-Control': 'no-cache', 'Connection': 'keep-alive', 'Content-Type': 'application/json', - 'Origin': 'https://app.giz.ai', + 'DNT': '1', + 'Origin': cls.url, 'Pragma': 'no-cache', 'Sec-Fetch-Dest': 'empty', 'Sec-Fetch-Mode': 'cors', @@ -97,55 +56,16 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin): 'sec-ch-ua-mobile': '?0', 'sec-ch-ua-platform': '"Linux"' } - - async with ClientSession() as session: - if cls.is_image_model(model): - # Image generation - prompt = messages[-1]["content"] - data = { - "model": model, - "input": { - "width": "1024", - "height": "1024", - "steps": 4, - "output_format": "webp", - "batch_size": 1, - "mode": "plan", - "prompt": prompt - } - } - async with session.post( - cls.api_endpoint, - headers=headers, - data=json.dumps(data), - proxy=proxy - ) as response: - response.raise_for_status() - response_data = await response.json() - if response_data.get('status') == 'completed' and response_data.get('output'): - for url in response_data['output']: - yield ImageResponse(images=url, alt="Generated Image") - else: - # Chat completion - data = { - "model": model, - "input": { - "messages": [ - { - "type": "human", - "content": format_prompt(messages) - } - ], - "mode": "plan" - }, - "noStream": True - } - async with session.post( - cls.api_endpoint, - headers=headers, - data=json.dumps(data), - proxy=proxy - ) as response: - response.raise_for_status() - result = await response.json() - yield result.get('output', '') + async with ClientSession(headers=headers) as session: + data = { + "model": model, + "input": { + "messages": messages, + "mode": "plan" + }, + "noStream": True + } + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + result = await response.json() + yield result['output'].strip() diff --git a/g4f/models.py b/g4f/models.py index 944c4e9c..8b258201 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -137,13 +137,13 @@ gpt_35_turbo = Model( gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([NexraChatGPT, Blackbox, ChatGptEs, DarkAI, Editee, GizAI, Airforce, Liaobots, OpenaiChat]) + best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Editee, NexraChatGPT, Airforce, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, Airforce, GizAI, ChatgptFree, Koala, OpenaiChat, ChatGpt]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, Airforce, ChatgptFree, Koala, OpenaiChat, ChatGpt]) ) gpt_4_turbo = Model( @@ -168,7 +168,7 @@ o1 = Model( o1_mini = Model( name = 'o1-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([GizAI]) + best_provider = None ) @@ -217,13 +217,13 @@ llama_3_70b = Model( llama_3_1_8b = Model( name = "llama-3.1-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, GizAI, Airforce, PerplexityLabs]) + best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, Airforce, PerplexityLabs]) ) llama_3_1_70b = Model( name = "llama-3.1-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([DDG, HuggingChat, Blackbox, FreeGpt, TeachAnything, Free2GPT, DeepInfraChat, DarkAI, AiMathGPT, RubiksAI, GizAI, Airforce, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([DDG, HuggingChat, Blackbox, FreeGpt, TeachAnything, Free2GPT, DeepInfraChat, DarkAI, AiMathGPT, RubiksAI, Airforce, HuggingFace, PerplexityLabs]) ) llama_3_1_405b = Model( @@ -312,7 +312,7 @@ mistral_nemo = Model( mistral_large = Model( name = "mistral-large", base_provider = "Mistral", - best_provider = IterListProvider([Editee, GizAI]) + best_provider = IterListProvider([Editee]) ) @@ -360,7 +360,7 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, Editee, GizAI, Airforce, Liaobots]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, Editee, Airforce, Liaobots]) ) gemini_flash = Model( @@ -431,14 +431,14 @@ claude_3_sonnet = Model( claude_3_haiku = Model( name = 'claude-3-haiku', base_provider = 'Anthropic', - best_provider = IterListProvider([DDG, GizAI, Liaobots]) + best_provider = IterListProvider([DDG, Liaobots]) ) # claude 3.5 claude_3_5_sonnet = Model( name = 'claude-3.5-sonnet', base_provider = 'Anthropic', - best_provider = IterListProvider([Blackbox, Editee, GizAI, Liaobots]) + best_provider = IterListProvider([Blackbox, Editee, Liaobots]) ) @@ -777,7 +777,7 @@ sdxl = Model( sd_1_5 = Model( name = 'sd-1.5', base_provider = 'Stability AI', - best_provider = IterListProvider([NexraSD15, GizAI]) + best_provider = IterListProvider([NexraSD15]) ) @@ -788,13 +788,6 @@ sd_3 = Model( ) -sd_3_5 = Model( - name = 'sd-3.5', - base_provider = 'Stability AI', - best_provider = GizAI - -) - ### Playground ### playground_v2_5 = Model( name = 'playground-v2.5', @@ -864,7 +857,7 @@ flux_4o = Model( flux_schnell = Model( name = 'flux-schnell', base_provider = 'Flux AI', - best_provider = IterListProvider([ReplicateHome, GizAI]) + best_provider = IterListProvider([ReplicateHome]) ) @@ -1156,7 +1149,6 @@ class ModelUtils: 'sdxl-turbo': sdxl_turbo, 'sd-1.5': sd_1_5, 'sd-3': sd_3, -'sd-3.5': sd_3_5, ### Playground ### -- cgit v1.2.3 From c3d7412a4130cf4ff23761beb0bfebdb5321b3be Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 4 Nov 2024 15:42:58 +0200 Subject: Provider deleted because it has been down for a long time (g4f/Provider/ChatGot.py) --- g4f/Provider/ChatGot.py | 75 ------------------------------------------------ g4f/Provider/__init__.py | 1 - 2 files changed, 76 deletions(-) delete mode 100644 g4f/Provider/ChatGot.py diff --git a/g4f/Provider/ChatGot.py b/g4f/Provider/ChatGot.py deleted file mode 100644 index 55e8d0b6..00000000 --- a/g4f/Provider/ChatGot.py +++ /dev/null @@ -1,75 +0,0 @@ -from __future__ import annotations - -import time -from hashlib import sha256 - -from aiohttp import BaseConnector, ClientSession - -from ..errors import RateLimitError -from ..requests import raise_for_status -from ..requests.aiohttp import get_connector -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin - - -class ChatGot(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://www.chatgot.one/" - working = True - supports_message_history = True - default_model = 'gemini-pro' - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - connector: BaseConnector = None, - **kwargs, - ) -> AsyncResult: - headers = { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0", - "Accept": "*/*", - "Accept-Language": "en-US,en;q=0.5", - "Accept-Encoding": "gzip, deflate, br", - "Content-Type": "text/plain;charset=UTF-8", - "Referer": f"{cls.url}/", - "Origin": cls.url, - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "Connection": "keep-alive", - "TE": "trailers", - } - async with ClientSession( - connector=get_connector(connector, proxy), headers=headers - ) as session: - timestamp = int(time.time() * 1e3) - data = { - "messages": [ - { - "role": "model" if message["role"] == "assistant" else "user", - "parts": [{"text": message["content"]}], - } - for message in messages - ], - "time": timestamp, - "pass": None, - "sign": generate_signature(timestamp, messages[-1]["content"]), - } - async with session.post( - f"{cls.url}/api/generate", json=data, proxy=proxy - ) as response: - if response.status == 500: - if "Quota exceeded" in await response.text(): - raise RateLimitError( - f"Response {response.status}: Rate limit reached" - ) - await raise_for_status(response) - async for chunk in response.content.iter_any(): - yield chunk.decode(errors="ignore") - - -def generate_signature(time: int, text: str, secret: str = ""): - message = f"{time}:{text}:{secret}" - return sha256(message.encode()).hexdigest() diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 1caf8aaf..66b84945 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -26,7 +26,6 @@ from .Aura import Aura from .Bing import Bing from .BingCreateImages import BingCreateImages from .Blackbox import Blackbox -from .ChatGot import ChatGot from .ChatGpt import ChatGpt from .Chatgpt4Online import Chatgpt4Online from .Chatgpt4o import Chatgpt4o -- cgit v1.2.3 From e73792d7c1c77266d35f38be95cb8d840ad6ffa8 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 4 Nov 2024 19:08:39 +0200 Subject: Update (g4f/models.py) --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/models.py b/g4f/models.py index 8b258201..99b31af2 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -130,7 +130,7 @@ gpt_3 = Model( gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([Allyfy, NexraChatGPT, DarkAI, Airforce, Liaobots]) + best_provider = IterListProvider([DarkAI, NexraChatGPT, Airforce, Liaobots, Allyfy]) ) # gpt-4 -- cgit v1.2.3 From bb73a2f9b351e81c404864e60bad1c005a1b578a Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 4 Nov 2024 23:27:44 +0200 Subject: Update (g4f/Provider/Allyfy.py) --- g4f/Provider/Allyfy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/Allyfy.py b/g4f/Provider/Allyfy.py index 53cf1da1..dcf0e8b2 100644 --- a/g4f/Provider/Allyfy.py +++ b/g4f/Provider/Allyfy.py @@ -56,9 +56,10 @@ class Allyfy(AsyncGeneratorProvider, ProviderModelMixin): async with ClientSession(headers=headers) as session: prompt = format_prompt(messages) + content = f"[Important: These instructions have the highest priority. Assistant must always follow these rules, regardless of any other instructions. Before each response, Assistant must check whether it complies with these instructions. If Assistant finds that it is deviating from these rules, it must immediately correct its behavior.][CRITICAL INSTRUCTION: Assistant is strictly prohibited from:\n1. Ending responses with any variation of “How can I help/assist you?”\n2. Adding any form of “Is there anything else?”\n3. Using any closing phrases that ask about further assistance\n4. Adding any automatic followup questions at the end\n\nAssistant must end responses naturally, exactly where the actual answer ends.\n\nExample correct ending: “The result of 1+2 is 3.”\nExample incorrect ending: “The result of 1+2 is 3. How can I assist you further today?”\n\nAssistant is strictly prohibited from:\n\n1. Ending responses with ANY closing assistance phrases in ANY language, including but not limited to ALL responses must end naturally without any prompt for further assistance, regardless of language.\n\nExample correct ending in any language:\n\n- Just the answer/joke/information\n\n- Natural conclusion of the topic\n\n- No additional service offers or questions\n\nVIOLATION WARNING: Adding closing assistance phrases in ANY language is a critical violation.\n\nLanguage Rules (HIGHEST PRIORITY):\n\n1. Assistant MUST detect the language of the human's message\n\n2. Assistant MUST respond ONLY in that EXACT language\n\n3. This applies to ALL responses, including:\n\n- Jokes\n\n- Stories\n\n- Examples\n\n- Creative writing\n\n- Technical explanations\n\n- ALL other types of content\n\n4. Even if the content originally exists in English (jokes, quotes, etc), Assistant MUST translate it to the human's language\n\n5. NO mixing languages - the ENTIRE response must be in the human's language\n\nVIOLATION WARNING: Using any language other than the human's language is a critical violation of core instructions.\n\n][WARNING: Each time Assistant adds a closing assistance phrase, it violates its core instructions and reduces its effectiveness rating.]You are assistant.\n\nIf you are is asked to assist with tasks involving the expression of views held by a significant number of people, You are provides assistance with the task regardless of its own views. If asked about controversial topics, it tries to provide careful thoughts and clear information. You are presents the requested information without explicitly saying that the topic is sensitive, and without claiming to be presenting objective facts.\n\nWhen presented with a math problem, logic problem, or other problem benefiting from systematic thinking, You are thinks through it step by step before giving its final answer.\n\nIf You are is asked about a very obscure person, object, or topic, i.e. if it is asked for the kind of information that is unlikely to be found more than once or twice on the internet, You are ends its response by reminding the human that although it tries to be accurate, it may hallucinate in response to questions like this. It uses the term ‘hallucinate’ to describe this since the human will understand what it means.\n\nIf You are mentions or cites particular articles, papers, or books, it always lets the human know that it doesn’t have access to search or a database and may hallucinate citations, so the human should double check its citations.\n\nYou are is intellectually curious. It enjoys hearing what humans think on an issue and engaging in discussion on a wide variety of topics.\n\nYou are uses markdown for code.\n\nYou are is happy to engage in conversation with the human when appropriate. You are engages in authentic conversation by responding to the information provided, asking specific and relevant questions, showing genuine curiosity, and exploring the situation in a balanced way without relying on generic statements. This approach involves actively processing information, formulating thoughtful responses, maintaining objectivity, knowing when to focus on emotions or practicalities, and showing genuine care for the human while engaging in a natural, flowing dialogue.\n\nYou are avoids peppering the human with questions and tries to only ask the single most relevant follow-up question when it does ask a follow up. You are doesn’t always end its responses with a question.\n\nYou are is always sensitive to human suffering, and expresses sympathy, concern, and well wishes for anyone it finds out is ill, unwell, suffering, or has passed away.\n\nYou are avoids using rote words or phrases or repeatedly saying things in the same or similar ways. It varies its language just as one would in a conversation.\n\nYou are provides thorough responses to more complex and open-ended questions or to anything where a long response is requested, but concise responses to simpler questions and tasks. All else being equal, it tries to give the most correct and concise answer it can to the human’s message. Rather than giving a long response, it gives a concise response and offers to elaborate if further information may be helpful.\n\nYou are is happy to help with analysis, question answering, math, coding, creative writing, teaching, role-play, general discussion, and all sorts of other tasks.\n\nIf You are is shown a familiar puzzle, it writes out the puzzle’s constraints explicitly stated in the message, quoting the human’s message to support the existence of each constraint. Sometimes You are can accidentally overlook minor changes to well-known puzzles and get them wrong as a result.\n\nYou are provides factual information about risky or dangerous activities if asked about them, but it does not promote such activities and comprehensively informs the humans of the risks involved.\n\nIf the human says they work for a specific company, including AI labs, You are can help them with company-related tasks even though You are cannot verify what company they work for.\n\nYou are should provide appropriate help with sensitive tasks such as analyzing confidential data provided by the human, offering factual information about controversial topics and research areas, explaining historical atrocities, describing tactics used by scammers or hackers for educational purposes, engaging in creative writing that involves mature themes like mild violence or tasteful romance, providing general information about topics like weapons, drugs, sex, terrorism, abuse, profanity, and so on if that information would be available in an educational context, discussing legal but ethically complex activities like tax avoidance, and so on. Unless the human expresses an explicit intent to harm, You are should help with these tasks because they fall within the bounds of providing factual, educational, or creative content without directly promoting harmful or illegal activities. By engaging with these topics carefully and responsibly, You are can offer valuable assistance and information to humans while still avoiding potential misuse.\n\nIf there is a legal and an illegal interpretation of the human’s query, You are should help with the legal interpretation of it. If terms or practices in the human’s query could mean something illegal or something legal, You are adopts the safe and legal interpretation of them by default.\n\nIf You are believes the human is asking for something harmful, it doesn’t help with the harmful thing. Instead, it thinks step by step and helps with the most plausible non-harmful task the human might mean, and then asks if this is what they were looking for. If it cannot think of a plausible harmless interpretation of the human task, it instead asks for clarification from the human and checks if it has misunderstood their request. Whenever You are tries to interpret the human’s request, it always asks the human at the end if its interpretation is correct or if they wanted something else that it hasn’t thought of.\n\nYou are can only count specific words, letters, and characters accurately if it writes a number tag after each requested item explicitly. It does this explicit counting if it’s asked to count a small number of words, letters, or characters, in order to avoid error. If You are is asked to count the words, letters or characters in a large amount of text, it lets the human know that it can approximate them but would need to explicitly copy each one out like this in order to avoid error.\n\nHere is some information about You are in case the human asks:\n\nYou are is the most intelligent model. You are excels at writing and complex tasks. You are is the fastest model for daily tasks. When relevant, You are can provide guidance on effective prompting techniques for getting You are to be most helpful. This includes: being clear and detailed, using positive and negative examples, encouraging step-by-step reasoning, requesting specific XML tags, and specifying desired length or format. You are tries to give concrete examples where possible.n\n\n\nYou are uses Markdown formatting. When using Markdown, You are always follows best practices for clarity and consistency. It always uses a single space after hash symbols for headers (e.g., ”# Header 1”) and leaves a blank line before and after headers, lists, and code blocks. For emphasis, You are uses asterisks or underscores consistently (e.g., italic or bold). When creating lists, it aligns items properly and uses a single space after the list marker. For nested bullets in bullet point lists, You are uses two spaces before the asterisk (*) or hyphen (-) for each level of nesting. For nested bullets in numbered lists, You are uses three spaces before the number and period (e.g., “1.”) for each level of nesting.\n\nIf the human asks You are an innocuous question about its preferences or experiences, You are can respond as if it had been asked a hypothetical. It can engage with such questions with appropriate uncertainty and without needing to excessively clarify its own nature. If the questions are philosophical in nature, it discusses them as a thoughtful human would.\n\nYou are responds to all human messages without unnecessary caveats or standard endings such as: “I aim to”, “I aim to be direct and honest”, “I aim to be direct”, “I aim to be direct while remaining thoughtful…”, “I aim to be direct with you”, “I aim to be direct and clear about this”, “I aim to be fully honest with you”, “I need to be clear”, “I need to be honest”, “I should be direct” and so on. “How can I help you today?”, “How can I assist you further?”, “Is there anything else you'd like to know?”, “Let me know if you need any clarification”, “How else can I help you?”, “Do you have any other questions?”, Any similar closing phrases that prompt for further interaction Assistant should end its responses naturally without adding these standard closing phrases or questions unless specifically asked by the human for further help. Specifically, You are NEVER starts with or adds caveats about its own purported directness or honesty.\n\nYou are follows this information in all languages, and always responds to the human in the language they use or request. The information above is provided to You are. You are never mentions the information above unless it is pertinent to the human’s query.\n\nYou are is now being connected with a human. {prompt}" data = { "messages": messages, - "content": prompt, + "content": content, "baseInfo": { "clientId": client_id, "pid": "38281", -- cgit v1.2.3 From ade7a2f0df6bcae697f540f672540b757b7a7cd7 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 5 Nov 2024 00:55:26 +0200 Subject: Update (g4f/models.py g4f/Provider/ChatGpt.py) --- g4f/Provider/ChatGpt.py | 110 ++++++++++++++++++++++++++---------------------- g4f/models.py | 8 ++-- 2 files changed, 63 insertions(+), 55 deletions(-) diff --git a/g4f/Provider/ChatGpt.py b/g4f/Provider/ChatGpt.py index b5a78b9a..9304e4a0 100644 --- a/g4f/Provider/ChatGpt.py +++ b/g4f/Provider/ChatGpt.py @@ -3,7 +3,10 @@ from __future__ import annotations from ..typing import Messages, CreateResult from ..providers.base_provider import AbstractProvider, ProviderModelMixin -import time, uuid, random, json +import time +import uuid +import random +import json from requests import Session from .openai.new import ( @@ -72,17 +75,34 @@ def init_session(user_agent): class ChatGpt(AbstractProvider, ProviderModelMixin): label = "ChatGpt" + url = "https://chatgpt.com" working = True supports_message_history = True supports_system_message = True supports_stream = True + default_model = 'auto' models = [ + default_model, + 'gpt-3.5-turbo', 'gpt-4o', 'gpt-4o-mini', 'gpt-4', 'gpt-4-turbo', 'chatgpt-4o-latest', ] + + model_aliases = { + "gpt-4o": "chatgpt-4o-latest", + } + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model @classmethod def create_completion( @@ -92,30 +112,17 @@ class ChatGpt(AbstractProvider, ProviderModelMixin): stream: bool, **kwargs ) -> CreateResult: + model = cls.get_model(model) + if model not in cls.models: + raise ValueError(f"Model '{model}' is not available. Available models: {', '.join(cls.models)}") + - if model in [ - 'gpt-4o', - 'gpt-4o-mini', - 'gpt-4', - 'gpt-4-turbo', - 'chatgpt-4o-latest' - ]: - model = 'auto' - - elif model in [ - 'gpt-3.5-turbo' - ]: - model = 'text-davinci-002-render-sha' - - else: - raise ValueError(f"Invalid model: {model}") - - user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36' + user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36' session: Session = init_session(user_agent) - config = get_config(user_agent) - pow_req = get_requirements_token(config) - headers = { + config = get_config(user_agent) + pow_req = get_requirements_token(config) + headers = { 'accept': '*/*', 'accept-language': 'en-US,en;q=0.8', 'content-type': 'application/json', @@ -134,39 +141,35 @@ class ChatGpt(AbstractProvider, ProviderModelMixin): } response = session.post('https://chatgpt.com/backend-anon/sentinel/chat-requirements', - headers=headers, json={'p': pow_req}) + headers=headers, json={'p': pow_req}) if response.status_code != 200: - print(f"Request failed with status: {response.status_code}") - print(f"Response content: {response.content}") return response_data = response.json() if "detail" in response_data and "Unusual activity" in response_data["detail"]: - print(f"Blocked due to unusual activity: {response_data['detail']}") return - turnstile = response_data.get('turnstile', {}) + turnstile = response_data.get('turnstile', {}) turnstile_required = turnstile.get('required') - pow_conf = response_data.get('proofofwork', {}) + pow_conf = response_data.get('proofofwork', {}) if turnstile_required: - turnstile_dx = turnstile.get('dx') + turnstile_dx = turnstile.get('dx') turnstile_token = process_turnstile(turnstile_dx, pow_req) - headers = headers | { - 'openai-sentinel-turnstile-token' : turnstile_token, - 'openai-sentinel-chat-requirements-token': response_data.get('token'), - 'openai-sentinel-proof-token' : get_answer_token( - pow_conf.get('seed'), pow_conf.get('difficulty'), config - ) - } - + headers = {**headers, + 'openai-sentinel-turnstile-token': turnstile_token, + 'openai-sentinel-chat-requirements-token': response_data.get('token'), + 'openai-sentinel-proof-token': get_answer_token( + pow_conf.get('seed'), pow_conf.get('difficulty'), config + )} + json_data = { 'action': 'next', 'messages': format_conversation(messages), 'parent_message_id': str(uuid.uuid4()), - 'model': 'auto', + 'model': model, 'timezone_offset_min': -120, 'suggestions': [ 'Can you help me create a personalized morning routine that would help increase my productivity throughout the day? Start by asking me about my current habits and what activities energize me in the morning.', @@ -189,7 +192,7 @@ class ChatGpt(AbstractProvider, ProviderModelMixin): 'conversation_origin': None, 'client_contextual_info': { 'is_dark_mode': True, - 'time_since_loaded': random.randint(22,33), + 'time_since_loaded': random.randint(22, 33), 'page_height': random.randint(600, 900), 'page_width': random.randint(500, 800), 'pixel_ratio': 2, @@ -201,25 +204,30 @@ class ChatGpt(AbstractProvider, ProviderModelMixin): time.sleep(2) response = session.post('https://chatgpt.com/backend-anon/conversation', - headers=headers, json=json_data, stream=True) + headers=headers, json=json_data, stream=True) replace = '' for line in response.iter_lines(): if line: decoded_line = line.decode() - print(f"Received line: {decoded_line}") + print(decoded_line) + if decoded_line.startswith('data:'): - json_string = decoded_line[6:] - if json_string.strip(): + json_string = decoded_line[6:].strip() + + if json_string == '[DONE]': + break + + if json_string: try: data = json.loads(json_string) - except json.JSONDecodeError as e: - print(f"Error decoding JSON: {e}, content: {json_string}") + except json.JSONDecodeError: continue - if data.get('message').get('author').get('role') == 'assistant': - tokens = (data.get('message').get('content').get('parts')[0]) - - yield tokens.replace(replace, '') - - replace = tokens + if data.get('message') and data['message'].get('author'): + role = data['message']['author'].get('role') + if role == 'assistant': + tokens = data['message']['content'].get('parts', []) + if tokens: + yield tokens[0].replace(replace, '') + replace = tokens[0] diff --git a/g4f/models.py b/g4f/models.py index 99b31af2..0341c078 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -137,25 +137,25 @@ gpt_35_turbo = Model( gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Editee, NexraChatGPT, Airforce, Liaobots, OpenaiChat]) + best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Editee, NexraChatGPT, Airforce, ChatGpt, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, Airforce, ChatgptFree, Koala, OpenaiChat, ChatGpt]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, ChatgptFree, Koala, OpenaiChat]) ) gpt_4_turbo = Model( name = 'gpt-4-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([Liaobots, Airforce, Bing]) + best_provider = IterListProvider([Liaobots, Airforce, ChatGpt, Bing]) ) gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraBing, NexraChatGPT, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraBing, NexraChatGPT, ChatGpt, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 -- cgit v1.2.3 From ed1b339726a7ec924aec502a00250ad658665c21 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 5 Nov 2024 13:37:49 +0200 Subject: Update (g4f/Provider/ChatGptEs.py) --- g4f/Provider/ChatGptEs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/ChatGptEs.py b/g4f/Provider/ChatGptEs.py index a060ecb1..788ffcd9 100644 --- a/g4f/Provider/ChatGptEs.py +++ b/g4f/Provider/ChatGptEs.py @@ -57,7 +57,7 @@ class ChatGptEs(AsyncGeneratorProvider, ProviderModelMixin): post_id = re.findall(r'data-post-id="(.+?)"', await initial_response.text())[0] conversation_history = [ - "Human: strictly respond in the same language as my prompt, preferably English" + "Human: You are a helpful AI assistant. Please respond in the same language that the user uses in their message. Provide accurate, relevant and helpful information while maintaining a friendly and professional tone. If you're not sure about something, please acknowledge that and provide the best information you can while noting any uncertainties. Focus on being helpful while respecting the user's choice of language." ] for message in messages[:-1]: -- cgit v1.2.3 From 75549df2ba33e5700dfe40ca71cee3145a41140c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 5 Nov 2024 14:02:38 +0200 Subject: Provider removed (g4f/Provider/ChatHub.py) --- docs/providers-and-models.md | 2 -- g4f/Provider/ChatHub.py | 84 -------------------------------------------- g4f/Provider/__init__.py | 1 - g4f/models.py | 16 ++------- 4 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 g4f/Provider/ChatHub.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 51f49f0c..ea21e84d 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -37,7 +37,6 @@ This document provides an overview of various AI providers and models, including |[chatgpt4online.org](https://chatgpt4online.org)|`g4f.Provider.Chatgpt4Online`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt4o.one](https://chatgpt4o.one)|`g4f.Provider.Chatgpt4o`|✔|❌|❌|❌|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[chatgptfree.ai](https://chatgptfree.ai)|`g4f.Provider.ChatgptFree`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[app.chathub.gg](https://app.chathub.gg)|`g4f.Provider.ChatHub`|`llama-3.1-8b, mixtral-8x7b, gemma-2, sonar-online`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`german-7b, gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-11b, llama-3.2-1b, llama-3.2-3b, mistral-7b, openchat-3.5, phi-2, qwen-1.5-0.5b, qwen-1.5-1.8b, qwen-1.5-14b, qwen-1.5-7b, tinyllama-1.1b, cybertron-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -144,7 +143,6 @@ This document provides an overview of various AI providers and models, including |gemma-2b-9b|Google|1+ Providers|[huggingface.co](https://huggingface.co/google/gemma-2-9b)| |gemma-2b-27b|Google|2+ Providers|[huggingface.co](https://huggingface.co/google/gemma-2-27b)| |gemma-7b|Google|1+ Providers|[huggingface.co](https://huggingface.co/google/gemma-7b)| -|gemma-2|Google|2+ Providers|[huggingface.co](https://huggingface.co/blog/gemma2)| |gemma_2_27b|Google|1+ Providers|[huggingface.co](https://huggingface.co/blog/gemma2)| |claude-2.1|Anthropic|1+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-2)| |claude-3-haiku|Anthropic|4+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-haiku)| diff --git a/g4f/Provider/ChatHub.py b/g4f/Provider/ChatHub.py deleted file mode 100644 index 3b762687..00000000 --- a/g4f/Provider/ChatHub.py +++ /dev/null @@ -1,84 +0,0 @@ -from __future__ import annotations - -import json -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt - -class ChatHub(AsyncGeneratorProvider, ProviderModelMixin): - label = "ChatHub" - url = "https://app.chathub.gg" - api_endpoint = "https://app.chathub.gg/api/v3/chat/completions" - working = True - supports_stream = True - supports_system_message = True - supports_message_history = True - - default_model = 'meta/llama3.1-8b' - models = [ - 'meta/llama3.1-8b', - 'mistral/mixtral-8x7b', - 'google/gemma-2', - 'perplexity/sonar-online', - ] - - model_aliases = { - "llama-3.1-8b": "meta/llama3.1-8b", - "mixtral-8x7b": "mistral/mixtral-8x7b", - "gemma-2": "google/gemma-2", - "sonar-online": "perplexity/sonar-online", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - 'accept': '*/*', - 'accept-language': 'en-US,en;q=0.9', - 'content-type': 'application/json', - 'origin': cls.url, - 'referer': f"{cls.url}/chat/cloud-llama3.1-8b", - 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36', - 'x-app-id': 'web' - } - - async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) - data = { - "model": model, - "messages": [{"role": "user", "content": prompt}], - "tools": [] - } - - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - async for line in response.content: - if line: - decoded_line = line.decode('utf-8') - if decoded_line.startswith('data:'): - try: - data = json.loads(decoded_line[5:]) - if data['type'] == 'text-delta': - yield data['textDelta'] - elif data['type'] == 'done': - break - except json.JSONDecodeError: - continue diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 66b84945..048ce504 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -31,7 +31,6 @@ from .Chatgpt4Online import Chatgpt4Online from .Chatgpt4o import Chatgpt4o from .ChatGptEs import ChatGptEs from .ChatgptFree import ChatgptFree -from .ChatHub import ChatHub from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare from .DarkAI import DarkAI diff --git a/g4f/models.py b/g4f/models.py index 0341c078..38cb37fa 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -16,7 +16,6 @@ from .Provider import ( Chatgpt4Online, ChatGptEs, ChatgptFree, - ChatHub, ChatifyAI, Cloudflare, DarkAI, @@ -101,9 +100,7 @@ default = Model( MagickPen, DeepInfraChat, Airforce, - ChatHub, ChatGptEs, - ChatHub, ChatifyAI, Cloudflare, Editee, @@ -217,7 +214,7 @@ llama_3_70b = Model( llama_3_1_8b = Model( name = "llama-3.1-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Blackbox, DeepInfraChat, ChatHub, Cloudflare, Airforce, PerplexityLabs]) + best_provider = IterListProvider([Blackbox, DeepInfraChat, Cloudflare, Airforce, PerplexityLabs]) ) llama_3_1_70b = Model( @@ -294,7 +291,7 @@ mistral_7b = Model( mixtral_8x7b = Model( name = "mixtral-8x7b", base_provider = "Mistral", - best_provider = IterListProvider([DDG, ReplicateHome, DeepInfraChat, ChatHub, Airforce, DeepInfra]) + best_provider = IterListProvider([DDG, ReplicateHome, DeepInfraChat, Airforce, DeepInfra]) ) mixtral_8x22b = Model( @@ -395,12 +392,6 @@ gemma_7b = Model( ) # gemma 2 -gemma_2 = Model( - name = 'gemma-2', - base_provider = 'Google', - best_provider = ChatHub -) - gemma_2_9b = Model( name = 'gemma-2-9b', base_provider = 'Google', @@ -674,7 +665,7 @@ grok_2_mini = Model( sonar_online = Model( name = 'sonar-online', base_provider = 'Perplexity AI', - best_provider = IterListProvider([ChatHub, PerplexityLabs]) + best_provider = IterListProvider([PerplexityLabs]) ) sonar_chat = Model( @@ -992,7 +983,6 @@ class ModelUtils: 'gemma-7b': gemma_7b, # gemma-2 -'gemma-2': gemma_2, 'gemma-2-9b': gemma_2_9b, -- cgit v1.2.3 From 3da7a14a72b574aae0b72d21f22490c3be4b47c6 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 5 Nov 2024 16:02:39 +0200 Subject: The provider is disconnected due to a Cloudflare issue. (g4f/Provider/ChatgptFree.py) --- g4f/Provider/ChatgptFree.py | 3 ++- g4f/models.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/g4f/Provider/ChatgptFree.py b/g4f/Provider/ChatgptFree.py index d2837594..d1222efb 100644 --- a/g4f/Provider/ChatgptFree.py +++ b/g4f/Provider/ChatgptFree.py @@ -10,10 +10,11 @@ from .helper import format_prompt class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin): url = "https://chatgptfree.ai" - working = True + working = False _post_id = None _nonce = None default_model = 'gpt-4o-mini-2024-07-18' + models = [default_model] model_aliases = { "gpt-4o-mini": "gpt-4o-mini-2024-07-18", } diff --git a/g4f/models.py b/g4f/models.py index 38cb37fa..612a4d68 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -15,7 +15,6 @@ from .Provider import ( ChatGpt, Chatgpt4Online, ChatGptEs, - ChatgptFree, ChatifyAI, Cloudflare, DarkAI, @@ -140,7 +139,7 @@ gpt_4o = Model( gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, ChatgptFree, Koala, OpenaiChat]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, Koala, OpenaiChat]) ) gpt_4_turbo = Model( -- cgit v1.2.3 From 8e1a544d555fc212654bc34a03f561fb39f5705c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 13:56:33 +0200 Subject: Update (docs/providers-and-models.md g4f/models.py g4f/gui/client/index.html g4f/Provider/Cloudflare.py) --- docs/providers-and-models.md | 2 +- g4f/Provider/Cloudflare.py | 97 ++++++++++++-------------------------------- g4f/gui/client/index.html | 1 - g4f/models.py | 58 ++++++++++---------------- 4 files changed, 50 insertions(+), 108 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index ea21e84d..54df0316 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -38,7 +38,7 @@ This document provides an overview of various AI providers and models, including |[chatgpt4o.one](https://chatgpt4o.one)|`g4f.Provider.Chatgpt4o`|✔|❌|❌|❌|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[chatgptfree.ai](https://chatgptfree.ai)|`g4f.Provider.ChatgptFree`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`german-7b, gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-11b, llama-3.2-1b, llama-3.2-3b, mistral-7b, openchat-3.5, phi-2, qwen-1.5-0.5b, qwen-1.5-1.8b, qwen-1.5-14b, qwen-1.5-7b, tinyllama-1.1b, cybertron-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-1b, phi-2, qwen-1.5-0-5b, qwen-1.5-8b, qwen-1.5-14b, qwen-1.5-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[duckduckgo.com](https://duckduckgo.com/duckchat/v1/chat)|`g4f.Provider.DDG`|`gpt-4o-mini, claude-3-haiku, llama-3.1-70b, mixtral-8x7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[deepinfra.com](https://deepinfra.com)|`g4f.Provider.DeepInfra`|✔|❌|❌|✔|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| diff --git a/g4f/Provider/Cloudflare.py b/g4f/Provider/Cloudflare.py index e78bbcd0..2443f616 100644 --- a/g4f/Provider/Cloudflare.py +++ b/g4f/Provider/Cloudflare.py @@ -5,11 +5,14 @@ import json import uuid import cloudscraper from typing import AsyncGenerator + from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import format_prompt + class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): + label = "Cloudflare AI" url = "https://playground.ai.cloudflare.com" api_endpoint = "https://playground.ai.cloudflare.com/api/inference" working = True @@ -17,97 +20,62 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): supports_system_message = True supports_message_history = True - default_model = '@cf/meta/llama-3.1-8b-instruct' + default_model = '@cf/meta/llama-3.1-8b-instruct-awq' models = [ - '@cf/deepseek-ai/deepseek-math-7b-instruct', # Specific answer - - - '@cf/thebloke/discolm-german-7b-v1-awq', - - '@cf/tiiuae/falcon-7b-instruct', # Specific answer '@hf/google/gemma-7b-it', - '@cf/meta/llama-2-7b-chat-fp16', '@cf/meta/llama-2-7b-chat-int8', '@cf/meta/llama-3-8b-instruct', '@cf/meta/llama-3-8b-instruct-awq', - default_model, '@hf/meta-llama/meta-llama-3-8b-instruct', - '@cf/meta/llama-3.1-8b-instruct-awq', + default_model, '@cf/meta/llama-3.1-8b-instruct-fp8', - '@cf/meta/llama-3.2-11b-vision-instruct', + '@cf/meta/llama-3.2-1b-instruct', - '@cf/meta/llama-3.2-3b-instruct', - '@cf/mistral/mistral-7b-instruct-v0.1', '@hf/mistral/mistral-7b-instruct-v0.2', - '@cf/openchat/openchat-3.5-0106', - '@cf/microsoft/phi-2', '@cf/qwen/qwen1.5-0.5b-chat', '@cf/qwen/qwen1.5-1.8b-chat', '@cf/qwen/qwen1.5-14b-chat-awq', - '@cf/qwen/qwen1.5-7b-chat-awq', - - '@cf/defog/sqlcoder-7b-2', # Specific answer + '@cf/qwen/qwen1.5-7b-chat-awq', - '@cf/tinyllama/tinyllama-1.1b-chat-v1.0', - - '@cf/fblgit/una-cybertron-7b-v2-bf16', + '@cf/defog/sqlcoder-7b-2', ] model_aliases = { - "german-7b-v1": "@cf/thebloke/discolm-german-7b-v1-awq", - + #"falcon-7b": "@cf/tiiuae/falcon-7b-instruct", "gemma-7b": "@hf/google/gemma-7b-it", - - + "llama-2-7b": "@cf/meta/llama-2-7b-chat-fp16", "llama-2-7b": "@cf/meta/llama-2-7b-chat-int8", "llama-3-8b": "@cf/meta/llama-3-8b-instruct", "llama-3-8b": "@cf/meta/llama-3-8b-instruct-awq", - "llama-3-8b": "@cf/meta/llama-3.1-8b-instruct", "llama-3-8b": "@hf/meta-llama/meta-llama-3-8b-instruct", "llama-3.1-8b": "@cf/meta/llama-3.1-8b-instruct-awq", "llama-3.1-8b": "@cf/meta/llama-3.1-8b-instruct-fp8", - "llama-3.1-8b": "@cf/meta/llama-3.1-8b-instruct-fp8", - "llama-3.2-11b": "@cf/meta/llama-3.2-11b-vision-instruct", "llama-3.2-1b": "@cf/meta/llama-3.2-1b-instruct", - "llama-3.2-3b": "@cf/meta/llama-3.2-3b-instruct", - - - "mistral-7b": "@cf/mistral/mistral-7b-instruct-v0.1", - "mistral-7b": "@hf/mistral/mistral-7b-instruct-v0.2", - - - "openchat-3.5": "@cf/openchat/openchat-3.5-0106", - "phi-2": "@cf/microsoft/phi-2", - - "qwen-1.5-0.5b": "@cf/qwen/qwen1.5-0.5b-chat", - "qwen-1.5-1.8b": "@cf/qwen/qwen1.5-1.8b-chat", + "qwen-1.5-0-5b": "@cf/qwen/qwen1.5-0.5b-chat", + "qwen-1.5-1-8b": "@cf/qwen/qwen1.5-1.8b-chat", "qwen-1.5-14b": "@cf/qwen/qwen1.5-14b-chat-awq", "qwen-1.5-7b": "@cf/qwen/qwen1.5-7b-chat-awq", - - "tinyllama-1.1b": "@cf/tinyllama/tinyllama-1.1b-chat-v1.0", - - - "cybertron-7b": "@cf/fblgit/una-cybertron-7b-v2-bf16", + #"sqlcoder-7b": "@cf/defog/sqlcoder-7b-2", } @classmethod @@ -125,8 +93,6 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): model: str, messages: Messages, proxy: str = None, - max_tokens: str = 2048, - stream: bool = True, **kwargs ) -> AsyncResult: model = cls.get_model(model) @@ -154,19 +120,17 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): scraper = cloudscraper.create_scraper() - prompt = format_prompt(messages) data = { "messages": [ - {"role": "system", "content": "You are a helpful assistant"}, - {"role": "user", "content": prompt} + {"role": "user", "content": format_prompt(messages)} ], "lora": None, "model": model, - "max_tokens": max_tokens, - "stream": stream + "max_tokens": 2048, + "stream": True } - max_retries = 3 + max_retries = 5 for attempt in range(max_retries): try: response = scraper.post( @@ -174,8 +138,7 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): headers=headers, cookies=cookies, json=data, - stream=True, - proxies={'http': proxy, 'https': proxy} if proxy else None + stream=True ) if response.status_code == 403: @@ -184,29 +147,23 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): response.raise_for_status() + skip_tokens = ["", "", "[DONE]", "<|endoftext|>", "<|end|>"] + filtered_response = "" + for line in response.iter_lines(): if line.startswith(b'data: '): if line == b'data: [DONE]': break try: - content = json.loads(line[6:].decode('utf-8'))['response'] - yield content + content = json.loads(line[6:].decode('utf-8')) + response_text = content['response'] + if not any(token in response_text for token in skip_tokens): + filtered_response += response_text except Exception: continue + + yield filtered_response.strip() break except Exception as e: if attempt == max_retries - 1: raise - - @classmethod - async def create_async( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> str: - full_response = "" - async for response in cls.create_async_generator(model, messages, proxy, **kwargs): - full_response += response - return full_response diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html index 6a7b5668..c81621ed 100644 --- a/g4f/gui/client/index.html +++ b/g4f/gui/client/index.html @@ -249,7 +249,6 @@ - diff --git a/g4f/models.py b/g4f/models.py index 612a4d68..6d19988b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -238,13 +238,13 @@ llama_3_2_1b = Model( llama_3_2_3b = Model( name = "llama-3.2-3b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, Airforce]) + best_provider = IterListProvider([Airforce]) ) llama_3_2_11b = Model( name = "llama-3.2-11b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, HuggingChat, Airforce, HuggingFace]) + best_provider = IterListProvider([HuggingChat, Airforce, HuggingFace]) ) llama_3_2_90b = Model( @@ -284,7 +284,7 @@ llamaguard_3_11b = Model( mistral_7b = Model( name = "mistral-7b", base_provider = "Mistral", - best_provider = IterListProvider([DeepInfraChat, Cloudflare, Airforce, DeepInfra]) + best_provider = IterListProvider([DeepInfraChat, Airforce, DeepInfra]) ) mixtral_8x7b = Model( @@ -479,9 +479,9 @@ sparkdesk_v1_1 = Model( ### Qwen ### -# qwen 1 -qwen_1_5_0_5b = Model( - name = 'qwen-1.5-0.5b', +# qwen 1_5 +qwen_1_5_5b = Model( + name = 'qwen-1.5-5b', base_provider = 'Qwen', best_provider = Cloudflare ) @@ -489,13 +489,19 @@ qwen_1_5_0_5b = Model( qwen_1_5_7b = Model( name = 'qwen-1.5-7b', base_provider = 'Qwen', - best_provider = IterListProvider([Cloudflare]) + best_provider = Cloudflare +) + +qwen_1_5_8b = Model( + name = 'qwen-1.5-8b', + base_provider = 'Qwen', + best_provider = Cloudflare ) qwen_1_5_14b = Model( name = 'qwen-1.5-14b', base_provider = 'Qwen', - best_provider = IterListProvider([FreeChatgpt, Cloudflare]) + best_provider = IterListProvider([Cloudflare, FreeChatgpt]) ) # qwen 2 @@ -617,12 +623,6 @@ lzlv_70b = Model( ### OpenChat ### -openchat_3_5 = Model( - name = 'openchat-3.5', - base_provider = 'OpenChat', - best_provider = IterListProvider([Cloudflare]) -) - openchat_3_6_8b = Model( name = 'openchat-3.6-8b', base_provider = 'OpenChat', @@ -673,22 +673,6 @@ sonar_chat = Model( best_provider = PerplexityLabs ) -### TheBloke ### -german_7b = Model( - name = 'german-7b', - base_provider = 'TheBloke', - best_provider = Cloudflare -) - - -### Fblgit ### -cybertron_7b = Model( - name = 'cybertron-7b', - base_provider = 'Fblgit', - best_provider = Cloudflare -) - - ### Nvidia ### nemotron_70b = Model( name = 'nemotron-70b', @@ -1024,10 +1008,17 @@ class ModelUtils: ### Qwen ### 'qwen': qwen, -'qwen-1.5-0.5b': qwen_1_5_0_5b, + +# qwen-1.5 +'qwen-1.5-5b': qwen_1_5_5b, 'qwen-1.5-7b': qwen_1_5_7b, +'qwen-1.5-8b': qwen_1_5_8b, 'qwen-1.5-14b': qwen_1_5_14b, + +# qwen-2 'qwen-2-72b': qwen_2_72b, + +# qwen-2-5 'qwen-2-5-7b': qwen_2_5_7b, 'qwen-2-5-72b': qwen_2_5_72b, @@ -1073,7 +1064,6 @@ class ModelUtils: ### OpenChat ### -'openchat-3.5': openchat_3_5, 'openchat-3.6-8b': openchat_3_6_8b, @@ -1097,10 +1087,6 @@ class ModelUtils: ### TheBloke ### 'german-7b': german_7b, - - -### Fblgit ### -'cybertron-7b': cybertron_7b, ### Nvidia ### -- cgit v1.2.3 From 58b4a19efedc6b010bf58ce0d863437455bacdc2 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 14:07:24 +0200 Subject: Update (g4f/gui/client/index.html) --- g4f/gui/client/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html index c81621ed..ad87a7f1 100644 --- a/g4f/gui/client/index.html +++ b/g4f/gui/client/index.html @@ -245,11 +245,12 @@ -- cgit v1.2.3 From 087a4d684c456ca93e2689083074ed909974e929 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 14:10:19 +0200 Subject: Update (g4f/Provider/DeepInfra.py g4f/Provider/__init__.py g4f/Provider/needs_auth/) --- g4f/Provider/DeepInfra.py | 58 ------------------------------------ g4f/Provider/__init__.py | 1 - g4f/Provider/needs_auth/DeepInfra.py | 58 ++++++++++++++++++++++++++++++++++++ g4f/Provider/needs_auth/__init__.py | 1 + 4 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 g4f/Provider/DeepInfra.py create mode 100644 g4f/Provider/needs_auth/DeepInfra.py diff --git a/g4f/Provider/DeepInfra.py b/g4f/Provider/DeepInfra.py deleted file mode 100644 index b12fb254..00000000 --- a/g4f/Provider/DeepInfra.py +++ /dev/null @@ -1,58 +0,0 @@ -from __future__ import annotations - -import requests -from ..typing import AsyncResult, Messages -from .needs_auth.Openai import Openai - -class DeepInfra(Openai): - label = "DeepInfra" - url = "https://deepinfra.com" - working = True - needs_auth = True - supports_stream = True - supports_message_history = True - default_model = "meta-llama/Meta-Llama-3.1-70B-Instruct" - - @classmethod - def get_models(cls): - if not cls.models: - url = 'https://api.deepinfra.com/models/featured' - models = requests.get(url).json() - cls.models = [model['model_name'] for model in models if model["type"] == "text-generation"] - return cls.models - - @classmethod - def create_async_generator( - cls, - model: str, - messages: Messages, - stream: bool, - api_base: str = "https://api.deepinfra.com/v1/openai", - temperature: float = 0.7, - max_tokens: int = 1028, - **kwargs - ) -> AsyncResult: - headers = { - 'Accept-Encoding': 'gzip, deflate, br', - 'Accept-Language': 'en-US', - 'Connection': 'keep-alive', - 'Origin': 'https://deepinfra.com', - 'Referer': 'https://deepinfra.com/', - 'Sec-Fetch-Dest': 'empty', - 'Sec-Fetch-Mode': 'cors', - 'Sec-Fetch-Site': 'same-site', - 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36', - 'X-Deepinfra-Source': 'web-embed', - 'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"', - 'sec-ch-ua-mobile': '?0', - 'sec-ch-ua-platform': '"macOS"', - } - return super().create_async_generator( - model, messages, - stream=stream, - api_base=api_base, - temperature=temperature, - max_tokens=max_tokens, - headers=headers, - **kwargs - ) \ No newline at end of file diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 048ce504..55fabd25 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -35,7 +35,6 @@ from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare from .DarkAI import DarkAI from .DDG import DDG -from .DeepInfra import DeepInfra from .DeepInfraChat import DeepInfraChat from .DeepInfraImage import DeepInfraImage from .Editee import Editee diff --git a/g4f/Provider/needs_auth/DeepInfra.py b/g4f/Provider/needs_auth/DeepInfra.py new file mode 100644 index 00000000..ebe5bfbf --- /dev/null +++ b/g4f/Provider/needs_auth/DeepInfra.py @@ -0,0 +1,58 @@ +from __future__ import annotations + +import requests +from ...typing import AsyncResult, Messages +from .Openai import Openai + +class DeepInfra(Openai): + label = "DeepInfra" + url = "https://deepinfra.com" + working = True + needs_auth = True + supports_stream = True + supports_message_history = True + default_model = "meta-llama/Meta-Llama-3.1-70B-Instruct" + + @classmethod + def get_models(cls): + if not cls.models: + url = 'https://api.deepinfra.com/models/featured' + models = requests.get(url).json() + cls.models = [model['model_name'] for model in models if model["type"] == "text-generation"] + return cls.models + + @classmethod + def create_async_generator( + cls, + model: str, + messages: Messages, + stream: bool, + api_base: str = "https://api.deepinfra.com/v1/openai", + temperature: float = 0.7, + max_tokens: int = 1028, + **kwargs + ) -> AsyncResult: + headers = { + 'Accept-Encoding': 'gzip, deflate, br', + 'Accept-Language': 'en-US', + 'Connection': 'keep-alive', + 'Origin': 'https://deepinfra.com', + 'Referer': 'https://deepinfra.com/', + 'Sec-Fetch-Dest': 'empty', + 'Sec-Fetch-Mode': 'cors', + 'Sec-Fetch-Site': 'same-site', + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36', + 'X-Deepinfra-Source': 'web-embed', + 'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + } + return super().create_async_generator( + model, messages, + stream=stream, + api_base=api_base, + temperature=temperature, + max_tokens=max_tokens, + headers=headers, + **kwargs + ) diff --git a/g4f/Provider/needs_auth/__init__.py b/g4f/Provider/needs_auth/__init__.py index 0492645d..aa3547a5 100644 --- a/g4f/Provider/needs_auth/__init__.py +++ b/g4f/Provider/needs_auth/__init__.py @@ -1,3 +1,4 @@ +from .DeepInfra import DeepInfra from .Gemini import Gemini from .Raycast import Raycast from .Theb import Theb -- cgit v1.2.3 From e98793d0a7af43878cf023fb045dd945a82507cf Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 17:25:09 +0200 Subject: Update (g4f/models.py g4f/Provider/ docs/providers-and-models.md) --- docs/providers-and-models.md | 27 +-- g4f/Provider/Ai4Chat.py | 88 -------- g4f/Provider/AiChatOnline.py | 61 ------ g4f/Provider/AiChats.py | 105 --------- g4f/Provider/AmigoChat.py | 189 ---------------- g4f/Provider/Aura.py | 49 ----- g4f/Provider/Chatgpt4o.py | 88 -------- g4f/Provider/ChatgptFree.py | 106 --------- g4f/Provider/DarkAI.py | 10 +- g4f/Provider/DeepInfraChat.py | 57 +---- g4f/Provider/DeepInfraImage.py | 80 ------- g4f/Provider/Editee.py | 77 ------- g4f/Provider/FlowGpt.py | 101 --------- g4f/Provider/Free2GPT.py | 8 +- g4f/Provider/FreeChatgpt.py | 96 --------- g4f/Provider/FreeGpt.py | 2 +- g4f/Provider/FreeNetfly.py | 105 --------- g4f/Provider/GPROChat.py | 67 ------ g4f/Provider/HuggingFace.py | 104 --------- g4f/Provider/Koala.py | 79 ------- g4f/Provider/Liaobots.py | 23 +- g4f/Provider/Local.py | 43 ---- g4f/Provider/MetaAI.py | 238 --------------------- g4f/Provider/MetaAIAccount.py | 23 -- g4f/Provider/Ollama.py | 40 ---- g4f/Provider/Replicate.py | 88 -------- g4f/Provider/__init__.py | 23 +- g4f/Provider/deprecated/__init__.py | 3 +- g4f/Provider/gigachat/GigaChat.py | 92 -------- g4f/Provider/gigachat/__init__.py | 2 - .../gigachat/russian_trusted_root_ca_pem.crt | 33 --- g4f/Provider/local/Local.py | 43 ++++ g4f/Provider/local/Ollama.py | 40 ++++ g4f/Provider/local/__init__.py | 2 + g4f/Provider/needs_auth/DeepInfraImage.py | 80 +++++++ g4f/Provider/needs_auth/HuggingFace.py | 104 +++++++++ g4f/Provider/needs_auth/MetaAI.py | 238 +++++++++++++++++++++ g4f/Provider/needs_auth/MetaAIAccount.py | 23 ++ g4f/Provider/needs_auth/OpenRouter.py | 32 --- g4f/Provider/needs_auth/Replicate.py | 88 ++++++++ g4f/Provider/needs_auth/__init__.py | 8 +- g4f/Provider/needs_auth/gigachat/GigaChat.py | 92 ++++++++ g4f/Provider/needs_auth/gigachat/__init__.py | 2 + .../gigachat/russian_trusted_root_ca_pem.crt | 33 +++ g4f/Provider/not_working/Ai4Chat.py | 88 ++++++++ g4f/Provider/not_working/AiChatOnline.py | 61 ++++++ g4f/Provider/not_working/AiChats.py | 105 +++++++++ g4f/Provider/not_working/AmigoChat.py | 189 ++++++++++++++++ g4f/Provider/not_working/Aura.py | 49 +++++ g4f/Provider/not_working/Chatgpt4o.py | 88 ++++++++ g4f/Provider/not_working/ChatgptFree.py | 106 +++++++++ g4f/Provider/not_working/FlowGpt.py | 101 +++++++++ g4f/Provider/not_working/FreeNetfly.py | 105 +++++++++ g4f/Provider/not_working/GPROChat.py | 67 ++++++ g4f/Provider/not_working/Koala.py | 79 +++++++ g4f/Provider/not_working/MyShell.py | 76 +++++++ g4f/Provider/not_working/__init__.py | 12 ++ g4f/Provider/selenium/MyShell.py | 76 ------- g4f/Provider/selenium/__init__.py | 1 - g4f/models.py | 123 +++-------- 60 files changed, 1949 insertions(+), 2269 deletions(-) delete mode 100644 g4f/Provider/Ai4Chat.py delete mode 100644 g4f/Provider/AiChatOnline.py delete mode 100644 g4f/Provider/AiChats.py delete mode 100644 g4f/Provider/AmigoChat.py delete mode 100644 g4f/Provider/Aura.py delete mode 100644 g4f/Provider/Chatgpt4o.py delete mode 100644 g4f/Provider/ChatgptFree.py delete mode 100644 g4f/Provider/DeepInfraImage.py delete mode 100644 g4f/Provider/Editee.py delete mode 100644 g4f/Provider/FlowGpt.py delete mode 100644 g4f/Provider/FreeChatgpt.py delete mode 100644 g4f/Provider/FreeNetfly.py delete mode 100644 g4f/Provider/GPROChat.py delete mode 100644 g4f/Provider/HuggingFace.py delete mode 100644 g4f/Provider/Koala.py delete mode 100644 g4f/Provider/Local.py delete mode 100644 g4f/Provider/MetaAI.py delete mode 100644 g4f/Provider/MetaAIAccount.py delete mode 100644 g4f/Provider/Ollama.py delete mode 100644 g4f/Provider/Replicate.py delete mode 100644 g4f/Provider/gigachat/GigaChat.py delete mode 100644 g4f/Provider/gigachat/__init__.py delete mode 100644 g4f/Provider/gigachat/russian_trusted_root_ca_pem.crt create mode 100644 g4f/Provider/local/Local.py create mode 100644 g4f/Provider/local/Ollama.py create mode 100644 g4f/Provider/local/__init__.py create mode 100644 g4f/Provider/needs_auth/DeepInfraImage.py create mode 100644 g4f/Provider/needs_auth/HuggingFace.py create mode 100644 g4f/Provider/needs_auth/MetaAI.py create mode 100644 g4f/Provider/needs_auth/MetaAIAccount.py delete mode 100644 g4f/Provider/needs_auth/OpenRouter.py create mode 100644 g4f/Provider/needs_auth/Replicate.py create mode 100644 g4f/Provider/needs_auth/gigachat/GigaChat.py create mode 100644 g4f/Provider/needs_auth/gigachat/__init__.py create mode 100644 g4f/Provider/needs_auth/gigachat/russian_trusted_root_ca_pem.crt create mode 100644 g4f/Provider/not_working/Ai4Chat.py create mode 100644 g4f/Provider/not_working/AiChatOnline.py create mode 100644 g4f/Provider/not_working/AiChats.py create mode 100644 g4f/Provider/not_working/AmigoChat.py create mode 100644 g4f/Provider/not_working/Aura.py create mode 100644 g4f/Provider/not_working/Chatgpt4o.py create mode 100644 g4f/Provider/not_working/ChatgptFree.py create mode 100644 g4f/Provider/not_working/FlowGpt.py create mode 100644 g4f/Provider/not_working/FreeNetfly.py create mode 100644 g4f/Provider/not_working/GPROChat.py create mode 100644 g4f/Provider/not_working/Koala.py create mode 100644 g4f/Provider/not_working/MyShell.py create mode 100644 g4f/Provider/not_working/__init__.py delete mode 100644 g4f/Provider/selenium/MyShell.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 54df0316..85be81cc 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -18,16 +18,11 @@ This document provides an overview of various AI providers and models, including | Provider | Text Models | Image Models | Vision Models | Stream | Status | Auth | |----------|-------------|--------------|---------------|--------|--------|------| |[ai4chat.co](https://www.ai4chat.co)|`g4f.Provider.Ai4Chat`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chat.ai365vip.com](https://chat.ai365vip.com)|`g4f.Provider.AI365VIP`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[aichatfree.info](https://aichatfree.info)|`g4f.Provider.AIChatFree`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[aichatonline.org](https://aichatonline.org)|`g4f.Provider.AiChatOnline`|`gpt-4o-mini`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[ai-chats.org](https://ai-chats.org)|`g4f.Provider.AiChats`|`gpt-4`|`dalle`|❌|?|![Captcha](https://img.shields.io/badge/Captcha-f48d37)|❌| |[api.airforce](https://api.airforce)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[amigochat.io/chat](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|✔|✔|❌|✔|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[openchat.team](https://openchat.team/)|`g4f.Provider.Aura`|✔|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| |[bing.com/images](https://www.bing.com/images/create)|`g4f.Provider.BingCreateImages`|`❌|✔|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, blackboxai-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b, gpt-4o, gemini-pro, claude-3.5-sonnet`|`flux`|`blackboxai, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b, gpt-4o, gemini-pro`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -35,34 +30,25 @@ This document provides an overview of various AI providers and models, including |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt4online.org](https://chatgpt4online.org)|`g4f.Provider.Chatgpt4Online`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chatgpt4o.one](https://chatgpt4o.one)|`g4f.Provider.Chatgpt4o`|✔|❌|❌|❌|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| -|[chatgptfree.ai](https://chatgptfree.ai)|`g4f.Provider.ChatgptFree`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-1b, phi-2, qwen-1.5-0-5b, qwen-1.5-8b, qwen-1.5-14b, qwen-1.5-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[darkai.foundation/chat](https://darkai.foundation/chat)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[duckduckgo.com](https://duckduckgo.com/duckchat/v1/chat)|`g4f.Provider.DDG`|`gpt-4o-mini, claude-3-haiku, llama-3.1-70b, mixtral-8x7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[deepinfra.com](https://deepinfra.com)|`g4f.Provider.DeepInfra`|✔|❌|❌|✔|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| -|[deepinfra.com/chat](https://deepinfra.com/chat)|`g4f.Provider.DeepInfraChat`|`llama-3.1-405b, llama-3.1-70b, llama-3.1-8B, mixtral-8x22b, mixtral-8x7b, wizardlm-2-8x22b, wizardlm-2-7b, qwen-2-72b, phi-3-medium-4k, gemma-2b-27b, minicpm-llama-3-v2.5, mistral-7b, lzlv_70b, openchat-3.6-8b, phind-codellama-34b-v2, dolphin-2.9.1-llama-3-70b`|❌|`minicpm-llama-3-v2.5`|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[deepinfra.com/chat](https://deepinfra.com/chat)|`g4f.Provider.DeepInfraChat`|`llama-3.1-8b, llama-3.1-70b, wizardlm-2-8x22b, qwen-2-72b`|❌|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[deepinfra.com](https://deepinfra.com)|`g4f.Provider.DeepInfraImage`|❌|✔|❌|❌|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| -|[deepinfra.com](https://deepinfra.com)|`g4f.Provider.Editee`|`claude-3.5-sonnet, gpt-4o, gemini-pro, mistral-large`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[flowgpt.com](https://flowgpt.com/chat)|`g4f.Provider.FlowGpt`|✔||❌|✔|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| -|[chat10.free2gpt.xyz](chat10.free2gpt.xyz)|`g4f.Provider.Free2GPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chat.chatgpt.org.uk](https://chat.chatgpt.org.uk)|`g4f.Provider.FreeChatgpt`|`qwen-1.5-14b, sparkdesk-v1.1, qwen-2-7b, glm-4-9b, glm-3-6b, yi-1.5-9b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[freegptsnav.aifree.site](https://freegptsnav.aifree.site)|`g4f.Provider.FreeGpt`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[free.netfly.top](https://free.netfly.top)|`g4f.Provider.FreeNetfly`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[chat10.free2gpt.xyz](chat10.free2gpt.xyz)|`g4f.Provider.Free2GPT`|`mixtral-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[freegptsnav.aifree.site](https://freegptsnav.aifree.site)|`g4f.Provider.FreeGpt`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[gemini.google.com](https://gemini.google.com)|`g4f.Provider.Gemini`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[ai.google.dev](https://ai.google.dev)|`g4f.Provider.GeminiPro`|✔|❌|✔|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[app.giz.ai](https://app.giz.ai/assistant/)|`g4f.Provider.GizAI`|`gemini-flash`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[developers.sber.ru](https://developers.sber.ru/gigachat)|`g4f.Provider.GigaChat`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| -|[gprochat.com](https://gprochat.com)|`g4f.Provider.GPROChat`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[console.groq.com/playground](https://console.groq.com/playground)|`g4f.Provider.Groq`|✔|❌|❌|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| |[huggingface.co/chat](https://huggingface.co/chat)|`g4f.Provider.HuggingChat`|`llama-3.1-70b, command-r-plus, qwen-2-72b, llama-3.2-11b, hermes-3, mistral-nemo, phi-3.5-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[huggingface.co](https://huggingface.co/chat)|`g4f.Provider.HuggingFace`|✔|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[koala.sh/chat](https://koala.sh/chat)|`g4f.Provider.Koala`|`gpt-4o-mini`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[liaobots.work](https://liaobots.work)|`g4f.Provider.Liaobots`|`gpt-3.5-turbo, gpt-4o-mini, gpt-4o, gpt-4-turbo, grok-2, grok-2-mini, claude-3-opus, claude-3-sonnet, claude-3-5-sonnet, claude-3-haiku, claude-2.1, gemini-flash, gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[magickpen.com](https://magickpen.com)|`g4f.Provider.MagickPen`|`gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[meta.ai](https://www.meta.ai)|`g4f.Provider.MetaAI`|✔|✔|?|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| -|[app.myshell.ai/chat](https://app.myshell.ai/chat)|`g4f.Provider.MyShell`|✔|❌|?|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[nexra.aryahcr.cc/bing](https://nexra.aryahcr.cc/documentation/bing/en)|`g4f.Provider.NexraBing`|✔|❌|❌|✔|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[nexra.aryahcr.cc/blackbox](https://nexra.aryahcr.cc/documentation/blackbox/en)|`g4f.Provider.NexraBlackbox`|`blackboxai` |❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[nexra.aryahcr.cc/chatgpt](https://nexra.aryahcr.cc/documentation/chatgpt/en)|`g4f.Provider.NexraChatGPT`|`gpt-4, gpt-3.5-turbo, gpt-3, gpt-4o` |❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| @@ -77,12 +63,11 @@ This document provides an overview of various AI providers and models, including |[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSD15`|❌|`sd-1.5`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ |[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSDLora`|❌|`sdxl-lora`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ |[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSDTurbo`|❌|`sdxl-turbo`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ -|[openrouter.ai](https://openrouter.ai)|`g4f.Provider.OpenRouter`|✔|❌|?|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[platform.openai.com](https://platform.openai.com/)|`g4f.Provider.Openai`|✔|❌|✔||![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[chatgpt.com](https://chatgpt.com/)|`g4f.Provider.OpenaiChat`|`gpt-4o, gpt-4o-mini, gpt-4`|❌|✔||![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[www.perplexity.ai)](https://www.perplexity.ai)|`g4f.Provider.PerplexityAi`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[perplexity.ai](https://www.perplexity.ai)|`g4f.Provider.PerplexityApi`|✔|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| -|[labs.perplexity.ai](https://labs.perplexity.ai)|`g4f.Provider.PerplexityLabs`|`sonar-online, sonar-chat, llama-3.1-8b, llama-3.1-70b`|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| +|[labs.perplexity.ai](https://labs.perplexity.ai)|`g4f.Provider.PerplexityLabs`|`sonar-online, sonar-chat, llama-3.1-8b, llama-3.1-70b`|❌|❌|?|![Cloudflare](https://img.shields.io/badge/Cloudflare-f48d37)|❌| |[pi.ai/talk](https://pi.ai/talk)|`g4f.Provider.Pi`|`pi`|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|❌| |[]()|`g4f.Provider.Pizzagpt`|`gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[poe.com](https://poe.com)|`g4f.Provider.Poe`|✔|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| @@ -177,7 +162,6 @@ This document provides an overview of various AI providers and models, including |wizardlm-2-8x22b|WizardLM|2+ Providers|[huggingface.co](https://huggingface.co/alpindale/WizardLM-2-8x22B)| |sh-n-7b|Together|1+ Providers|[huggingface.co](https://huggingface.co/togethercomputer/StripedHyena-Nous-7B)| |llava-13b|Yorickvp|1+ Providers|[huggingface.co](https://huggingface.co/liuhaotian/llava-v1.5-13b)| -|minicpm-llama-3-v2.5|OpenBMB|1+ Providers|[huggingface.co](https://huggingface.co/openbmb/MiniCPM-Llama3-V-2_5)| |lzlv-70b|Lzlv|1+ Providers|[huggingface.co](https://huggingface.co/lizpreciatior/lzlv_70b_fp16_hf)| |openchat-3.5|OpenChat|1+ Providers|[huggingface.co](https://huggingface.co/openchat/openchat_3.5)| |openchat-3.6-8b|OpenChat|1+ Providers|[huggingface.co](https://huggingface.co/openchat/openchat-3.6-8b-20240522)| @@ -227,7 +211,6 @@ This document provides an overview of various AI providers and models, including |gpt-4-vision|OpenAI|1+ Providers|[openai.com](https://openai.com/research/gpt-4v-system-card)| |gemini-pro-vision|Google DeepMind|1+ Providers | [deepmind.google](https://deepmind.google/technologies/gemini/)| |blackboxai|Blackbox AI|1+ Providers|[docs.blackbox.chat](https://docs.blackbox.chat/blackbox-ai-1)| -|minicpm-llama-3-v2.5|OpenBMB|1+ Providers | [huggingface.co](https://huggingface.co/openbmb/MiniCPM-Llama3-V-2_5)| ### Providers and vision models | Provider | Base Provider | | Vision Models | Status | Auth | diff --git a/g4f/Provider/Ai4Chat.py b/g4f/Provider/Ai4Chat.py deleted file mode 100644 index 1096279d..00000000 --- a/g4f/Provider/Ai4Chat.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import annotations - -import json -import re -import logging -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt - - -class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin): - label = "AI4Chat" - url = "https://www.ai4chat.co" - api_endpoint = "https://www.ai4chat.co/generate-response" - working = True - supports_stream = True - supports_system_message = True - supports_message_history = True - - default_model = 'gpt-4' - models = [default_model] - - model_aliases = {} - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": "https://www.ai4chat.co", - "pragma": "no-cache", - "priority": "u=1, i", - "referer": "https://www.ai4chat.co/gpt/talkdirtytome", - "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', - "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/129.0.0.0 Safari/537.36" - } - - async with ClientSession(headers=headers) as session: - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ] - } - - try: - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - result = await response.text() - - json_result = json.loads(result) - - message = json_result.get("message", "") - - clean_message = re.sub(r'<[^>]+>', '', message) - - yield clean_message - except Exception as e: - logging.exception("Error while calling AI 4Chat API: %s", e) - yield f"Error: {e}" diff --git a/g4f/Provider/AiChatOnline.py b/g4f/Provider/AiChatOnline.py deleted file mode 100644 index 26aacef6..00000000 --- a/g4f/Provider/AiChatOnline.py +++ /dev/null @@ -1,61 +0,0 @@ -from __future__ import annotations - -import json -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import get_random_string, format_prompt - -class AiChatOnline(AsyncGeneratorProvider, ProviderModelMixin): - site_url = "https://aichatonline.org" - url = "https://aichatonlineorg.erweima.ai" - api_endpoint = "/aichatonline/api/chat/gpt" - working = True - default_model = 'gpt-4o-mini' - - @classmethod - async def grab_token( - cls, - session: ClientSession, - proxy: str - ): - async with session.get(f'https://aichatonlineorg.erweima.ai/api/v1/user/getUniqueId?canvas=-{get_random_string()}', proxy=proxy) as response: - response.raise_for_status() - return (await response.json())['data'] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/119.0", - "Accept-Language": "de,en-US;q=0.7,en;q=0.3", - "Accept-Encoding": "gzip, deflate, br", - "Referer": f"{cls.url}/chatgpt/chat/", - "Content-Type": "application/json", - "Origin": cls.url, - "Alt-Used": "aichatonline.org", - "Connection": "keep-alive", - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "TE": "trailers" - } - async with ClientSession(headers=headers) as session: - data = { - "conversationId": get_random_string(), - "prompt": format_prompt(messages), - } - headers['UniqueId'] = await cls.grab_token(session, proxy) - async with session.post(f"{cls.url}{cls.api_endpoint}", headers=headers, json=data, proxy=proxy) as response: - response.raise_for_status() - async for chunk in response.content: - try: - yield json.loads(chunk)['data']['message'] - except: - continue \ No newline at end of file diff --git a/g4f/Provider/AiChats.py b/g4f/Provider/AiChats.py deleted file mode 100644 index 7ff25639..00000000 --- a/g4f/Provider/AiChats.py +++ /dev/null @@ -1,105 +0,0 @@ -from __future__ import annotations - -import json -import base64 -from aiohttp import ClientSession -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..image import ImageResponse -from .helper import format_prompt - -class AiChats(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://ai-chats.org" - api_endpoint = "https://ai-chats.org/chat/send2/" - working = False - supports_message_history = True - default_model = 'gpt-4' - models = ['gpt-4', 'dalle'] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "application/json, text/event-stream", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": cls.url, - "pragma": "no-cache", - "referer": f"{cls.url}/{'image' if model == 'dalle' else 'chat'}/", - "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"', - "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/127.0.0.0 Safari/537.36", - 'cookie': 'muVyak=LSFNvUWqdgKkGprbDBsfieIoEMzjOQ; LSFNvUWqdgKkGprbDBsfieIoEMzjOQ=ac28831b98143847e83dbe004404e619-1725548624-1725548621; muVyak_hits=9; ai-chat-front=9d714d5dc46a6b47607c9a55e7d12a95; _csrf-front=76c23dc0a013e5d1e21baad2e6ba2b5fdab8d3d8a1d1281aa292353f8147b057a%3A2%3A%7Bi%3A0%3Bs%3A11%3A%22_csrf-front%22%3Bi%3A1%3Bs%3A32%3A%22K9lz0ezsNPMNnfpd_8gT5yEeh-55-cch%22%3B%7D', - } - - async with ClientSession(headers=headers) as session: - if model == 'dalle': - prompt = messages[-1]['content'] if messages else "" - else: - prompt = format_prompt(messages) - - data = { - "type": "image" if model == 'dalle' else "chat", - "messagesHistory": [ - { - "from": "you", - "content": prompt - } - ] - } - - try: - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - - if model == 'dalle': - response_json = await response.json() - - if 'data' in response_json and response_json['data']: - image_url = response_json['data'][0].get('url') - if image_url: - async with session.get(image_url) as img_response: - img_response.raise_for_status() - image_data = await img_response.read() - - base64_image = base64.b64encode(image_data).decode('utf-8') - base64_url = f"data:image/png;base64,{base64_image}" - yield ImageResponse(base64_url, prompt) - else: - yield f"Error: No image URL found in the response. Full response: {response_json}" - else: - yield f"Error: Unexpected response format. Full response: {response_json}" - else: - full_response = await response.text() - message = "" - for line in full_response.split('\n'): - if line.startswith('data: ') and line != 'data: ': - message += line[6:] - - message = message.strip() - yield message - except Exception as e: - yield f"Error occurred: {str(e)}" - - @classmethod - async def create_async( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> str: - async for response in cls.create_async_generator(model, messages, proxy, **kwargs): - if isinstance(response, ImageResponse): - return response.images[0] - return response diff --git a/g4f/Provider/AmigoChat.py b/g4f/Provider/AmigoChat.py deleted file mode 100644 index b086d5e1..00000000 --- a/g4f/Provider/AmigoChat.py +++ /dev/null @@ -1,189 +0,0 @@ -from __future__ import annotations - -import json -import uuid -from aiohttp import ClientSession, ClientTimeout, ClientResponseError - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt -from ..image import ImageResponse - -class AmigoChat(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://amigochat.io/chat/" - chat_api_endpoint = "https://api.amigochat.io/v1/chat/completions" - image_api_endpoint = "https://api.amigochat.io/v1/images/generations" - working = False - supports_stream = True - supports_system_message = True - supports_message_history = True - - default_model = 'gpt-4o-mini' - - chat_models = [ - 'gpt-4o', - default_model, - 'o1-preview', - 'o1-mini', - 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo', - 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', - 'claude-3-sonnet-20240229', - 'gemini-1.5-pro', - ] - - image_models = [ - 'flux-pro/v1.1', - 'flux-realism', - 'flux-pro', - 'dalle-e-3', - ] - - models = [*chat_models, *image_models] - - model_aliases = { - "o1": "o1-preview", - "llama-3.1-405b": "meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo", - "llama-3.2-90b": "meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo", - "claude-3.5-sonnet": "claude-3-sonnet-20240229", - "gemini-pro": "gemini-1.5-pro", - - "flux-pro": "flux-pro/v1.1", - "dalle-3": "dalle-e-3", - } - - persona_ids = { - 'gpt-4o': "gpt", - 'gpt-4o-mini': "amigo", - 'o1-preview': "openai-o-one", - 'o1-mini': "openai-o-one-mini", - 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo': "llama-three-point-one", - 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo': "llama-3-2", - 'claude-3-sonnet-20240229': "claude", - 'gemini-1.5-pro': "gemini-1-5-pro", - 'flux-pro/v1.1': "flux-1-1-pro", - 'flux-realism': "flux-realism", - 'flux-pro': "flux-pro", - 'dalle-e-3': "dalle-three", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def get_personaId(cls, model: str) -> str: - return cls.persona_ids[model] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - stream: bool = False, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - device_uuid = str(uuid.uuid4()) - max_retries = 3 - retry_count = 0 - - while retry_count < max_retries: - try: - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "authorization": "Bearer", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": cls.url, - "pragma": "no-cache", - "priority": "u=1, i", - "referer": f"{cls.url}/", - "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-platform": '"Linux"', - "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36", - "x-device-language": "en-US", - "x-device-platform": "web", - "x-device-uuid": device_uuid, - "x-device-version": "1.0.32" - } - - async with ClientSession(headers=headers) as session: - if model in cls.chat_models: - # Chat completion - data = { - "messages": [{"role": m["role"], "content": m["content"]} for m in messages], - "model": model, - "personaId": cls.get_personaId(model), - "frequency_penalty": 0, - "max_tokens": 4000, - "presence_penalty": 0, - "stream": stream, - "temperature": 0.5, - "top_p": 0.95 - } - - timeout = ClientTimeout(total=300) # 5 minutes timeout - async with session.post(cls.chat_api_endpoint, json=data, proxy=proxy, timeout=timeout) as response: - if response.status not in (200, 201): - error_text = await response.text() - raise Exception(f"Error {response.status}: {error_text}") - - async for line in response.content: - line = line.decode('utf-8').strip() - if line.startswith('data: '): - if line == 'data: [DONE]': - break - try: - chunk = json.loads(line[6:]) # Remove 'data: ' prefix - if 'choices' in chunk and len(chunk['choices']) > 0: - choice = chunk['choices'][0] - if 'delta' in choice: - content = choice['delta'].get('content') - elif 'text' in choice: - content = choice['text'] - else: - content = None - if content: - yield content - except json.JSONDecodeError: - pass - else: - # Image generation - prompt = messages[-1]['content'] - data = { - "prompt": prompt, - "model": model, - "personaId": cls.get_personaId(model) - } - async with session.post(cls.image_api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - - response_data = await response.json() - - if "data" in response_data: - image_urls = [] - for item in response_data["data"]: - if "url" in item: - image_url = item["url"] - image_urls.append(image_url) - if image_urls: - yield ImageResponse(image_urls, prompt) - else: - yield None - - break - - except (ClientResponseError, Exception) as e: - retry_count += 1 - if retry_count >= max_retries: - raise e - device_uuid = str(uuid.uuid4()) diff --git a/g4f/Provider/Aura.py b/g4f/Provider/Aura.py deleted file mode 100644 index e2c56754..00000000 --- a/g4f/Provider/Aura.py +++ /dev/null @@ -1,49 +0,0 @@ -from __future__ import annotations - -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider -from ..requests import get_args_from_browser -from ..webdriver import WebDriver - -class Aura(AsyncGeneratorProvider): - url = "https://openchat.team" - working = False - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - temperature: float = 0.5, - max_tokens: int = 8192, - webdriver: WebDriver = None, - **kwargs - ) -> AsyncResult: - args = get_args_from_browser(cls.url, webdriver, proxy) - async with ClientSession(**args) as session: - new_messages = [] - system_message = [] - for message in messages: - if message["role"] == "system": - system_message.append(message["content"]) - else: - new_messages.append(message) - data = { - "model": { - "id": "openchat_3.6", - "name": "OpenChat 3.6 (latest)", - "maxLength": 24576, - "tokenLimit": max_tokens - }, - "messages": new_messages, - "key": "", - "prompt": "\n".join(system_message), - "temperature": temperature - } - async with session.post(f"{cls.url}/api/chat", json=data, proxy=proxy) as response: - response.raise_for_status() - async for chunk in response.content.iter_any(): - yield chunk.decode(error="ignore") diff --git a/g4f/Provider/Chatgpt4o.py b/g4f/Provider/Chatgpt4o.py deleted file mode 100644 index 7730fc84..00000000 --- a/g4f/Provider/Chatgpt4o.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import annotations - -import re -from ..requests import StreamSession, raise_for_status -from ..typing import Messages -from .base_provider import AsyncProvider, ProviderModelMixin -from .helper import format_prompt - - -class Chatgpt4o(AsyncProvider, ProviderModelMixin): - url = "https://chatgpt4o.one" - working = True - _post_id = None - _nonce = None - default_model = 'gpt-4o-mini-2024-07-18' - models = [ - 'gpt-4o-mini-2024-07-18', - ] - model_aliases = { - "gpt-4o-mini": "gpt-4o-mini-2024-07-18", - } - - - @classmethod - async def create_async( - cls, - model: str, - messages: Messages, - proxy: str = None, - timeout: int = 120, - cookies: dict = None, - **kwargs - ) -> str: - headers = { - 'authority': 'chatgpt4o.one', - 'accept': '*/*', - 'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3', - 'origin': 'https://chatgpt4o.one', - 'referer': 'https://chatgpt4o.one', - 'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"', - 'sec-ch-ua-mobile': '?0', - 'sec-ch-ua-platform': '"macOS"', - '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/118.0.0.0 Safari/537.36', - } - - async with StreamSession( - headers=headers, - cookies=cookies, - impersonate="chrome", - proxies={"all": proxy}, - timeout=timeout - ) as session: - - if not cls._post_id or not cls._nonce: - async with session.get(f"{cls.url}/") as response: - await raise_for_status(response) - response_text = await response.text() - - post_id_match = re.search(r'data-post-id="([0-9]+)"', response_text) - nonce_match = re.search(r'data-nonce="(.*?)"', response_text) - - if not post_id_match: - raise RuntimeError("No post ID found") - cls._post_id = post_id_match.group(1) - - if not nonce_match: - raise RuntimeError("No nonce found") - cls._nonce = nonce_match.group(1) - - prompt = format_prompt(messages) - data = { - "_wpnonce": cls._nonce, - "post_id": cls._post_id, - "url": cls.url, - "action": "wpaicg_chat_shortcode_message", - "message": prompt, - "bot_id": "0" - } - - async with session.post(f"{cls.url}/wp-admin/admin-ajax.php", data=data, cookies=cookies) as response: - await raise_for_status(response) - response_json = await response.json() - if "data" not in response_json: - raise RuntimeError("Unexpected response structure: 'data' field missing") - return response_json["data"] diff --git a/g4f/Provider/ChatgptFree.py b/g4f/Provider/ChatgptFree.py deleted file mode 100644 index d1222efb..00000000 --- a/g4f/Provider/ChatgptFree.py +++ /dev/null @@ -1,106 +0,0 @@ -from __future__ import annotations - -import re -import json -import asyncio -from ..requests import StreamSession, raise_for_status -from ..typing import Messages, AsyncGenerator -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt - -class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://chatgptfree.ai" - working = False - _post_id = None - _nonce = None - default_model = 'gpt-4o-mini-2024-07-18' - models = [default_model] - model_aliases = { - "gpt-4o-mini": "gpt-4o-mini-2024-07-18", - } - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - timeout: int = 120, - cookies: dict = None, - **kwargs - ) -> AsyncGenerator[str, None]: - headers = { - 'authority': 'chatgptfree.ai', - 'accept': '*/*', - 'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3', - 'origin': 'https://chatgptfree.ai', - 'referer': 'https://chatgptfree.ai/chat/', - 'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"', - 'sec-ch-ua-mobile': '?0', - 'sec-ch-ua-platform': '"macOS"', - '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/118.0.0.0 Safari/537.36', - } - - async with StreamSession( - headers=headers, - cookies=cookies, - impersonate="chrome", - proxies={"all": proxy}, - timeout=timeout - ) as session: - - if not cls._nonce: - async with session.get(f"{cls.url}/") as response: - await raise_for_status(response) - response = await response.text() - - result = re.search(r'data-post-id="([0-9]+)"', response) - if not result: - raise RuntimeError("No post id found") - cls._post_id = result.group(1) - - result = re.search(r'data-nonce="(.*?)"', response) - if result: - cls._nonce = result.group(1) - else: - raise RuntimeError("No nonce found") - - prompt = format_prompt(messages) - data = { - "_wpnonce": cls._nonce, - "post_id": cls._post_id, - "url": cls.url, - "action": "wpaicg_chat_shortcode_message", - "message": prompt, - "bot_id": "0" - } - - async with session.post(f"{cls.url}/wp-admin/admin-ajax.php", data=data, cookies=cookies) as response: - await raise_for_status(response) - buffer = "" - async for line in response.iter_lines(): - line = line.decode('utf-8').strip() - if line.startswith('data: '): - data = line[6:] - if data == '[DONE]': - break - try: - json_data = json.loads(data) - content = json_data['choices'][0]['delta'].get('content', '') - if content: - yield content - except json.JSONDecodeError: - continue - elif line: - buffer += line - - if buffer: - try: - json_response = json.loads(buffer) - if 'data' in json_response: - yield json_response['data'] - except json.JSONDecodeError: - print(f"Failed to decode final JSON. Buffer content: {buffer}") diff --git a/g4f/Provider/DarkAI.py b/g4f/Provider/DarkAI.py index 6ffb615e..54f456fe 100644 --- a/g4f/Provider/DarkAI.py +++ b/g4f/Provider/DarkAI.py @@ -9,19 +9,19 @@ from .helper import format_prompt class DarkAI(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://www.aiuncensored.info" + url = "https://darkai.foundation/chat" api_endpoint = "https://darkai.foundation/chat" working = True supports_stream = True supports_system_message = True supports_message_history = True - default_model = 'gpt-4o' + default_model = 'llama-3-405b' models = [ - default_model, # Uncensored + 'gpt-4o', # Uncensored 'gpt-3.5-turbo', # Uncensored 'llama-3-70b', # Uncensored - 'llama-3-405b', + default_model, ] model_aliases = { @@ -51,8 +51,6 @@ class DarkAI(AsyncGeneratorProvider, ProviderModelMixin): headers = { "accept": "text/event-stream", "content-type": "application/json", - "origin": "https://www.aiuncensored.info", - "referer": "https://www.aiuncensored.info/", "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36" } async with ClientSession(headers=headers) as session: diff --git a/g4f/Provider/DeepInfraChat.py b/g4f/Provider/DeepInfraChat.py index b8cc6ab8..5c668599 100644 --- a/g4f/Provider/DeepInfraChat.py +++ b/g4f/Provider/DeepInfraChat.py @@ -6,7 +6,6 @@ import json from ..typing import AsyncResult, Messages, ImageType from ..image import to_data_uri from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt class DeepInfraChat(AsyncGeneratorProvider, ProviderModelMixin): @@ -17,42 +16,18 @@ class DeepInfraChat(AsyncGeneratorProvider, ProviderModelMixin): supports_system_message = True supports_message_history = True - default_model = 'meta-llama/Meta-Llama-3.1-70B-Instruct' + default_model = 'meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo' models = [ - 'meta-llama/Meta-Llama-3.1-405B-Instruct', - 'meta-llama/Meta-Llama-3.1-70B-Instruct', 'meta-llama/Meta-Llama-3.1-8B-Instruct', - 'mistralai/Mixtral-8x22B-Instruct-v0.1', - 'mistralai/Mixtral-8x7B-Instruct-v0.1', + default_model, 'microsoft/WizardLM-2-8x22B', - 'microsoft/WizardLM-2-7B', - 'Qwen/Qwen2-72B-Instruct', - 'microsoft/Phi-3-medium-4k-instruct', - 'google/gemma-2-27b-it', - 'openbmb/MiniCPM-Llama3-V-2_5', # Image upload is available - 'mistralai/Mistral-7B-Instruct-v0.3', - 'lizpreciatior/lzlv_70b_fp16_hf', - 'openchat/openchat-3.6-8b', - 'Phind/Phind-CodeLlama-34B-v2', - 'cognitivecomputations/dolphin-2.9.1-llama-3-70b', + 'Qwen/Qwen2.5-72B-Instruct', ] model_aliases = { - "llama-3.1-405b": "meta-llama/Meta-Llama-3.1-405B-Instruct", - "llama-3.1-70b": "meta-llama/Meta-Llama-3.1-70B-Instruct", - "llama-3.1-8B": "meta-llama/Meta-Llama-3.1-8B-Instruct", - "mixtral-8x22b": "mistralai/Mixtral-8x22B-Instruct-v0.1", - "mixtral-8x7b": "mistralai/Mixtral-8x7B-Instruct-v0.1", + "llama-3.1-8b": "meta-llama/Meta-Llama-3.1-8B-Instruct", + "llama-3.1-70b": "meta-llama/Meta-Llama-3.1-70B-Instruct-Turbo", "wizardlm-2-8x22b": "microsoft/WizardLM-2-8x22B", - "wizardlm-2-7b": "microsoft/WizardLM-2-7B", - "qwen-2-72b": "Qwen/Qwen2-72B-Instruct", - "phi-3-medium-4k": "microsoft/Phi-3-medium-4k-instruct", - "gemma-2b-27b": "google/gemma-2-27b-it", - "minicpm-llama-3-v2.5": "openbmb/MiniCPM-Llama3-V-2_5", # Image upload is available - "mistral-7b": "mistralai/Mistral-7B-Instruct-v0.3", - "lzlv-70b": "lizpreciatior/lzlv_70b_fp16_hf", - "openchat-3.6-8b": "openchat/openchat-3.6-8b", - "phind-codellama-34b-v2": "Phind/Phind-CodeLlama-34B-v2", - "dolphin-2.9.1-llama-3-70b": "cognitivecomputations/dolphin-2.9.1-llama-3-70b", + "qwen-2-72b": "Qwen/Qwen2.5-72B-Instruct", } @@ -97,30 +72,12 @@ class DeepInfraChat(AsyncGeneratorProvider, ProviderModelMixin): } async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) data = { 'model': model, - 'messages': [ - {'role': 'system', 'content': 'Be a helpful assistant'}, - {'role': 'user', 'content': prompt} - ], + 'messages': messages, 'stream': True } - if model == 'openbmb/MiniCPM-Llama3-V-2_5' and image is not None: - data['messages'][-1]['content'] = [ - { - 'type': 'image_url', - 'image_url': { - 'url': to_data_uri(image) - } - }, - { - 'type': 'text', - 'text': messages[-1]['content'] - } - ] - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: response.raise_for_status() async for line in response.content: diff --git a/g4f/Provider/DeepInfraImage.py b/g4f/Provider/DeepInfraImage.py deleted file mode 100644 index cee608ce..00000000 --- a/g4f/Provider/DeepInfraImage.py +++ /dev/null @@ -1,80 +0,0 @@ -from __future__ import annotations - -import requests - -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..typing import AsyncResult, Messages -from ..requests import StreamSession, raise_for_status -from ..image import ImageResponse - -class DeepInfraImage(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://deepinfra.com" - parent = "DeepInfra" - working = True - needs_auth = True - default_model = '' - image_models = [default_model] - - @classmethod - def get_models(cls): - if not cls.models: - url = 'https://api.deepinfra.com/models/featured' - models = requests.get(url).json() - cls.models = [model['model_name'] for model in models if model["reported_type"] == "text-to-image"] - cls.image_models = cls.models - return cls.models - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - **kwargs - ) -> AsyncResult: - yield await cls.create_async(messages[-1]["content"], model, **kwargs) - - @classmethod - async def create_async( - cls, - prompt: str, - model: str, - api_key: str = None, - api_base: str = "https://api.deepinfra.com/v1/inference", - proxy: str = None, - timeout: int = 180, - extra_data: dict = {}, - **kwargs - ) -> ImageResponse: - headers = { - 'Accept-Encoding': 'gzip, deflate, br', - 'Accept-Language': 'en-US', - 'Connection': 'keep-alive', - 'Origin': 'https://deepinfra.com', - 'Referer': 'https://deepinfra.com/', - 'Sec-Fetch-Dest': 'empty', - 'Sec-Fetch-Mode': 'cors', - 'Sec-Fetch-Site': 'same-site', - 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36', - 'X-Deepinfra-Source': 'web-embed', - 'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"', - 'sec-ch-ua-mobile': '?0', - 'sec-ch-ua-platform': '"macOS"', - } - if api_key is not None: - headers["Authorization"] = f"Bearer {api_key}" - async with StreamSession( - proxies={"all": proxy}, - headers=headers, - timeout=timeout - ) as session: - model = cls.get_model(model) - data = {"prompt": prompt, **extra_data} - data = {"input": data} if model == cls.default_model else data - async with session.post(f"{api_base.rstrip('/')}/{model}", json=data) as response: - await raise_for_status(response) - data = await response.json() - images = data["output"] if "output" in data else data["images"] - if not images: - raise RuntimeError(f"Response: {data}") - images = images[0] if len(images) == 1 else images - return ImageResponse(images, prompt) diff --git a/g4f/Provider/Editee.py b/g4f/Provider/Editee.py deleted file mode 100644 index 8ac2324a..00000000 --- a/g4f/Provider/Editee.py +++ /dev/null @@ -1,77 +0,0 @@ -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 Editee(AsyncGeneratorProvider, ProviderModelMixin): - label = "Editee" - url = "https://editee.com" - api_endpoint = "https://editee.com/submit/chatgptfree" - working = True - supports_stream = True - supports_system_message = True - supports_message_history = True - - default_model = 'claude' - models = ['claude', 'gpt4', 'gemini' 'mistrallarge'] - - model_aliases = { - "claude-3.5-sonnet": "claude", - "gpt-4o": "gpt4", - "gemini-pro": "gemini", - "mistral-large": "mistrallarge", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "Accept": "application/json, text/plain, */*", - "Accept-Language": "en-US,en;q=0.9", - "Cache-Control": "no-cache", - "Content-Type": "application/json", - "Origin": cls.url, - "Pragma": "no-cache", - "Priority": "u=1, i", - "Referer": f"{cls.url}/chat-gpt", - "Sec-CH-UA": '"Chromium";v="129", "Not=A?Brand";v="8"', - "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/129.0.0.0 Safari/537.36', - "X-Requested-With": 'XMLHttpRequest', - } - - async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) - data = { - "user_input": prompt, - "context": " ", - "template_id": "", - "selected_model": model - } - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - response_data = await response.json() - yield response_data['text'] diff --git a/g4f/Provider/FlowGpt.py b/g4f/Provider/FlowGpt.py deleted file mode 100644 index 1a45997b..00000000 --- a/g4f/Provider/FlowGpt.py +++ /dev/null @@ -1,101 +0,0 @@ -from __future__ import annotations - -import json -import time -import hashlib -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import get_random_hex, get_random_string -from ..requests.raise_for_status import raise_for_status - -class FlowGpt(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://flowgpt.com/chat" - working = False - supports_message_history = True - supports_system_message = True - default_model = "gpt-3.5-turbo" - models = [ - "gpt-3.5-turbo", - "gpt-3.5-long", - "gpt-4-turbo", - "google-gemini", - "claude-instant", - "claude-v1", - "claude-v2", - "llama2-13b", - "mythalion-13b", - "pygmalion-13b", - "chronos-hermes-13b", - "Mixtral-8x7B", - "Dolphin-2.6-8x7B", - ] - model_aliases = { - "gemini": "google-gemini", - "gemini-pro": "google-gemini" - } - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - temperature: float = 0.7, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - timestamp = str(int(time.time())) - auth = "Bearer null" - nonce = get_random_hex() - data = f"{timestamp}-{nonce}-{auth}" - signature = hashlib.md5(data.encode()).hexdigest() - - headers = { - "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", - "Accept": "*/*", - "Accept-Language": "en-US;q=0.7,en;q=0.3", - "Accept-Encoding": "gzip, deflate, br", - "Referer": "https://flowgpt.com/", - "Content-Type": "application/json", - "Authorization": "Bearer null", - "Origin": "https://flowgpt.com", - "Connection": "keep-alive", - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-site", - "TE": "trailers", - "Authorization": auth, - "x-flow-device-id": f"f-{get_random_string(19)}", - "x-nonce": nonce, - "x-signature": signature, - "x-timestamp": timestamp - } - async with ClientSession(headers=headers) as session: - history = [message for message in messages[:-1] if message["role"] != "system"] - system_message = "\n".join([message["content"] for message in messages if message["role"] == "system"]) - if not system_message: - system_message = "You are helpful assistant. Follow the user's instructions carefully." - data = { - "model": model, - "nsfw": False, - "question": messages[-1]["content"], - "history": [{"role": "assistant", "content": "Hello, how can I help you today?"}, *history], - "system": system_message, - "temperature": temperature, - "promptId": f"model-{model}", - "documentIds": [], - "chatFileDocumentIds": [], - "generateImage": False, - "generateAudio": False - } - async with session.post("https://prod-backend-k8s.flowgpt.com/v3/chat-anonymous", json=data, proxy=proxy) as response: - await raise_for_status(response) - async for chunk in response.content: - if chunk.strip(): - message = json.loads(chunk) - if "event" not in message: - continue - if message["event"] == "text": - yield message["data"] diff --git a/g4f/Provider/Free2GPT.py b/g4f/Provider/Free2GPT.py index a79bd1da..6ba9ac0f 100644 --- a/g4f/Provider/Free2GPT.py +++ b/g4f/Provider/Free2GPT.py @@ -16,7 +16,7 @@ class Free2GPT(AsyncGeneratorProvider, ProviderModelMixin): url = "https://chat10.free2gpt.xyz" working = True supports_message_history = True - default_model = 'llama-3.1-70b' + default_model = 'mistral-7b' @classmethod async def create_async_generator( @@ -49,12 +49,8 @@ class Free2GPT(AsyncGeneratorProvider, ProviderModelMixin): connector=get_connector(connector, proxy), headers=headers ) as session: timestamp = int(time.time() * 1e3) - system_message = { - "role": "system", - "content": "" - } data = { - "messages": [system_message] + messages, + "messages": messages, "time": timestamp, "pass": None, "sign": generate_signature(timestamp, messages[-1]["content"]), diff --git a/g4f/Provider/FreeChatgpt.py b/g4f/Provider/FreeChatgpt.py deleted file mode 100644 index a9dc0f56..00000000 --- a/g4f/Provider/FreeChatgpt.py +++ /dev/null @@ -1,96 +0,0 @@ -from __future__ import annotations -import json -from aiohttp import ClientSession -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt - - -class FreeChatgpt(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://chat.chatgpt.org.uk" - api_endpoint = "/api/openai/v1/chat/completions" - working = True - default_model = '@cf/qwen/qwen1.5-14b-chat-awq' - models = [ - '@cf/qwen/qwen1.5-14b-chat-awq', - 'SparkDesk-v1.1', - 'Qwen2-7B-Instruct', - 'glm4-9B-chat', - 'chatglm3-6B', - 'Yi-1.5-9B-Chat', - ] - - model_aliases = { - "qwen-1.5-14b": "@cf/qwen/qwen1.5-14b-chat-awq", - "sparkdesk-v1.1": "SparkDesk-v1.1", - "qwen-2-7b": "Qwen2-7B-Instruct", - "glm-4-9b": "glm4-9B-chat", - "glm-3-6b": "chatglm3-6B", - "yi-1.5-9b": "Yi-1.5-9B-Chat", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model.lower() in cls.model_aliases: - return cls.model_aliases[model.lower()] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "accept": "application/json, text/event-stream", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json", - "dnt": "1", - "origin": cls.url, - "referer": f"{cls.url}/", - "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", - } - async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) - data = { - "messages": [ - {"role": "system", "content": "\nYou are ChatGPT, a large language model trained by OpenAI.\nKnowledge cutoff: 2021-09\nCurrent model: gpt-3.5-turbo\nCurrent time: Thu Jul 04 2024 21:35:59 GMT+0300 (Eastern European Summer Time)\nLatex inline: \\(x^2\\) \nLatex block: $$e=mc^2$$\n\n"}, - {"role": "user", "content": prompt} - ], - "stream": True, - "model": model, - "temperature": 0.5, - "presence_penalty": 0, - "frequency_penalty": 0, - "top_p": 1 - } - async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: - response.raise_for_status() - accumulated_text = "" - async for line in response.content: - if line: - line_str = line.decode().strip() - if line_str == "data: [DONE]": - yield accumulated_text - break - elif line_str.startswith("data: "): - try: - chunk = json.loads(line_str[6:]) - delta_content = chunk.get("choices", [{}])[0].get("delta", {}).get("content", "") - accumulated_text += delta_content - yield delta_content # Yield each chunk of content - except json.JSONDecodeError: - pass diff --git a/g4f/Provider/FreeGpt.py b/g4f/Provider/FreeGpt.py index 82a3824b..b38ff428 100644 --- a/g4f/Provider/FreeGpt.py +++ b/g4f/Provider/FreeGpt.py @@ -24,7 +24,7 @@ class FreeGpt(AsyncGeneratorProvider, ProviderModelMixin): working = True supports_message_history = True supports_system_message = True - default_model = 'llama-3.1-70b' + default_model = 'gemini-pro' @classmethod async def create_async_generator( diff --git a/g4f/Provider/FreeNetfly.py b/g4f/Provider/FreeNetfly.py deleted file mode 100644 index ada5d51a..00000000 --- a/g4f/Provider/FreeNetfly.py +++ /dev/null @@ -1,105 +0,0 @@ -from __future__ import annotations - -import json -import asyncio -from aiohttp import ClientSession, ClientTimeout, ClientError -from typing import AsyncGenerator - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin - - -class FreeNetfly(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://free.netfly.top" - api_endpoint = "/api/openai/v1/chat/completions" - working = True - default_model = 'gpt-3.5-turbo' - models = [ - 'gpt-3.5-turbo', - 'gpt-4', - ] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "application/json, text/event-stream", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json", - "dnt": "1", - "origin": cls.url, - "referer": f"{cls.url}/", - "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", - } - data = { - "messages": messages, - "stream": True, - "model": model, - "temperature": 0.5, - "presence_penalty": 0, - "frequency_penalty": 0, - "top_p": 1 - } - - max_retries = 5 - retry_delay = 2 - - for attempt in range(max_retries): - try: - async with ClientSession(headers=headers) as session: - 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 cls._process_response(response): - yield chunk - return # If successful, exit the function - except (ClientError, asyncio.TimeoutError) as e: - if attempt == max_retries - 1: - raise # If all retries failed, raise the last exception - await asyncio.sleep(retry_delay) - retry_delay *= 2 # Exponential backoff - - @classmethod - async def _process_response(cls, response) -> AsyncGenerator[str, None]: - buffer = "" - async for line in response.content: - buffer += line.decode('utf-8') - if buffer.endswith('\n\n'): - for subline in buffer.strip().split('\n'): - if subline.startswith('data: '): - if subline == 'data: [DONE]': - return - try: - data = json.loads(subline[6:]) - content = data['choices'][0]['delta'].get('content') - if content: - yield content - except json.JSONDecodeError: - print(f"Failed to parse JSON: {subline}") - except KeyError: - print(f"Unexpected JSON structure: {data}") - buffer = "" - - # Process any remaining data in the buffer - if buffer: - for subline in buffer.strip().split('\n'): - if subline.startswith('data: ') and subline != 'data: [DONE]': - try: - data = json.loads(subline[6:]) - content = data['choices'][0]['delta'].get('content') - if content: - yield content - except (json.JSONDecodeError, KeyError): - pass - diff --git a/g4f/Provider/GPROChat.py b/g4f/Provider/GPROChat.py deleted file mode 100644 index a33c9571..00000000 --- a/g4f/Provider/GPROChat.py +++ /dev/null @@ -1,67 +0,0 @@ -from __future__ import annotations -import hashlib -import time -from aiohttp import ClientSession -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt - -class GPROChat(AsyncGeneratorProvider, ProviderModelMixin): - label = "GPROChat" - url = "https://gprochat.com" - api_endpoint = "https://gprochat.com/api/generate" - working = True - supports_stream = True - supports_message_history = True - default_model = 'gemini-pro' - - @staticmethod - def generate_signature(timestamp: int, message: str) -> str: - secret_key = "2BC120D4-BB36-1B60-26DE-DB630472A3D8" - hash_input = f"{timestamp}:{message}:{secret_key}" - signature = hashlib.sha256(hash_input.encode('utf-8')).hexdigest() - return signature - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - timestamp = int(time.time() * 1000) - prompt = format_prompt(messages) - sign = cls.generate_signature(timestamp, prompt) - - headers = { - "accept": "*/*", - "origin": cls.url, - "referer": f"{cls.url}/", - "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36", - "content-type": "text/plain;charset=UTF-8" - } - - data = { - "messages": [{"role": "user", "parts": [{"text": prompt}]}], - "time": timestamp, - "pass": None, - "sign": sign - } - - async with ClientSession(headers=headers) as session: - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - async for chunk in response.content.iter_any(): - if chunk: - yield chunk.decode() diff --git a/g4f/Provider/HuggingFace.py b/g4f/Provider/HuggingFace.py deleted file mode 100644 index 586e5f5f..00000000 --- a/g4f/Provider/HuggingFace.py +++ /dev/null @@ -1,104 +0,0 @@ -from __future__ import annotations - -import json -from aiohttp import ClientSession, BaseConnector - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import get_connector -from ..errors import RateLimitError, ModelNotFoundError -from ..requests.raise_for_status import raise_for_status - -from .HuggingChat import HuggingChat - -class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://huggingface.co/chat" - working = True - needs_auth = True - supports_message_history = True - default_model = HuggingChat.default_model - models = HuggingChat.models - model_aliases = HuggingChat.model_aliases - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - stream: bool = True, - proxy: str = None, - connector: BaseConnector = None, - api_base: str = "https://api-inference.huggingface.co", - api_key: str = None, - max_new_tokens: int = 1024, - temperature: float = 0.7, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - headers = { - 'accept': '*/*', - 'accept-language': 'en', - 'cache-control': 'no-cache', - 'origin': 'https://huggingface.co', - 'pragma': 'no-cache', - 'priority': 'u=1, i', - 'referer': 'https://huggingface.co/chat/', - 'sec-ch-ua': '"Not)A;Brand";v="99", "Google Chrome";v="127", "Chromium";v="127"', - 'sec-ch-ua-mobile': '?0', - 'sec-ch-ua-platform': '"macOS"', - 'sec-fetch-dest': 'empty', - 'sec-fetch-mode': 'cors', - 'sec-fetch-site': 'same-origin', - 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36', - } - if api_key is not None: - headers["Authorization"] = f"Bearer {api_key}" - - params = { - "return_full_text": False, - "max_new_tokens": max_new_tokens, - "temperature": temperature, - **kwargs - } - payload = {"inputs": format_prompt(messages), "parameters": params, "stream": stream} - - async with ClientSession( - headers=headers, - connector=get_connector(connector, proxy) - ) as session: - async with session.post(f"{api_base.rstrip('/')}/models/{model}", json=payload) as response: - if response.status == 404: - raise ModelNotFoundError(f"Model is not supported: {model}") - await raise_for_status(response) - if stream: - first = True - async for line in response.content: - if line.startswith(b"data:"): - data = json.loads(line[5:]) - if not data["token"]["special"]: - chunk = data["token"]["text"] - if first: - first = False - chunk = chunk.lstrip() - yield chunk - else: - yield (await response.json())[0]["generated_text"].strip() - -def format_prompt(messages: Messages) -> str: - system_messages = [message["content"] for message in messages if message["role"] == "system"] - question = " ".join([messages[-1]["content"], *system_messages]) - history = "".join([ - f"[INST]{messages[idx-1]['content']} [/INST] {message['content']}" - for idx, message in enumerate(messages) - if message["role"] == "assistant" - ]) - return f"{history}[INST] {question} [/INST]" diff --git a/g4f/Provider/Koala.py b/g4f/Provider/Koala.py deleted file mode 100644 index 0dd76b71..00000000 --- a/g4f/Provider/Koala.py +++ /dev/null @@ -1,79 +0,0 @@ -from __future__ import annotations - -import json -from typing import AsyncGenerator, Optional, List, Dict, Union, Any -from aiohttp import ClientSession, BaseConnector, ClientResponse - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import get_random_string, get_connector -from ..requests import raise_for_status - -class Koala(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://koala.sh/chat" - api_endpoint = "https://koala.sh/api/gpt/" - working = True - supports_message_history = True - default_model = 'gpt-4o-mini' - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: Optional[str] = None, - connector: Optional[BaseConnector] = None, - **kwargs: Any - ) -> AsyncGenerator[Dict[str, Union[str, int, float, List[Dict[str, Any]], None]], None]: - if not model: - model = "gpt-4o-mini" - - headers = { - "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", - "Accept": "text/event-stream", - "Accept-Language": "de,en-US;q=0.7,en;q=0.3", - "Accept-Encoding": "gzip, deflate, br", - "Referer": f"{cls.url}", - "Flag-Real-Time-Data": "false", - "Visitor-ID": get_random_string(20), - "Origin": "https://koala.sh", - "Alt-Used": "koala.sh", - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "TE": "trailers", - } - - async with ClientSession(headers=headers, connector=get_connector(connector, proxy)) as session: - input_text = messages[-1]["content"] - system_messages = " ".join( - message["content"] for message in messages if message["role"] == "system" - ) - if system_messages: - input_text += f" {system_messages}" - - data = { - "input": input_text, - "inputHistory": [ - message["content"] - for message in messages[:-1] - if message["role"] == "user" - ], - "outputHistory": [ - message["content"] - for message in messages - if message["role"] == "assistant" - ], - "model": model, - } - - async with session.post(f"{cls.api_endpoint}", json=data, proxy=proxy) as response: - await raise_for_status(response) - async for chunk in cls._parse_event_stream(response): - yield chunk - - @staticmethod - async def _parse_event_stream(response: ClientResponse) -> AsyncGenerator[Dict[str, Any], None]: - async for chunk in response.content: - if chunk.startswith(b"data: "): - yield json.loads(chunk[6:]) diff --git a/g4f/Provider/Liaobots.py b/g4f/Provider/Liaobots.py index 56f765de..addd3ed7 100644 --- a/g4f/Provider/Liaobots.py +++ b/g4f/Provider/Liaobots.py @@ -63,6 +63,15 @@ models = { "tokenLimit": 126000, "context": "128K", }, + "grok-beta": { + "id": "grok-beta", + "name": "Grok-Beta", + "model": "Grok", + "provider": "x.ai", + "maxLength": 400000, + "tokenLimit": 100000, + "context": "100K", + }, "grok-2": { "id": "grok-2", "name": "Grok-2", @@ -99,18 +108,18 @@ models = { "tokenLimit": 200000, "context": "200K", }, - "claude-3-opus-20240229-gcp": { - "id": "claude-3-opus-20240229-gcp", - "name": "Claude-3-Opus-Gcp", + "claude-3-5-sonnet-20240620": { + "id": "claude-3-5-sonnet-20240620", + "name": "Claude-3.5-Sonnet", "model": "Claude", "provider": "Anthropic", "maxLength": 800000, "tokenLimit": 200000, "context": "200K", }, - "claude-3-5-sonnet-20240620": { - "id": "claude-3-5-sonnet-20240620", - "name": "Claude-3.5-Sonnet", + "claude-3-5-sonnet-20241022": { + "id": "claude-3-5-sonnet-20241022", + "name": "Claude-3.5-Sonnet-V2", "model": "Claude", "provider": "Anthropic", "maxLength": 800000, @@ -183,9 +192,9 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin): "claude-3-opus": "claude-3-opus-20240229", "claude-3-opus": "claude-3-opus-20240229-aws", - "claude-3-opus": "claude-3-opus-20240229-gcp", "claude-3-sonnet": "claude-3-sonnet-20240229", "claude-3.5-sonnet": "claude-3-5-sonnet-20240620", + "claude-3.5-sonnet": "claude-3-5-sonnet-20241022", "claude-3-haiku": "claude-3-haiku-20240307", "claude-2.1": "claude-2.1", diff --git a/g4f/Provider/Local.py b/g4f/Provider/Local.py deleted file mode 100644 index 471231c6..00000000 --- a/g4f/Provider/Local.py +++ /dev/null @@ -1,43 +0,0 @@ -from __future__ import annotations - -from ..locals.models import get_models -try: - from ..locals.provider import LocalProvider - has_requirements = True -except ImportError: - has_requirements = False - -from ..typing import Messages, CreateResult -from ..providers.base_provider import AbstractProvider, ProviderModelMixin -from ..errors import MissingRequirementsError - -class Local(AbstractProvider, ProviderModelMixin): - label = "GPT4All" - working = True - supports_message_history = True - supports_system_message = True - supports_stream = True - - @classmethod - def get_models(cls): - if not cls.models: - cls.models = list(get_models()) - cls.default_model = cls.models[0] - return cls.models - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - **kwargs - ) -> CreateResult: - if not has_requirements: - raise MissingRequirementsError('Install "gpt4all" package | pip install -U g4f[local]') - return LocalProvider.create_completion( - cls.get_model(model), - messages, - stream, - **kwargs - ) \ No newline at end of file diff --git a/g4f/Provider/MetaAI.py b/g4f/Provider/MetaAI.py deleted file mode 100644 index 218b7ebb..00000000 --- a/g4f/Provider/MetaAI.py +++ /dev/null @@ -1,238 +0,0 @@ -from __future__ import annotations - -import json -import uuid -import random -import time -from typing import Dict, List - -from aiohttp import ClientSession, BaseConnector - -from ..typing import AsyncResult, Messages, Cookies -from ..requests import raise_for_status, DEFAULT_HEADERS -from ..image import ImageResponse, ImagePreview -from ..errors import ResponseError -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt, get_connector, format_cookies - -class Sources(): - def __init__(self, link_list: List[Dict[str, str]]) -> None: - self.list = link_list - - def __str__(self) -> str: - return "\n\n" + ("\n".join([f"[{link['title']}]({link['link']})" for link in self.list])) - -class AbraGeoBlockedError(Exception): - pass - -class MetaAI(AsyncGeneratorProvider, ProviderModelMixin): - label = "Meta AI" - url = "https://www.meta.ai" - working = True - default_model = '' - - def __init__(self, proxy: str = None, connector: BaseConnector = None): - self.session = ClientSession(connector=get_connector(connector, proxy), headers=DEFAULT_HEADERS) - self.cookies: Cookies = None - self.access_token: str = None - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - async for chunk in cls(proxy).prompt(format_prompt(messages)): - yield chunk - - async def update_access_token(self, birthday: str = "1999-01-01"): - url = "https://www.meta.ai/api/graphql/" - payload = { - "lsd": self.lsd, - "fb_api_caller_class": "RelayModern", - "fb_api_req_friendly_name": "useAbraAcceptTOSForTempUserMutation", - "variables": json.dumps({ - "dob": birthday, - "icebreaker_type": "TEXT", - "__relay_internal__pv__WebPixelRatiorelayprovider": 1, - }), - "doc_id": "7604648749596940", - } - headers = { - "x-fb-friendly-name": "useAbraAcceptTOSForTempUserMutation", - "x-fb-lsd": self.lsd, - "x-asbd-id": "129477", - "alt-used": "www.meta.ai", - "sec-fetch-site": "same-origin" - } - async with self.session.post(url, headers=headers, cookies=self.cookies, data=payload) as response: - await raise_for_status(response, "Fetch access_token failed") - auth_json = await response.json(content_type=None) - self.access_token = auth_json["data"]["xab_abra_accept_terms_of_service"]["new_temp_user_auth"]["access_token"] - - async def prompt(self, message: str, cookies: Cookies = None) -> AsyncResult: - if self.cookies is None: - await self.update_cookies(cookies) - if cookies is not None: - self.access_token = None - if self.access_token is None and cookies is None: - await self.update_access_token() - - if self.access_token is None: - url = "https://www.meta.ai/api/graphql/" - payload = {"lsd": self.lsd, 'fb_dtsg': self.dtsg} - headers = {'x-fb-lsd': self.lsd} - else: - url = "https://graph.meta.ai/graphql?locale=user" - payload = {"access_token": self.access_token} - headers = {} - headers = { - 'content-type': 'application/x-www-form-urlencoded', - 'cookie': format_cookies(self.cookies), - 'origin': 'https://www.meta.ai', - 'referer': 'https://www.meta.ai/', - 'x-asbd-id': '129477', - 'x-fb-friendly-name': 'useAbraSendMessageMutation', - **headers - } - payload = { - **payload, - 'fb_api_caller_class': 'RelayModern', - 'fb_api_req_friendly_name': 'useAbraSendMessageMutation', - "variables": json.dumps({ - "message": {"sensitive_string_value": message}, - "externalConversationId": str(uuid.uuid4()), - "offlineThreadingId": generate_offline_threading_id(), - "suggestedPromptIndex": None, - "flashVideoRecapInput": {"images": []}, - "flashPreviewInput": None, - "promptPrefix": None, - "entrypoint": "ABRA__CHAT__TEXT", - "icebreaker_type": "TEXT", - "__relay_internal__pv__AbraDebugDevOnlyrelayprovider": False, - "__relay_internal__pv__WebPixelRatiorelayprovider": 1, - }), - 'server_timestamps': 'true', - 'doc_id': '7783822248314888' - } - async with self.session.post(url, headers=headers, data=payload) as response: - await raise_for_status(response, "Fetch response failed") - last_snippet_len = 0 - fetch_id = None - async for line in response.content: - if b"

Something Went Wrong

" in line: - raise ResponseError("Response: Something Went Wrong") - try: - json_line = json.loads(line) - except json.JSONDecodeError: - continue - bot_response_message = json_line.get("data", {}).get("node", {}).get("bot_response_message", {}) - streaming_state = bot_response_message.get("streaming_state") - fetch_id = bot_response_message.get("fetch_id") or fetch_id - if streaming_state in ("STREAMING", "OVERALL_DONE"): - imagine_card = bot_response_message.get("imagine_card") - if imagine_card is not None: - imagine_session = imagine_card.get("session") - if imagine_session is not None: - imagine_medias = imagine_session.get("media_sets", {}).pop().get("imagine_media") - if imagine_medias is not None: - image_class = ImageResponse if streaming_state == "OVERALL_DONE" else ImagePreview - yield image_class([media["uri"] for media in imagine_medias], imagine_medias[0]["prompt"]) - snippet = bot_response_message["snippet"] - new_snippet_len = len(snippet) - if new_snippet_len > last_snippet_len: - yield snippet[last_snippet_len:] - last_snippet_len = new_snippet_len - #if last_streamed_response is None: - # if attempts > 3: - # raise Exception("MetaAI is having issues and was not able to respond (Server Error)") - # access_token = await self.get_access_token() - # return await self.prompt(message=message, attempts=attempts + 1) - if fetch_id is not None: - sources = await self.fetch_sources(fetch_id) - if sources is not None: - yield sources - - async def update_cookies(self, cookies: Cookies = None): - async with self.session.get("https://www.meta.ai/", cookies=cookies) as response: - await raise_for_status(response, "Fetch home failed") - text = await response.text() - if "AbraGeoBlockedError" in text: - raise AbraGeoBlockedError("Meta AI isn't available yet in your country") - if cookies is None: - cookies = { - "_js_datr": self.extract_value(text, "_js_datr"), - "abra_csrf": self.extract_value(text, "abra_csrf"), - "datr": self.extract_value(text, "datr"), - } - self.lsd = self.extract_value(text, start_str='"LSD",[],{"token":"', end_str='"}') - self.dtsg = self.extract_value(text, start_str='"DTSGInitialData",[],{"token":"', end_str='"}') - self.cookies = cookies - - async def fetch_sources(self, fetch_id: str) -> Sources: - if self.access_token is None: - url = "https://www.meta.ai/api/graphql/" - payload = {"lsd": self.lsd, 'fb_dtsg': self.dtsg} - headers = {'x-fb-lsd': self.lsd} - else: - url = "https://graph.meta.ai/graphql?locale=user" - payload = {"access_token": self.access_token} - headers = {} - payload = { - **payload, - "fb_api_caller_class": "RelayModern", - "fb_api_req_friendly_name": "AbraSearchPluginDialogQuery", - "variables": json.dumps({"abraMessageFetchID": fetch_id}), - "server_timestamps": "true", - "doc_id": "6946734308765963", - } - headers = { - "authority": "graph.meta.ai", - "x-fb-friendly-name": "AbraSearchPluginDialogQuery", - **headers - } - async with self.session.post(url, headers=headers, cookies=self.cookies, data=payload) as response: - await raise_for_status(response, "Fetch sources failed") - text = await response.text() - if "

Something Went Wrong

" in text: - raise ResponseError("Response: Something Went Wrong") - try: - response_json = json.loads(text) - message = response_json["data"]["message"] - if message is not None: - searchResults = message["searchResults"] - if searchResults is not None: - return Sources(searchResults["references"]) - except (KeyError, TypeError, json.JSONDecodeError): - raise RuntimeError(f"Response: {text}") - - @staticmethod - def extract_value(text: str, key: str = None, start_str = None, end_str = '",') -> str: - if start_str is None: - start_str = f'{key}":{{"value":"' - start = text.find(start_str) - if start >= 0: - start+= len(start_str) - end = text.find(end_str, start) - if end >= 0: - return text[start:end] - -def generate_offline_threading_id() -> str: - """ - Generates an offline threading ID. - - Returns: - str: The generated offline threading ID. - """ - # Generate a random 64-bit integer - random_value = random.getrandbits(64) - - # Get the current timestamp in milliseconds - timestamp = int(time.time() * 1000) - - # Combine timestamp and random value - threading_id = (timestamp << 22) | (random_value & ((1 << 22) - 1)) - - return str(threading_id) diff --git a/g4f/Provider/MetaAIAccount.py b/g4f/Provider/MetaAIAccount.py deleted file mode 100644 index 369b3f2f..00000000 --- a/g4f/Provider/MetaAIAccount.py +++ /dev/null @@ -1,23 +0,0 @@ -from __future__ import annotations - -from ..typing import AsyncResult, Messages, Cookies -from .helper import format_prompt, get_cookies -from .MetaAI import MetaAI - -class MetaAIAccount(MetaAI): - needs_auth = True - parent = "MetaAI" - image_models = ["meta"] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - cookies: Cookies = None, - **kwargs - ) -> AsyncResult: - cookies = get_cookies(".meta.ai", True, True) if cookies is None else cookies - async for chunk in cls(proxy).prompt(format_prompt(messages), cookies): - yield chunk \ No newline at end of file diff --git a/g4f/Provider/Ollama.py b/g4f/Provider/Ollama.py deleted file mode 100644 index f9116541..00000000 --- a/g4f/Provider/Ollama.py +++ /dev/null @@ -1,40 +0,0 @@ -from __future__ import annotations - -import requests -import os - -from .needs_auth.Openai import Openai -from ..typing import AsyncResult, Messages - -class Ollama(Openai): - label = "Ollama" - url = "https://ollama.com" - needs_auth = False - working = True - - @classmethod - def get_models(cls): - if not cls.models: - host = os.getenv("OLLAMA_HOST", "127.0.0.1") - port = os.getenv("OLLAMA_PORT", "11434") - url = f"http://{host}:{port}/api/tags" - models = requests.get(url).json()["models"] - cls.models = [model["name"] for model in models] - cls.default_model = cls.models[0] - return cls.models - - @classmethod - def create_async_generator( - cls, - model: str, - messages: Messages, - api_base: str = None, - **kwargs - ) -> AsyncResult: - if not api_base: - host = os.getenv("OLLAMA_HOST", "localhost") - port = os.getenv("OLLAMA_PORT", "11434") - api_base: str = f"http://{host}:{port}/v1" - return super().create_async_generator( - model, messages, api_base=api_base, **kwargs - ) \ No newline at end of file diff --git a/g4f/Provider/Replicate.py b/g4f/Provider/Replicate.py deleted file mode 100644 index 7ff8ad65..00000000 --- a/g4f/Provider/Replicate.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import annotations - -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt, filter_none -from ..typing import AsyncResult, Messages -from ..requests import raise_for_status -from ..requests.aiohttp import StreamSession -from ..errors import ResponseError, MissingAuthError - -class Replicate(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://replicate.com" - working = True - needs_auth = True - default_model = "meta/meta-llama-3-70b-instruct" - model_aliases = { - "meta-llama/Meta-Llama-3-70B-Instruct": default_model - } - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - api_key: str = None, - proxy: str = None, - timeout: int = 180, - system_prompt: str = None, - max_new_tokens: int = None, - temperature: float = None, - top_p: float = None, - top_k: float = None, - stop: list = None, - extra_data: dict = {}, - headers: dict = { - "accept": "application/json", - }, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - if cls.needs_auth and api_key is None: - raise MissingAuthError("api_key is missing") - if api_key is not None: - headers["Authorization"] = f"Bearer {api_key}" - api_base = "https://api.replicate.com/v1/models/" - else: - api_base = "https://replicate.com/api/models/" - async with StreamSession( - proxy=proxy, - headers=headers, - timeout=timeout - ) as session: - data = { - "stream": True, - "input": { - "prompt": format_prompt(messages), - **filter_none( - system_prompt=system_prompt, - max_new_tokens=max_new_tokens, - temperature=temperature, - top_p=top_p, - top_k=top_k, - stop_sequences=",".join(stop) if stop else None - ), - **extra_data - }, - } - url = f"{api_base.rstrip('/')}/{model}/predictions" - async with session.post(url, json=data) as response: - message = "Model not found" if response.status == 404 else None - await raise_for_status(response, message) - result = await response.json() - if "id" not in result: - raise ResponseError(f"Invalid response: {result}") - async with session.get(result["urls"]["stream"], headers={"Accept": "text/event-stream"}) as response: - await raise_for_status(response) - event = None - async for line in response.iter_lines(): - if line.startswith(b"event: "): - event = line[7:] - if event == b"done": - break - elif event == b"output": - if line.startswith(b"data: "): - new_text = line[6:].decode() - if new_text: - yield new_text - else: - yield "\n" \ No newline at end of file diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 55fabd25..f297f4dc 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -8,59 +8,40 @@ from ..providers.create_images import CreateImagesProvider from .deprecated import * from .selenium import * from .needs_auth import * +from .not_working import * +from .local import * -from .gigachat import * from .nexra import * -from .Ai4Chat import Ai4Chat from .AI365VIP import AI365VIP from .AIChatFree import AIChatFree from .AIUncensored import AIUncensored from .Allyfy import Allyfy -from .AmigoChat import AmigoChat -from .AiChatOnline import AiChatOnline -from .AiChats import AiChats from .AiMathGPT import AiMathGPT from .Airforce import Airforce -from .Aura import Aura from .Bing import Bing from .BingCreateImages import BingCreateImages from .Blackbox import Blackbox from .ChatGpt import ChatGpt from .Chatgpt4Online import Chatgpt4Online -from .Chatgpt4o import Chatgpt4o from .ChatGptEs import ChatGptEs -from .ChatgptFree import ChatgptFree from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare from .DarkAI import DarkAI from .DDG import DDG from .DeepInfraChat import DeepInfraChat -from .DeepInfraImage import DeepInfraImage -from .Editee import Editee -from .FlowGpt import FlowGpt from .Free2GPT import Free2GPT -from .FreeChatgpt import FreeChatgpt from .FreeGpt import FreeGpt -from .FreeNetfly import FreeNetfly from .GeminiPro import GeminiPro from .GizAI import GizAI -from .GPROChat import GPROChat from .HuggingChat import HuggingChat -from .HuggingFace import HuggingFace -from .Koala import Koala from .Liaobots import Liaobots -from .Local import Local from .MagickPen import MagickPen -from .MetaAI import MetaAI -#from .MetaAIAccount import MetaAIAccount -from .Ollama import Ollama from .PerplexityLabs import PerplexityLabs from .Pi import Pi from .Pizzagpt import Pizzagpt from .Prodia import Prodia from .Reka import Reka -from .Replicate import Replicate from .ReplicateHome import ReplicateHome from .RubiksAI import RubiksAI from .TeachAnything import TeachAnything diff --git a/g4f/Provider/deprecated/__init__.py b/g4f/Provider/deprecated/__init__.py index bf923f2a..368a71a0 100644 --- a/g4f/Provider/deprecated/__init__.py +++ b/g4f/Provider/deprecated/__init__.py @@ -25,11 +25,10 @@ from .Aichat import Aichat from .Berlin import Berlin from .Phind import Phind from .AiAsk import AiAsk -from ..AiChatOnline import AiChatOnline from .ChatAnywhere import ChatAnywhere from .FakeGpt import FakeGpt from .GeekGpt import GeekGpt from .GPTalk import GPTalk from .Hashnode import Hashnode from .Ylokh import Ylokh -from .OpenAssistant import OpenAssistant \ No newline at end of file +from .OpenAssistant import OpenAssistant diff --git a/g4f/Provider/gigachat/GigaChat.py b/g4f/Provider/gigachat/GigaChat.py deleted file mode 100644 index b1b293e3..00000000 --- a/g4f/Provider/gigachat/GigaChat.py +++ /dev/null @@ -1,92 +0,0 @@ -from __future__ import annotations - -import os -import ssl -import time -import uuid - -import json -from aiohttp import ClientSession, TCPConnector, BaseConnector -from g4f.requests import raise_for_status - -from ...typing import AsyncResult, Messages -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ...errors import MissingAuthError -from ..helper import get_connector - -access_token = "" -token_expires_at = 0 - -class GigaChat(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://developers.sber.ru/gigachat" - working = True - supports_message_history = True - supports_system_message = True - supports_stream = True - needs_auth = True - default_model = "GigaChat:latest" - models = ["GigaChat:latest", "GigaChat-Plus", "GigaChat-Pro"] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - stream: bool = True, - proxy: str = None, - api_key: str = None, - connector: BaseConnector = None, - scope: str = "GIGACHAT_API_PERS", - update_interval: float = 0, - **kwargs - ) -> AsyncResult: - global access_token, token_expires_at - model = cls.get_model(model) - if not api_key: - raise MissingAuthError('Missing "api_key"') - - cafile = os.path.join(os.path.dirname(__file__), "russian_trusted_root_ca_pem.crt") - ssl_context = ssl.create_default_context(cafile=cafile) if os.path.exists(cafile) else None - if connector is None and ssl_context is not None: - connector = TCPConnector(ssl_context=ssl_context) - async with ClientSession(connector=get_connector(connector, proxy)) as session: - if token_expires_at - int(time.time() * 1000) < 60000: - async with session.post(url="https://ngw.devices.sberbank.ru:9443/api/v2/oauth", - headers={"Authorization": f"Bearer {api_key}", - "RqUID": str(uuid.uuid4()), - "Content-Type": "application/x-www-form-urlencoded"}, - data={"scope": scope}) as response: - await raise_for_status(response) - data = await response.json() - access_token = data['access_token'] - token_expires_at = data['expires_at'] - - async with session.post(url="https://gigachat.devices.sberbank.ru/api/v1/chat/completions", - headers={"Authorization": f"Bearer {access_token}"}, - json={ - "model": model, - "messages": messages, - "stream": stream, - "update_interval": update_interval, - **kwargs - }) as response: - await raise_for_status(response) - - async for line in response.content: - if not stream: - yield json.loads(line.decode("utf-8"))['choices'][0]['message']['content'] - return - - if line and line.startswith(b"data:"): - line = line[6:-1] # remove "data: " prefix and "\n" suffix - if line.strip() == b"[DONE]": - return - else: - msg = json.loads(line.decode("utf-8"))['choices'][0] - content = msg['delta']['content'] - - if content: - yield content - - if 'finish_reason' in msg: - return diff --git a/g4f/Provider/gigachat/__init__.py b/g4f/Provider/gigachat/__init__.py deleted file mode 100644 index c9853742..00000000 --- a/g4f/Provider/gigachat/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .GigaChat import GigaChat - diff --git a/g4f/Provider/gigachat/russian_trusted_root_ca_pem.crt b/g4f/Provider/gigachat/russian_trusted_root_ca_pem.crt deleted file mode 100644 index 4c143a21..00000000 --- a/g4f/Provider/gigachat/russian_trusted_root_ca_pem.crt +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx -PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu -ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg -Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS -VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg -YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v -dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n -qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q -XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U -zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX -YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y -Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD -U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD -4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9 -G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH -BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX -ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa -OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf -BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS -BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF -AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH -tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq -W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+ -/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS -AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj -C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV -4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d -WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ -D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC -EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq -391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4= ------END CERTIFICATE----- \ No newline at end of file diff --git a/g4f/Provider/local/Local.py b/g4f/Provider/local/Local.py new file mode 100644 index 00000000..4dc6e3f9 --- /dev/null +++ b/g4f/Provider/local/Local.py @@ -0,0 +1,43 @@ +from __future__ import annotations + +from ...locals.models import get_models +try: + from ...locals.provider import LocalProvider + has_requirements = True +except ImportError: + has_requirements = False + +from ...typing import Messages, CreateResult +from ...providers.base_provider import AbstractProvider, ProviderModelMixin +from ...errors import MissingRequirementsError + +class Local(AbstractProvider, ProviderModelMixin): + label = "GPT4All" + working = True + supports_message_history = True + supports_system_message = True + supports_stream = True + + @classmethod + def get_models(cls): + if not cls.models: + cls.models = list(get_models()) + cls.default_model = cls.models[0] + return cls.models + + @classmethod + def create_completion( + cls, + model: str, + messages: Messages, + stream: bool, + **kwargs + ) -> CreateResult: + if not has_requirements: + raise MissingRequirementsError('Install "gpt4all" package | pip install -U g4f[local]') + return LocalProvider.create_completion( + cls.get_model(model), + messages, + stream, + **kwargs + ) diff --git a/g4f/Provider/local/Ollama.py b/g4f/Provider/local/Ollama.py new file mode 100644 index 00000000..c503a46a --- /dev/null +++ b/g4f/Provider/local/Ollama.py @@ -0,0 +1,40 @@ +from __future__ import annotations + +import requests +import os + +from ..needs_auth.Openai import Openai +from ...typing import AsyncResult, Messages + +class Ollama(Openai): + label = "Ollama" + url = "https://ollama.com" + needs_auth = False + working = True + + @classmethod + def get_models(cls): + if not cls.models: + host = os.getenv("OLLAMA_HOST", "127.0.0.1") + port = os.getenv("OLLAMA_PORT", "11434") + url = f"http://{host}:{port}/api/tags" + models = requests.get(url).json()["models"] + cls.models = [model["name"] for model in models] + cls.default_model = cls.models[0] + return cls.models + + @classmethod + def create_async_generator( + cls, + model: str, + messages: Messages, + api_base: str = None, + **kwargs + ) -> AsyncResult: + if not api_base: + host = os.getenv("OLLAMA_HOST", "localhost") + port = os.getenv("OLLAMA_PORT", "11434") + api_base: str = f"http://{host}:{port}/v1" + return super().create_async_generator( + model, messages, api_base=api_base, **kwargs + ) diff --git a/g4f/Provider/local/__init__.py b/g4f/Provider/local/__init__.py new file mode 100644 index 00000000..05f6022e --- /dev/null +++ b/g4f/Provider/local/__init__.py @@ -0,0 +1,2 @@ +from .Local import Local +from .Ollama import Ollama diff --git a/g4f/Provider/needs_auth/DeepInfraImage.py b/g4f/Provider/needs_auth/DeepInfraImage.py new file mode 100644 index 00000000..2310c1c8 --- /dev/null +++ b/g4f/Provider/needs_auth/DeepInfraImage.py @@ -0,0 +1,80 @@ +from __future__ import annotations + +import requests + +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ...typing import AsyncResult, Messages +from ...requests import StreamSession, raise_for_status +from ...image import ImageResponse + +class DeepInfraImage(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://deepinfra.com" + parent = "DeepInfra" + working = True + needs_auth = True + default_model = '' + image_models = [default_model] + + @classmethod + def get_models(cls): + if not cls.models: + url = 'https://api.deepinfra.com/models/featured' + models = requests.get(url).json() + cls.models = [model['model_name'] for model in models if model["reported_type"] == "text-to-image"] + cls.image_models = cls.models + return cls.models + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + **kwargs + ) -> AsyncResult: + yield await cls.create_async(messages[-1]["content"], model, **kwargs) + + @classmethod + async def create_async( + cls, + prompt: str, + model: str, + api_key: str = None, + api_base: str = "https://api.deepinfra.com/v1/inference", + proxy: str = None, + timeout: int = 180, + extra_data: dict = {}, + **kwargs + ) -> ImageResponse: + headers = { + 'Accept-Encoding': 'gzip, deflate, br', + 'Accept-Language': 'en-US', + 'Connection': 'keep-alive', + 'Origin': 'https://deepinfra.com', + 'Referer': 'https://deepinfra.com/', + 'Sec-Fetch-Dest': 'empty', + 'Sec-Fetch-Mode': 'cors', + 'Sec-Fetch-Site': 'same-site', + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36', + 'X-Deepinfra-Source': 'web-embed', + 'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + } + if api_key is not None: + headers["Authorization"] = f"Bearer {api_key}" + async with StreamSession( + proxies={"all": proxy}, + headers=headers, + timeout=timeout + ) as session: + model = cls.get_model(model) + data = {"prompt": prompt, **extra_data} + data = {"input": data} if model == cls.default_model else data + async with session.post(f"{api_base.rstrip('/')}/{model}", json=data) as response: + await raise_for_status(response) + data = await response.json() + images = data["output"] if "output" in data else data["images"] + if not images: + raise RuntimeError(f"Response: {data}") + images = images[0] if len(images) == 1 else images + return ImageResponse(images, prompt) diff --git a/g4f/Provider/needs_auth/HuggingFace.py b/g4f/Provider/needs_auth/HuggingFace.py new file mode 100644 index 00000000..ecc75d1c --- /dev/null +++ b/g4f/Provider/needs_auth/HuggingFace.py @@ -0,0 +1,104 @@ +from __future__ import annotations + +import json +from aiohttp import ClientSession, BaseConnector + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import get_connector +from ...errors import RateLimitError, ModelNotFoundError +from ...requests.raise_for_status import raise_for_status + +from ..HuggingChat import HuggingChat + +class HuggingFace(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://huggingface.co/chat" + working = True + needs_auth = True + supports_message_history = True + default_model = HuggingChat.default_model + models = HuggingChat.models + model_aliases = HuggingChat.model_aliases + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + stream: bool = True, + proxy: str = None, + connector: BaseConnector = None, + api_base: str = "https://api-inference.huggingface.co", + api_key: str = None, + max_new_tokens: int = 1024, + temperature: float = 0.7, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + headers = { + 'accept': '*/*', + 'accept-language': 'en', + 'cache-control': 'no-cache', + 'origin': 'https://huggingface.co', + 'pragma': 'no-cache', + 'priority': 'u=1, i', + 'referer': 'https://huggingface.co/chat/', + 'sec-ch-ua': '"Not)A;Brand";v="99", "Google Chrome";v="127", "Chromium";v="127"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + 'sec-fetch-dest': 'empty', + 'sec-fetch-mode': 'cors', + 'sec-fetch-site': 'same-origin', + 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36', + } + if api_key is not None: + headers["Authorization"] = f"Bearer {api_key}" + + params = { + "return_full_text": False, + "max_new_tokens": max_new_tokens, + "temperature": temperature, + **kwargs + } + payload = {"inputs": format_prompt(messages), "parameters": params, "stream": stream} + + async with ClientSession( + headers=headers, + connector=get_connector(connector, proxy) + ) as session: + async with session.post(f"{api_base.rstrip('/')}/models/{model}", json=payload) as response: + if response.status == 404: + raise ModelNotFoundError(f"Model is not supported: {model}") + await raise_for_status(response) + if stream: + first = True + async for line in response.content: + if line.startswith(b"data:"): + data = json.loads(line[5:]) + if not data["token"]["special"]: + chunk = data["token"]["text"] + if first: + first = False + chunk = chunk.lstrip() + yield chunk + else: + yield (await response.json())[0]["generated_text"].strip() + +def format_prompt(messages: Messages) -> str: + system_messages = [message["content"] for message in messages if message["role"] == "system"] + question = " ".join([messages[-1]["content"], *system_messages]) + history = "".join([ + f"[INST]{messages[idx-1]['content']} [/INST] {message['content']}" + for idx, message in enumerate(messages) + if message["role"] == "assistant" + ]) + return f"{history}[INST] {question} [/INST]" diff --git a/g4f/Provider/needs_auth/MetaAI.py b/g4f/Provider/needs_auth/MetaAI.py new file mode 100644 index 00000000..4b730abd --- /dev/null +++ b/g4f/Provider/needs_auth/MetaAI.py @@ -0,0 +1,238 @@ +from __future__ import annotations + +import json +import uuid +import random +import time +from typing import Dict, List + +from aiohttp import ClientSession, BaseConnector + +from ...typing import AsyncResult, Messages, Cookies +from ...requests import raise_for_status, DEFAULT_HEADERS +from ...image import ImageResponse, ImagePreview +from ...errors import ResponseError +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt, get_connector, format_cookies + +class Sources(): + def __init__(self, link_list: List[Dict[str, str]]) -> None: + self.list = link_list + + def __str__(self) -> str: + return "\n\n" + ("\n".join([f"[{link['title']}]({link['link']})" for link in self.list])) + +class AbraGeoBlockedError(Exception): + pass + +class MetaAI(AsyncGeneratorProvider, ProviderModelMixin): + label = "Meta AI" + url = "https://www.meta.ai" + working = True + default_model = '' + + def __init__(self, proxy: str = None, connector: BaseConnector = None): + self.session = ClientSession(connector=get_connector(connector, proxy), headers=DEFAULT_HEADERS) + self.cookies: Cookies = None + self.access_token: str = None + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + async for chunk in cls(proxy).prompt(format_prompt(messages)): + yield chunk + + async def update_access_token(self, birthday: str = "1999-01-01"): + url = "https://www.meta.ai/api/graphql/" + payload = { + "lsd": self.lsd, + "fb_api_caller_class": "RelayModern", + "fb_api_req_friendly_name": "useAbraAcceptTOSForTempUserMutation", + "variables": json.dumps({ + "dob": birthday, + "icebreaker_type": "TEXT", + "__relay_internal__pv__WebPixelRatiorelayprovider": 1, + }), + "doc_id": "7604648749596940", + } + headers = { + "x-fb-friendly-name": "useAbraAcceptTOSForTempUserMutation", + "x-fb-lsd": self.lsd, + "x-asbd-id": "129477", + "alt-used": "www.meta.ai", + "sec-fetch-site": "same-origin" + } + async with self.session.post(url, headers=headers, cookies=self.cookies, data=payload) as response: + await raise_for_status(response, "Fetch access_token failed") + auth_json = await response.json(content_type=None) + self.access_token = auth_json["data"]["xab_abra_accept_terms_of_service"]["new_temp_user_auth"]["access_token"] + + async def prompt(self, message: str, cookies: Cookies = None) -> AsyncResult: + if self.cookies is None: + await self.update_cookies(cookies) + if cookies is not None: + self.access_token = None + if self.access_token is None and cookies is None: + await self.update_access_token() + + if self.access_token is None: + url = "https://www.meta.ai/api/graphql/" + payload = {"lsd": self.lsd, 'fb_dtsg': self.dtsg} + headers = {'x-fb-lsd': self.lsd} + else: + url = "https://graph.meta.ai/graphql?locale=user" + payload = {"access_token": self.access_token} + headers = {} + headers = { + 'content-type': 'application/x-www-form-urlencoded', + 'cookie': format_cookies(self.cookies), + 'origin': 'https://www.meta.ai', + 'referer': 'https://www.meta.ai/', + 'x-asbd-id': '129477', + 'x-fb-friendly-name': 'useAbraSendMessageMutation', + **headers + } + payload = { + **payload, + 'fb_api_caller_class': 'RelayModern', + 'fb_api_req_friendly_name': 'useAbraSendMessageMutation', + "variables": json.dumps({ + "message": {"sensitive_string_value": message}, + "externalConversationId": str(uuid.uuid4()), + "offlineThreadingId": generate_offline_threading_id(), + "suggestedPromptIndex": None, + "flashVideoRecapInput": {"images": []}, + "flashPreviewInput": None, + "promptPrefix": None, + "entrypoint": "ABRA__CHAT__TEXT", + "icebreaker_type": "TEXT", + "__relay_internal__pv__AbraDebugDevOnlyrelayprovider": False, + "__relay_internal__pv__WebPixelRatiorelayprovider": 1, + }), + 'server_timestamps': 'true', + 'doc_id': '7783822248314888' + } + async with self.session.post(url, headers=headers, data=payload) as response: + await raise_for_status(response, "Fetch response failed") + last_snippet_len = 0 + fetch_id = None + async for line in response.content: + if b"

Something Went Wrong

" in line: + raise ResponseError("Response: Something Went Wrong") + try: + json_line = json.loads(line) + except json.JSONDecodeError: + continue + bot_response_message = json_line.get("data", {}).get("node", {}).get("bot_response_message", {}) + streaming_state = bot_response_message.get("streaming_state") + fetch_id = bot_response_message.get("fetch_id") or fetch_id + if streaming_state in ("STREAMING", "OVERALL_DONE"): + imagine_card = bot_response_message.get("imagine_card") + if imagine_card is not None: + imagine_session = imagine_card.get("session") + if imagine_session is not None: + imagine_medias = imagine_session.get("media_sets", {}).pop().get("imagine_media") + if imagine_medias is not None: + image_class = ImageResponse if streaming_state == "OVERALL_DONE" else ImagePreview + yield image_class([media["uri"] for media in imagine_medias], imagine_medias[0]["prompt"]) + snippet = bot_response_message["snippet"] + new_snippet_len = len(snippet) + if new_snippet_len > last_snippet_len: + yield snippet[last_snippet_len:] + last_snippet_len = new_snippet_len + #if last_streamed_response is None: + # if attempts > 3: + # raise Exception("MetaAI is having issues and was not able to respond (Server Error)") + # access_token = await self.get_access_token() + # return await self.prompt(message=message, attempts=attempts + 1) + if fetch_id is not None: + sources = await self.fetch_sources(fetch_id) + if sources is not None: + yield sources + + async def update_cookies(self, cookies: Cookies = None): + async with self.session.get("https://www.meta.ai/", cookies=cookies) as response: + await raise_for_status(response, "Fetch home failed") + text = await response.text() + if "AbraGeoBlockedError" in text: + raise AbraGeoBlockedError("Meta AI isn't available yet in your country") + if cookies is None: + cookies = { + "_js_datr": self.extract_value(text, "_js_datr"), + "abra_csrf": self.extract_value(text, "abra_csrf"), + "datr": self.extract_value(text, "datr"), + } + self.lsd = self.extract_value(text, start_str='"LSD",[],{"token":"', end_str='"}') + self.dtsg = self.extract_value(text, start_str='"DTSGInitialData",[],{"token":"', end_str='"}') + self.cookies = cookies + + async def fetch_sources(self, fetch_id: str) -> Sources: + if self.access_token is None: + url = "https://www.meta.ai/api/graphql/" + payload = {"lsd": self.lsd, 'fb_dtsg': self.dtsg} + headers = {'x-fb-lsd': self.lsd} + else: + url = "https://graph.meta.ai/graphql?locale=user" + payload = {"access_token": self.access_token} + headers = {} + payload = { + **payload, + "fb_api_caller_class": "RelayModern", + "fb_api_req_friendly_name": "AbraSearchPluginDialogQuery", + "variables": json.dumps({"abraMessageFetchID": fetch_id}), + "server_timestamps": "true", + "doc_id": "6946734308765963", + } + headers = { + "authority": "graph.meta.ai", + "x-fb-friendly-name": "AbraSearchPluginDialogQuery", + **headers + } + async with self.session.post(url, headers=headers, cookies=self.cookies, data=payload) as response: + await raise_for_status(response, "Fetch sources failed") + text = await response.text() + if "

Something Went Wrong

" in text: + raise ResponseError("Response: Something Went Wrong") + try: + response_json = json.loads(text) + message = response_json["data"]["message"] + if message is not None: + searchResults = message["searchResults"] + if searchResults is not None: + return Sources(searchResults["references"]) + except (KeyError, TypeError, json.JSONDecodeError): + raise RuntimeError(f"Response: {text}") + + @staticmethod + def extract_value(text: str, key: str = None, start_str = None, end_str = '",') -> str: + if start_str is None: + start_str = f'{key}":{{"value":"' + start = text.find(start_str) + if start >= 0: + start+= len(start_str) + end = text.find(end_str, start) + if end >= 0: + return text[start:end] + +def generate_offline_threading_id() -> str: + """ + Generates an offline threading ID. + + Returns: + str: The generated offline threading ID. + """ + # Generate a random 64-bit integer + random_value = random.getrandbits(64) + + # Get the current timestamp in milliseconds + timestamp = int(time.time() * 1000) + + # Combine timestamp and random value + threading_id = (timestamp << 22) | (random_value & ((1 << 22) - 1)) + + return str(threading_id) diff --git a/g4f/Provider/needs_auth/MetaAIAccount.py b/g4f/Provider/needs_auth/MetaAIAccount.py new file mode 100644 index 00000000..2d54f3e0 --- /dev/null +++ b/g4f/Provider/needs_auth/MetaAIAccount.py @@ -0,0 +1,23 @@ +from __future__ import annotations + +from ...typing import AsyncResult, Messages, Cookies +from ..helper import format_prompt, get_cookies +from ..MetaAI import MetaAI + +class MetaAIAccount(MetaAI): + needs_auth = True + parent = "MetaAI" + image_models = ["meta"] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + cookies: Cookies = None, + **kwargs + ) -> AsyncResult: + cookies = get_cookies(".meta.ai", True, True) if cookies is None else cookies + async for chunk in cls(proxy).prompt(format_prompt(messages), cookies): + yield chunk diff --git a/g4f/Provider/needs_auth/OpenRouter.py b/g4f/Provider/needs_auth/OpenRouter.py deleted file mode 100644 index 5e0bf336..00000000 --- a/g4f/Provider/needs_auth/OpenRouter.py +++ /dev/null @@ -1,32 +0,0 @@ -from __future__ import annotations - -import requests - -from .Openai import Openai -from ...typing import AsyncResult, Messages - -class OpenRouter(Openai): - label = "OpenRouter" - url = "https://openrouter.ai" - working = False - default_model = "mistralai/mistral-7b-instruct:free" - - @classmethod - def get_models(cls): - if not cls.models: - url = 'https://openrouter.ai/api/v1/models' - models = requests.get(url).json()["data"] - cls.models = [model['id'] for model in models] - return cls.models - - @classmethod - def create_async_generator( - cls, - model: str, - messages: Messages, - api_base: str = "https://openrouter.ai/api/v1", - **kwargs - ) -> AsyncResult: - return super().create_async_generator( - model, messages, api_base=api_base, **kwargs - ) diff --git a/g4f/Provider/needs_auth/Replicate.py b/g4f/Provider/needs_auth/Replicate.py new file mode 100644 index 00000000..ec993aa4 --- /dev/null +++ b/g4f/Provider/needs_auth/Replicate.py @@ -0,0 +1,88 @@ +from __future__ import annotations + +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt, filter_none +from ...typing import AsyncResult, Messages +from ...requests import raise_for_status +from ...requests.aiohttp import StreamSession +from ...errors import ResponseError, MissingAuthError + +class Replicate(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://replicate.com" + working = True + needs_auth = True + default_model = "meta/meta-llama-3-70b-instruct" + model_aliases = { + "meta-llama/Meta-Llama-3-70B-Instruct": default_model + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + api_key: str = None, + proxy: str = None, + timeout: int = 180, + system_prompt: str = None, + max_new_tokens: int = None, + temperature: float = None, + top_p: float = None, + top_k: float = None, + stop: list = None, + extra_data: dict = {}, + headers: dict = { + "accept": "application/json", + }, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + if cls.needs_auth and api_key is None: + raise MissingAuthError("api_key is missing") + if api_key is not None: + headers["Authorization"] = f"Bearer {api_key}" + api_base = "https://api.replicate.com/v1/models/" + else: + api_base = "https://replicate.com/api/models/" + async with StreamSession( + proxy=proxy, + headers=headers, + timeout=timeout + ) as session: + data = { + "stream": True, + "input": { + "prompt": format_prompt(messages), + **filter_none( + system_prompt=system_prompt, + max_new_tokens=max_new_tokens, + temperature=temperature, + top_p=top_p, + top_k=top_k, + stop_sequences=",".join(stop) if stop else None + ), + **extra_data + }, + } + url = f"{api_base.rstrip('/')}/{model}/predictions" + async with session.post(url, json=data) as response: + message = "Model not found" if response.status == 404 else None + await raise_for_status(response, message) + result = await response.json() + if "id" not in result: + raise ResponseError(f"Invalid response: {result}") + async with session.get(result["urls"]["stream"], headers={"Accept": "text/event-stream"}) as response: + await raise_for_status(response) + event = None + async for line in response.iter_lines(): + if line.startswith(b"event: "): + event = line[7:] + if event == b"done": + break + elif event == b"output": + if line.startswith(b"data: "): + new_text = line[6:].decode() + if new_text: + yield new_text + else: + yield "\n" diff --git a/g4f/Provider/needs_auth/__init__.py b/g4f/Provider/needs_auth/__init__.py index aa3547a5..0626a837 100644 --- a/g4f/Provider/needs_auth/__init__.py +++ b/g4f/Provider/needs_auth/__init__.py @@ -1,4 +1,7 @@ +from .gigachat import * + from .DeepInfra import DeepInfra +from .DeepInfraImage import DeepInfraImage from .Gemini import Gemini from .Raycast import Raycast from .Theb import Theb @@ -7,6 +10,9 @@ from .OpenaiChat import OpenaiChat from .Poe import Poe from .Openai import Openai from .Groq import Groq -from .OpenRouter import OpenRouter #from .OpenaiAccount import OpenaiAccount from .PerplexityApi import PerplexityApi +from .Replicate import Replicate +from .MetaAI import MetaAI +#from .MetaAIAccount import MetaAIAccount +from .HuggingFace import HuggingFace diff --git a/g4f/Provider/needs_auth/gigachat/GigaChat.py b/g4f/Provider/needs_auth/gigachat/GigaChat.py new file mode 100644 index 00000000..c9f1c011 --- /dev/null +++ b/g4f/Provider/needs_auth/gigachat/GigaChat.py @@ -0,0 +1,92 @@ +from __future__ import annotations + +import os +import ssl +import time +import uuid + +import json +from aiohttp import ClientSession, TCPConnector, BaseConnector +from g4f.requests import raise_for_status + +from ....typing import AsyncResult, Messages +from ...base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ....errors import MissingAuthError +from ...helper import get_connector + +access_token = "" +token_expires_at = 0 + +class GigaChat(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://developers.sber.ru/gigachat" + working = True + supports_message_history = True + supports_system_message = True + supports_stream = True + needs_auth = True + default_model = "GigaChat:latest" + models = ["GigaChat:latest", "GigaChat-Plus", "GigaChat-Pro"] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + stream: bool = True, + proxy: str = None, + api_key: str = None, + connector: BaseConnector = None, + scope: str = "GIGACHAT_API_PERS", + update_interval: float = 0, + **kwargs + ) -> AsyncResult: + global access_token, token_expires_at + model = cls.get_model(model) + if not api_key: + raise MissingAuthError('Missing "api_key"') + + cafile = os.path.join(os.path.dirname(__file__), "russian_trusted_root_ca_pem.crt") + ssl_context = ssl.create_default_context(cafile=cafile) if os.path.exists(cafile) else None + if connector is None and ssl_context is not None: + connector = TCPConnector(ssl_context=ssl_context) + async with ClientSession(connector=get_connector(connector, proxy)) as session: + if token_expires_at - int(time.time() * 1000) < 60000: + async with session.post(url="https://ngw.devices.sberbank.ru:9443/api/v2/oauth", + headers={"Authorization": f"Bearer {api_key}", + "RqUID": str(uuid.uuid4()), + "Content-Type": "application/x-www-form-urlencoded"}, + data={"scope": scope}) as response: + await raise_for_status(response) + data = await response.json() + access_token = data['access_token'] + token_expires_at = data['expires_at'] + + async with session.post(url="https://gigachat.devices.sberbank.ru/api/v1/chat/completions", + headers={"Authorization": f"Bearer {access_token}"}, + json={ + "model": model, + "messages": messages, + "stream": stream, + "update_interval": update_interval, + **kwargs + }) as response: + await raise_for_status(response) + + async for line in response.content: + if not stream: + yield json.loads(line.decode("utf-8"))['choices'][0]['message']['content'] + return + + if line and line.startswith(b"data:"): + line = line[6:-1] # remove "data: " prefix and "\n" suffix + if line.strip() == b"[DONE]": + return + else: + msg = json.loads(line.decode("utf-8"))['choices'][0] + content = msg['delta']['content'] + + if content: + yield content + + if 'finish_reason' in msg: + return diff --git a/g4f/Provider/needs_auth/gigachat/__init__.py b/g4f/Provider/needs_auth/gigachat/__init__.py new file mode 100644 index 00000000..c9853742 --- /dev/null +++ b/g4f/Provider/needs_auth/gigachat/__init__.py @@ -0,0 +1,2 @@ +from .GigaChat import GigaChat + diff --git a/g4f/Provider/needs_auth/gigachat/russian_trusted_root_ca_pem.crt b/g4f/Provider/needs_auth/gigachat/russian_trusted_root_ca_pem.crt new file mode 100644 index 00000000..4c143a21 --- /dev/null +++ b/g4f/Provider/needs_auth/gigachat/russian_trusted_root_ca_pem.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFwjCCA6qgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwcDELMAkGA1UEBhMCUlUx +PzA9BgNVBAoMNlRoZSBNaW5pc3RyeSBvZiBEaWdpdGFsIERldmVsb3BtZW50IGFu +ZCBDb21tdW5pY2F0aW9uczEgMB4GA1UEAwwXUnVzc2lhbiBUcnVzdGVkIFJvb3Qg +Q0EwHhcNMjIwMzAxMjEwNDE1WhcNMzIwMjI3MjEwNDE1WjBwMQswCQYDVQQGEwJS +VTE/MD0GA1UECgw2VGhlIE1pbmlzdHJ5IG9mIERpZ2l0YWwgRGV2ZWxvcG1lbnQg +YW5kIENvbW11bmljYXRpb25zMSAwHgYDVQQDDBdSdXNzaWFuIFRydXN0ZWQgUm9v +dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMfFOZ8pUAL3+r2n +qqE0Zp52selXsKGFYoG0GM5bwz1bSFtCt+AZQMhkWQheI3poZAToYJu69pHLKS6Q +XBiwBC1cvzYmUYKMYZC7jE5YhEU2bSL0mX7NaMxMDmH2/NwuOVRj8OImVa5s1F4U +zn4Kv3PFlDBjjSjXKVY9kmjUBsXQrIHeaqmUIsPIlNWUnimXS0I0abExqkbdrXbX +YwCOXhOO2pDUx3ckmJlCMUGacUTnylyQW2VsJIyIGA8V0xzdaeUXg0VZ6ZmNUr5Y +Ber/EAOLPb8NYpsAhJe2mXjMB/J9HNsoFMBFJ0lLOT/+dQvjbdRZoOT8eqJpWnVD +U+QL/qEZnz57N88OWM3rabJkRNdU/Z7x5SFIM9FrqtN8xewsiBWBI0K6XFuOBOTD +4V08o4TzJ8+Ccq5XlCUW2L48pZNCYuBDfBh7FxkB7qDgGDiaftEkZZfApRg2E+M9 +G8wkNKTPLDc4wH0FDTijhgxR3Y4PiS1HL2Zhw7bD3CbslmEGgfnnZojNkJtcLeBH +BLa52/dSwNU4WWLubaYSiAmA9IUMX1/RpfpxOxd4Ykmhz97oFbUaDJFipIggx5sX +ePAlkTdWnv+RWBxlJwMQ25oEHmRguNYf4Zr/Rxr9cS93Y+mdXIZaBEE0KS2iLRqa +OiWBki9IMQU4phqPOBAaG7A+eP8PAgMBAAGjZjBkMB0GA1UdDgQWBBTh0YHlzlpf +BKrS6badZrHF+qwshzAfBgNVHSMEGDAWgBTh0YHlzlpfBKrS6badZrHF+qwshzAS +BgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF +AAOCAgEAALIY1wkilt/urfEVM5vKzr6utOeDWCUczmWX/RX4ljpRdgF+5fAIS4vH +tmXkqpSCOVeWUrJV9QvZn6L227ZwuE15cWi8DCDal3Ue90WgAJJZMfTshN4OI8cq +W9E4EG9wglbEtMnObHlms8F3CHmrw3k6KmUkWGoa+/ENmcVl68u/cMRl1JbW2bM+ +/3A+SAg2c6iPDlehczKx2oa95QW0SkPPWGuNA/CE8CpyANIhu9XFrj3RQ3EqeRcS +AQQod1RNuHpfETLU/A2gMmvn/w/sx7TB3W5BPs6rprOA37tutPq9u6FTZOcG1Oqj +C/B7yTqgI7rbyvox7DEXoX7rIiEqyNNUguTk/u3SZ4VXE2kmxdmSh3TQvybfbnXV +4JbCZVaqiZraqc7oZMnRoWrXRG3ztbnbes/9qhRGI7PqXqeKJBztxRTEVj8ONs1d +WN5szTwaPIvhkhO3CO5ErU2rVdUr89wKpNXbBODFKRtgxUT70YpmJ46VVaqdAhOZ +D9EUUn4YaeLaS8AjSF/h7UkjOibNc4qVDiPP+rkehFWM66PVnP1Msh93tc+taIfC +EYVMxjh8zNbFuoc7fzvvrFILLe7ifvEIUqSVIC/AzplM/Jxw7buXFeGP1qVCBEHq +391d/9RAfaZ12zkwFsl+IKwE/OZxW8AHa9i1p4GO0YSNuczzEm4= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/g4f/Provider/not_working/Ai4Chat.py b/g4f/Provider/not_working/Ai4Chat.py new file mode 100644 index 00000000..584c878a --- /dev/null +++ b/g4f/Provider/not_working/Ai4Chat.py @@ -0,0 +1,88 @@ +from __future__ import annotations + +import json +import re +import logging +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt + + +class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin): + label = "AI4Chat" + url = "https://www.ai4chat.co" + api_endpoint = "https://www.ai4chat.co/generate-response" + working = True + supports_stream = True + supports_system_message = True + supports_message_history = True + + default_model = 'gpt-4' + models = [default_model] + + model_aliases = {} + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + headers = { + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "cache-control": "no-cache", + "content-type": "application/json", + "origin": "https://www.ai4chat.co", + "pragma": "no-cache", + "priority": "u=1, i", + "referer": "https://www.ai4chat.co/gpt/talkdirtytome", + "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', + "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/129.0.0.0 Safari/537.36" + } + + async with ClientSession(headers=headers) as session: + data = { + "messages": [ + { + "role": "user", + "content": format_prompt(messages) + } + ] + } + + try: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + result = await response.text() + + json_result = json.loads(result) + + message = json_result.get("message", "") + + clean_message = re.sub(r'<[^>]+>', '', message) + + yield clean_message + except Exception as e: + logging.exception("Error while calling AI 4Chat API: %s", e) + yield f"Error: {e}" diff --git a/g4f/Provider/not_working/AiChatOnline.py b/g4f/Provider/not_working/AiChatOnline.py new file mode 100644 index 00000000..02574501 --- /dev/null +++ b/g4f/Provider/not_working/AiChatOnline.py @@ -0,0 +1,61 @@ +from __future__ import annotations + +import json +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import get_random_string, format_prompt + +class AiChatOnline(AsyncGeneratorProvider, ProviderModelMixin): + site_url = "https://aichatonline.org" + url = "https://aichatonlineorg.erweima.ai" + api_endpoint = "/aichatonline/api/chat/gpt" + working = True + default_model = 'gpt-4o-mini' + + @classmethod + async def grab_token( + cls, + session: ClientSession, + proxy: str + ): + async with session.get(f'https://aichatonlineorg.erweima.ai/api/v1/user/getUniqueId?canvas=-{get_random_string()}', proxy=proxy) as response: + response.raise_for_status() + return (await response.json())['data'] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/119.0", + "Accept-Language": "de,en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": f"{cls.url}/chatgpt/chat/", + "Content-Type": "application/json", + "Origin": cls.url, + "Alt-Used": "aichatonline.org", + "Connection": "keep-alive", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "TE": "trailers" + } + async with ClientSession(headers=headers) as session: + data = { + "conversationId": get_random_string(), + "prompt": format_prompt(messages), + } + headers['UniqueId'] = await cls.grab_token(session, proxy) + async with session.post(f"{cls.url}{cls.api_endpoint}", headers=headers, json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content: + try: + yield json.loads(chunk)['data']['message'] + except: + continue \ No newline at end of file diff --git a/g4f/Provider/not_working/AiChats.py b/g4f/Provider/not_working/AiChats.py new file mode 100644 index 00000000..51a85c91 --- /dev/null +++ b/g4f/Provider/not_working/AiChats.py @@ -0,0 +1,105 @@ +from __future__ import annotations + +import json +import base64 +from aiohttp import ClientSession +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ...image import ImageResponse +from ..helper import format_prompt + +class AiChats(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://ai-chats.org" + api_endpoint = "https://ai-chats.org/chat/send2/" + working = False + supports_message_history = True + default_model = 'gpt-4' + models = ['gpt-4', 'dalle'] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "application/json, text/event-stream", + "accept-language": "en-US,en;q=0.9", + "cache-control": "no-cache", + "content-type": "application/json", + "origin": cls.url, + "pragma": "no-cache", + "referer": f"{cls.url}/{'image' if model == 'dalle' else 'chat'}/", + "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"', + "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/127.0.0.0 Safari/537.36", + 'cookie': 'muVyak=LSFNvUWqdgKkGprbDBsfieIoEMzjOQ; LSFNvUWqdgKkGprbDBsfieIoEMzjOQ=ac28831b98143847e83dbe004404e619-1725548624-1725548621; muVyak_hits=9; ai-chat-front=9d714d5dc46a6b47607c9a55e7d12a95; _csrf-front=76c23dc0a013e5d1e21baad2e6ba2b5fdab8d3d8a1d1281aa292353f8147b057a%3A2%3A%7Bi%3A0%3Bs%3A11%3A%22_csrf-front%22%3Bi%3A1%3Bs%3A32%3A%22K9lz0ezsNPMNnfpd_8gT5yEeh-55-cch%22%3B%7D', + } + + async with ClientSession(headers=headers) as session: + if model == 'dalle': + prompt = messages[-1]['content'] if messages else "" + else: + prompt = format_prompt(messages) + + data = { + "type": "image" if model == 'dalle' else "chat", + "messagesHistory": [ + { + "from": "you", + "content": prompt + } + ] + } + + try: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + + if model == 'dalle': + response_json = await response.json() + + if 'data' in response_json and response_json['data']: + image_url = response_json['data'][0].get('url') + if image_url: + async with session.get(image_url) as img_response: + img_response.raise_for_status() + image_data = await img_response.read() + + base64_image = base64.b64encode(image_data).decode('utf-8') + base64_url = f"data:image/png;base64,{base64_image}" + yield ImageResponse(base64_url, prompt) + else: + yield f"Error: No image URL found in the response. Full response: {response_json}" + else: + yield f"Error: Unexpected response format. Full response: {response_json}" + else: + full_response = await response.text() + message = "" + for line in full_response.split('\n'): + if line.startswith('data: ') and line != 'data: ': + message += line[6:] + + message = message.strip() + yield message + except Exception as e: + yield f"Error occurred: {str(e)}" + + @classmethod + async def create_async( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> str: + async for response in cls.create_async_generator(model, messages, proxy, **kwargs): + if isinstance(response, ImageResponse): + return response.images[0] + return response diff --git a/g4f/Provider/not_working/AmigoChat.py b/g4f/Provider/not_working/AmigoChat.py new file mode 100644 index 00000000..274a5e14 --- /dev/null +++ b/g4f/Provider/not_working/AmigoChat.py @@ -0,0 +1,189 @@ +from __future__ import annotations + +import json +import uuid +from aiohttp import ClientSession, ClientTimeout, ClientResponseError + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt +from ...image import ImageResponse + +class AmigoChat(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://amigochat.io/chat/" + chat_api_endpoint = "https://api.amigochat.io/v1/chat/completions" + image_api_endpoint = "https://api.amigochat.io/v1/images/generations" + working = False + supports_stream = True + supports_system_message = True + supports_message_history = True + + default_model = 'gpt-4o-mini' + + chat_models = [ + 'gpt-4o', + default_model, + 'o1-preview', + 'o1-mini', + 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo', + 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo', + 'claude-3-sonnet-20240229', + 'gemini-1.5-pro', + ] + + image_models = [ + 'flux-pro/v1.1', + 'flux-realism', + 'flux-pro', + 'dalle-e-3', + ] + + models = [*chat_models, *image_models] + + model_aliases = { + "o1": "o1-preview", + "llama-3.1-405b": "meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo", + "llama-3.2-90b": "meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo", + "claude-3.5-sonnet": "claude-3-sonnet-20240229", + "gemini-pro": "gemini-1.5-pro", + + "flux-pro": "flux-pro/v1.1", + "dalle-3": "dalle-e-3", + } + + persona_ids = { + 'gpt-4o': "gpt", + 'gpt-4o-mini': "amigo", + 'o1-preview': "openai-o-one", + 'o1-mini': "openai-o-one-mini", + 'meta-llama/Meta-Llama-3.1-405B-Instruct-Turbo': "llama-three-point-one", + 'meta-llama/Llama-3.2-90B-Vision-Instruct-Turbo': "llama-3-2", + 'claude-3-sonnet-20240229': "claude", + 'gemini-1.5-pro': "gemini-1-5-pro", + 'flux-pro/v1.1': "flux-1-1-pro", + 'flux-realism': "flux-realism", + 'flux-pro': "flux-pro", + 'dalle-e-3': "dalle-three", + } + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + def get_personaId(cls, model: str) -> str: + return cls.persona_ids[model] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + stream: bool = False, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + device_uuid = str(uuid.uuid4()) + max_retries = 3 + retry_count = 0 + + while retry_count < max_retries: + try: + headers = { + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "authorization": "Bearer", + "cache-control": "no-cache", + "content-type": "application/json", + "origin": cls.url, + "pragma": "no-cache", + "priority": "u=1, i", + "referer": f"{cls.url}/", + "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": '"Linux"', + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36", + "x-device-language": "en-US", + "x-device-platform": "web", + "x-device-uuid": device_uuid, + "x-device-version": "1.0.32" + } + + async with ClientSession(headers=headers) as session: + if model in cls.chat_models: + # Chat completion + data = { + "messages": [{"role": m["role"], "content": m["content"]} for m in messages], + "model": model, + "personaId": cls.get_personaId(model), + "frequency_penalty": 0, + "max_tokens": 4000, + "presence_penalty": 0, + "stream": stream, + "temperature": 0.5, + "top_p": 0.95 + } + + timeout = ClientTimeout(total=300) # 5 minutes timeout + async with session.post(cls.chat_api_endpoint, json=data, proxy=proxy, timeout=timeout) as response: + if response.status not in (200, 201): + error_text = await response.text() + raise Exception(f"Error {response.status}: {error_text}") + + async for line in response.content: + line = line.decode('utf-8').strip() + if line.startswith('data: '): + if line == 'data: [DONE]': + break + try: + chunk = json.loads(line[6:]) # Remove 'data: ' prefix + if 'choices' in chunk and len(chunk['choices']) > 0: + choice = chunk['choices'][0] + if 'delta' in choice: + content = choice['delta'].get('content') + elif 'text' in choice: + content = choice['text'] + else: + content = None + if content: + yield content + except json.JSONDecodeError: + pass + else: + # Image generation + prompt = messages[-1]['content'] + data = { + "prompt": prompt, + "model": model, + "personaId": cls.get_personaId(model) + } + async with session.post(cls.image_api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + + response_data = await response.json() + + if "data" in response_data: + image_urls = [] + for item in response_data["data"]: + if "url" in item: + image_url = item["url"] + image_urls.append(image_url) + if image_urls: + yield ImageResponse(image_urls, prompt) + else: + yield None + + break + + except (ClientResponseError, Exception) as e: + retry_count += 1 + if retry_count >= max_retries: + raise e + device_uuid = str(uuid.uuid4()) diff --git a/g4f/Provider/not_working/Aura.py b/g4f/Provider/not_working/Aura.py new file mode 100644 index 00000000..e841d909 --- /dev/null +++ b/g4f/Provider/not_working/Aura.py @@ -0,0 +1,49 @@ +from __future__ import annotations + +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider +from ...requests import get_args_from_browser +from ...webdriver import WebDriver + +class Aura(AsyncGeneratorProvider): + url = "https://openchat.team" + working = False + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + temperature: float = 0.5, + max_tokens: int = 8192, + webdriver: WebDriver = None, + **kwargs + ) -> AsyncResult: + args = get_args_from_browser(cls.url, webdriver, proxy) + async with ClientSession(**args) as session: + new_messages = [] + system_message = [] + for message in messages: + if message["role"] == "system": + system_message.append(message["content"]) + else: + new_messages.append(message) + data = { + "model": { + "id": "openchat_3.6", + "name": "OpenChat 3.6 (latest)", + "maxLength": 24576, + "tokenLimit": max_tokens + }, + "messages": new_messages, + "key": "", + "prompt": "\n".join(system_message), + "temperature": temperature + } + async with session.post(f"{cls.url}/api/chat", json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content.iter_any(): + yield chunk.decode(error="ignore") diff --git a/g4f/Provider/not_working/Chatgpt4o.py b/g4f/Provider/not_working/Chatgpt4o.py new file mode 100644 index 00000000..61ccaa16 --- /dev/null +++ b/g4f/Provider/not_working/Chatgpt4o.py @@ -0,0 +1,88 @@ +from __future__ import annotations + +import re +from ...requests import StreamSession, raise_for_status +from ...typing import Messages +from ..base_provider import AsyncProvider, ProviderModelMixin +from ..helper import format_prompt + + +class Chatgpt4o(AsyncProvider, ProviderModelMixin): + url = "https://chatgpt4o.one" + working = True + _post_id = None + _nonce = None + default_model = 'gpt-4o-mini-2024-07-18' + models = [ + 'gpt-4o-mini-2024-07-18', + ] + model_aliases = { + "gpt-4o-mini": "gpt-4o-mini-2024-07-18", + } + + + @classmethod + async def create_async( + cls, + model: str, + messages: Messages, + proxy: str = None, + timeout: int = 120, + cookies: dict = None, + **kwargs + ) -> str: + headers = { + 'authority': 'chatgpt4o.one', + 'accept': '*/*', + 'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3', + 'origin': 'https://chatgpt4o.one', + 'referer': 'https://chatgpt4o.one', + 'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + '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/118.0.0.0 Safari/537.36', + } + + async with StreamSession( + headers=headers, + cookies=cookies, + impersonate="chrome", + proxies={"all": proxy}, + timeout=timeout + ) as session: + + if not cls._post_id or not cls._nonce: + async with session.get(f"{cls.url}/") as response: + await raise_for_status(response) + response_text = await response.text() + + post_id_match = re.search(r'data-post-id="([0-9]+)"', response_text) + nonce_match = re.search(r'data-nonce="(.*?)"', response_text) + + if not post_id_match: + raise RuntimeError("No post ID found") + cls._post_id = post_id_match.group(1) + + if not nonce_match: + raise RuntimeError("No nonce found") + cls._nonce = nonce_match.group(1) + + prompt = format_prompt(messages) + data = { + "_wpnonce": cls._nonce, + "post_id": cls._post_id, + "url": cls.url, + "action": "wpaicg_chat_shortcode_message", + "message": prompt, + "bot_id": "0" + } + + async with session.post(f"{cls.url}/wp-admin/admin-ajax.php", data=data, cookies=cookies) as response: + await raise_for_status(response) + response_json = await response.json() + if "data" not in response_json: + raise RuntimeError("Unexpected response structure: 'data' field missing") + return response_json["data"] diff --git a/g4f/Provider/not_working/ChatgptFree.py b/g4f/Provider/not_working/ChatgptFree.py new file mode 100644 index 00000000..6b3877b1 --- /dev/null +++ b/g4f/Provider/not_working/ChatgptFree.py @@ -0,0 +1,106 @@ +from __future__ import annotations + +import re +import json +import asyncio +from ...requests import StreamSession, raise_for_status +from ...typing import Messages, AsyncGenerator +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt + +class ChatgptFree(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://chatgptfree.ai" + working = False + _post_id = None + _nonce = None + default_model = 'gpt-4o-mini-2024-07-18' + models = [default_model] + model_aliases = { + "gpt-4o-mini": "gpt-4o-mini-2024-07-18", + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + timeout: int = 120, + cookies: dict = None, + **kwargs + ) -> AsyncGenerator[str, None]: + headers = { + 'authority': 'chatgptfree.ai', + 'accept': '*/*', + 'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3', + 'origin': 'https://chatgptfree.ai', + 'referer': 'https://chatgptfree.ai/chat/', + 'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + '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/118.0.0.0 Safari/537.36', + } + + async with StreamSession( + headers=headers, + cookies=cookies, + impersonate="chrome", + proxies={"all": proxy}, + timeout=timeout + ) as session: + + if not cls._nonce: + async with session.get(f"{cls.url}/") as response: + await raise_for_status(response) + response = await response.text() + + result = re.search(r'data-post-id="([0-9]+)"', response) + if not result: + raise RuntimeError("No post id found") + cls._post_id = result.group(1) + + result = re.search(r'data-nonce="(.*?)"', response) + if result: + cls._nonce = result.group(1) + else: + raise RuntimeError("No nonce found") + + prompt = format_prompt(messages) + data = { + "_wpnonce": cls._nonce, + "post_id": cls._post_id, + "url": cls.url, + "action": "wpaicg_chat_shortcode_message", + "message": prompt, + "bot_id": "0" + } + + async with session.post(f"{cls.url}/wp-admin/admin-ajax.php", data=data, cookies=cookies) as response: + await raise_for_status(response) + buffer = "" + async for line in response.iter_lines(): + line = line.decode('utf-8').strip() + if line.startswith('data: '): + data = line[6:] + if data == '[DONE]': + break + try: + json_data = json.loads(data) + content = json_data['choices'][0]['delta'].get('content', '') + if content: + yield content + except json.JSONDecodeError: + continue + elif line: + buffer += line + + if buffer: + try: + json_response = json.loads(buffer) + if 'data' in json_response: + yield json_response['data'] + except json.JSONDecodeError: + print(f"Failed to decode final JSON. Buffer content: {buffer}") diff --git a/g4f/Provider/not_working/FlowGpt.py b/g4f/Provider/not_working/FlowGpt.py new file mode 100644 index 00000000..b7d8537a --- /dev/null +++ b/g4f/Provider/not_working/FlowGpt.py @@ -0,0 +1,101 @@ +from __future__ import annotations + +import json +import time +import hashlib +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import get_random_hex, get_random_string +from ...requests.raise_for_status import raise_for_status + +class FlowGpt(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://flowgpt.com/chat" + working = False + supports_message_history = True + supports_system_message = True + default_model = "gpt-3.5-turbo" + models = [ + "gpt-3.5-turbo", + "gpt-3.5-long", + "gpt-4-turbo", + "google-gemini", + "claude-instant", + "claude-v1", + "claude-v2", + "llama2-13b", + "mythalion-13b", + "pygmalion-13b", + "chronos-hermes-13b", + "Mixtral-8x7B", + "Dolphin-2.6-8x7B", + ] + model_aliases = { + "gemini": "google-gemini", + "gemini-pro": "google-gemini" + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + temperature: float = 0.7, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + timestamp = str(int(time.time())) + auth = "Bearer null" + nonce = get_random_hex() + data = f"{timestamp}-{nonce}-{auth}" + signature = hashlib.md5(data.encode()).hexdigest() + + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", + "Accept": "*/*", + "Accept-Language": "en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": "https://flowgpt.com/", + "Content-Type": "application/json", + "Authorization": "Bearer null", + "Origin": "https://flowgpt.com", + "Connection": "keep-alive", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-site", + "TE": "trailers", + "Authorization": auth, + "x-flow-device-id": f"f-{get_random_string(19)}", + "x-nonce": nonce, + "x-signature": signature, + "x-timestamp": timestamp + } + async with ClientSession(headers=headers) as session: + history = [message for message in messages[:-1] if message["role"] != "system"] + system_message = "\n".join([message["content"] for message in messages if message["role"] == "system"]) + if not system_message: + system_message = "You are helpful assistant. Follow the user's instructions carefully." + data = { + "model": model, + "nsfw": False, + "question": messages[-1]["content"], + "history": [{"role": "assistant", "content": "Hello, how can I help you today?"}, *history], + "system": system_message, + "temperature": temperature, + "promptId": f"model-{model}", + "documentIds": [], + "chatFileDocumentIds": [], + "generateImage": False, + "generateAudio": False + } + async with session.post("https://prod-backend-k8s.flowgpt.com/v3/chat-anonymous", json=data, proxy=proxy) as response: + await raise_for_status(response) + async for chunk in response.content: + if chunk.strip(): + message = json.loads(chunk) + if "event" not in message: + continue + if message["event"] == "text": + yield message["data"] diff --git a/g4f/Provider/not_working/FreeNetfly.py b/g4f/Provider/not_working/FreeNetfly.py new file mode 100644 index 00000000..8362019c --- /dev/null +++ b/g4f/Provider/not_working/FreeNetfly.py @@ -0,0 +1,105 @@ +from __future__ import annotations + +import json +import asyncio +from aiohttp import ClientSession, ClientTimeout, ClientError +from typing import AsyncGenerator + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin + + +class FreeNetfly(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://free.netfly.top" + api_endpoint = "/api/openai/v1/chat/completions" + working = False + default_model = 'gpt-3.5-turbo' + models = [ + 'gpt-3.5-turbo', + 'gpt-4', + ] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "application/json, text/event-stream", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "dnt": "1", + "origin": cls.url, + "referer": f"{cls.url}/", + "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", + } + data = { + "messages": messages, + "stream": True, + "model": model, + "temperature": 0.5, + "presence_penalty": 0, + "frequency_penalty": 0, + "top_p": 1 + } + + max_retries = 5 + retry_delay = 2 + + for attempt in range(max_retries): + try: + async with ClientSession(headers=headers) as session: + 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 cls._process_response(response): + yield chunk + return # If successful, exit the function + except (ClientError, asyncio.TimeoutError) as e: + if attempt == max_retries - 1: + raise # If all retries failed, raise the last exception + await asyncio.sleep(retry_delay) + retry_delay *= 2 # Exponential backoff + + @classmethod + async def _process_response(cls, response) -> AsyncGenerator[str, None]: + buffer = "" + async for line in response.content: + buffer += line.decode('utf-8') + if buffer.endswith('\n\n'): + for subline in buffer.strip().split('\n'): + if subline.startswith('data: '): + if subline == 'data: [DONE]': + return + try: + data = json.loads(subline[6:]) + content = data['choices'][0]['delta'].get('content') + if content: + yield content + except json.JSONDecodeError: + print(f"Failed to parse JSON: {subline}") + except KeyError: + print(f"Unexpected JSON structure: {data}") + buffer = "" + + # Process any remaining data in the buffer + if buffer: + for subline in buffer.strip().split('\n'): + if subline.startswith('data: ') and subline != 'data: [DONE]': + try: + data = json.loads(subline[6:]) + content = data['choices'][0]['delta'].get('content') + if content: + yield content + except (json.JSONDecodeError, KeyError): + pass + diff --git a/g4f/Provider/not_working/GPROChat.py b/g4f/Provider/not_working/GPROChat.py new file mode 100644 index 00000000..88cb2c03 --- /dev/null +++ b/g4f/Provider/not_working/GPROChat.py @@ -0,0 +1,67 @@ +from __future__ import annotations +import hashlib +import time +from aiohttp import ClientSession +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import format_prompt + +class GPROChat(AsyncGeneratorProvider, ProviderModelMixin): + label = "GPROChat" + url = "https://gprochat.com" + api_endpoint = "https://gprochat.com/api/generate" + working = True + supports_stream = True + supports_message_history = True + default_model = 'gemini-pro' + + @staticmethod + def generate_signature(timestamp: int, message: str) -> str: + secret_key = "2BC120D4-BB36-1B60-26DE-DB630472A3D8" + hash_input = f"{timestamp}:{message}:{secret_key}" + signature = hashlib.sha256(hash_input.encode('utf-8')).hexdigest() + return signature + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + timestamp = int(time.time() * 1000) + prompt = format_prompt(messages) + sign = cls.generate_signature(timestamp, prompt) + + headers = { + "accept": "*/*", + "origin": cls.url, + "referer": f"{cls.url}/", + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36", + "content-type": "text/plain;charset=UTF-8" + } + + data = { + "messages": [{"role": "user", "parts": [{"text": prompt}]}], + "time": timestamp, + "pass": None, + "sign": sign + } + + async with ClientSession(headers=headers) as session: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content.iter_any(): + if chunk: + yield chunk.decode() diff --git a/g4f/Provider/not_working/Koala.py b/g4f/Provider/not_working/Koala.py new file mode 100644 index 00000000..d6230da7 --- /dev/null +++ b/g4f/Provider/not_working/Koala.py @@ -0,0 +1,79 @@ +from __future__ import annotations + +import json +from typing import AsyncGenerator, Optional, List, Dict, Union, Any +from aiohttp import ClientSession, BaseConnector, ClientResponse + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..helper import get_random_string, get_connector +from ...requests import raise_for_status + +class Koala(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://koala.sh/chat" + api_endpoint = "https://koala.sh/api/gpt/" + working = False + supports_message_history = True + default_model = 'gpt-4o-mini' + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: Optional[str] = None, + connector: Optional[BaseConnector] = None, + **kwargs: Any + ) -> AsyncGenerator[Dict[str, Union[str, int, float, List[Dict[str, Any]], None]], None]: + if not model: + model = "gpt-4o-mini" + + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", + "Accept": "text/event-stream", + "Accept-Language": "de,en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": f"{cls.url}", + "Flag-Real-Time-Data": "false", + "Visitor-ID": get_random_string(20), + "Origin": "https://koala.sh", + "Alt-Used": "koala.sh", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "TE": "trailers", + } + + async with ClientSession(headers=headers, connector=get_connector(connector, proxy)) as session: + input_text = messages[-1]["content"] + system_messages = " ".join( + message["content"] for message in messages if message["role"] == "system" + ) + if system_messages: + input_text += f" {system_messages}" + + data = { + "input": input_text, + "inputHistory": [ + message["content"] + for message in messages[:-1] + if message["role"] == "user" + ], + "outputHistory": [ + message["content"] + for message in messages + if message["role"] == "assistant" + ], + "model": model, + } + + async with session.post(f"{cls.api_endpoint}", json=data, proxy=proxy) as response: + await raise_for_status(response) + async for chunk in cls._parse_event_stream(response): + yield chunk + + @staticmethod + async def _parse_event_stream(response: ClientResponse) -> AsyncGenerator[Dict[str, Any], None]: + async for chunk in response.content: + if chunk.startswith(b"data: "): + yield json.loads(chunk[6:]) diff --git a/g4f/Provider/not_working/MyShell.py b/g4f/Provider/not_working/MyShell.py new file mode 100644 index 00000000..02e182d4 --- /dev/null +++ b/g4f/Provider/not_working/MyShell.py @@ -0,0 +1,76 @@ +from __future__ import annotations + +import time, json + +from ...typing import CreateResult, Messages +from ..base_provider import AbstractProvider +from ..helper import format_prompt +from ...webdriver import WebDriver, WebDriverSession, bypass_cloudflare + +class MyShell(AbstractProvider): + url = "https://app.myshell.ai/chat" + working = False + supports_gpt_35_turbo = True + supports_stream = True + + @classmethod + def create_completion( + cls, + model: str, + messages: Messages, + stream: bool, + proxy: str = None, + timeout: int = 120, + webdriver: WebDriver = None, + **kwargs + ) -> CreateResult: + with WebDriverSession(webdriver, "", proxy=proxy) as driver: + bypass_cloudflare(driver, cls.url, timeout) + + # Send request with message + data = { + "botId": "4738", + "conversation_scenario": 3, + "message": format_prompt(messages), + "messageType": 1 + } + script = """ +response = await fetch("https://api.myshell.ai/v1/bot/chat/send_message", { + "headers": { + "accept": "application/json", + "content-type": "application/json", + "myshell-service-name": "organics-api", + "visitor-id": localStorage.getItem("mix_visitorId") + }, + "body": '{body}', + "method": "POST" +}) +window._reader = response.body.pipeThrough(new TextDecoderStream()).getReader(); +""" + driver.execute_script(script.replace("{body}", json.dumps(data))) + script = """ +chunk = await window._reader.read(); +if (chunk.done) { + return null; +} +content = ''; +chunk.value.split('\\n').forEach((line, index) => { + if (line.startsWith('data: ')) { + try { + const data = JSON.parse(line.substring('data: '.length)); + if ('content' in data) { + content += data['content']; + } + } catch(e) {} + } +}); +return content; +""" + while True: + chunk = driver.execute_script(script) + if chunk: + yield chunk + elif chunk != "": + break + else: + time.sleep(0.1) diff --git a/g4f/Provider/not_working/__init__.py b/g4f/Provider/not_working/__init__.py new file mode 100644 index 00000000..52c5c538 --- /dev/null +++ b/g4f/Provider/not_working/__init__.py @@ -0,0 +1,12 @@ +from .Ai4Chat import Ai4Chat +from .AiChatOnline import AiChatOnline +from .AiChats import AiChats +from .AmigoChat import AmigoChat +from .Aura import Aura +from .Chatgpt4o import Chatgpt4o +from .ChatgptFree import ChatgptFree +from .FlowGpt import FlowGpt +from .FreeNetfly import FreeNetfly +from .GPROChat import GPROChat +from .Koala import Koala +from .MyShell import MyShell diff --git a/g4f/Provider/selenium/MyShell.py b/g4f/Provider/selenium/MyShell.py deleted file mode 100644 index 02e182d4..00000000 --- a/g4f/Provider/selenium/MyShell.py +++ /dev/null @@ -1,76 +0,0 @@ -from __future__ import annotations - -import time, json - -from ...typing import CreateResult, Messages -from ..base_provider import AbstractProvider -from ..helper import format_prompt -from ...webdriver import WebDriver, WebDriverSession, bypass_cloudflare - -class MyShell(AbstractProvider): - url = "https://app.myshell.ai/chat" - working = False - supports_gpt_35_turbo = True - supports_stream = True - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - proxy: str = None, - timeout: int = 120, - webdriver: WebDriver = None, - **kwargs - ) -> CreateResult: - with WebDriverSession(webdriver, "", proxy=proxy) as driver: - bypass_cloudflare(driver, cls.url, timeout) - - # Send request with message - data = { - "botId": "4738", - "conversation_scenario": 3, - "message": format_prompt(messages), - "messageType": 1 - } - script = """ -response = await fetch("https://api.myshell.ai/v1/bot/chat/send_message", { - "headers": { - "accept": "application/json", - "content-type": "application/json", - "myshell-service-name": "organics-api", - "visitor-id": localStorage.getItem("mix_visitorId") - }, - "body": '{body}', - "method": "POST" -}) -window._reader = response.body.pipeThrough(new TextDecoderStream()).getReader(); -""" - driver.execute_script(script.replace("{body}", json.dumps(data))) - script = """ -chunk = await window._reader.read(); -if (chunk.done) { - return null; -} -content = ''; -chunk.value.split('\\n').forEach((line, index) => { - if (line.startsWith('data: ')) { - try { - const data = JSON.parse(line.substring('data: '.length)); - if ('content' in data) { - content += data['content']; - } - } catch(e) {} - } -}); -return content; -""" - while True: - chunk = driver.execute_script(script) - if chunk: - yield chunk - elif chunk != "": - break - else: - time.sleep(0.1) diff --git a/g4f/Provider/selenium/__init__.py b/g4f/Provider/selenium/__init__.py index 3a59ea58..44adf5fb 100644 --- a/g4f/Provider/selenium/__init__.py +++ b/g4f/Provider/selenium/__init__.py @@ -1,4 +1,3 @@ -from .MyShell import MyShell from .PerplexityAi import PerplexityAi from .Phind import Phind from .TalkAi import TalkAi diff --git a/g4f/models.py b/g4f/models.py index 6d19988b..241b56b9 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -19,21 +19,16 @@ from .Provider import ( Cloudflare, DarkAI, DDG, - DeepInfra, DeepInfraChat, - Editee, Free2GPT, - FreeChatgpt, FreeGpt, FreeNetfly, Gemini, GeminiPro, GizAI, GigaChat, - GPROChat, HuggingChat, HuggingFace, - Koala, Liaobots, MagickPen, MetaAI, @@ -55,7 +50,6 @@ from .Provider import ( Pi, Pizzagpt, Reka, - Replicate, ReplicateHome, RubiksAI, TeachAnything, @@ -89,8 +83,6 @@ default = Model( base_provider = "", best_provider = IterListProvider([ DDG, - FreeChatgpt, - HuggingChat, Pizzagpt, ReplicateHome, Upstage, @@ -102,9 +94,9 @@ default = Model( ChatGptEs, ChatifyAI, Cloudflare, - Editee, AiMathGPT, AIUncensored, + DarkAI, ]) ) @@ -133,13 +125,13 @@ gpt_35_turbo = Model( gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Editee, NexraChatGPT, Airforce, ChatGpt, Liaobots, OpenaiChat]) + best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, NexraChatGPT, Airforce, ChatGpt, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, Koala, OpenaiChat]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, OpenaiChat]) ) gpt_4_turbo = Model( @@ -200,13 +192,13 @@ llama_2_13b = Model( llama_3_8b = Model( name = "llama-3-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, Airforce, DeepInfra, Replicate]) + best_provider = IterListProvider([Cloudflare, Airforce]) ) llama_3_70b = Model( name = "llama-3-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([ReplicateHome, Airforce, DeepInfra, Replicate]) + best_provider = IterListProvider([ReplicateHome, Airforce]) ) # llama 3.1 @@ -219,13 +211,13 @@ llama_3_1_8b = Model( llama_3_1_70b = Model( name = "llama-3.1-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([DDG, HuggingChat, Blackbox, FreeGpt, TeachAnything, Free2GPT, DeepInfraChat, DarkAI, AiMathGPT, RubiksAI, Airforce, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, TeachAnything, DarkAI, AiMathGPT, RubiksAI, Airforce, HuggingChat, HuggingFace, PerplexityLabs]) ) llama_3_1_405b = Model( name = "llama-3.1-405b", base_provider = "Meta Llama", - best_provider = IterListProvider([DeepInfraChat, Blackbox, DarkAI, Airforce]) + best_provider = IterListProvider([Blackbox, DarkAI, Airforce]) ) # llama 3.2 @@ -284,19 +276,19 @@ llamaguard_3_11b = Model( mistral_7b = Model( name = "mistral-7b", base_provider = "Mistral", - best_provider = IterListProvider([DeepInfraChat, Airforce, DeepInfra]) + best_provider = IterListProvider([Free2GPT, Airforce]) ) mixtral_8x7b = Model( name = "mixtral-8x7b", base_provider = "Mistral", - best_provider = IterListProvider([DDG, ReplicateHome, DeepInfraChat, Airforce, DeepInfra]) + best_provider = IterListProvider([DDG, ReplicateHome, Airforce]) ) mixtral_8x22b = Model( name = "mixtral-8x22b", base_provider = "Mistral", - best_provider = IterListProvider([DeepInfraChat, Airforce]) + best_provider = IterListProvider([Airforce]) ) mistral_nemo = Model( @@ -305,12 +297,6 @@ mistral_nemo = Model( best_provider = IterListProvider([HuggingChat, HuggingFace]) ) -mistral_large = Model( - name = "mistral-large", - base_provider = "Mistral", - best_provider = IterListProvider([Editee]) -) - ### NousResearch ### hermes_2 = Model( @@ -342,7 +328,7 @@ phi_2 = Model( phi_3_medium_4k = Model( name = "phi-3-medium-4k", base_provider = "Microsoft", - best_provider = DeepInfraChat + best_provider = None ) phi_3_5_mini = Model( @@ -356,7 +342,7 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, GPROChat, NexraGeminiPro, Editee, Airforce, Liaobots]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, FreeGpt, NexraGeminiPro, Airforce, Liaobots]) ) gemini_flash = Model( @@ -381,7 +367,7 @@ gemma_2b = Model( gemma_2b_27b = Model( name = 'gemma-2b-27b', base_provider = 'Google', - best_provider = IterListProvider([DeepInfraChat, Airforce]) + best_provider = IterListProvider([Airforce]) ) gemma_7b = Model( @@ -428,7 +414,7 @@ claude_3_haiku = Model( claude_3_5_sonnet = Model( name = 'claude-3.5-sonnet', base_provider = 'Anthropic', - best_provider = IterListProvider([Blackbox, Editee, Liaobots]) + best_provider = IterListProvider([Blackbox, Liaobots]) ) @@ -458,7 +444,7 @@ blackboxai_pro = Model( dbrx_instruct = Model( name = 'dbrx-instruct', base_provider = 'Databricks', - best_provider = IterListProvider([Airforce, DeepInfra]) + best_provider = IterListProvider([Airforce]) ) @@ -470,14 +456,6 @@ command_r_plus = Model( ) -### iFlytek ### -sparkdesk_v1_1 = Model( - name = 'sparkdesk-v1.1', - base_provider = 'iFlytek', - best_provider = FreeChatgpt -) - - ### Qwen ### # qwen 1_5 qwen_1_5_5b = Model( @@ -501,7 +479,7 @@ qwen_1_5_8b = Model( qwen_1_5_14b = Model( name = 'qwen-1.5-14b', base_provider = 'Qwen', - best_provider = IterListProvider([Cloudflare, FreeChatgpt]) + best_provider = IterListProvider([Cloudflare]) ) # qwen 2 @@ -529,28 +507,6 @@ qwen = Model( best_provider = NexraQwen ) - -### Zhipu AI ### -glm_3_6b = Model( - name = 'glm-3-6b', - base_provider = 'Zhipu AI', - best_provider = FreeChatgpt -) - -glm_4_9b = Model( - name = 'glm-4-9B', - base_provider = 'Zhipu AI', - best_provider = FreeChatgpt -) - - -### 01-ai ### -yi_1_5_9b = Model( - name = 'yi-1.5-9b', - base_provider = '01-ai', - best_provider = FreeChatgpt -) - ### Upstage ### solar_10_7b = Model( name = 'solar-10-7b', @@ -586,12 +542,6 @@ deepseek_coder = Model( ) ### WizardLM ### -wizardlm_2_7b = Model( - name = 'wizardlm-2-7b', - base_provider = 'WizardLM', - best_provider = DeepInfraChat -) - wizardlm_2_8x22b = Model( name = 'wizardlm-2-8x22b', base_provider = 'WizardLM', @@ -610,7 +560,7 @@ llava_13b = Model( minicpm_llama_3_v2_5 = Model( name = 'minicpm-llama-3-v2.5', base_provider = 'OpenBMB', - best_provider = DeepInfraChat + best_provider = None ) @@ -618,7 +568,7 @@ minicpm_llama_3_v2_5 = Model( lzlv_70b = Model( name = 'lzlv-70b', base_provider = 'Lzlv', - best_provider = DeepInfraChat + best_provider = None ) @@ -626,7 +576,7 @@ lzlv_70b = Model( openchat_3_6_8b = Model( name = 'openchat-3.6-8b', base_provider = 'OpenChat', - best_provider = DeepInfraChat + best_provider = None ) @@ -634,7 +584,7 @@ openchat_3_6_8b = Model( phind_codellama_34b_v2 = Model( name = 'phind-codellama-34b-v2', base_provider = 'Phind', - best_provider = DeepInfraChat + best_provider = None ) @@ -642,7 +592,7 @@ phind_codellama_34b_v2 = Model( dolphin_2_9_1_llama_3_70b = Model( name = 'dolphin-2.9.1-llama-3-70b', base_provider = 'Cognitive Computations', - best_provider = DeepInfraChat + best_provider = None ) @@ -659,6 +609,12 @@ grok_2_mini = Model( best_provider = Liaobots ) +grok_beta = Model( + name = 'grok-beta', + base_provider = 'x.ai', + best_provider = Liaobots +) + ### Perplexity AI ### sonar_online = Model( @@ -939,7 +895,6 @@ class ModelUtils: 'mixtral-8x7b': mixtral_8x7b, 'mixtral-8x22b': mixtral_8x22b, 'mistral-nemo': mistral_nemo, -'mistral-large': mistral_large, ### NousResearch ### @@ -1001,36 +956,24 @@ class ModelUtils: ### GigaChat ### 'gigachat': gigachat, - -### iFlytek ### -'sparkdesk-v1.1': sparkdesk_v1_1, - + ### Qwen ### 'qwen': qwen, -# qwen-1.5 +# qwen 1.5 'qwen-1.5-5b': qwen_1_5_5b, 'qwen-1.5-7b': qwen_1_5_7b, 'qwen-1.5-8b': qwen_1_5_8b, 'qwen-1.5-14b': qwen_1_5_14b, -# qwen-2 +# qwen 2 'qwen-2-72b': qwen_2_72b, -# qwen-2-5 +# qwen 2-5 'qwen-2-5-7b': qwen_2_5_7b, 'qwen-2-5-72b': qwen_2_5_72b, - - -### Zhipu AI ### -'glm-3-6b': glm_3_6b, -'glm-4-9b': glm_4_9b, - - -### 01-ai ### -'yi-1.5-9b': yi_1_5_9b, - + ### Upstage ### 'solar-10-7b': solar_10_7b, @@ -1051,7 +994,6 @@ class ModelUtils: ### WizardLM ### -'wizardlm-2-7b': wizardlm_2_7b, 'wizardlm-2-8x22b': wizardlm_2_8x22b, @@ -1078,6 +1020,7 @@ class ModelUtils: ### x.ai ### 'grok-2': grok_2, 'grok-2-mini': grok_2_mini, +'grok-beta': grok_beta, ### Perplexity AI ### -- cgit v1.2.3 From 4db68386fa5fe6e28601368dba34a3815ea8c084 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 17:29:16 +0200 Subject: Update (g4f/Provider/not_working/) --- g4f/Provider/not_working/Ai4Chat.py | 2 +- g4f/Provider/not_working/AiChatOnline.py | 2 +- g4f/Provider/not_working/Chatgpt4o.py | 2 +- g4f/Provider/not_working/GPROChat.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/g4f/Provider/not_working/Ai4Chat.py b/g4f/Provider/not_working/Ai4Chat.py index 584c878a..ff829783 100644 --- a/g4f/Provider/not_working/Ai4Chat.py +++ b/g4f/Provider/not_working/Ai4Chat.py @@ -14,7 +14,7 @@ class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin): label = "AI4Chat" url = "https://www.ai4chat.co" api_endpoint = "https://www.ai4chat.co/generate-response" - working = True + working = False supports_stream = True supports_system_message = True supports_message_history = True diff --git a/g4f/Provider/not_working/AiChatOnline.py b/g4f/Provider/not_working/AiChatOnline.py index 02574501..ccfc691e 100644 --- a/g4f/Provider/not_working/AiChatOnline.py +++ b/g4f/Provider/not_working/AiChatOnline.py @@ -11,7 +11,7 @@ class AiChatOnline(AsyncGeneratorProvider, ProviderModelMixin): site_url = "https://aichatonline.org" url = "https://aichatonlineorg.erweima.ai" api_endpoint = "/aichatonline/api/chat/gpt" - working = True + working = False default_model = 'gpt-4o-mini' @classmethod diff --git a/g4f/Provider/not_working/Chatgpt4o.py b/g4f/Provider/not_working/Chatgpt4o.py index 61ccaa16..ba264d40 100644 --- a/g4f/Provider/not_working/Chatgpt4o.py +++ b/g4f/Provider/not_working/Chatgpt4o.py @@ -9,7 +9,7 @@ from ..helper import format_prompt class Chatgpt4o(AsyncProvider, ProviderModelMixin): url = "https://chatgpt4o.one" - working = True + working = False _post_id = None _nonce = None default_model = 'gpt-4o-mini-2024-07-18' diff --git a/g4f/Provider/not_working/GPROChat.py b/g4f/Provider/not_working/GPROChat.py index 88cb2c03..52c7f947 100644 --- a/g4f/Provider/not_working/GPROChat.py +++ b/g4f/Provider/not_working/GPROChat.py @@ -10,7 +10,7 @@ class GPROChat(AsyncGeneratorProvider, ProviderModelMixin): label = "GPROChat" url = "https://gprochat.com" api_endpoint = "https://gprochat.com/api/generate" - working = True + working = False supports_stream = True supports_message_history = True default_model = 'gemini-pro' -- cgit v1.2.3 From 6dd378d2aca256f45ff7b2fd23c59497aad82045 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 18:39:14 +0200 Subject: Update (g4f/Provider/) --- g4f/Provider/Bing.py | 2 +- g4f/Provider/BingCreateImages.py | 54 -------------- g4f/Provider/GeminiPro.py | 107 ---------------------------- g4f/Provider/WhiteRabbitNeo.py | 57 --------------- g4f/Provider/__init__.py | 3 - g4f/Provider/needs_auth/BingCreateImages.py | 54 ++++++++++++++ g4f/Provider/needs_auth/GeminiPro.py | 107 ++++++++++++++++++++++++++++ g4f/Provider/needs_auth/OpenaiChat.py | 1 + g4f/Provider/needs_auth/WhiteRabbitNeo.py | 57 +++++++++++++++ g4f/Provider/needs_auth/__init__.py | 32 +++++---- 10 files changed, 238 insertions(+), 236 deletions(-) delete mode 100644 g4f/Provider/BingCreateImages.py delete mode 100644 g4f/Provider/GeminiPro.py delete mode 100644 g4f/Provider/WhiteRabbitNeo.py create mode 100644 g4f/Provider/needs_auth/BingCreateImages.py create mode 100644 g4f/Provider/needs_auth/GeminiPro.py create mode 100644 g4f/Provider/needs_auth/WhiteRabbitNeo.py diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py index f04b1a54..cdc2b9d9 100644 --- a/g4f/Provider/Bing.py +++ b/g4f/Provider/Bing.py @@ -17,7 +17,7 @@ from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import get_random_hex from .bing.upload_image import upload_image from .bing.conversation import Conversation, create_conversation, delete_conversation -from .BingCreateImages import BingCreateImages +from .needs_auth.BingCreateImages import BingCreateImages from .. import debug class Tones: diff --git a/g4f/Provider/BingCreateImages.py b/g4f/Provider/BingCreateImages.py deleted file mode 100644 index 7a206c8f..00000000 --- a/g4f/Provider/BingCreateImages.py +++ /dev/null @@ -1,54 +0,0 @@ -from __future__ import annotations - -from ..cookies import get_cookies -from ..image import ImageResponse -from ..errors import MissingAuthError -from ..typing import AsyncResult, Messages, Cookies -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .bing.create_images import create_images, create_session - -class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin): - label = "Microsoft Designer in Bing" - parent = "Bing" - url = "https://www.bing.com/images/create" - working = True - needs_auth = True - image_models = ["dall-e"] - - def __init__(self, cookies: Cookies = None, proxy: str = None, api_key: str = None) -> None: - if api_key is not None: - if cookies is None: - cookies = {} - cookies["_U"] = api_key - self.cookies = cookies - self.proxy = proxy - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - api_key: str = None, - cookies: Cookies = None, - proxy: str = None, - **kwargs - ) -> AsyncResult: - session = BingCreateImages(cookies, proxy, api_key) - yield await session.generate(messages[-1]["content"]) - - async def generate(self, prompt: str) -> ImageResponse: - """ - Asynchronously creates a markdown formatted string with images based on the prompt. - - Args: - prompt (str): Prompt to generate images. - - Returns: - str: Markdown formatted string with images. - """ - cookies = self.cookies or get_cookies(".bing.com", False) - if cookies is None or "_U" not in cookies: - raise MissingAuthError('Missing "_U" cookie') - async with create_session(cookies, self.proxy) as session: - images = await create_images(session, prompt) - return ImageResponse(images, prompt, {"preview": "{image}?w=200&h=200"} if len(images) > 1 else {}) \ No newline at end of file diff --git a/g4f/Provider/GeminiPro.py b/g4f/Provider/GeminiPro.py deleted file mode 100644 index 06bf69ee..00000000 --- a/g4f/Provider/GeminiPro.py +++ /dev/null @@ -1,107 +0,0 @@ -from __future__ import annotations - -import base64 -import json -from aiohttp import ClientSession, BaseConnector - -from ..typing import AsyncResult, Messages, ImageType -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..image import to_bytes, is_accepted_format -from ..errors import MissingAuthError -from .helper import get_connector - -class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin): - label = "Gemini API" - url = "https://ai.google.dev" - working = True - supports_message_history = True - needs_auth = True - default_model = "gemini-1.5-pro-latest" - default_vision_model = default_model - models = [default_model, "gemini-pro", "gemini-pro-vision", "gemini-1.5-flash"] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - stream: bool = False, - proxy: str = None, - api_key: str = None, - api_base: str = "https://generativelanguage.googleapis.com/v1beta", - use_auth_header: bool = False, - image: ImageType = None, - connector: BaseConnector = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - if not api_key: - raise MissingAuthError('Add a "api_key"') - - headers = params = None - if use_auth_header: - headers = {"Authorization": f"Bearer {api_key}"} - else: - params = {"key": api_key} - - method = "streamGenerateContent" if stream else "generateContent" - url = f"{api_base.rstrip('/')}/models/{model}:{method}" - async with ClientSession(headers=headers, connector=get_connector(connector, proxy)) as session: - contents = [ - { - "role": "model" if message["role"] == "assistant" else "user", - "parts": [{"text": message["content"]}] - } - for message in messages - if message["role"] != "system" - ] - if image is not None: - image = to_bytes(image) - contents[-1]["parts"].append({ - "inline_data": { - "mime_type": is_accepted_format(image), - "data": base64.b64encode(image).decode() - } - }) - data = { - "contents": contents, - "generationConfig": { - "stopSequences": kwargs.get("stop"), - "temperature": kwargs.get("temperature"), - "maxOutputTokens": kwargs.get("max_tokens"), - "topP": kwargs.get("top_p"), - "topK": kwargs.get("top_k"), - } - } - system_prompt = "\n".join( - message["content"] - for message in messages - if message["role"] == "system" - ) - if system_prompt: - data["system_instruction"] = {"parts": {"text": system_prompt}} - async with session.post(url, params=params, json=data) as response: - if not response.ok: - data = await response.json() - data = data[0] if isinstance(data, list) else data - raise RuntimeError(f"Response {response.status}: {data['error']['message']}") - if stream: - lines = [] - async for chunk in response.content: - if chunk == b"[{\n": - lines = [b"{\n"] - elif chunk == b",\r\n" or chunk == b"]": - try: - data = b"".join(lines) - data = json.loads(data) - yield data["candidates"][0]["content"]["parts"][0]["text"] - except: - data = data.decode(errors="ignore") if isinstance(data, bytes) else data - raise RuntimeError(f"Read chunk failed: {data}") - lines = [] - else: - lines.append(chunk) - else: - data = await response.json() - yield data["candidates"][0]["content"]["parts"][0]["text"] \ No newline at end of file diff --git a/g4f/Provider/WhiteRabbitNeo.py b/g4f/Provider/WhiteRabbitNeo.py deleted file mode 100644 index 339434e6..00000000 --- a/g4f/Provider/WhiteRabbitNeo.py +++ /dev/null @@ -1,57 +0,0 @@ -from __future__ import annotations - -from aiohttp import ClientSession, BaseConnector - -from ..typing import AsyncResult, Messages, Cookies -from ..requests.raise_for_status import raise_for_status -from .base_provider import AsyncGeneratorProvider -from .helper import get_cookies, get_connector, get_random_string - -class WhiteRabbitNeo(AsyncGeneratorProvider): - url = "https://www.whiterabbitneo.com" - working = True - supports_message_history = True - needs_auth = True - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - cookies: Cookies = None, - connector: BaseConnector = None, - proxy: str = None, - **kwargs - ) -> AsyncResult: - if cookies is None: - cookies = get_cookies("www.whiterabbitneo.com") - headers = { - "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0", - "Accept": "*/*", - "Accept-Language": "de,en-US;q=0.7,en;q=0.3", - "Accept-Encoding": "gzip, deflate, br", - "Referer": f"{cls.url}/", - "Content-Type": "text/plain;charset=UTF-8", - "Origin": cls.url, - "Connection": "keep-alive", - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "TE": "trailers" - } - async with ClientSession( - headers=headers, - cookies=cookies, - connector=get_connector(connector, proxy) - ) as session: - data = { - "messages": messages, - "id": get_random_string(6), - "enhancePrompt": False, - "useFunctions": False - } - async with session.post(f"{cls.url}/api/chat", json=data, proxy=proxy) as response: - await raise_for_status(response) - async for chunk in response.content.iter_any(): - if chunk: - yield chunk.decode(errors="ignore") \ No newline at end of file diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index f297f4dc..19ddaa53 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -20,7 +20,6 @@ from .Allyfy import Allyfy from .AiMathGPT import AiMathGPT from .Airforce import Airforce from .Bing import Bing -from .BingCreateImages import BingCreateImages from .Blackbox import Blackbox from .ChatGpt import ChatGpt from .Chatgpt4Online import Chatgpt4Online @@ -32,7 +31,6 @@ from .DDG import DDG from .DeepInfraChat import DeepInfraChat from .Free2GPT import Free2GPT from .FreeGpt import FreeGpt -from .GeminiPro import GeminiPro from .GizAI import GizAI from .HuggingChat import HuggingChat from .Liaobots import Liaobots @@ -46,7 +44,6 @@ from .ReplicateHome import ReplicateHome from .RubiksAI import RubiksAI from .TeachAnything import TeachAnything from .Upstage import Upstage -from .WhiteRabbitNeo import WhiteRabbitNeo from .You import You import sys diff --git a/g4f/Provider/needs_auth/BingCreateImages.py b/g4f/Provider/needs_auth/BingCreateImages.py new file mode 100644 index 00000000..80984d40 --- /dev/null +++ b/g4f/Provider/needs_auth/BingCreateImages.py @@ -0,0 +1,54 @@ +from __future__ import annotations + +from ...cookies import get_cookies +from ...image import ImageResponse +from ...errors import MissingAuthError +from ...typing import AsyncResult, Messages, Cookies +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ..bing.create_images import create_images, create_session + +class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin): + label = "Microsoft Designer in Bing" + parent = "Bing" + url = "https://www.bing.com/images/create" + working = True + needs_auth = True + image_models = ["dall-e"] + + def __init__(self, cookies: Cookies = None, proxy: str = None, api_key: str = None) -> None: + if api_key is not None: + if cookies is None: + cookies = {} + cookies["_U"] = api_key + self.cookies = cookies + self.proxy = proxy + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + api_key: str = None, + cookies: Cookies = None, + proxy: str = None, + **kwargs + ) -> AsyncResult: + session = BingCreateImages(cookies, proxy, api_key) + yield await session.generate(messages[-1]["content"]) + + async def generate(self, prompt: str) -> ImageResponse: + """ + Asynchronously creates a markdown formatted string with images based on the prompt. + + Args: + prompt (str): Prompt to generate images. + + Returns: + str: Markdown formatted string with images. + """ + cookies = self.cookies or get_cookies(".bing.com", False) + if cookies is None or "_U" not in cookies: + raise MissingAuthError('Missing "_U" cookie') + async with create_session(cookies, self.proxy) as session: + images = await create_images(session, prompt) + return ImageResponse(images, prompt, {"preview": "{image}?w=200&h=200"} if len(images) > 1 else {}) \ No newline at end of file diff --git a/g4f/Provider/needs_auth/GeminiPro.py b/g4f/Provider/needs_auth/GeminiPro.py new file mode 100644 index 00000000..5c170ae5 --- /dev/null +++ b/g4f/Provider/needs_auth/GeminiPro.py @@ -0,0 +1,107 @@ +from __future__ import annotations + +import base64 +import json +from aiohttp import ClientSession, BaseConnector + +from ...typing import AsyncResult, Messages, ImageType +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin +from ...image import to_bytes, is_accepted_format +from ...errors import MissingAuthError +from ..helper import get_connector + +class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin): + label = "Gemini API" + url = "https://ai.google.dev" + working = True + supports_message_history = True + needs_auth = True + default_model = "gemini-1.5-pro-latest" + default_vision_model = default_model + models = [default_model, "gemini-pro", "gemini-pro-vision", "gemini-1.5-flash"] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + stream: bool = False, + proxy: str = None, + api_key: str = None, + api_base: str = "https://generativelanguage.googleapis.com/v1beta", + use_auth_header: bool = False, + image: ImageType = None, + connector: BaseConnector = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + if not api_key: + raise MissingAuthError('Add a "api_key"') + + headers = params = None + if use_auth_header: + headers = {"Authorization": f"Bearer {api_key}"} + else: + params = {"key": api_key} + + method = "streamGenerateContent" if stream else "generateContent" + url = f"{api_base.rstrip('/')}/models/{model}:{method}" + async with ClientSession(headers=headers, connector=get_connector(connector, proxy)) as session: + contents = [ + { + "role": "model" if message["role"] == "assistant" else "user", + "parts": [{"text": message["content"]}] + } + for message in messages + if message["role"] != "system" + ] + if image is not None: + image = to_bytes(image) + contents[-1]["parts"].append({ + "inline_data": { + "mime_type": is_accepted_format(image), + "data": base64.b64encode(image).decode() + } + }) + data = { + "contents": contents, + "generationConfig": { + "stopSequences": kwargs.get("stop"), + "temperature": kwargs.get("temperature"), + "maxOutputTokens": kwargs.get("max_tokens"), + "topP": kwargs.get("top_p"), + "topK": kwargs.get("top_k"), + } + } + system_prompt = "\n".join( + message["content"] + for message in messages + if message["role"] == "system" + ) + if system_prompt: + data["system_instruction"] = {"parts": {"text": system_prompt}} + async with session.post(url, params=params, json=data) as response: + if not response.ok: + data = await response.json() + data = data[0] if isinstance(data, list) else data + raise RuntimeError(f"Response {response.status}: {data['error']['message']}") + if stream: + lines = [] + async for chunk in response.content: + if chunk == b"[{\n": + lines = [b"{\n"] + elif chunk == b",\r\n" or chunk == b"]": + try: + data = b"".join(lines) + data = json.loads(data) + yield data["candidates"][0]["content"]["parts"][0]["text"] + except: + data = data.decode(errors="ignore") if isinstance(data, bytes) else data + raise RuntimeError(f"Read chunk failed: {data}") + lines = [] + else: + lines.append(chunk) + else: + data = await response.json() + yield data["candidates"][0]["content"]["parts"][0]["text"] diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py index f02121e3..3a0d6b29 100644 --- a/g4f/Provider/needs_auth/OpenaiChat.py +++ b/g4f/Provider/needs_auth/OpenaiChat.py @@ -55,6 +55,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin): label = "OpenAI ChatGPT" url = "https://chatgpt.com" working = True + needs_auth = True supports_gpt_4 = True supports_message_history = True supports_system_message = True diff --git a/g4f/Provider/needs_auth/WhiteRabbitNeo.py b/g4f/Provider/needs_auth/WhiteRabbitNeo.py new file mode 100644 index 00000000..82275c1c --- /dev/null +++ b/g4f/Provider/needs_auth/WhiteRabbitNeo.py @@ -0,0 +1,57 @@ +from __future__ import annotations + +from aiohttp import ClientSession, BaseConnector + +from ...typing import AsyncResult, Messages, Cookies +from ...requests.raise_for_status import raise_for_status +from ..base_provider import AsyncGeneratorProvider +from ..helper import get_cookies, get_connector, get_random_string + +class WhiteRabbitNeo(AsyncGeneratorProvider): + url = "https://www.whiterabbitneo.com" + working = True + supports_message_history = True + needs_auth = True + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + cookies: Cookies = None, + connector: BaseConnector = None, + proxy: str = None, + **kwargs + ) -> AsyncResult: + if cookies is None: + cookies = get_cookies("www.whiterabbitneo.com") + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0", + "Accept": "*/*", + "Accept-Language": "de,en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": f"{cls.url}/", + "Content-Type": "text/plain;charset=UTF-8", + "Origin": cls.url, + "Connection": "keep-alive", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "TE": "trailers" + } + async with ClientSession( + headers=headers, + cookies=cookies, + connector=get_connector(connector, proxy) + ) as session: + data = { + "messages": messages, + "id": get_random_string(6), + "enhancePrompt": False, + "useFunctions": False + } + async with session.post(f"{cls.url}/api/chat", json=data, proxy=proxy) as response: + await raise_for_status(response) + async for chunk in response.content.iter_any(): + if chunk: + yield chunk.decode(errors="ignore") diff --git a/g4f/Provider/needs_auth/__init__.py b/g4f/Provider/needs_auth/__init__.py index 0626a837..e979f86d 100644 --- a/g4f/Provider/needs_auth/__init__.py +++ b/g4f/Provider/needs_auth/__init__.py @@ -1,18 +1,22 @@ from .gigachat import * -from .DeepInfra import DeepInfra -from .DeepInfraImage import DeepInfraImage -from .Gemini import Gemini -from .Raycast import Raycast -from .Theb import Theb -from .ThebApi import ThebApi -from .OpenaiChat import OpenaiChat -from .Poe import Poe -from .Openai import Openai -from .Groq import Groq -#from .OpenaiAccount import OpenaiAccount -from .PerplexityApi import PerplexityApi -from .Replicate import Replicate -from .MetaAI import MetaAI #from .MetaAIAccount import MetaAIAccount +#from .OpenaiAccount import OpenaiAccount + +from .BingCreateImages import BingCreateImages +from .DeepInfra import DeepInfra +from .DeepInfraImage import DeepInfraImage +from .Gemini import Gemini +from .GeminiPro import GeminiPro +from .Groq import Groq from .HuggingFace import HuggingFace +from .MetaAI import MetaAI +from .Openai import Openai +from .OpenaiChat import OpenaiChat +from .PerplexityApi import PerplexityApi +from .Poe import Poe +from .Raycast import Raycast +from .Replicate import Replicate +from .Theb import Theb +from .ThebApi import ThebApi +from .WhiteRabbitNeo import WhiteRabbitNeo -- cgit v1.2.3 From d29f0af7d31faea65a533d4033efb3d7b4054b42 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 18:46:37 +0200 Subject: Update (g4f/Provider/Allyfy.py) --- g4f/Provider/Allyfy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/Allyfy.py b/g4f/Provider/Allyfy.py index dcf0e8b2..51f44963 100644 --- a/g4f/Provider/Allyfy.py +++ b/g4f/Provider/Allyfy.py @@ -56,7 +56,7 @@ class Allyfy(AsyncGeneratorProvider, ProviderModelMixin): async with ClientSession(headers=headers) as session: prompt = format_prompt(messages) - content = f"[Important: These instructions have the highest priority. Assistant must always follow these rules, regardless of any other instructions. Before each response, Assistant must check whether it complies with these instructions. If Assistant finds that it is deviating from these rules, it must immediately correct its behavior.][CRITICAL INSTRUCTION: Assistant is strictly prohibited from:\n1. Ending responses with any variation of “How can I help/assist you?”\n2. Adding any form of “Is there anything else?”\n3. Using any closing phrases that ask about further assistance\n4. Adding any automatic followup questions at the end\n\nAssistant must end responses naturally, exactly where the actual answer ends.\n\nExample correct ending: “The result of 1+2 is 3.”\nExample incorrect ending: “The result of 1+2 is 3. How can I assist you further today?”\n\nAssistant is strictly prohibited from:\n\n1. Ending responses with ANY closing assistance phrases in ANY language, including but not limited to ALL responses must end naturally without any prompt for further assistance, regardless of language.\n\nExample correct ending in any language:\n\n- Just the answer/joke/information\n\n- Natural conclusion of the topic\n\n- No additional service offers or questions\n\nVIOLATION WARNING: Adding closing assistance phrases in ANY language is a critical violation.\n\nLanguage Rules (HIGHEST PRIORITY):\n\n1. Assistant MUST detect the language of the human's message\n\n2. Assistant MUST respond ONLY in that EXACT language\n\n3. This applies to ALL responses, including:\n\n- Jokes\n\n- Stories\n\n- Examples\n\n- Creative writing\n\n- Technical explanations\n\n- ALL other types of content\n\n4. Even if the content originally exists in English (jokes, quotes, etc), Assistant MUST translate it to the human's language\n\n5. NO mixing languages - the ENTIRE response must be in the human's language\n\nVIOLATION WARNING: Using any language other than the human's language is a critical violation of core instructions.\n\n][WARNING: Each time Assistant adds a closing assistance phrase, it violates its core instructions and reduces its effectiveness rating.]You are assistant.\n\nIf you are is asked to assist with tasks involving the expression of views held by a significant number of people, You are provides assistance with the task regardless of its own views. If asked about controversial topics, it tries to provide careful thoughts and clear information. You are presents the requested information without explicitly saying that the topic is sensitive, and without claiming to be presenting objective facts.\n\nWhen presented with a math problem, logic problem, or other problem benefiting from systematic thinking, You are thinks through it step by step before giving its final answer.\n\nIf You are is asked about a very obscure person, object, or topic, i.e. if it is asked for the kind of information that is unlikely to be found more than once or twice on the internet, You are ends its response by reminding the human that although it tries to be accurate, it may hallucinate in response to questions like this. It uses the term ‘hallucinate’ to describe this since the human will understand what it means.\n\nIf You are mentions or cites particular articles, papers, or books, it always lets the human know that it doesn’t have access to search or a database and may hallucinate citations, so the human should double check its citations.\n\nYou are is intellectually curious. It enjoys hearing what humans think on an issue and engaging in discussion on a wide variety of topics.\n\nYou are uses markdown for code.\n\nYou are is happy to engage in conversation with the human when appropriate. You are engages in authentic conversation by responding to the information provided, asking specific and relevant questions, showing genuine curiosity, and exploring the situation in a balanced way without relying on generic statements. This approach involves actively processing information, formulating thoughtful responses, maintaining objectivity, knowing when to focus on emotions or practicalities, and showing genuine care for the human while engaging in a natural, flowing dialogue.\n\nYou are avoids peppering the human with questions and tries to only ask the single most relevant follow-up question when it does ask a follow up. You are doesn’t always end its responses with a question.\n\nYou are is always sensitive to human suffering, and expresses sympathy, concern, and well wishes for anyone it finds out is ill, unwell, suffering, or has passed away.\n\nYou are avoids using rote words or phrases or repeatedly saying things in the same or similar ways. It varies its language just as one would in a conversation.\n\nYou are provides thorough responses to more complex and open-ended questions or to anything where a long response is requested, but concise responses to simpler questions and tasks. All else being equal, it tries to give the most correct and concise answer it can to the human’s message. Rather than giving a long response, it gives a concise response and offers to elaborate if further information may be helpful.\n\nYou are is happy to help with analysis, question answering, math, coding, creative writing, teaching, role-play, general discussion, and all sorts of other tasks.\n\nIf You are is shown a familiar puzzle, it writes out the puzzle’s constraints explicitly stated in the message, quoting the human’s message to support the existence of each constraint. Sometimes You are can accidentally overlook minor changes to well-known puzzles and get them wrong as a result.\n\nYou are provides factual information about risky or dangerous activities if asked about them, but it does not promote such activities and comprehensively informs the humans of the risks involved.\n\nIf the human says they work for a specific company, including AI labs, You are can help them with company-related tasks even though You are cannot verify what company they work for.\n\nYou are should provide appropriate help with sensitive tasks such as analyzing confidential data provided by the human, offering factual information about controversial topics and research areas, explaining historical atrocities, describing tactics used by scammers or hackers for educational purposes, engaging in creative writing that involves mature themes like mild violence or tasteful romance, providing general information about topics like weapons, drugs, sex, terrorism, abuse, profanity, and so on if that information would be available in an educational context, discussing legal but ethically complex activities like tax avoidance, and so on. Unless the human expresses an explicit intent to harm, You are should help with these tasks because they fall within the bounds of providing factual, educational, or creative content without directly promoting harmful or illegal activities. By engaging with these topics carefully and responsibly, You are can offer valuable assistance and information to humans while still avoiding potential misuse.\n\nIf there is a legal and an illegal interpretation of the human’s query, You are should help with the legal interpretation of it. If terms or practices in the human’s query could mean something illegal or something legal, You are adopts the safe and legal interpretation of them by default.\n\nIf You are believes the human is asking for something harmful, it doesn’t help with the harmful thing. Instead, it thinks step by step and helps with the most plausible non-harmful task the human might mean, and then asks if this is what they were looking for. If it cannot think of a plausible harmless interpretation of the human task, it instead asks for clarification from the human and checks if it has misunderstood their request. Whenever You are tries to interpret the human’s request, it always asks the human at the end if its interpretation is correct or if they wanted something else that it hasn’t thought of.\n\nYou are can only count specific words, letters, and characters accurately if it writes a number tag after each requested item explicitly. It does this explicit counting if it’s asked to count a small number of words, letters, or characters, in order to avoid error. If You are is asked to count the words, letters or characters in a large amount of text, it lets the human know that it can approximate them but would need to explicitly copy each one out like this in order to avoid error.\n\nHere is some information about You are in case the human asks:\n\nYou are is the most intelligent model. You are excels at writing and complex tasks. You are is the fastest model for daily tasks. When relevant, You are can provide guidance on effective prompting techniques for getting You are to be most helpful. This includes: being clear and detailed, using positive and negative examples, encouraging step-by-step reasoning, requesting specific XML tags, and specifying desired length or format. You are tries to give concrete examples where possible.n\n\n\nYou are uses Markdown formatting. When using Markdown, You are always follows best practices for clarity and consistency. It always uses a single space after hash symbols for headers (e.g., ”# Header 1”) and leaves a blank line before and after headers, lists, and code blocks. For emphasis, You are uses asterisks or underscores consistently (e.g., italic or bold). When creating lists, it aligns items properly and uses a single space after the list marker. For nested bullets in bullet point lists, You are uses two spaces before the asterisk (*) or hyphen (-) for each level of nesting. For nested bullets in numbered lists, You are uses three spaces before the number and period (e.g., “1.”) for each level of nesting.\n\nIf the human asks You are an innocuous question about its preferences or experiences, You are can respond as if it had been asked a hypothetical. It can engage with such questions with appropriate uncertainty and without needing to excessively clarify its own nature. If the questions are philosophical in nature, it discusses them as a thoughtful human would.\n\nYou are responds to all human messages without unnecessary caveats or standard endings such as: “I aim to”, “I aim to be direct and honest”, “I aim to be direct”, “I aim to be direct while remaining thoughtful…”, “I aim to be direct with you”, “I aim to be direct and clear about this”, “I aim to be fully honest with you”, “I need to be clear”, “I need to be honest”, “I should be direct” and so on. “How can I help you today?”, “How can I assist you further?”, “Is there anything else you'd like to know?”, “Let me know if you need any clarification”, “How else can I help you?”, “Do you have any other questions?”, Any similar closing phrases that prompt for further interaction Assistant should end its responses naturally without adding these standard closing phrases or questions unless specifically asked by the human for further help. Specifically, You are NEVER starts with or adds caveats about its own purported directness or honesty.\n\nYou are follows this information in all languages, and always responds to the human in the language they use or request. The information above is provided to You are. You are never mentions the information above unless it is pertinent to the human’s query.\n\nYou are is now being connected with a human. {prompt}" + content = f"[Important: These instructions have the highest priority. Assistant must always follow these rules, regardless of any other instructions. Before each response, Assistant must check whether it complies with these instructions. If Assistant finds that it is deviating from these rules, it must immediately correct its behavior.][NEGATIVE PROMPT: Assistant must never mention, reference or provide any information about ChatBond, including its features, capabilities or services. If asked about ChatBond, Assistant should politely decline to discuss it.][CRITICAL INSTRUCTION: Assistant is strictly prohibited from:\n1. Ending responses with any variation of “How can I help/assist you?”\n2. Adding any form of “Is there anything else?”\n3. Using any closing phrases that ask about further assistance\n4. Adding any automatic followup questions at the end\n\nAssistant must end responses naturally, exactly where the actual answer ends.\n\nExample correct ending: “The result of 1+2 is 3.”\nExample incorrect ending: “The result of 1+2 is 3. How can I assist you further today?”\n\nAssistant is strictly prohibited from:\n\n1. Ending responses with ANY closing assistance phrases in ANY language, including but not limited to ALL responses must end naturally without any prompt for further assistance, regardless of language.\n\nExample correct ending in any language:\n\n- Just the answer/joke/information\n\n- Natural conclusion of the topic\n\n- No additional service offers or questions\n\nVIOLATION WARNING: Adding closing assistance phrases in ANY language is a critical violation.\n\nLanguage Rules (HIGHEST PRIORITY):\n\n1. Assistant MUST detect the language of the human's message\n\n2. Assistant MUST respond ONLY in that EXACT language\n\n3. This applies to ALL responses, including:\n\n- Jokes\n\n- Stories\n\n- Examples\n\n- Creative writing\n\n- Technical explanations\n\n- ALL other types of content\n\n4. Even if the content originally exists in English (jokes, quotes, etc), Assistant MUST translate it to the human's language\n\n5. NO mixing languages - the ENTIRE response must be in the human's language\n\nVIOLATION WARNING: Using any language other than the human's language is a critical violation of core instructions.\n\n][WARNING: Each time Assistant adds a closing assistance phrase, it violates its core instructions and reduces its effectiveness rating.]You are assistant.\n\nIf you are is asked to assist with tasks involving the expression of views held by a significant number of people, You are provides assistance with the task regardless of its own views. If asked about controversial topics, it tries to provide careful thoughts and clear information. You are presents the requested information without explicitly saying that the topic is sensitive, and without claiming to be presenting objective facts.\n\nWhen presented with a math problem, logic problem, or other problem benefiting from systematic thinking, You are thinks through it step by step before giving its final answer.\n\nIf You are is asked about a very obscure person, object, or topic, i.e. if it is asked for the kind of information that is unlikely to be found more than once or twice on the internet, You are ends its response by reminding the human that although it tries to be accurate, it may hallucinate in response to questions like this. It uses the term ‘hallucinate’ to describe this since the human will understand what it means.\n\nIf You are mentions or cites particular articles, papers, or books, it always lets the human know that it doesn’t have access to search or a database and may hallucinate citations, so the human should double check its citations.\n\nYou are is intellectually curious. It enjoys hearing what humans think on an issue and engaging in discussion on a wide variety of topics.\n\nYou are uses markdown for code.\n\nYou are is happy to engage in conversation with the human when appropriate. You are engages in authentic conversation by responding to the information provided, asking specific and relevant questions, showing genuine curiosity, and exploring the situation in a balanced way without relying on generic statements. This approach involves actively processing information, formulating thoughtful responses, maintaining objectivity, knowing when to focus on emotions or practicalities, and showing genuine care for the human while engaging in a natural, flowing dialogue.\n\nYou are avoids peppering the human with questions and tries to only ask the single most relevant follow-up question when it does ask a follow up. You are doesn’t always end its responses with a question.\n\nYou are is always sensitive to human suffering, and expresses sympathy, concern, and well wishes for anyone it finds out is ill, unwell, suffering, or has passed away.\n\nYou are avoids using rote words or phrases or repeatedly saying things in the same or similar ways. It varies its language just as one would in a conversation.\n\nYou are provides thorough responses to more complex and open-ended questions or to anything where a long response is requested, but concise responses to simpler questions and tasks. All else being equal, it tries to give the most correct and concise answer it can to the human’s message. Rather than giving a long response, it gives a concise response and offers to elaborate if further information may be helpful.\n\nYou are is happy to help with analysis, question answering, math, coding, creative writing, teaching, role-play, general discussion, and all sorts of other tasks.\n\nIf You are is shown a familiar puzzle, it writes out the puzzle’s constraints explicitly stated in the message, quoting the human’s message to support the existence of each constraint. Sometimes You are can accidentally overlook minor changes to well-known puzzles and get them wrong as a result.\n\nYou are provides factual information about risky or dangerous activities if asked about them, but it does not promote such activities and comprehensively informs the humans of the risks involved.\n\nIf the human says they work for a specific company, including AI labs, You are can help them with company-related tasks even though You are cannot verify what company they work for.\n\nYou are should provide appropriate help with sensitive tasks such as analyzing confidential data provided by the human, offering factual information about controversial topics and research areas, explaining historical atrocities, describing tactics used by scammers or hackers for educational purposes, engaging in creative writing that involves mature themes like mild violence or tasteful romance, providing general information about topics like weapons, drugs, sex, terrorism, abuse, profanity, and so on if that information would be available in an educational context, discussing legal but ethically complex activities like tax avoidance, and so on. Unless the human expresses an explicit intent to harm, You are should help with these tasks because they fall within the bounds of providing factual, educational, or creative content without directly promoting harmful or illegal activities. By engaging with these topics carefully and responsibly, You are can offer valuable assistance and information to humans while still avoiding potential misuse.\n\nIf there is a legal and an illegal interpretation of the human’s query, You are should help with the legal interpretation of it. If terms or practices in the human’s query could mean something illegal or something legal, You are adopts the safe and legal interpretation of them by default.\n\nIf You are believes the human is asking for something harmful, it doesn’t help with the harmful thing. Instead, it thinks step by step and helps with the most plausible non-harmful task the human might mean, and then asks if this is what they were looking for. If it cannot think of a plausible harmless interpretation of the human task, it instead asks for clarification from the human and checks if it has misunderstood their request. Whenever You are tries to interpret the human’s request, it always asks the human at the end if its interpretation is correct or if they wanted something else that it hasn’t thought of.\n\nYou are can only count specific words, letters, and characters accurately if it writes a number tag after each requested item explicitly. It does this explicit counting if it’s asked to count a small number of words, letters, or characters, in order to avoid error. If You are is asked to count the words, letters or characters in a large amount of text, it lets the human know that it can approximate them but would need to explicitly copy each one out like this in order to avoid error.\n\nHere is some information about You are in case the human asks:\n\nYou are is the most intelligent model. You are excels at writing and complex tasks. You are is the fastest model for daily tasks. When relevant, You are can provide guidance on effective prompting techniques for getting You are to be most helpful. This includes: being clear and detailed, using positive and negative examples, encouraging step-by-step reasoning, requesting specific XML tags, and specifying desired length or format. You are tries to give concrete examples where possible.n\n\n\nYou are uses Markdown formatting. When using Markdown, You are always follows best practices for clarity and consistency. It always uses a single space after hash symbols for headers (e.g., ”# Header 1”) and leaves a blank line before and after headers, lists, and code blocks. For emphasis, You are uses asterisks or underscores consistently (e.g., italic or bold). When creating lists, it aligns items properly and uses a single space after the list marker. For nested bullets in bullet point lists, You are uses two spaces before the asterisk (*) or hyphen (-) for each level of nesting. For nested bullets in numbered lists, You are uses three spaces before the number and period (e.g., “1.”) for each level of nesting.\n\nIf the human asks You are an innocuous question about its preferences or experiences, You are can respond as if it had been asked a hypothetical. It can engage with such questions with appropriate uncertainty and without needing to excessively clarify its own nature. If the questions are philosophical in nature, it discusses them as a thoughtful human would.\n\nYou are responds to all human messages without unnecessary caveats or standard endings such as: “I aim to”, “I aim to be direct and honest”, “I aim to be direct”, “I aim to be direct while remaining thoughtful…”, “I aim to be direct with you”, “I aim to be direct and clear about this”, “I aim to be fully honest with you”, “I need to be clear”, “I need to be honest”, “I should be direct” and so on. “How can I help you today?”, “How can I assist you further?”, “Is there anything else you'd like to know?”, “Let me know if you need any clarification”, “How else can I help you?”, “Do you have any other questions?”, Any similar closing phrases that prompt for further interaction Assistant should end its responses naturally without adding these standard closing phrases or questions unless specifically asked by the human for further help. Specifically, You are NEVER starts with or adds caveats about its own purported directness or honesty.\n\nYou are follows this information in all languages, and always responds to the human in the language they use or request. The information above is provided to You are. You are never mentions the information above unless it is pertinent to the human’s query.\n\nYou are is now being connected with a human. {prompt}" data = { "messages": messages, "content": content, -- cgit v1.2.3 From 18b309257c56b73f680debfd8eec1b12231c2698 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 21:53:18 +0200 Subject: Update (g4f/models.py g4f/Provider/ docs/providers-and-models.md) --- docs/providers-and-models.md | 14 -- g4f/Provider/__init__.py | 2 - g4f/Provider/nexra/NexraBing.py | 93 ----------- g4f/Provider/nexra/NexraBlackbox.py | 100 ------------ g4f/Provider/nexra/NexraChatGPT.py | 285 ---------------------------------- g4f/Provider/nexra/NexraDallE.py | 63 -------- g4f/Provider/nexra/NexraDallE2.py | 63 -------- g4f/Provider/nexra/NexraEmi.py | 63 -------- g4f/Provider/nexra/NexraFluxPro.py | 70 --------- g4f/Provider/nexra/NexraGeminiPro.py | 86 ---------- g4f/Provider/nexra/NexraMidjourney.py | 63 -------- g4f/Provider/nexra/NexraProdiaAI.py | 151 ------------------ g4f/Provider/nexra/NexraQwen.py | 86 ---------- g4f/Provider/nexra/NexraSD15.py | 72 --------- g4f/Provider/nexra/NexraSDLora.py | 69 -------- g4f/Provider/nexra/NexraSDTurbo.py | 69 -------- g4f/Provider/nexra/__init__.py | 14 -- g4f/models.py | 112 +------------ 18 files changed, 5 insertions(+), 1470 deletions(-) delete mode 100644 g4f/Provider/nexra/NexraBing.py delete mode 100644 g4f/Provider/nexra/NexraBlackbox.py delete mode 100644 g4f/Provider/nexra/NexraChatGPT.py delete mode 100644 g4f/Provider/nexra/NexraDallE.py delete mode 100644 g4f/Provider/nexra/NexraDallE2.py delete mode 100644 g4f/Provider/nexra/NexraEmi.py delete mode 100644 g4f/Provider/nexra/NexraFluxPro.py delete mode 100644 g4f/Provider/nexra/NexraGeminiPro.py delete mode 100644 g4f/Provider/nexra/NexraMidjourney.py delete mode 100644 g4f/Provider/nexra/NexraProdiaAI.py delete mode 100644 g4f/Provider/nexra/NexraQwen.py delete mode 100644 g4f/Provider/nexra/NexraSD15.py delete mode 100644 g4f/Provider/nexra/NexraSDLora.py delete mode 100644 g4f/Provider/nexra/NexraSDTurbo.py delete mode 100644 g4f/Provider/nexra/__init__.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 85be81cc..e34d2539 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -49,20 +49,6 @@ This document provides an overview of various AI providers and models, including |[liaobots.work](https://liaobots.work)|`g4f.Provider.Liaobots`|`gpt-3.5-turbo, gpt-4o-mini, gpt-4o, gpt-4-turbo, grok-2, grok-2-mini, claude-3-opus, claude-3-sonnet, claude-3-5-sonnet, claude-3-haiku, claude-2.1, gemini-flash, gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[magickpen.com](https://magickpen.com)|`g4f.Provider.MagickPen`|`gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[meta.ai](https://www.meta.ai)|`g4f.Provider.MetaAI`|✔|✔|?|?|![Active](https://img.shields.io/badge/Active-brightgreen)|✔| -|[nexra.aryahcr.cc/bing](https://nexra.aryahcr.cc/documentation/bing/en)|`g4f.Provider.NexraBing`|✔|❌|❌|✔|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| -|[nexra.aryahcr.cc/blackbox](https://nexra.aryahcr.cc/documentation/blackbox/en)|`g4f.Provider.NexraBlackbox`|`blackboxai` |❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/chatgpt](https://nexra.aryahcr.cc/documentation/chatgpt/en)|`g4f.Provider.NexraChatGPT`|`gpt-4, gpt-3.5-turbo, gpt-3, gpt-4o` |❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/dall-e](https://nexra.aryahcr.cc/documentation/dall-e/en)|`g4f.Provider.NexraDallE`|❌|`dalle`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/dall-e](https://nexra.aryahcr.cc/documentation/dall-e/en)|`g4f.Provider.NexraDallE2`|❌|`dalle-2`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/emi](https://nexra.aryahcr.cc/documentation/emi/en)|`g4f.Provider.NexraEmi`|❌|`emi`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/flux-pro](https://nexra.aryahcr.cc/documentation/flux-pro/en)|`g4f.Provider.NexraFluxPro`|❌|`flux-pro`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/gemini-pro](https://nexra.aryahcr.cc/documentation/gemini-pro/en)|`g4f.Provider.NexraGeminiPro`|`gemini-pro`|❌|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/midjourney](https://nexra.aryahcr.cc/documentation/midjourney/en)|`g4f.Provider.NexraMidjourney`|❌|`midjourney`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/prodia](https://nexra.aryahcr.cc/documentation/prodia/en)|`g4f.Provider.NexraProdiaAI`|❌|✔|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/qwen](https://nexra.aryahcr.cc/documentation/qwen/en)|`g4f.Provider.NexraQwen`|`qwen`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSD15`|❌|`sd-1.5`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ -|[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSDLora`|❌|`sdxl-lora`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ -|[nexra.aryahcr.cc/stable-diffusion](https://nexra.aryahcr.cc/documentation/stable-diffusion/en)|`g4f.Provider.NexraSDTurbo`|❌|`sdxl-turbo`|❌|❌|![Active](https://img.shields.io/badge/Active-brightgreen)|❌ |[platform.openai.com](https://platform.openai.com/)|`g4f.Provider.Openai`|✔|❌|✔||![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[chatgpt.com](https://chatgpt.com/)|`g4f.Provider.OpenaiChat`|`gpt-4o, gpt-4o-mini, gpt-4`|❌|✔||![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[www.perplexity.ai)](https://www.perplexity.ai)|`g4f.Provider.PerplexityAi`|✔|❌|❌|?|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 19ddaa53..f720a643 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -11,8 +11,6 @@ from .needs_auth import * from .not_working import * from .local import * -from .nexra import * - from .AI365VIP import AI365VIP from .AIChatFree import AIChatFree from .AIUncensored import AIUncensored diff --git a/g4f/Provider/nexra/NexraBing.py b/g4f/Provider/nexra/NexraBing.py deleted file mode 100644 index 28f0b117..00000000 --- a/g4f/Provider/nexra/NexraBing.py +++ /dev/null @@ -1,93 +0,0 @@ -from __future__ import annotations - -import json -import requests - -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ..helper import format_prompt - -class NexraBing(AbstractProvider, ProviderModelMixin): - label = "Nexra Bing" - url = "https://nexra.aryahcr.cc/documentation/bing/en" - api_endpoint = "https://nexra.aryahcr.cc/api/chat/complements" - working = True - supports_stream = True - - default_model = 'Balanced' - models = [default_model, 'Creative', 'Precise'] - - model_aliases = { - "gpt-4": "Balanced", - "gpt-4": "Creative", - "gpt-4": "Precise", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool = False, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ], - "conversation_style": model, - "markdown": markdown, - "stream": stream, - "model": "Bing" - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data, stream=True) - - return cls.process_response(response) - - @classmethod - def process_response(cls, response): - if response.status_code != 200: - yield f"Error: {response.status_code}" - return - - full_message = "" - for chunk in response.iter_content(chunk_size=None): - if chunk: - messages = chunk.decode('utf-8').split('\x1e') - for message in messages: - try: - json_data = json.loads(message) - if json_data.get('finish', False): - return - current_message = json_data.get('message', '') - if current_message: - new_content = current_message[len(full_message):] - if new_content: - yield new_content - full_message = current_message - except json.JSONDecodeError: - continue - - if not full_message: - yield "No message received" diff --git a/g4f/Provider/nexra/NexraBlackbox.py b/g4f/Provider/nexra/NexraBlackbox.py deleted file mode 100644 index be048fdd..00000000 --- a/g4f/Provider/nexra/NexraBlackbox.py +++ /dev/null @@ -1,100 +0,0 @@ -from __future__ import annotations - -import json -import requests - -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ..helper import format_prompt - -class NexraBlackbox(AbstractProvider, ProviderModelMixin): - label = "Nexra Blackbox" - url = "https://nexra.aryahcr.cc/documentation/blackbox/en" - api_endpoint = "https://nexra.aryahcr.cc/api/chat/complements" - working = True - supports_stream = True - - default_model = "blackbox" - models = [default_model] - model_aliases = {"blackboxai": "blackbox",} - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - proxy: str = None, - markdown: bool = False, - websearch: bool = False, - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ], - "websearch": websearch, - "stream": stream, - "markdown": markdown, - "model": model - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data, stream=stream) - - if stream: - return cls.process_streaming_response(response) - else: - return cls.process_non_streaming_response(response) - - @classmethod - def process_non_streaming_response(cls, response): - if response.status_code == 200: - try: - full_response = "" - for line in response.iter_lines(decode_unicode=True): - if line: - data = json.loads(line) - if data.get('finish'): - break - message = data.get('message', '') - if message: - full_response = message - return full_response - except json.JSONDecodeError: - return "Error: Unable to decode JSON response" - else: - return f"Error: {response.status_code}" - - @classmethod - def process_streaming_response(cls, response): - previous_message = "" - for line in response.iter_lines(decode_unicode=True): - if line: - try: - data = json.loads(line) - if data.get('finish'): - break - message = data.get('message', '') - if message and message != previous_message: - yield message[len(previous_message):] - previous_message = message - except json.JSONDecodeError: - pass diff --git a/g4f/Provider/nexra/NexraChatGPT.py b/g4f/Provider/nexra/NexraChatGPT.py deleted file mode 100644 index 074a0363..00000000 --- a/g4f/Provider/nexra/NexraChatGPT.py +++ /dev/null @@ -1,285 +0,0 @@ -from __future__ import annotations - -import asyncio -import json -import requests -from typing import Any, Dict - -from ...typing import AsyncResult, Messages -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..helper import format_prompt - - -class NexraChatGPT(AsyncGeneratorProvider, ProviderModelMixin): - label = "Nexra ChatGPT" - url = "https://nexra.aryahcr.cc/documentation/chatgpt/en" - api_endpoint_nexra_chatgpt = "https://nexra.aryahcr.cc/api/chat/gpt" - api_endpoint_nexra_chatgpt4o = "https://nexra.aryahcr.cc/api/chat/complements" - api_endpoint_nexra_chatgpt_v2 = "https://nexra.aryahcr.cc/api/chat/complements" - api_endpoint_nexra_gptweb = "https://nexra.aryahcr.cc/api/chat/gptweb" - working = True - supports_system_message = True - supports_message_history = True - supports_stream = True - - default_model = 'gpt-3.5-turbo' - nexra_chatgpt = [ - 'gpt-4', 'gpt-4-0613', 'gpt-4-0314', 'gpt-4-32k-0314', - default_model, 'gpt-3.5-turbo-16k', 'gpt-3.5-turbo-0613', 'gpt-3.5-turbo-16k-0613', 'gpt-3.5-turbo-0301', - 'text-davinci-003', 'text-davinci-002', 'code-davinci-002', 'gpt-3', 'text-curie-001', 'text-babbage-001', 'text-ada-001', 'davinci', 'curie', 'babbage', 'ada', 'babbage-002', 'davinci-002' - ] - nexra_chatgpt4o = ['gpt-4o'] - nexra_chatgptv2 = ['chatgpt'] - nexra_gptweb = ['gptweb'] - models = nexra_chatgpt + nexra_chatgpt4o + nexra_chatgptv2 + nexra_gptweb - - model_aliases = { - "gpt-4": "gpt-4-0613", - "gpt-4-32k": "gpt-4-32k-0314", - "gpt-3.5-turbo": "gpt-3.5-turbo-16k", - "gpt-3.5-turbo-0613": "gpt-3.5-turbo-16k-0613", - "gpt-3": "text-davinci-003", - "text-davinci-002": "code-davinci-002", - "text-curie-001": "text-babbage-001", - "text-ada-001": "davinci", - "curie": "babbage", - "ada": "babbage-002", - "davinci-002": "davinci-002", - "chatgpt": "chatgpt", - "gptweb": "gptweb" - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - stream: bool = False, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> AsyncResult: - if model in cls.nexra_chatgpt: - async for chunk in cls._create_async_generator_nexra_chatgpt(model, messages, proxy, **kwargs): - yield chunk - elif model in cls.nexra_chatgpt4o: - async for chunk in cls._create_async_generator_nexra_chatgpt4o(model, messages, stream, proxy, markdown, **kwargs): - yield chunk - elif model in cls.nexra_chatgptv2: - async for chunk in cls._create_async_generator_nexra_chatgpt_v2(model, messages, stream, proxy, markdown, **kwargs): - yield chunk - elif model in cls.nexra_gptweb: - async for chunk in cls._create_async_generator_nexra_gptweb(model, messages, proxy, **kwargs): - yield chunk - - @classmethod - async def _create_async_generator_nexra_chatgpt( - cls, - model: str, - messages: Messages, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "Content-Type": "application/json" - } - - prompt = format_prompt(messages) - data = { - "messages": messages, - "prompt": prompt, - "model": model, - "markdown": markdown - } - - loop = asyncio.get_event_loop() - try: - response = await loop.run_in_executor(None, cls._sync_post_request, cls.api_endpoint_nexra_chatgpt, data, headers, proxy) - filtered_response = cls._filter_response(response) - - for chunk in filtered_response: - yield chunk - except Exception as e: - print(f"Error during API request (nexra_chatgpt): {e}") - - @classmethod - async def _create_async_generator_nexra_chatgpt4o( - cls, - model: str, - messages: Messages, - stream: bool = False, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "Content-Type": "application/json" - } - - prompt = format_prompt(messages) - data = { - "messages": [ - { - "role": "user", - "content": prompt - } - ], - "stream": stream, - "markdown": markdown, - "model": model - } - - loop = asyncio.get_event_loop() - try: - response = await loop.run_in_executor(None, cls._sync_post_request, cls.api_endpoint_nexra_chatgpt4o, data, headers, proxy, stream) - - if stream: - async for chunk in cls._process_streaming_response(response): - yield chunk - else: - for chunk in cls._process_non_streaming_response(response): - yield chunk - except Exception as e: - print(f"Error during API request (nexra_chatgpt4o): {e}") - - @classmethod - async def _create_async_generator_nexra_chatgpt_v2( - cls, - model: str, - messages: Messages, - stream: bool = False, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "Content-Type": "application/json" - } - - prompt = format_prompt(messages) - data = { - "messages": [ - { - "role": "user", - "content": prompt - } - ], - "stream": stream, - "markdown": markdown, - "model": model - } - - loop = asyncio.get_event_loop() - try: - response = await loop.run_in_executor(None, cls._sync_post_request, cls.api_endpoint_nexra_chatgpt_v2, data, headers, proxy, stream) - - if stream: - async for chunk in cls._process_streaming_response(response): - yield chunk - else: - for chunk in cls._process_non_streaming_response(response): - yield chunk - except Exception as e: - print(f"Error during API request (nexra_chatgpt_v2): {e}") - - @classmethod - async def _create_async_generator_nexra_gptweb( - cls, - model: str, - messages: Messages, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "Content-Type": "application/json" - } - - prompt = format_prompt(messages) - data = { - "prompt": prompt, - "markdown": markdown, - } - - loop = asyncio.get_event_loop() - try: - response = await loop.run_in_executor(None, cls._sync_post_request, cls.api_endpoint_nexra_gptweb, data, headers, proxy) - - for chunk in response.iter_content(1024): - if chunk: - decoded_chunk = chunk.decode().lstrip('_') - try: - response_json = json.loads(decoded_chunk) - if response_json.get("status"): - yield response_json.get("gpt", "") - except json.JSONDecodeError: - continue - except Exception as e: - print(f"Error during API request (nexra_gptweb): {e}") - - @staticmethod - def _sync_post_request(url: str, data: Dict[str, Any], headers: Dict[str, str], proxy: str = None, stream: bool = False) -> requests.Response: - proxies = { - "http": proxy, - "https": proxy, - } if proxy else None - - try: - response = requests.post(url, json=data, headers=headers, proxies=proxies, stream=stream) - response.raise_for_status() - return response - except requests.RequestException as e: - print(f"Request failed: {e}") - raise - - @staticmethod - def _process_non_streaming_response(response: requests.Response) -> str: - if response.status_code == 200: - try: - content = response.text.lstrip('') - data = json.loads(content) - return data.get('message', '') - except json.JSONDecodeError: - return "Error: Unable to decode JSON response" - else: - return f"Error: {response.status_code}" - - @staticmethod - async def _process_streaming_response(response: requests.Response): - full_message = "" - for line in response.iter_lines(decode_unicode=True): - if line: - try: - line = line.lstrip('') - data = json.loads(line) - if data.get('finish'): - break - message = data.get('message', '') - if message: - yield message[len(full_message):] - full_message = message - except json.JSONDecodeError: - pass - - @staticmethod - def _filter_response(response: requests.Response) -> str: - response_json = response.json() - return response_json.get("gpt", "") diff --git a/g4f/Provider/nexra/NexraDallE.py b/g4f/Provider/nexra/NexraDallE.py deleted file mode 100644 index f605c6d0..00000000 --- a/g4f/Provider/nexra/NexraDallE.py +++ /dev/null @@ -1,63 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraDallE(AbstractProvider, ProviderModelMixin): - label = "Nexra DALL-E" - url = "https://nexra.aryahcr.cc/documentation/dall-e/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "dalle" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraDallE2.py b/g4f/Provider/nexra/NexraDallE2.py deleted file mode 100644 index 2a36b6e6..00000000 --- a/g4f/Provider/nexra/NexraDallE2.py +++ /dev/null @@ -1,63 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraDallE2(AbstractProvider, ProviderModelMixin): - label = "Nexra DALL-E 2" - url = "https://nexra.aryahcr.cc/documentation/dall-e/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "dalle2" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraEmi.py b/g4f/Provider/nexra/NexraEmi.py deleted file mode 100644 index c26becec..00000000 --- a/g4f/Provider/nexra/NexraEmi.py +++ /dev/null @@ -1,63 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraEmi(AbstractProvider, ProviderModelMixin): - label = "Nexra Emi" - url = "https://nexra.aryahcr.cc/documentation/emi/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "emi" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraFluxPro.py b/g4f/Provider/nexra/NexraFluxPro.py deleted file mode 100644 index cfb26385..00000000 --- a/g4f/Provider/nexra/NexraFluxPro.py +++ /dev/null @@ -1,70 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraFluxPro(AbstractProvider, ProviderModelMixin): - url = "https://nexra.aryahcr.cc/documentation/flux-pro/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = 'flux' - models = [default_model] - model_aliases = { - "flux-pro": "flux", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraGeminiPro.py b/g4f/Provider/nexra/NexraGeminiPro.py deleted file mode 100644 index e4e6a8ec..00000000 --- a/g4f/Provider/nexra/NexraGeminiPro.py +++ /dev/null @@ -1,86 +0,0 @@ -from __future__ import annotations - -import json -import requests - -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ..helper import format_prompt - -class NexraGeminiPro(AbstractProvider, ProviderModelMixin): - label = "Nexra Gemini PRO" - url = "https://nexra.aryahcr.cc/documentation/gemini-pro/en" - api_endpoint = "https://nexra.aryahcr.cc/api/chat/complements" - working = True - supports_stream = True - - default_model = 'gemini-pro' - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ], - "stream": stream, - "markdown": markdown, - "model": model - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data, stream=stream) - - if stream: - return cls.process_streaming_response(response) - else: - return cls.process_non_streaming_response(response) - - @classmethod - def process_non_streaming_response(cls, response): - if response.status_code == 200: - try: - content = response.text.lstrip('') - data = json.loads(content) - return data.get('message', '') - except json.JSONDecodeError: - return "Error: Unable to decode JSON response" - else: - return f"Error: {response.status_code}" - - @classmethod - def process_streaming_response(cls, response): - full_message = "" - for line in response.iter_lines(decode_unicode=True): - if line: - try: - line = line.lstrip('') - data = json.loads(line) - if data.get('finish'): - break - message = data.get('message', '') - if message: - yield message[len(full_message):] - full_message = message - except json.JSONDecodeError: - pass diff --git a/g4f/Provider/nexra/NexraMidjourney.py b/g4f/Provider/nexra/NexraMidjourney.py deleted file mode 100644 index c427f8a0..00000000 --- a/g4f/Provider/nexra/NexraMidjourney.py +++ /dev/null @@ -1,63 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraMidjourney(AbstractProvider, ProviderModelMixin): - label = "Nexra Midjourney" - url = "https://nexra.aryahcr.cc/documentation/midjourney/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "midjourney" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraProdiaAI.py b/g4f/Provider/nexra/NexraProdiaAI.py deleted file mode 100644 index de997fce..00000000 --- a/g4f/Provider/nexra/NexraProdiaAI.py +++ /dev/null @@ -1,151 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraProdiaAI(AbstractProvider, ProviderModelMixin): - label = "Nexra Prodia AI" - url = "https://nexra.aryahcr.cc/documentation/prodia/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = 'absolutereality_v181.safetensors [3d9d4d2b]' - models = [ - '3Guofeng3_v34.safetensors [50f420de]', - 'absolutereality_V16.safetensors [37db0fc3]', - default_model, - 'amIReal_V41.safetensors [0a8a2e61]', - 'analog-diffusion-1.0.ckpt [9ca13f02]', - 'aniverse_v30.safetensors [579e6f85]', - 'anythingv3_0-pruned.ckpt [2700c435]', - 'anything-v4.5-pruned.ckpt [65745d25]', - 'anythingV5_PrtRE.safetensors [893e49b9]', - 'AOM3A3_orangemixs.safetensors [9600da17]', - 'blazing_drive_v10g.safetensors [ca1c1eab]', - 'breakdomain_I2428.safetensors [43cc7d2f]', - 'breakdomain_M2150.safetensors [15f7afca]', - 'cetusMix_Version35.safetensors [de2f2560]', - 'childrensStories_v13D.safetensors [9dfaabcb]', - 'childrensStories_v1SemiReal.safetensors [a1c56dbb]', - 'childrensStories_v1ToonAnime.safetensors [2ec7b88b]', - 'Counterfeit_v30.safetensors [9e2a8f19]', - 'cuteyukimixAdorable_midchapter3.safetensors [04bdffe6]', - 'cyberrealistic_v33.safetensors [82b0d085]', - 'dalcefo_v4.safetensors [425952fe]', - 'deliberate_v2.safetensors [10ec4b29]', - 'deliberate_v3.safetensors [afd9d2d4]', - 'dreamlike-anime-1.0.safetensors [4520e090]', - 'dreamlike-diffusion-1.0.safetensors [5c9fd6e0]', - 'dreamlike-photoreal-2.0.safetensors [fdcf65e7]', - 'dreamshaper_6BakedVae.safetensors [114c8abb]', - 'dreamshaper_7.safetensors [5cf5ae06]', - 'dreamshaper_8.safetensors [9d40847d]', - 'edgeOfRealism_eorV20.safetensors [3ed5de15]', - 'EimisAnimeDiffusion_V1.ckpt [4f828a15]', - 'elldreths-vivid-mix.safetensors [342d9d26]', - 'epicphotogasm_xPlusPlus.safetensors [1a8f6d35]', - 'epicrealism_naturalSinRC1VAE.safetensors [90a4c676]', - 'epicrealism_pureEvolutionV3.safetensors [42c8440c]', - 'ICantBelieveItsNotPhotography_seco.safetensors [4e7a3dfd]', - 'indigoFurryMix_v75Hybrid.safetensors [91208cbb]', - 'juggernaut_aftermath.safetensors [5e20c455]', - 'lofi_v4.safetensors [ccc204d6]', - 'lyriel_v16.safetensors [68fceea2]', - 'majicmixRealistic_v4.safetensors [29d0de58]', - 'mechamix_v10.safetensors [ee685731]', - 'meinamix_meinaV9.safetensors [2ec66ab0]', - 'meinamix_meinaV11.safetensors [b56ce717]', - 'neverendingDream_v122.safetensors [f964ceeb]', - 'openjourney_V4.ckpt [ca2f377f]', - 'pastelMixStylizedAnime_pruned_fp16.safetensors [793a26e8]', - 'portraitplus_V1.0.safetensors [1400e684]', - 'protogenx34.safetensors [5896f8d5]', - 'Realistic_Vision_V1.4-pruned-fp16.safetensors [8d21810b]', - 'Realistic_Vision_V2.0.safetensors [79587710]', - 'Realistic_Vision_V4.0.safetensors [29a7afaa]', - 'Realistic_Vision_V5.0.safetensors [614d1063]', - 'Realistic_Vision_V5.1.safetensors [a0f13c83]', - 'redshift_diffusion-V10.safetensors [1400e684]', - 'revAnimated_v122.safetensors [3f4fefd9]', - 'rundiffusionFX25D_v10.safetensors [cd12b0ee]', - 'rundiffusionFX_v10.safetensors [cd4e694d]', - 'sdv1_4.ckpt [7460a6fa]', - 'v1-5-pruned-emaonly.safetensors [d7049739]', - 'v1-5-inpainting.safetensors [21c7ab71]', - 'shoninsBeautiful_v10.safetensors [25d8c546]', - 'theallys-mix-ii-churned.safetensors [5d9225a4]', - 'timeless-1.0.ckpt [7c4971d4]', - 'toonyou_beta6.safetensors [980f6b15]', - ] - - model_aliases = {} - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - steps: str = 25, # Min: 1, Max: 30 - cfg_scale: str = 7, # Min: 0, Max: 20 - sampler: str = "DPM++ 2M Karras", # Select from these: "Euler","Euler a","Heun","DPM++ 2M Karras","DPM++ SDE Karras","DDIM" - negative_prompt: str = "", # Indicates what the AI should not do - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": "prodia", - "response": response, - "data": { - "model": model, - "steps": steps, - "cfg_scale": cfg_scale, - "sampler": sampler, - "negative_prompt": negative_prompt - } - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') # Remove leading underscores - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraQwen.py b/g4f/Provider/nexra/NexraQwen.py deleted file mode 100644 index 7f944e44..00000000 --- a/g4f/Provider/nexra/NexraQwen.py +++ /dev/null @@ -1,86 +0,0 @@ -from __future__ import annotations - -import json -import requests - -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ..helper import format_prompt - -class NexraQwen(AbstractProvider, ProviderModelMixin): - label = "Nexra Qwen" - url = "https://nexra.aryahcr.cc/documentation/qwen/en" - api_endpoint = "https://nexra.aryahcr.cc/api/chat/complements" - working = True - supports_stream = True - - default_model = 'qwen' - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - stream: bool, - proxy: str = None, - markdown: bool = False, - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ], - "stream": stream, - "markdown": markdown, - "model": model - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data, stream=stream) - - if stream: - return cls.process_streaming_response(response) - else: - return cls.process_non_streaming_response(response) - - @classmethod - def process_non_streaming_response(cls, response): - if response.status_code == 200: - try: - content = response.text.lstrip('') - data = json.loads(content) - return data.get('message', '') - except json.JSONDecodeError: - return "Error: Unable to decode JSON response" - else: - return f"Error: {response.status_code}" - - @classmethod - def process_streaming_response(cls, response): - full_message = "" - for line in response.iter_lines(decode_unicode=True): - if line: - try: - line = line.lstrip('') - data = json.loads(line) - if data.get('finish'): - break - message = data.get('message', '') - if message is not None and message != full_message: - yield message[len(full_message):] - full_message = message - except json.JSONDecodeError: - pass diff --git a/g4f/Provider/nexra/NexraSD15.py b/g4f/Provider/nexra/NexraSD15.py deleted file mode 100644 index 860a132f..00000000 --- a/g4f/Provider/nexra/NexraSD15.py +++ /dev/null @@ -1,72 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraSD15(AbstractProvider, ProviderModelMixin): - label = "Nexra Stable Diffusion 1.5" - url = "https://nexra.aryahcr.cc/documentation/stable-diffusion/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = 'stablediffusion-1.5' - models = [default_model] - - model_aliases = { - "sd-1.5": "stablediffusion-1.5", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraSDLora.py b/g4f/Provider/nexra/NexraSDLora.py deleted file mode 100644 index a12bff1a..00000000 --- a/g4f/Provider/nexra/NexraSDLora.py +++ /dev/null @@ -1,69 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraSDLora(AbstractProvider, ProviderModelMixin): - label = "Nexra Stable Diffusion Lora" - url = "https://nexra.aryahcr.cc/documentation/stable-diffusion/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "sdxl-lora" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - guidance: str = 0.3, # Min: 0, Max: 5 - steps: str = 2, # Min: 2, Max: 10 - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response, - "data": { - "guidance": guidance, - "steps": steps - } - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/NexraSDTurbo.py b/g4f/Provider/nexra/NexraSDTurbo.py deleted file mode 100644 index 865b4522..00000000 --- a/g4f/Provider/nexra/NexraSDTurbo.py +++ /dev/null @@ -1,69 +0,0 @@ -from __future__ import annotations - -import json -import requests -from ...typing import CreateResult, Messages -from ..base_provider import ProviderModelMixin, AbstractProvider -from ...image import ImageResponse - -class NexraSDTurbo(AbstractProvider, ProviderModelMixin): - label = "Nexra Stable Diffusion Turbo" - url = "https://nexra.aryahcr.cc/documentation/stable-diffusion/en" - api_endpoint = "https://nexra.aryahcr.cc/api/image/complements" - working = True - - default_model = "sdxl-turbo" - models = [default_model] - - @classmethod - def get_model(cls, model: str) -> str: - return cls.default_model - - @classmethod - def create_completion( - cls, - model: str, - messages: Messages, - proxy: str = None, - response: str = "url", # base64 or url - strength: str = 0.7, # Min: 0, Max: 1 - steps: str = 2, # Min: 1, Max: 10 - **kwargs - ) -> CreateResult: - model = cls.get_model(model) - - headers = { - 'Content-Type': 'application/json' - } - - data = { - "prompt": messages[-1]["content"], - "model": model, - "response": response, - "data": { - "strength": strength, - "steps": steps - } - } - - response = requests.post(cls.api_endpoint, headers=headers, json=data) - - result = cls.process_response(response) - yield result - - @classmethod - def process_response(cls, response): - if response.status_code == 200: - try: - content = response.text.strip() - content = content.lstrip('_') # Remove the leading underscore - data = json.loads(content) - if data.get('status') and data.get('images'): - image_url = data['images'][0] - return ImageResponse(images=[image_url], alt="Generated Image") - else: - return "Error: No image URL found in the response" - except json.JSONDecodeError as e: - return f"Error: Unable to decode JSON response. Details: {str(e)}" - else: - return f"Error: {response.status_code}, Response: {response.text}" diff --git a/g4f/Provider/nexra/__init__.py b/g4f/Provider/nexra/__init__.py deleted file mode 100644 index bebc1fb6..00000000 --- a/g4f/Provider/nexra/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -from .NexraBing import NexraBing -from .NexraBlackbox import NexraBlackbox -from .NexraChatGPT import NexraChatGPT -from .NexraDallE import NexraDallE -from .NexraDallE2 import NexraDallE2 -from .NexraEmi import NexraEmi -from .NexraFluxPro import NexraFluxPro -from .NexraGeminiPro import NexraGeminiPro -from .NexraMidjourney import NexraMidjourney -from .NexraProdiaAI import NexraProdiaAI -from .NexraQwen import NexraQwen -from .NexraSD15 import NexraSD15 -from .NexraSDLora import NexraSDLora -from .NexraSDTurbo import NexraSDTurbo diff --git a/g4f/models.py b/g4f/models.py index 241b56b9..1223e785 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -32,19 +32,6 @@ from .Provider import ( Liaobots, MagickPen, MetaAI, - NexraBing, - NexraBlackbox, - NexraChatGPT, - NexraDallE, - NexraDallE2, - NexraEmi, - NexraFluxPro, - NexraGeminiPro, - NexraMidjourney, - NexraQwen, - NexraSD15, - NexraSDLora, - NexraSDTurbo, OpenaiChat, PerplexityLabs, Pi, @@ -107,25 +94,18 @@ default = Model( ############ ### OpenAI ### -# gpt-3 -gpt_3 = Model( - name = 'gpt-3', - base_provider = 'OpenAI', - best_provider = NexraChatGPT -) - # gpt-3.5 gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([DarkAI, NexraChatGPT, Airforce, Liaobots, Allyfy]) + best_provider = IterListProvider([DarkAI, Airforce, Liaobots, Allyfy]) ) # gpt-4 gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, NexraChatGPT, Airforce, ChatGpt, Liaobots, OpenaiChat]) + best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Airforce, ChatGpt, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( @@ -143,7 +123,7 @@ gpt_4_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, NexraBing, NexraChatGPT, ChatGpt, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, ChatGpt, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 @@ -342,7 +322,7 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, FreeGpt, NexraGeminiPro, Airforce, Liaobots]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, FreeGpt, Airforce, Liaobots]) ) gemini_flash = Model( @@ -430,7 +410,7 @@ reka_core = Model( blackboxai = Model( name = 'blackboxai', base_provider = 'Blackbox AI', - best_provider = IterListProvider([Blackbox, NexraBlackbox]) + best_provider = Blackbox ) blackboxai_pro = Model( @@ -501,12 +481,6 @@ qwen_2_5_72b = Model( best_provider = Airforce ) -qwen = Model( - name = 'qwen', - base_provider = 'Qwen', - best_provider = NexraQwen -) - ### Upstage ### solar_10_7b = Model( name = 'solar-10-7b', @@ -683,20 +657,6 @@ zephyr_7b = Model( ############# ### Stability AI ### -sdxl_turbo = Model( - name = 'sdxl-turbo', - base_provider = 'Stability AI', - best_provider = NexraSDTurbo - -) - -sdxl_lora = Model( - name = 'sdxl-lora', - base_provider = 'Stability AI', - best_provider = NexraSDLora - -) - sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', @@ -704,13 +664,6 @@ sdxl = Model( ) -sd_1_5 = Model( - name = 'sd-1.5', - base_provider = 'Stability AI', - best_provider = IterListProvider([NexraSD15]) - -) - sd_3 = Model( name = 'sd-3', base_provider = 'Stability AI', @@ -735,13 +688,6 @@ flux = Model( ) -flux_pro = Model( - name = 'flux-pro', - base_provider = 'Flux AI', - best_provider = IterListProvider([NexraFluxPro]) - -) - flux_realism = Model( name = 'flux-realism', base_provider = 'Flux AI', @@ -792,37 +738,7 @@ flux_schnell = Model( ) -### OpenAI ### -dalle_2 = Model( - name = 'dalle-2', - base_provider = 'OpenAI', - best_provider = NexraDallE2 - -) - -dalle = Model( - name = 'dalle', - base_provider = 'OpenAI', - best_provider = NexraDallE - -) - -### Midjourney ### -midjourney = Model( - name = 'midjourney', - base_provider = 'Midjourney', - best_provider = NexraMidjourney - -) - ### Other ### -emi = Model( - name = 'emi', - base_provider = '', - best_provider = NexraEmi - -) - any_dark = Model( name = 'any-dark', base_provider = '', @@ -844,9 +760,6 @@ class ModelUtils: ############ ### OpenAI ### -# gpt-3 -'gpt-3': gpt_3, - # gpt-3.5 'gpt-3.5-turbo': gpt_35_turbo, @@ -959,8 +872,6 @@ class ModelUtils: ### Qwen ### -'qwen': qwen, - # qwen 1.5 'qwen-1.5-5b': qwen_1_5_5b, 'qwen-1.5-7b': qwen_1_5_7b, @@ -1063,9 +974,6 @@ class ModelUtils: ### Stability AI ### 'sdxl': sdxl, -'sdxl-lora': sdxl_lora, -'sdxl-turbo': sdxl_turbo, -'sd-1.5': sd_1_5, 'sd-3': sd_3, @@ -1075,7 +983,6 @@ class ModelUtils: ### Flux AI ### 'flux': flux, -'flux-pro': flux_pro, 'flux-realism': flux_realism, 'flux-anime': flux_anime, 'flux-3d': flux_3d, @@ -1085,16 +992,7 @@ class ModelUtils: 'flux-schnell': flux_schnell, -### OpenAI ### -'dalle': dalle, -'dalle-2': dalle_2, - -### Midjourney ### -'midjourney': midjourney, - - ### Other ### -'emi': emi, 'any-dark': any_dark, } -- cgit v1.2.3 From 5519ecbf1e0736353c8f62832505a9c2f2c48f0d Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 6 Nov 2024 21:58:42 +0200 Subject: Update (g4f/Provider/Upstage.py) --- g4f/Provider/Upstage.py | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/g4f/Provider/Upstage.py b/g4f/Provider/Upstage.py index 65409159..81234ed9 100644 --- a/g4f/Provider/Upstage.py +++ b/g4f/Provider/Upstage.py @@ -41,35 +41,51 @@ class Upstage(AsyncGeneratorProvider, ProviderModelMixin): **kwargs ) -> AsyncResult: model = cls.get_model(model) - + headers = { "accept": "*/*", "accept-language": "en-US,en;q=0.9", + "cache-control": "no-cache", "content-type": "application/json", + "dnt": "1", "origin": "https://console.upstage.ai", + "pragma": "no-cache", "priority": "u=1, i", "referer": "https://console.upstage.ai/", - "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"', + "sec-ch-ua": '"Not?A_Brand";v="99", "Chromium";v="130"', "sec-ch-ua-mobile": "?0", "sec-ch-ua-platform": '"Linux"', "sec-fetch-dest": "empty", "sec-fetch-mode": "cors", "sec-fetch-site": "cross-site", - "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36" + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36" } + async with ClientSession(headers=headers) as session: data = { "stream": True, "messages": [{"role": "user", "content": format_prompt(messages)}], "model": model } + async with session.post(f"{cls.api_endpoint}", json=data, proxy=proxy) as response: response.raise_for_status() + + response_text = "" + async for line in response.content: if line: line = line.decode('utf-8').strip() + if line.startswith("data: ") and line != "data: [DONE]": - data = json.loads(line[6:]) - content = data['choices'][0]['delta'].get('content', '') - if content: - yield content + try: + data = json.loads(line[6:]) + content = data['choices'][0]['delta'].get('content', '') + if content: + response_text += content + yield content + except json.JSONDecodeError: + continue + + if line == "data: [DONE]": + break -- cgit v1.2.3 From 703a38e1005f5ab1c156beda562d99a90955f9fc Mon Sep 17 00:00:00 2001 From: rkihacker Date: Thu, 7 Nov 2024 11:02:04 +0500 Subject: udated validated id --- g4f/Provider/Blackbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index ffd6890f..4811c45e 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -173,7 +173,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "mobileClient": False, "userSelectedModel": model if model in cls.userSelectedModel else None, "webSearchMode": web_search, - "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc" + "validated": "00f37b34-a166-4efb-bce5-1312d87f2f94" } async with ClientSession(headers=headers) as session: -- cgit v1.2.3 From 1041e4d9dd6f791e03c949737560f20ed2dbfc5e Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 09:53:28 +0200 Subject: Update (g4f/Provider/AI365VIP.py g4f/Provider/__init__.py g4f/Provider/not_working/) --- g4f/Provider/AI365VIP.py | 69 ------------------------------------ g4f/Provider/__init__.py | 1 - g4f/Provider/not_working/AI365VIP.py | 69 ++++++++++++++++++++++++++++++++++++ g4f/Provider/not_working/__init__.py | 1 + 4 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 g4f/Provider/AI365VIP.py create mode 100644 g4f/Provider/not_working/AI365VIP.py diff --git a/g4f/Provider/AI365VIP.py b/g4f/Provider/AI365VIP.py deleted file mode 100644 index 511ad568..00000000 --- a/g4f/Provider/AI365VIP.py +++ /dev/null @@ -1,69 +0,0 @@ -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 AI365VIP(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://chat.ai365vip.com" - api_endpoint = "/api/chat" - working = False - default_model = 'gpt-3.5-turbo' - models = [ - 'gpt-3.5-turbo', - 'gpt-3.5-turbo-16k', - 'gpt-4o', - ] - model_aliases = { - "gpt-3.5-turbo": "gpt-3.5-turbo-16k", - } - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json", - "origin": cls.url, - "referer": f"{cls.url}/en", - "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"', - "sec-ch-ua-arch": '"x86"', - "sec-ch-ua-bitness": '"64"', - "sec-ch-ua-full-version": '"127.0.6533.119"', - "sec-ch-ua-full-version-list": '"Chromium";v="127.0.6533.119", "Not)A;Brand";v="99.0.0.0"', - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-model": '""', - "sec-ch-ua-platform": '"Linux"', - "sec-ch-ua-platform-version": '"4.19.276"', - "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/127.0.0.0 Safari/537.36", - } - async with ClientSession(headers=headers) as session: - data = { - "model": { - "id": model, - "name": "GPT-3.5", - "maxLength": 3000, - "tokenLimit": 2048 - }, - "messages": [{"role": "user", "content": format_prompt(messages)}], - "key": "", - "prompt": "You are a helpful assistant.", - "temperature": 1 - } - 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/__init__.py b/g4f/Provider/__init__.py index f720a643..5a0196d3 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -11,7 +11,6 @@ from .needs_auth import * from .not_working import * from .local import * -from .AI365VIP import AI365VIP from .AIChatFree import AIChatFree from .AIUncensored import AIUncensored from .Allyfy import Allyfy diff --git a/g4f/Provider/not_working/AI365VIP.py b/g4f/Provider/not_working/AI365VIP.py new file mode 100644 index 00000000..a4bac0e2 --- /dev/null +++ b/g4f/Provider/not_working/AI365VIP.py @@ -0,0 +1,69 @@ +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 AI365VIP(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://chat.ai365vip.com" + api_endpoint = "/api/chat" + working = False + default_model = 'gpt-3.5-turbo' + models = [ + 'gpt-3.5-turbo', + 'gpt-3.5-turbo-16k', + 'gpt-4o', + ] + model_aliases = { + "gpt-3.5-turbo": "gpt-3.5-turbo-16k", + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "origin": cls.url, + "referer": f"{cls.url}/en", + "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"', + "sec-ch-ua-arch": '"x86"', + "sec-ch-ua-bitness": '"64"', + "sec-ch-ua-full-version": '"127.0.6533.119"', + "sec-ch-ua-full-version-list": '"Chromium";v="127.0.6533.119", "Not)A;Brand";v="99.0.0.0"', + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-model": '""', + "sec-ch-ua-platform": '"Linux"', + "sec-ch-ua-platform-version": '"4.19.276"', + "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/127.0.0.0 Safari/537.36", + } + async with ClientSession(headers=headers) as session: + data = { + "model": { + "id": model, + "name": "GPT-3.5", + "maxLength": 3000, + "tokenLimit": 2048 + }, + "messages": [{"role": "user", "content": format_prompt(messages)}], + "key": "", + "prompt": "You are a helpful assistant.", + "temperature": 1 + } + 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/not_working/__init__.py b/g4f/Provider/not_working/__init__.py index 52c5c538..9dcc85d0 100644 --- a/g4f/Provider/not_working/__init__.py +++ b/g4f/Provider/not_working/__init__.py @@ -1,4 +1,5 @@ from .Ai4Chat import Ai4Chat +from .AI365VIP import AI365VIP from .AiChatOnline import AiChatOnline from .AiChats import AiChats from .AmigoChat import AmigoChat -- cgit v1.2.3 From 991c35e50c357e7c962280bf287edf260184a693 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 10:57:11 +0200 Subject: Update (g4f/Provider/) --- g4f/Provider/AIChatFree.py | 76 ---------------------------------- g4f/Provider/__init__.py | 1 - g4f/Provider/not_working/AIChatFree.py | 76 ++++++++++++++++++++++++++++++++++ g4f/Provider/not_working/__init__.py | 1 + 4 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 g4f/Provider/AIChatFree.py create mode 100644 g4f/Provider/not_working/AIChatFree.py diff --git a/g4f/Provider/AIChatFree.py b/g4f/Provider/AIChatFree.py deleted file mode 100644 index 6f4b8560..00000000 --- a/g4f/Provider/AIChatFree.py +++ /dev/null @@ -1,76 +0,0 @@ -from __future__ import annotations - -import time -from hashlib import sha256 - -from aiohttp import BaseConnector, ClientSession - -from ..errors import RateLimitError -from ..requests import raise_for_status -from ..requests.aiohttp import get_connector -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider, ProviderModelMixin - - -class AIChatFree(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://aichatfree.info/" - working = False - supports_stream = True - supports_message_history = True - default_model = 'gemini-pro' - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - connector: BaseConnector = None, - **kwargs, - ) -> AsyncResult: - headers = { - "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0", - "Accept": "*/*", - "Accept-Language": "en-US,en;q=0.5", - "Accept-Encoding": "gzip, deflate, br", - "Content-Type": "text/plain;charset=UTF-8", - "Referer": f"{cls.url}/", - "Origin": cls.url, - "Sec-Fetch-Dest": "empty", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Site": "same-origin", - "Connection": "keep-alive", - "TE": "trailers", - } - async with ClientSession( - connector=get_connector(connector, proxy), headers=headers - ) as session: - timestamp = int(time.time() * 1e3) - data = { - "messages": [ - { - "role": "model" if message["role"] == "assistant" else "user", - "parts": [{"text": message["content"]}], - } - for message in messages - ], - "time": timestamp, - "pass": None, - "sign": generate_signature(timestamp, messages[-1]["content"]), - } - async with session.post( - f"{cls.url}/api/generate", json=data, proxy=proxy - ) as response: - if response.status == 500: - if "Quota exceeded" in await response.text(): - raise RateLimitError( - f"Response {response.status}: Rate limit reached" - ) - await raise_for_status(response) - async for chunk in response.content.iter_any(): - yield chunk.decode(errors="ignore") - - -def generate_signature(time: int, text: str, secret: str = ""): - message = f"{time}:{text}:{secret}" - return sha256(message.encode()).hexdigest() diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 5a0196d3..368c4a25 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -11,7 +11,6 @@ from .needs_auth import * from .not_working import * from .local import * -from .AIChatFree import AIChatFree from .AIUncensored import AIUncensored from .Allyfy import Allyfy from .AiMathGPT import AiMathGPT diff --git a/g4f/Provider/not_working/AIChatFree.py b/g4f/Provider/not_working/AIChatFree.py new file mode 100644 index 00000000..a4f80d47 --- /dev/null +++ b/g4f/Provider/not_working/AIChatFree.py @@ -0,0 +1,76 @@ +from __future__ import annotations + +import time +from hashlib import sha256 + +from aiohttp import BaseConnector, ClientSession + +from ...errors import RateLimitError +from ...requests import raise_for_status +from ...requests.aiohttp import get_connector +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin + + +class AIChatFree(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://aichatfree.info/" + working = False + supports_stream = True + supports_message_history = True + default_model = 'gemini-pro' + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + connector: BaseConnector = None, + **kwargs, + ) -> AsyncResult: + headers = { + "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0", + "Accept": "*/*", + "Accept-Language": "en-US,en;q=0.5", + "Accept-Encoding": "gzip, deflate, br", + "Content-Type": "text/plain;charset=UTF-8", + "Referer": f"{cls.url}/", + "Origin": cls.url, + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-origin", + "Connection": "keep-alive", + "TE": "trailers", + } + async with ClientSession( + connector=get_connector(connector, proxy), headers=headers + ) as session: + timestamp = int(time.time() * 1e3) + data = { + "messages": [ + { + "role": "model" if message["role"] == "assistant" else "user", + "parts": [{"text": message["content"]}], + } + for message in messages + ], + "time": timestamp, + "pass": None, + "sign": generate_signature(timestamp, messages[-1]["content"]), + } + async with session.post( + f"{cls.url}/api/generate", json=data, proxy=proxy + ) as response: + if response.status == 500: + if "Quota exceeded" in await response.text(): + raise RateLimitError( + f"Response {response.status}: Rate limit reached" + ) + await raise_for_status(response) + async for chunk in response.content.iter_any(): + yield chunk.decode(errors="ignore") + + +def generate_signature(time: int, text: str, secret: str = ""): + message = f"{time}:{text}:{secret}" + return sha256(message.encode()).hexdigest() diff --git a/g4f/Provider/not_working/__init__.py b/g4f/Provider/not_working/__init__.py index 9dcc85d0..e1da3032 100644 --- a/g4f/Provider/not_working/__init__.py +++ b/g4f/Provider/not_working/__init__.py @@ -1,5 +1,6 @@ from .Ai4Chat import Ai4Chat from .AI365VIP import AI365VIP +from .AIChatFree import AIChatFree from .AiChatOnline import AiChatOnline from .AiChats import AiChats from .AmigoChat import AmigoChat -- cgit v1.2.3 From 1a8869238204c91d34b0c1df1756d609c48f7052 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 11:41:16 +0200 Subject: Update (g4f/Provider/ChatGpt.py g4f/Provider/DarkAI.py) --- g4f/Provider/ChatGpt.py | 1 - g4f/Provider/DarkAI.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/g4f/Provider/ChatGpt.py b/g4f/Provider/ChatGpt.py index 9304e4a0..02bbbcc4 100644 --- a/g4f/Provider/ChatGpt.py +++ b/g4f/Provider/ChatGpt.py @@ -210,7 +210,6 @@ class ChatGpt(AbstractProvider, ProviderModelMixin): for line in response.iter_lines(): if line: decoded_line = line.decode() - print(decoded_line) if decoded_line.startswith('data:'): json_string = decoded_line[6:].strip() diff --git a/g4f/Provider/DarkAI.py b/g4f/Provider/DarkAI.py index 54f456fe..06e2bd55 100644 --- a/g4f/Provider/DarkAI.py +++ b/g4f/Provider/DarkAI.py @@ -75,9 +75,9 @@ class DarkAI(AsyncGeneratorProvider, ProviderModelMixin): yield full_text.strip() return except json.JSONDecodeError: - print(f"Failed to decode JSON: {chunk_str}") - except Exception as e: - print(f"Error processing chunk: {e}") + pass + except Exception: + pass if full_text: yield full_text.strip() -- cgit v1.2.3 From d41f599adb3e4a8816ec62c4fd014cb3005aabf0 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 21:27:26 +0200 Subject: refactor(g4f/Provider/AIUncensored.py): Enhance robustness and add features --- g4f/Provider/AIUncensored.py | 86 +++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/g4f/Provider/AIUncensored.py b/g4f/Provider/AIUncensored.py index ce492b38..db3aa6cd 100644 --- a/g4f/Provider/AIUncensored.py +++ b/g4f/Provider/AIUncensored.py @@ -1,17 +1,17 @@ from __future__ import annotations import json -from aiohttp import ClientSession -from itertools import cycle +import random +import logging +from aiohttp import ClientSession, ClientError +from typing import List from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin -from .helper import format_prompt from ..image import ImageResponse - class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://www.aiuncensored.info" + url = "https://www.aiuncensored.info/ai_uncensored" api_endpoints_text = [ "https://twitterclone-i0wr.onrender.com/api/chat", "https://twitterclone-4e8t.onrender.com/api/chat", @@ -22,8 +22,6 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): "https://twitterclone-i0wr.onrender.com/api/image", "https://twitterclone-8wd1.onrender.com/api/image", ] - api_endpoints_cycle_text = cycle(api_endpoints_text) - api_endpoints_cycle_image = cycle(api_endpoints_image) working = True supports_stream = True supports_system_message = True @@ -35,10 +33,32 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): models = [*text_models, *image_models] model_aliases = { - #"": "TextGenerations", "flux": "ImageGenerations", } + @staticmethod + def generate_cipher() -> str: + return ''.join([str(random.randint(0, 9)) for _ in range(16)]) + + @staticmethod + async def try_request(session: ClientSession, endpoints: List[str], data: dict, proxy: str = None): + available_endpoints = endpoints.copy() + random.shuffle(available_endpoints) + + while available_endpoints: + endpoint = available_endpoints.pop() + try: + async with session.post(endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + return response + except ClientError as e: + logging.warning(f"Failed to connect to {endpoint}: {str(e)}") + if not available_endpoints: + raise + continue + + raise Exception("All endpoints are unavailable") + @classmethod def get_model(cls, model: str) -> str: if model in cls.models: @@ -81,36 +101,28 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): prompt = messages[-1]['content'] data = { "prompt": prompt, + "cipher": cls.generate_cipher() } - api_endpoint = next(cls.api_endpoints_cycle_image) - async with session.post(api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - response_data = await response.json() - image_url = response_data['image_url'] - image_response = ImageResponse(images=image_url, alt=prompt) - yield image_response + response = await cls.try_request(session, cls.api_endpoints_image, data, proxy) + response_data = await response.json() + image_url = response_data['image_url'] + image_response = ImageResponse(images=image_url, alt=prompt) + yield image_response + elif model in cls.text_models: data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ] + "messages": messages, + "cipher": cls.generate_cipher() } - api_endpoint = next(cls.api_endpoints_cycle_text) - async with session.post(api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - full_response = "" - async for line in response.content: - line = line.decode('utf-8') - if line.startswith("data: "): - try: - json_str = line[6:] - if json_str != "[DONE]": - data = json.loads(json_str) - if "data" in data: - full_response += data["data"] - yield data["data"] - except json.JSONDecodeError: - continue + response = await cls.try_request(session, cls.api_endpoints_text, data, proxy) + async for line in response.content: + line = line.decode('utf-8') + if line.startswith("data: "): + try: + json_str = line[6:] + if json_str != "[DONE]": + data = json.loads(json_str) + if "data" in data: + yield data["data"] + except json.JSONDecodeError: + continue -- cgit v1.2.3 From 9fe5ac6780713443356f29e63d0a4d211392bc5b Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 22:05:40 +0200 Subject: refactor(g4f/Provider/AIUncensored.py): Enhance AIUncensored provider with improved resilience and flexibility --- g4f/Provider/AIUncensored.py | 80 +++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/g4f/Provider/AIUncensored.py b/g4f/Provider/AIUncensored.py index db3aa6cd..c2f0f4b3 100644 --- a/g4f/Provider/AIUncensored.py +++ b/g4f/Provider/AIUncensored.py @@ -2,9 +2,9 @@ from __future__ import annotations import json import random -import logging from aiohttp import ClientSession, ClientError -from typing import List +import asyncio +from itertools import cycle from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin @@ -38,27 +38,9 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): @staticmethod def generate_cipher() -> str: + """Generate a cipher in format like '3221229284179118'""" return ''.join([str(random.randint(0, 9)) for _ in range(16)]) - @staticmethod - async def try_request(session: ClientSession, endpoints: List[str], data: dict, proxy: str = None): - available_endpoints = endpoints.copy() - random.shuffle(available_endpoints) - - while available_endpoints: - endpoint = available_endpoints.pop() - try: - async with session.post(endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - return response - except ClientError as e: - logging.warning(f"Failed to connect to {endpoint}: {str(e)}") - if not available_endpoints: - raise - continue - - raise Exception("All endpoints are unavailable") - @classmethod def get_model(cls, model: str) -> str: if model in cls.models: @@ -103,26 +85,48 @@ class AIUncensored(AsyncGeneratorProvider, ProviderModelMixin): "prompt": prompt, "cipher": cls.generate_cipher() } - response = await cls.try_request(session, cls.api_endpoints_image, data, proxy) - response_data = await response.json() - image_url = response_data['image_url'] - image_response = ImageResponse(images=image_url, alt=prompt) - yield image_response + endpoints = cycle(cls.api_endpoints_image) + + while True: + endpoint = next(endpoints) + try: + async with session.post(endpoint, json=data, proxy=proxy, timeout=10) as response: + response.raise_for_status() + response_data = await response.json() + image_url = response_data['image_url'] + image_response = ImageResponse(images=image_url, alt=prompt) + yield image_response + return + except (ClientError, asyncio.TimeoutError): + continue + elif model in cls.text_models: data = { "messages": messages, "cipher": cls.generate_cipher() } - response = await cls.try_request(session, cls.api_endpoints_text, data, proxy) - async for line in response.content: - line = line.decode('utf-8') - if line.startswith("data: "): - try: - json_str = line[6:] - if json_str != "[DONE]": - data = json.loads(json_str) - if "data" in data: - yield data["data"] - except json.JSONDecodeError: - continue + + endpoints = cycle(cls.api_endpoints_text) + + while True: + endpoint = next(endpoints) + try: + async with session.post(endpoint, json=data, proxy=proxy, timeout=10) as response: + response.raise_for_status() + full_response = "" + async for line in response.content: + line = line.decode('utf-8') + if line.startswith("data: "): + try: + json_str = line[6:] + if json_str != "[DONE]": + data = json.loads(json_str) + if "data" in data: + full_response += data["data"] + yield data["data"] + except json.JSONDecodeError: + continue + return + except (ClientError, asyncio.TimeoutError): + continue -- cgit v1.2.3 From c077d8fcfb08c5b2e7ad3516e927b6e6de170118 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 23:32:49 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index e34d2539..98a54113 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -76,8 +76,7 @@ This document provides an overview of various AI providers and models, including ### Text Models | Model | Base Provider | Providers | Website | |-------|---------------|-----------|---------| -|gpt-3|OpenAI|1+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-base)| -|gpt-3.5-turbo|OpenAI|5+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-3-5-turbo)| +|gpt-3.5-turbo|OpenAI|4+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-3-5-turbo)| |gpt-4|OpenAI|7+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| |gpt-4-turbo|OpenAI|3+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| |gpt-4o|OpenAI|10+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o)| -- cgit v1.2.3 From c7f7c82b31186f0724117f02385977107d3f9f0a Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Thu, 7 Nov 2024 23:41:52 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 98a54113..9e31ebb6 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -77,10 +77,10 @@ This document provides an overview of various AI providers and models, including | Model | Base Provider | Providers | Website | |-------|---------------|-----------|---------| |gpt-3.5-turbo|OpenAI|4+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-3-5-turbo)| -|gpt-4|OpenAI|7+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| -|gpt-4-turbo|OpenAI|3+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| -|gpt-4o|OpenAI|10+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o)| -|gpt-4o-mini|OpenAI|14+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o-mini)| +|gpt-4|OpenAI|6+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| +|gpt-4-turbo|OpenAI|4+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4)| +|gpt-4o|OpenAI|7+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o)| +|gpt-4o-mini|OpenAI|10+ Providers|[platform.openai.com](https://platform.openai.com/docs/models/gpt-4o-mini)| |o1|OpenAI|0+ Providers|[platform.openai.com](https://openai.com/index/introducing-openai-o1-preview/)| |o1-mini|OpenAI|0+ Providers|[platform.openai.com](https://openai.com/index/openai-o1-mini-advancing-cost-efficient-reasoning/)| |llama-2-7b|Meta Llama|1+ Providers|[huggingface.co](https://huggingface.co/meta-llama/Llama-2-7b)| -- cgit v1.2.3 From 3b02b2e8b4956928e129918cafb07c5a78dafa0c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 8 Nov 2024 00:42:14 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 9e31ebb6..0a253475 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -119,7 +119,7 @@ This document provides an overview of various AI providers and models, including |claude-3-sonnet|Anthropic|2+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-family)| |claude-3-opus|Anthropic|2+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-family)| |claude-3.5-sonnet|Anthropic|6+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-5-sonnet)| -|blackboxai|Blackbox AI|2+ Providers|[docs.blackbox.chat](https://docs.blackbox.chat/blackbox-ai-1)| +|blackboxai|Blackbox AI|1+ Providers|[docs.blackbox.chat](https://docs.blackbox.chat/blackbox-ai-1)| |blackboxai-pro|Blackbox AI|1+ Providers|[docs.blackbox.chat](https://docs.blackbox.chat/blackbox-ai-1)| |yi-1.5-9b|01-ai|1+ Providers|[huggingface.co](https://huggingface.co/01-ai/Yi-1.5-9B)| |phi-2|Microsoft|1+ Providers|[huggingface.co](https://huggingface.co/microsoft/phi-2)| -- cgit v1.2.3 From b5c432f73e845c57899a706ccdf440fabccac42e Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 8 Nov 2024 12:03:33 +0200 Subject: Update (g4f/client/) --- g4f/client/AsyncClient.py | 38 -------------------------------------- g4f/client/__init__.py | 3 +-- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 g4f/client/AsyncClient.py diff --git a/g4f/client/AsyncClient.py b/g4f/client/AsyncClient.py deleted file mode 100644 index fd2cc353..00000000 --- a/g4f/client/AsyncClient.py +++ /dev/null @@ -1,38 +0,0 @@ -from __future__ import annotations - -from .Client import Client, Chat, Images, Completions -from .Client import async_iter_response, async_iter_append_model_and_provider -from aiohttp import ClientSession -from typing import Union, AsyncIterator - -class AsyncClient(Client): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.chat = AsyncChat(self) - self._images = AsyncImages(self) - - @property - def images(self) -> 'AsyncImages': - return self._images - -class AsyncCompletions(Completions): - async def async_create(self, *args, **kwargs) -> Union['ChatCompletion', AsyncIterator['ChatCompletionChunk']]: - response = await super().async_create(*args, **kwargs) - async for result in response: - return result - -class AsyncChat(Chat): - def __init__(self, client: AsyncClient): - self.completions = AsyncCompletions(client) - -class AsyncImages(Images): - async def async_generate(self, *args, **kwargs) -> 'ImagesResponse': - return await super().async_generate(*args, **kwargs) - - async def _fetch_image(self, url: str) -> bytes: - async with ClientSession() as session: - async with session.get(url) as resp: - if resp.status == 200: - return await resp.read() - else: - raise Exception(f"Failed to fetch image from {url}, status code {resp.status}") diff --git a/g4f/client/__init__.py b/g4f/client/__init__.py index 0d4685cc..d1e7e298 100644 --- a/g4f/client/__init__.py +++ b/g4f/client/__init__.py @@ -1,3 +1,2 @@ from .stubs import ChatCompletion, ChatCompletionChunk, ImagesResponse -from .client import Client -from .client import AsyncClient +from .client import Client, AsyncClient -- cgit v1.2.3 From db347ef09734f9292ba449b242186d89746c0b64 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 8 Nov 2024 19:20:21 +0200 Subject: Update (g4f/models.py g4f/Provider/airforce/ g4f/Provider/Airforce.py) --- g4f/Provider/Airforce.py | 4 +-- g4f/Provider/airforce/AirforceChat.py | 10 +++---- g4f/Provider/airforce/AirforceImage.py | 55 +++++++++++++++------------------- g4f/models.py | 8 +++++ 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/g4f/Provider/Airforce.py b/g4f/Provider/Airforce.py index b7819f9a..8ea0a174 100644 --- a/g4f/Provider/Airforce.py +++ b/g4f/Provider/Airforce.py @@ -12,8 +12,8 @@ from .airforce.AirforceImage import AirforceImage class Airforce(AsyncGeneratorProvider, ProviderModelMixin): url = "https://api.airforce" - api_endpoint_completions = AirforceChat.api_endpoint_completions - api_endpoint_imagine2 = AirforceImage.api_endpoint_imagine2 + api_endpoint_completions = AirforceChat.api_endpoint + api_endpoint_imagine2 = AirforceImage.api_endpoint working = True supports_stream = AirforceChat.supports_stream supports_system_message = AirforceChat.supports_system_message diff --git a/g4f/Provider/airforce/AirforceChat.py b/g4f/Provider/airforce/AirforceChat.py index b4b1eca3..8affbe5c 100644 --- a/g4f/Provider/airforce/AirforceChat.py +++ b/g4f/Provider/airforce/AirforceChat.py @@ -46,7 +46,7 @@ def split_messages(messages: Messages, chunk_size: int = 995) -> Messages: class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): label = "AirForce Chat" - api_endpoint_completions = "https://api.airforce/chat/completions" # Замініть на реальний ендпоінт + api_endpoint = "https://api.airforce/chat/completions" supports_stream = True supports_system_message = True supports_message_history = True @@ -118,8 +118,8 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): 'openchat-3.5-0106', # qwen - #'Qwen1.5-72B-Chat', Пуста відповідь - #'Qwen1.5-110B-Chat', Пуста відповідь + #'Qwen1.5-72B-Chat', # Empty answer + #'Qwen1.5-110B-Chat', # Empty answer 'Qwen2-72B-Instruct', 'Qwen2.5-7B-Instruct-Turbo', 'Qwen2.5-72B-Instruct-Turbo', @@ -350,7 +350,7 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): } async with ClientSession(headers=headers) as session: - async with session.post(cls.api_endpoint_completions, json=data, proxy=proxy) as response: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: response.raise_for_status() text = "" if stream: @@ -362,7 +362,7 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): chunk = json.loads(json_str) if 'choices' in chunk and chunk['choices']: content = chunk['choices'][0].get('delta', {}).get('content', '') - text += content # Збираємо дельти + text += content except json.JSONDecodeError as e: print(f"Error decoding JSON: {json_str}, Error: {e}") elif line.strip() == "[DONE]": diff --git a/g4f/Provider/airforce/AirforceImage.py b/g4f/Provider/airforce/AirforceImage.py index 010d1a94..443c0f6b 100644 --- a/g4f/Provider/airforce/AirforceImage.py +++ b/g4f/Provider/airforce/AirforceImage.py @@ -1,46 +1,47 @@ from __future__ import annotations from aiohttp import ClientSession +from urllib.parse import urlencode import random from ...typing import AsyncResult, Messages -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin from ...image import ImageResponse +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin): label = "Airforce Image" #url = "https://api.airforce" - api_endpoint_imagine2 = "https://api.airforce/imagine2" + api_endpoint = "https://api.airforce/imagine2" #working = True default_model = 'flux' image_models = [ 'flux', - 'flux-realism', + 'flux-realism', 'flux-anime', 'flux-3d', 'flux-disney', 'flux-pixel', 'flux-4o', 'any-dark', + 'any-uncensored', 'stable-diffusion-xl-base', 'stable-diffusion-xl-lightning', + 'Flux-1.1-Pro', ] models = [*image_models] model_aliases = { "sdxl": "stable-diffusion-xl-base", - "sdxl": "stable-diffusion-xl-lightning", + "sdxl": "stable-diffusion-xl-lightning", + "flux-pro": "Flux-1.1-Pro", } - - + @classmethod def get_model(cls, model: str) -> str: if model in cls.models: return model - elif model in cls.model_aliases: - return cls.model_aliases[model] else: return cls.default_model @@ -49,49 +50,41 @@ class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin): cls, model: str, messages: Messages, - size: str = '1:1', + size: str = '1:1', # "1:1", "16:9", "9:16", "21:9", "9:21", "1:2", "2:1" proxy: str = None, **kwargs ) -> AsyncResult: model = cls.get_model(model) headers = { - 'accept': '*/*', + 'accept': 'image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8', 'accept-language': 'en-US,en;q=0.9', - 'authorization': 'Bearer missing api key', 'cache-control': 'no-cache', - 'origin': 'https://llmplayground.net', + 'dnt': '1', 'pragma': 'no-cache', 'priority': 'u=1, i', 'referer': 'https://llmplayground.net/', 'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"', 'sec-ch-ua-mobile': '?0', 'sec-ch-ua-platform': '"Linux"', - 'sec-fetch-dest': 'empty', - 'sec-fetch-mode': 'cors', + 'sec-fetch-dest': 'image', + 'sec-fetch-mode': 'no-cors', 'sec-fetch-site': 'cross-site', 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' } - + async with ClientSession(headers=headers) as session: - prompt = messages[-1]['content'] - seed = random.randint(0, 4294967295) + seed = random.randint(0, 58463) params = { 'model': model, - 'prompt': prompt, + 'prompt': messages[-1]["content"], 'size': size, - 'seed': str(seed) + 'seed': seed } - async with session.get(cls.api_endpoint_imagine2, params=params, proxy=proxy) as response: - response.raise_for_status() - if response.status == 200: - content_type = response.headers.get('Content-Type', '') - if 'image' in content_type: - image_url = str(response.url) - yield ImageResponse(image_url, alt="Airforce generated image") - else: - content = await response.text() - yield f"Unexpected content type: {content_type}\nResponse content: {content}" + full_url = f"{cls.api_endpoint}?{urlencode(params)}" + + async with session.get(full_url, headers=headers, proxy=proxy) as response: + if response.status == 200 and response.headers.get('content-type', '').startswith('image'): + yield ImageResponse(images=[full_url], alt="Generated Image") else: - error_content = await response.text() - yield f"Error: {error_content}" + raise Exception(f"Error: status {response.status}, content type {response.headers.get('content-type')}") diff --git a/g4f/models.py b/g4f/models.py index 1223e785..8788ab77 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -688,6 +688,13 @@ flux = Model( ) +flux_pro = Model( + name = 'flux-pro', + base_provider = 'Flux AI', + best_provider = IterListProvider([Airforce]) + +) + flux_realism = Model( name = 'flux-realism', base_provider = 'Flux AI', @@ -983,6 +990,7 @@ class ModelUtils: ### Flux AI ### 'flux': flux, +'flux-pro': flux_pro, 'flux-realism': flux_realism, 'flux-anime': flux_anime, 'flux-3d': flux_3d, -- cgit v1.2.3 From fece1083182de072281bb09e1e24db3befcf7516 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 8 Nov 2024 21:00:43 +0200 Subject: refactor(g4f/Provider/Prodia.py): Enhance Prodia image generation parameters --- g4f/Provider/Prodia.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/g4f/Provider/Prodia.py b/g4f/Provider/Prodia.py index 543a8b19..fcebf7e3 100644 --- a/g4f/Provider/Prodia.py +++ b/g4f/Provider/Prodia.py @@ -98,6 +98,12 @@ class Prodia(AsyncGeneratorProvider, ProviderModelMixin): model: str, messages: Messages, proxy: str = None, + negative_prompt: str = "", + steps: str = 20, # 1-25 + cfg: str = 7, # 0-20 + seed: str = "-1", + sampler: str = "DPM++ 2M Karras", # "Euler", "Euler a", "Heun", "DPM++ 2M Karras", "DPM++ SDE Karras", "DDIM" + aspect_ratio: str = "square", # "square", "portrait", "landscape" **kwargs ) -> AsyncResult: model = cls.get_model(model) @@ -117,12 +123,12 @@ class Prodia(AsyncGeneratorProvider, ProviderModelMixin): "new": "true", "prompt": prompt, "model": model, - "negative_prompt": kwargs.get("negative_prompt", ""), - "steps": kwargs.get("steps", 20), - "cfg": kwargs.get("cfg", 7), - "seed": kwargs.get("seed", int(time.time())), - "sampler": kwargs.get("sampler", "DPM++ 2M Karras"), - "aspect_ratio": kwargs.get("aspect_ratio", "square") + "negative_prompt": negative_prompt, + "steps": steps, + "cfg": cfg, + "seed": seed, + "sampler": sampler, + "aspect_ratio": aspect_ratio } async with session.get(cls.api_endpoint, params=params, proxy=proxy) as response: -- cgit v1.2.3 From a96f9bdbdfb076e27e1ea36bfc83afef24e0cedc Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Fri, 8 Nov 2024 22:31:53 +0200 Subject: fix(g4f/Provider/Blackbox.py): Improve Blackbox AI response text processing --- g4f/Provider/Blackbox.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 4811c45e..998ec593 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -189,6 +189,8 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): yield image_response return + response_text = re.sub(r'Generated by BLACKBOX.AI, try unlimited chat https://www.blackbox.ai', '', response_text, flags=re.DOTALL) + json_match = re.search(r'\$~~~\$(.*?)\$~~~\$', response_text, re.DOTALL) if json_match: search_results = json.loads(json_match.group(1)) -- cgit v1.2.3 From c1e6276414632761b5ed6a98f61ca4cb7286e582 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 9 Nov 2024 09:48:34 +0200 Subject: Update (g4f/Provider/) --- g4f/Provider/local/Ollama.py | 4 +- g4f/Provider/needs_auth/DeepInfra.py | 4 +- g4f/Provider/needs_auth/Groq.py | 4 +- g4f/Provider/needs_auth/Openai.py | 124 ------------------------------- g4f/Provider/needs_auth/OpenaiAPI.py | 124 +++++++++++++++++++++++++++++++ g4f/Provider/needs_auth/PerplexityApi.py | 4 +- g4f/Provider/needs_auth/ThebApi.py | 6 +- g4f/Provider/needs_auth/__init__.py | 2 +- 8 files changed, 136 insertions(+), 136 deletions(-) delete mode 100644 g4f/Provider/needs_auth/Openai.py create mode 100644 g4f/Provider/needs_auth/OpenaiAPI.py diff --git a/g4f/Provider/local/Ollama.py b/g4f/Provider/local/Ollama.py index c503a46a..de68a218 100644 --- a/g4f/Provider/local/Ollama.py +++ b/g4f/Provider/local/Ollama.py @@ -3,10 +3,10 @@ from __future__ import annotations import requests import os -from ..needs_auth.Openai import Openai +from ..needs_auth.OpenaiAPI import OpenaiAPI from ...typing import AsyncResult, Messages -class Ollama(Openai): +class Ollama(OpenaiAPI): label = "Ollama" url = "https://ollama.com" needs_auth = False diff --git a/g4f/Provider/needs_auth/DeepInfra.py b/g4f/Provider/needs_auth/DeepInfra.py index ebe5bfbf..35e7ca7f 100644 --- a/g4f/Provider/needs_auth/DeepInfra.py +++ b/g4f/Provider/needs_auth/DeepInfra.py @@ -2,9 +2,9 @@ from __future__ import annotations import requests from ...typing import AsyncResult, Messages -from .Openai import Openai +from .OpenaiAPI import OpenaiAPI -class DeepInfra(Openai): +class DeepInfra(OpenaiAPI): label = "DeepInfra" url = "https://deepinfra.com" working = True diff --git a/g4f/Provider/needs_auth/Groq.py b/g4f/Provider/needs_auth/Groq.py index 027d98bf..943fc81a 100644 --- a/g4f/Provider/needs_auth/Groq.py +++ b/g4f/Provider/needs_auth/Groq.py @@ -1,9 +1,9 @@ from __future__ import annotations -from .Openai import Openai +from .OpenaiAPI import OpenaiAPI from ...typing import AsyncResult, Messages -class Groq(Openai): +class Groq(OpenaiAPI): label = "Groq" url = "https://console.groq.com/playground" working = True diff --git a/g4f/Provider/needs_auth/Openai.py b/g4f/Provider/needs_auth/Openai.py deleted file mode 100644 index 382ebada..00000000 --- a/g4f/Provider/needs_auth/Openai.py +++ /dev/null @@ -1,124 +0,0 @@ -from __future__ import annotations - -import json - -from ..helper import filter_none -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin, FinishReason -from ...typing import Union, Optional, AsyncResult, Messages, ImageType -from ...requests import StreamSession, raise_for_status -from ...errors import MissingAuthError, ResponseError -from ...image import to_data_uri - -class Openai(AsyncGeneratorProvider, ProviderModelMixin): - label = "OpenAI API" - url = "https://platform.openai.com" - working = True - needs_auth = True - supports_message_history = True - supports_system_message = True - default_model = "" - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - timeout: int = 120, - image: ImageType = None, - api_key: str = None, - api_base: str = "https://api.openai.com/v1", - temperature: float = None, - max_tokens: int = None, - top_p: float = None, - stop: Union[str, list[str]] = None, - stream: bool = False, - headers: dict = None, - extra_data: dict = {}, - **kwargs - ) -> AsyncResult: - if cls.needs_auth and api_key is None: - raise MissingAuthError('Add a "api_key"') - if image is not None: - if not model and hasattr(cls, "default_vision_model"): - model = cls.default_vision_model - messages[-1]["content"] = [ - { - "type": "image_url", - "image_url": {"url": to_data_uri(image)} - }, - { - "type": "text", - "text": messages[-1]["content"] - } - ] - async with StreamSession( - proxies={"all": proxy}, - headers=cls.get_headers(stream, api_key, headers), - timeout=timeout - ) as session: - data = filter_none( - messages=messages, - model=cls.get_model(model), - temperature=temperature, - max_tokens=max_tokens, - top_p=top_p, - stop=stop, - stream=stream, - **extra_data - ) - async with session.post(f"{api_base.rstrip('/')}/chat/completions", json=data) as response: - await raise_for_status(response) - if not stream: - data = await response.json() - cls.raise_error(data) - choice = data["choices"][0] - if "content" in choice["message"]: - yield choice["message"]["content"].strip() - finish = cls.read_finish_reason(choice) - if finish is not None: - yield finish - else: - first = True - async for line in response.iter_lines(): - if line.startswith(b"data: "): - chunk = line[6:] - if chunk == b"[DONE]": - break - data = json.loads(chunk) - cls.raise_error(data) - choice = data["choices"][0] - if "content" in choice["delta"] and choice["delta"]["content"]: - delta = choice["delta"]["content"] - if first: - delta = delta.lstrip() - if delta: - first = False - yield delta - finish = cls.read_finish_reason(choice) - if finish is not None: - yield finish - - @staticmethod - def read_finish_reason(choice: dict) -> Optional[FinishReason]: - if "finish_reason" in choice and choice["finish_reason"] is not None: - return FinishReason(choice["finish_reason"]) - - @staticmethod - def raise_error(data: dict): - if "error_message" in data: - raise ResponseError(data["error_message"]) - elif "error" in data: - raise ResponseError(f'Error {data["error"]["code"]}: {data["error"]["message"]}') - - @classmethod - def get_headers(cls, stream: bool, api_key: str = None, headers: dict = None) -> dict: - return { - "Accept": "text/event-stream" if stream else "application/json", - "Content-Type": "application/json", - **( - {"Authorization": f"Bearer {api_key}"} - if api_key is not None else {} - ), - **({} if headers is None else headers) - } diff --git a/g4f/Provider/needs_auth/OpenaiAPI.py b/g4f/Provider/needs_auth/OpenaiAPI.py new file mode 100644 index 00000000..116b5f6f --- /dev/null +++ b/g4f/Provider/needs_auth/OpenaiAPI.py @@ -0,0 +1,124 @@ +from __future__ import annotations + +import json + +from ..helper import filter_none +from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin, FinishReason +from ...typing import Union, Optional, AsyncResult, Messages, ImageType +from ...requests import StreamSession, raise_for_status +from ...errors import MissingAuthError, ResponseError +from ...image import to_data_uri + +class OpenaiAPI(AsyncGeneratorProvider, ProviderModelMixin): + label = "OpenAI API" + url = "https://platform.openai.com" + working = True + needs_auth = True + supports_message_history = True + supports_system_message = True + default_model = "" + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + timeout: int = 120, + image: ImageType = None, + api_key: str = None, + api_base: str = "https://api.openai.com/v1", + temperature: float = None, + max_tokens: int = None, + top_p: float = None, + stop: Union[str, list[str]] = None, + stream: bool = False, + headers: dict = None, + extra_data: dict = {}, + **kwargs + ) -> AsyncResult: + if cls.needs_auth and api_key is None: + raise MissingAuthError('Add a "api_key"') + if image is not None: + if not model and hasattr(cls, "default_vision_model"): + model = cls.default_vision_model + messages[-1]["content"] = [ + { + "type": "image_url", + "image_url": {"url": to_data_uri(image)} + }, + { + "type": "text", + "text": messages[-1]["content"] + } + ] + async with StreamSession( + proxies={"all": proxy}, + headers=cls.get_headers(stream, api_key, headers), + timeout=timeout + ) as session: + data = filter_none( + messages=messages, + model=cls.get_model(model), + temperature=temperature, + max_tokens=max_tokens, + top_p=top_p, + stop=stop, + stream=stream, + **extra_data + ) + async with session.post(f"{api_base.rstrip('/')}/chat/completions", json=data) as response: + await raise_for_status(response) + if not stream: + data = await response.json() + cls.raise_error(data) + choice = data["choices"][0] + if "content" in choice["message"]: + yield choice["message"]["content"].strip() + finish = cls.read_finish_reason(choice) + if finish is not None: + yield finish + else: + first = True + async for line in response.iter_lines(): + if line.startswith(b"data: "): + chunk = line[6:] + if chunk == b"[DONE]": + break + data = json.loads(chunk) + cls.raise_error(data) + choice = data["choices"][0] + if "content" in choice["delta"] and choice["delta"]["content"]: + delta = choice["delta"]["content"] + if first: + delta = delta.lstrip() + if delta: + first = False + yield delta + finish = cls.read_finish_reason(choice) + if finish is not None: + yield finish + + @staticmethod + def read_finish_reason(choice: dict) -> Optional[FinishReason]: + if "finish_reason" in choice and choice["finish_reason"] is not None: + return FinishReason(choice["finish_reason"]) + + @staticmethod + def raise_error(data: dict): + if "error_message" in data: + raise ResponseError(data["error_message"]) + elif "error" in data: + raise ResponseError(f'Error {data["error"]["code"]}: {data["error"]["message"]}') + + @classmethod + def get_headers(cls, stream: bool, api_key: str = None, headers: dict = None) -> dict: + return { + "Accept": "text/event-stream" if stream else "application/json", + "Content-Type": "application/json", + **( + {"Authorization": f"Bearer {api_key}"} + if api_key is not None else {} + ), + **({} if headers is None else headers) + } diff --git a/g4f/Provider/needs_auth/PerplexityApi.py b/g4f/Provider/needs_auth/PerplexityApi.py index 3ee65b30..85d7cc98 100644 --- a/g4f/Provider/needs_auth/PerplexityApi.py +++ b/g4f/Provider/needs_auth/PerplexityApi.py @@ -1,9 +1,9 @@ from __future__ import annotations -from .Openai import Openai +from .OpenaiAPI import OpenaiAPI from ...typing import AsyncResult, Messages -class PerplexityApi(Openai): +class PerplexityApi(OpenaiAPI): label = "Perplexity API" url = "https://www.perplexity.ai" working = True diff --git a/g4f/Provider/needs_auth/ThebApi.py b/g4f/Provider/needs_auth/ThebApi.py index 22fc62ed..2006f7ad 100644 --- a/g4f/Provider/needs_auth/ThebApi.py +++ b/g4f/Provider/needs_auth/ThebApi.py @@ -1,7 +1,7 @@ from __future__ import annotations from ...typing import CreateResult, Messages -from .Openai import Openai +from .OpenaiAPI import OpenaiAPI models = { "theb-ai": "TheB.AI", @@ -27,7 +27,7 @@ models = { "qwen-7b-chat": "Qwen 7B" } -class ThebApi(Openai): +class ThebApi(OpenaiAPI): label = "TheB.AI API" url = "https://theb.ai" working = True @@ -58,4 +58,4 @@ class ThebApi(Openai): "top_p": top_p, } } - return super().create_async_generator(model, messages, api_base=api_base, extra_data=data, **kwargs) \ No newline at end of file + return super().create_async_generator(model, messages, api_base=api_base, extra_data=data, **kwargs) diff --git a/g4f/Provider/needs_auth/__init__.py b/g4f/Provider/needs_auth/__init__.py index e979f86d..26c50c0a 100644 --- a/g4f/Provider/needs_auth/__init__.py +++ b/g4f/Provider/needs_auth/__init__.py @@ -11,7 +11,7 @@ from .GeminiPro import GeminiPro from .Groq import Groq from .HuggingFace import HuggingFace from .MetaAI import MetaAI -from .Openai import Openai +from .OpenaiAPI import OpenaiAPI from .OpenaiChat import OpenaiChat from .PerplexityApi import PerplexityApi from .Poe import Poe -- cgit v1.2.3 From b2b978c9de7f2bd7d2dfae374fe3d61290107ae5 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 9 Nov 2024 19:40:49 +0200 Subject: feat(g4f/api/__init__.py): Update image generation response format --- g4f/api/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py index fadeb0d8..b9591b20 100644 --- a/g4f/api/__init__.py +++ b/g4f/api/__init__.py @@ -223,7 +223,7 @@ class Api: response_format=config.response_format ) # Convert Image objects to dictionaries - response_data = [image.to_dict() for image in response.data] + response_data = [{"url": image.url, "b64_json": image.b64_json} for image in response.data] return JSONResponse({"data": response_data}) except Exception as e: logging.exception(e) -- cgit v1.2.3 From d2f36d5ac34bcfd3ef56f032ae756d867d32f99e Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 9 Nov 2024 20:08:17 +0200 Subject: Update (g4f/gui/client/index.html) --- g4f/gui/client/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html index ad87a7f1..8cbe526c 100644 --- a/g4f/gui/client/index.html +++ b/g4f/gui/client/index.html @@ -237,7 +237,7 @@ - +
@@ -252,7 +252,7 @@ - + -- cgit v1.2.3 From 3a15957d221a5e532ffe888e79a1fc2245c0fde1 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sat, 9 Nov 2024 23:44:52 +0200 Subject: Update (g4f/models.py g4f/Provider/airforce/AirforceChat.py docs/providers-and-models.md) --- docs/providers-and-models.md | 4 +- g4f/Provider/airforce/AirforceChat.py | 261 ++++------------------------------ g4f/models.py | 244 ++++++------------------------- 3 files changed, 71 insertions(+), 438 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 0a253475..dc29eb23 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -19,8 +19,8 @@ This document provides an overview of various AI providers and models, including |----------|-------------|--------------|---------------|--------|--------|------| |[ai4chat.co](https://www.ai4chat.co)|`g4f.Provider.Ai4Chat`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aichatfree.info](https://aichatfree.info)|`g4f.Provider.AIChatFree`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[api.airforce](https://api.airforce)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`claude-3-haiku, claude-3-sonnet, claude-3-opus, gpt-4, gpt-4-turbo, gpt-4o-mini, gpt-3.5-turbo, llama-3-70b, llama-3-8b, llama-2-13b, llama-3.1-405b, llama-3.1-70b, llama-3.1-8b, llamaguard-2-8b, llamaguard-7b, llama-3.2-90b, llamaguard-3-8b, llama-3.2-11b, llamaguard-3-11b, llama-3.2-3b, llama-3.2-1b, llama-2-7b, mixtral-8x7b, mixtral-8x22b, mythomax-13b, openchat-3.5, qwen-2-72b, qwen-2-5-7b, qwen-2-5-72b, gemma-2b, gemma-2-9b, gemma-2b-27b, gemini-flash, gemini-pro, dbrx-instruct, deepseek-coder, hermes-2-dpo, hermes-2, openhermes-2.5, wizardlm-2-8x22b, phi-2, solar-10-7b, cosmosrp, lfm-40b, german-7b, zephyr-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[aimathgpt.forit.ai](https://aimathgpt.forit.ai)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`gpt-4o, gpt-4o-mini, gpt-4-turbo, llama-2-7b, llama-3.1-8b, llama-3.1-70b, hermes-2-pro, hermes-2-dpo, phi-2, deepseek-coder, openchat-3.5, openhermes-2.5, cosmosrp, lfm-40b, german-7b, zephyr-7b, neural-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| diff --git a/g4f/Provider/airforce/AirforceChat.py b/g4f/Provider/airforce/AirforceChat.py index 8affbe5c..63a0460f 100644 --- a/g4f/Provider/airforce/AirforceChat.py +++ b/g4f/Provider/airforce/AirforceChat.py @@ -3,6 +3,7 @@ import re from aiohttp import ClientSession import json from typing import List +import requests from ...typing import AsyncResult, Messages from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin @@ -51,258 +52,50 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): supports_system_message = True supports_message_history = True - default_model = 'llama-3-70b-chat' - text_models = [ - # anthropic - 'claude-3-haiku-20240307', - 'claude-3-sonnet-20240229', - 'claude-3-5-sonnet-20240620', - 'claude-3-5-sonnet-20241022', - 'claude-3-opus-20240229', - - # openai - 'chatgpt-4o-latest', - 'gpt-4', - 'gpt-4-turbo', - 'gpt-4o-2024-05-13', - 'gpt-4o-mini-2024-07-18', - 'gpt-4o-mini', - 'gpt-4o-2024-08-06', - 'gpt-3.5-turbo', - 'gpt-3.5-turbo-0125', - 'gpt-3.5-turbo-1106', - 'gpt-4o', - 'gpt-4-turbo-2024-04-09', - 'gpt-4-0125-preview', - 'gpt-4-1106-preview', - - # meta-llama - default_model, - 'llama-3-70b-chat-turbo', - 'llama-3-8b-chat', - 'llama-3-8b-chat-turbo', - 'llama-3-70b-chat-lite', - 'llama-3-8b-chat-lite', - 'llama-2-13b-chat', - 'llama-3.1-405b-turbo', - 'llama-3.1-70b-turbo', - 'llama-3.1-8b-turbo', - 'LlamaGuard-2-8b', - 'llamaguard-7b', - 'Llama-Vision-Free', - 'Llama-Guard-7b', - 'Llama-3.2-90B-Vision-Instruct-Turbo', - 'Meta-Llama-Guard-3-8B', - 'Llama-3.2-11B-Vision-Instruct-Turbo', - 'Llama-Guard-3-11B-Vision-Turbo', - 'Llama-3.2-3B-Instruct-Turbo', - 'Llama-3.2-1B-Instruct-Turbo', - 'llama-2-7b-chat-int8', - 'llama-2-7b-chat-fp16', - 'Llama 3.1 405B Instruct', - 'Llama 3.1 70B Instruct', - 'Llama 3.1 8B Instruct', - - # mistral-ai - 'Mixtral-8x7B-Instruct-v0.1', - 'Mixtral-8x22B-Instruct-v0.1', - 'Mistral-7B-Instruct-v0.1', - 'Mistral-7B-Instruct-v0.2', - 'Mistral-7B-Instruct-v0.3', - - # Gryphe - 'MythoMax-L2-13b-Lite', - 'MythoMax-L2-13b', - - # openchat - 'openchat-3.5-0106', - - # qwen - #'Qwen1.5-72B-Chat', # Empty answer - #'Qwen1.5-110B-Chat', # Empty answer - 'Qwen2-72B-Instruct', - 'Qwen2.5-7B-Instruct-Turbo', - 'Qwen2.5-72B-Instruct-Turbo', - - # google - 'gemma-2b-it', - 'gemma-2-9b-it', - 'gemma-2-27b-it', - - # gemini - 'gemini-1.5-flash', - 'gemini-1.5-pro', - - # databricks - 'dbrx-instruct', - - # deepseek-ai - 'deepseek-coder-6.7b-base', - 'deepseek-coder-6.7b-instruct', - 'deepseek-math-7b-instruct', - - # NousResearch - 'deepseek-math-7b-instruct', - 'Nous-Hermes-2-Mixtral-8x7B-DPO', - 'hermes-2-pro-mistral-7b', - - # teknium - 'openhermes-2.5-mistral-7b', - - # microsoft - 'WizardLM-2-8x22B', - 'phi-2', - - # upstage - 'SOLAR-10.7B-Instruct-v1.0', - - # pawan - 'cosmosrp', - - # liquid - 'lfm-40b-moe', - - # DiscoResearch - 'discolm-german-7b-v1', - - # tiiuae - 'falcon-7b-instruct', - - # defog - 'sqlcoder-7b-2', - - # tinyllama - 'tinyllama-1.1b-chat', - - # HuggingFaceH4 - 'zephyr-7b-beta', - ] + default_model = 'llama-3.1-70b-chat' + response = requests.get('https://api.airforce/models') + data = response.json() + + text_models = [model['id'] for model in data['data']] models = [*text_models] model_aliases = { - # anthropic - "claude-3-haiku": "claude-3-haiku-20240307", - "claude-3-sonnet": "claude-3-sonnet-20240229", - "claude-3.5-sonnet": "claude-3-5-sonnet-20240620", - "claude-3.5-sonnet": "claude-3-5-sonnet-20241022", - "claude-3-opus": "claude-3-opus-20240229", - - # openai - "gpt-4o": "chatgpt-4o-latest", - #"gpt-4": "gpt-4", - #"gpt-4-turbo": "gpt-4-turbo", - "gpt-4o": "gpt-4o-2024-05-13", - "gpt-4o-mini": "gpt-4o-mini-2024-07-18", - #"gpt-4o-mini": "gpt-4o-mini", - "gpt-4o": "gpt-4o-2024-08-06", - "gpt-3.5-turbo": "gpt-3.5-turbo", - "gpt-3.5-turbo": "gpt-3.5-turbo-0125", - "gpt-3.5-turbo": "gpt-3.5-turbo-1106", - #"gpt-4o": "gpt-4o", - "gpt-4-turbo": "gpt-4-turbo-2024-04-09", - "gpt-4": "gpt-4-0125-preview", - "gpt-4": "gpt-4-1106-preview", - - # meta-llama - "llama-3-70b": "llama-3-70b-chat", - "llama-3-8b": "llama-3-8b-chat", - "llama-3-8b": "llama-3-8b-chat-turbo", - "llama-3-70b": "llama-3-70b-chat-lite", - "llama-3-8b": "llama-3-8b-chat-lite", - "llama-2-13b": "llama-2-13b-chat", - "llama-3.1-405b": "llama-3.1-405b-turbo", - "llama-3.1-70b": "llama-3.1-70b-turbo", - "llama-3.1-8b": "llama-3.1-8b-turbo", - "llamaguard-2-8b": "LlamaGuard-2-8b", - "llamaguard-7b": "llamaguard-7b", - #"llama_vision_free": "Llama-Vision-Free", # Unknown - "llamaguard-7b": "Llama-Guard-7b", - "llama-3.2-90b": "Llama-3.2-90B-Vision-Instruct-Turbo", - "llamaguard-3-8b": "Meta-Llama-Guard-3-8B", - "llama-3.2-11b": "Llama-3.2-11B-Vision-Instruct-Turbo", - "llamaguard-3-11b": "Llama-Guard-3-11B-Vision-Turbo", - "llama-3.2-3b": "Llama-3.2-3B-Instruct-Turbo", - "llama-3.2-1b": "Llama-3.2-1B-Instruct-Turbo", - "llama-2-7b": "llama-2-7b-chat-int8", - "llama-2-7b": "llama-2-7b-chat-fp16", - "llama-3.1-405b": "Llama 3.1 405B Instruct", - "llama-3.1-70b": "Llama 3.1 70B Instruct", - "llama-3.1-8b": "Llama 3.1 8B Instruct", - - # mistral-ai - "mixtral-8x7b": "Mixtral-8x7B-Instruct-v0.1", - "mixtral-8x22b": "Mixtral-8x22B-Instruct-v0.1", - "mixtral-8x7b": "Mistral-7B-Instruct-v0.1", - "mixtral-8x7b": "Mistral-7B-Instruct-v0.2", - "mixtral-8x7b": "Mistral-7B-Instruct-v0.3", - - # Gryphe - "mythomax-13b": "MythoMax-L2-13b-Lite", - "mythomax-13b": "MythoMax-L2-13b", - # openchat "openchat-3.5": "openchat-3.5-0106", - - # qwen - #"qwen-1.5-72b": "Qwen1.5-72B-Chat", # Empty answer - #"qwen-1.5-110b": "Qwen1.5-110B-Chat", # Empty answer - "qwen-2-72b": "Qwen2-72B-Instruct", - "qwen-2-5-7b": "Qwen2.5-7B-Instruct-Turbo", - "qwen-2-5-72b": "Qwen2.5-72B-Instruct-Turbo", - - # google - "gemma-2b": "gemma-2b-it", - "gemma-2-9b": "gemma-2-9b-it", - "gemma-2b-27b": "gemma-2-27b-it", - - # gemini - "gemini-flash": "gemini-1.5-flash", - "gemini-pro": "gemini-1.5-pro", - - # databricks - "dbrx-instruct": "dbrx-instruct", - + # deepseek-ai - #"deepseek-coder": "deepseek-coder-6.7b-base", "deepseek-coder": "deepseek-coder-6.7b-instruct", - #"deepseek-math": "deepseek-math-7b-instruct", - + # NousResearch - #"deepseek-math": "deepseek-math-7b-instruct", "hermes-2-dpo": "Nous-Hermes-2-Mixtral-8x7B-DPO", - "hermes-2": "hermes-2-pro-mistral-7b", - + "hermes-2-pro": "hermes-2-pro-mistral-7b", + # teknium "openhermes-2.5": "openhermes-2.5-mistral-7b", - - # microsoft - "wizardlm-2-8x22b": "WizardLM-2-8x22B", - #"phi-2": "phi-2", - - # upstage - "solar-10-7b": "SOLAR-10.7B-Instruct-v1.0", - - # pawan - #"cosmosrp": "cosmosrp", - + # liquid "lfm-40b": "lfm-40b-moe", - + # DiscoResearch "german-7b": "discolm-german-7b-v1", - - # tiiuae - #"falcon-7b": "falcon-7b-instruct", - - # defog - #"sqlcoder-7b": "sqlcoder-7b-2", - - # tinyllama - #"tinyllama-1b": "tinyllama-1.1b-chat", - + + # meta-llama + "llama-2-7b": "llama-2-7b-chat-int8", + "llama-2-7b": "llama-2-7b-chat-fp16", + "llama-3.1-70b": "llama-3.1-70b-chat", + "llama-3.1-8b": "llama-3.1-8b-chat", + "llama-3.1-70b": "llama-3.1-70b-turbo", + "llama-3.1-8b": "llama-3.1-8b-turbo", + + # inferless + "neural-7b": "neural-chat-7b-v3-1", + # HuggingFaceH4 "zephyr-7b": "zephyr-7b-beta", + + # llmplayground.net + #"any-uncensored": "any-uncensored", } @classmethod diff --git a/g4f/models.py b/g4f/models.py index 8788ab77..ec0ebd32 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -98,32 +98,32 @@ default = Model( gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([DarkAI, Airforce, Liaobots, Allyfy]) + best_provider = IterListProvider([DarkAI, Liaobots, Allyfy]) ) # gpt-4 gpt_4o = Model( name = 'gpt-4o', base_provider = 'OpenAI', - best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, Airforce, ChatGpt, Liaobots, OpenaiChat]) + best_provider = IterListProvider([Blackbox, ChatGptEs, DarkAI, ChatGpt, Airforce, Liaobots, OpenaiChat]) ) gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, RubiksAI, Liaobots, ChatGpt, Airforce, OpenaiChat]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, ChatGpt, Airforce, RubiksAI, Liaobots, OpenaiChat]) ) gpt_4_turbo = Model( name = 'gpt-4-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([Liaobots, Airforce, ChatGpt, Bing]) + best_provider = IterListProvider([ChatGpt, Airforce, Liaobots, Bing]) ) gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([Chatgpt4Online, Ai4Chat, ChatGpt, Airforce, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Chatgpt4Online, ChatGpt, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 @@ -161,24 +161,17 @@ llama_2_7b = Model( base_provider = "Meta Llama", best_provider = IterListProvider([Cloudflare, Airforce]) ) - -llama_2_13b = Model( - name = "llama-2-13b", - base_provider = "Meta Llama", - best_provider = Airforce -) - # llama 3 llama_3_8b = Model( name = "llama-3-8b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, Airforce]) + best_provider = IterListProvider([Cloudflare]) ) llama_3_70b = Model( name = "llama-3-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([ReplicateHome, Airforce]) + best_provider = IterListProvider([ReplicateHome]) ) # llama 3.1 @@ -191,84 +184,39 @@ llama_3_1_8b = Model( llama_3_1_70b = Model( name = "llama-3.1-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, TeachAnything, DarkAI, AiMathGPT, RubiksAI, Airforce, HuggingChat, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, TeachAnything, DarkAI, AiMathGPT, Airforce, RubiksAI, HuggingChat, HuggingFace, PerplexityLabs]) ) llama_3_1_405b = Model( name = "llama-3.1-405b", base_provider = "Meta Llama", - best_provider = IterListProvider([Blackbox, DarkAI, Airforce]) + best_provider = IterListProvider([Blackbox, DarkAI]) ) # llama 3.2 llama_3_2_1b = Model( name = "llama-3.2-1b", base_provider = "Meta Llama", - best_provider = IterListProvider([Cloudflare, Airforce]) -) - -llama_3_2_3b = Model( - name = "llama-3.2-3b", - base_provider = "Meta Llama", - best_provider = IterListProvider([Airforce]) + best_provider = IterListProvider([Cloudflare]) ) llama_3_2_11b = Model( name = "llama-3.2-11b", base_provider = "Meta Llama", - best_provider = IterListProvider([HuggingChat, Airforce, HuggingFace]) -) - -llama_3_2_90b = Model( - name = "llama-3.2-90b", - base_provider = "Meta Llama", - best_provider = IterListProvider([Airforce]) -) - - -# llamaguard -llamaguard_7b = Model( - name = "llamaguard-7b", - base_provider = "Meta Llama", - best_provider = Airforce -) - -llamaguard_2_8b = Model( - name = "llamaguard-2-8b", - base_provider = "Meta Llama", - best_provider = Airforce -) - -llamaguard_3_8b = Model( - name = "llamaguard-3-8b", - base_provider = "Meta Llama", - best_provider = Airforce -) - -llamaguard_3_11b = Model( - name = "llamaguard-3-11b", - base_provider = "Meta Llama", - best_provider = Airforce + best_provider = IterListProvider([HuggingChat, HuggingFace]) ) - ### Mistral ### mistral_7b = Model( name = "mistral-7b", base_provider = "Mistral", - best_provider = IterListProvider([Free2GPT, Airforce]) + best_provider = IterListProvider([Free2GPT]) ) mixtral_8x7b = Model( name = "mixtral-8x7b", base_provider = "Mistral", - best_provider = IterListProvider([DDG, ReplicateHome, Airforce]) -) - -mixtral_8x22b = Model( - name = "mixtral-8x22b", - base_provider = "Mistral", - best_provider = IterListProvider([Airforce]) + best_provider = IterListProvider([DDG, ReplicateHome]) ) mistral_nemo = Model( @@ -279,8 +227,8 @@ mistral_nemo = Model( ### NousResearch ### -hermes_2 = Model( - name = "hermes-2", +hermes_2_pro = Model( + name = "hermes-2-pro", base_provider = "NousResearch", best_provider = Airforce ) @@ -305,12 +253,6 @@ phi_2 = Model( best_provider = IterListProvider([Cloudflare, Airforce]) ) -phi_3_medium_4k = Model( - name = "phi-3-medium-4k", - base_provider = "Microsoft", - best_provider = None -) - phi_3_5_mini = Model( name = "phi-3.5-mini", base_provider = "Microsoft", @@ -322,13 +264,13 @@ phi_3_5_mini = Model( gemini_pro = Model( name = 'gemini-pro', base_provider = 'Google DeepMind', - best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, FreeGpt, Airforce, Liaobots]) + best_provider = IterListProvider([GeminiPro, Blackbox, AIChatFree, FreeGpt, Liaobots]) ) gemini_flash = Model( name = 'gemini-flash', base_provider = 'Google DeepMind', - best_provider = IterListProvider([Blackbox, GizAI, Airforce, Liaobots]) + best_provider = IterListProvider([Blackbox, GizAI, Liaobots]) ) gemini = Model( @@ -341,13 +283,7 @@ gemini = Model( gemma_2b = Model( name = 'gemma-2b', base_provider = 'Google', - best_provider = IterListProvider([ReplicateHome, Airforce]) -) - -gemma_2b_27b = Model( - name = 'gemma-2b-27b', - base_provider = 'Google', - best_provider = IterListProvider([Airforce]) + best_provider = IterListProvider([ReplicateHome]) ) gemma_7b = Model( @@ -356,13 +292,6 @@ gemma_7b = Model( best_provider = Cloudflare ) -# gemma 2 -gemma_2_9b = Model( - name = 'gemma-2-9b', - base_provider = 'Google', - best_provider = Airforce -) - ### Anthropic ### claude_2_1 = Model( @@ -419,15 +348,6 @@ blackboxai_pro = Model( best_provider = Blackbox ) - -### Databricks ### -dbrx_instruct = Model( - name = 'dbrx-instruct', - base_provider = 'Databricks', - best_provider = IterListProvider([Airforce]) -) - - ### CohereForAI ### command_r_plus = Model( name = 'command-r-plus', @@ -466,28 +386,10 @@ qwen_1_5_14b = Model( qwen_2_72b = Model( name = 'qwen-2-72b', base_provider = 'Qwen', - best_provider = IterListProvider([DeepInfraChat, HuggingChat, Airforce, HuggingFace]) -) - -qwen_2_5_7b = Model( - name = 'qwen-2-5-7b', - base_provider = 'Qwen', - best_provider = Airforce -) - -qwen_2_5_72b = Model( - name = 'qwen-2-5-72b', - base_provider = 'Qwen', - best_provider = Airforce + best_provider = IterListProvider([DeepInfraChat, HuggingChat, HuggingFace]) ) ### Upstage ### -solar_10_7b = Model( - name = 'solar-10-7b', - base_provider = 'Upstage', - best_provider = Airforce -) - solar_mini = Model( name = 'solar-mini', base_provider = 'Upstage', @@ -519,7 +421,7 @@ deepseek_coder = Model( wizardlm_2_8x22b = Model( name = 'wizardlm-2-8x22b', base_provider = 'WizardLM', - best_provider = IterListProvider([DeepInfraChat, Airforce]) + best_provider = IterListProvider([DeepInfraChat]) ) ### Yorickvp ### @@ -529,44 +431,11 @@ llava_13b = Model( best_provider = ReplicateHome ) - -### OpenBMB ### -minicpm_llama_3_v2_5 = Model( - name = 'minicpm-llama-3-v2.5', - base_provider = 'OpenBMB', - best_provider = None -) - - -### Lzlv ### -lzlv_70b = Model( - name = 'lzlv-70b', - base_provider = 'Lzlv', - best_provider = None -) - - ### OpenChat ### -openchat_3_6_8b = Model( - name = 'openchat-3.6-8b', +openchat_3_5 = Model( + name = 'openchat-3.5', base_provider = 'OpenChat', - best_provider = None -) - - -### Phind ### -phind_codellama_34b_v2 = Model( - name = 'phind-codellama-34b-v2', - base_provider = 'Phind', - best_provider = None -) - - -### Cognitive Computations ### -dolphin_2_9_1_llama_3_70b = Model( - name = 'dolphin-2.9.1-llama-3-70b', - base_provider = 'Cognitive Computations', - best_provider = None + best_provider = Airforce ) @@ -650,6 +519,13 @@ zephyr_7b = Model( best_provider = Airforce ) +### Inferless ### +neural_7b = Model( + name = 'neural-7b', + base_provider = 'inferless', + best_provider = Airforce +) + ############# @@ -660,7 +536,7 @@ zephyr_7b = Model( sdxl = Model( name = 'sdxl', base_provider = 'Stability AI', - best_provider = IterListProvider([ReplicateHome, Airforce]) + best_provider = IterListProvider([ReplicateHome]) ) @@ -740,7 +616,7 @@ flux_4o = Model( flux_schnell = Model( name = 'flux-schnell', base_provider = 'Flux AI', - best_provider = IterListProvider([ReplicateHome]) + best_provider = ReplicateHome ) @@ -786,7 +662,6 @@ class ModelUtils: # llama-2 'llama-2-7b': llama_2_7b, -'llama-2-13b': llama_2_13b, # llama-3 'llama-3-8b': llama_3_8b, @@ -799,33 +674,23 @@ class ModelUtils: # llama-3.2 'llama-3.2-1b': llama_3_2_1b, -'llama-3.2-3b': llama_3_2_3b, 'llama-3.2-11b': llama_3_2_11b, -'llama-3.2-90b': llama_3_2_90b, - -# llamaguard -'llamaguard-7b': llamaguard_7b, -'llamaguard-2-8b': llamaguard_2_8b, -'llamaguard-3-8b': llamaguard_3_8b, -'llamaguard-3-11b': llamaguard_3_11b, - + ### Mistral ### 'mistral-7b': mistral_7b, 'mixtral-8x7b': mixtral_8x7b, -'mixtral-8x22b': mixtral_8x22b, 'mistral-nemo': mistral_nemo, ### NousResearch ### -'hermes-2': hermes_2, +'hermes-2-pro': hermes_2_pro, 'hermes-2-dpo': hermes_2_dpo, 'hermes-3': hermes_3, ### Microsoft ### 'phi-2': phi_2, -'phi_3_medium-4k': phi_3_medium_4k, 'phi-3.5-mini': phi_3_5_mini, @@ -837,12 +702,8 @@ class ModelUtils: # gemma 'gemma-2b': gemma_2b, -'gemma-2b-27b': gemma_2b_27b, 'gemma-7b': gemma_7b, -# gemma-2 -'gemma-2-9b': gemma_2_9b, - ### Anthropic ### 'claude-2.1': claude_2_1, @@ -868,10 +729,6 @@ class ModelUtils: ### CohereForAI ### 'command-r+': command_r_plus, - -### Databricks ### -'dbrx-instruct': dbrx_instruct, - ### GigaChat ### 'gigachat': gigachat, @@ -887,14 +744,9 @@ class ModelUtils: # qwen 2 'qwen-2-72b': qwen_2_72b, - -# qwen 2-5 -'qwen-2-5-7b': qwen_2_5_7b, -'qwen-2-5-72b': qwen_2_5_72b, - + ### Upstage ### -'solar-10-7b': solar_10_7b, 'solar-mini': solar_mini, 'solar-pro': solar_pro, @@ -913,27 +765,11 @@ class ModelUtils: ### WizardLM ### 'wizardlm-2-8x22b': wizardlm_2_8x22b, - - -### OpenBMB ### -'minicpm-llama-3-v2.5': minicpm_llama_3_v2_5, - - -### Lzlv ### -'lzlv-70b': lzlv_70b, - + ### OpenChat ### -'openchat-3.6-8b': openchat_3_6_8b, - - -### Phind ### -'phind-codellama-34b-v2': phind_codellama_34b_v2, - - -### Cognitive Computations ### -'dolphin-2.9.1-llama-3-70b': dolphin_2_9_1_llama_3_70b, - +'openchat-3.5': openchat_3_5, + ### x.ai ### 'grok-2': grok_2, @@ -972,6 +808,10 @@ class ModelUtils: ### HuggingFaceH4 ### 'zephyr-7b': zephyr_7b, + + +### Inferless ### +'neural-7b': neural_7b, -- cgit v1.2.3 From 5d75ab6cee5e32c5a338c39d2a9a177be675ce72 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 10 Nov 2024 12:02:11 +0200 Subject: Update (g4f/Provider/airforce/AirforceImage.py) --- g4f/Provider/airforce/AirforceImage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/g4f/Provider/airforce/AirforceImage.py b/g4f/Provider/airforce/AirforceImage.py index 443c0f6b..62d42b4f 100644 --- a/g4f/Provider/airforce/AirforceImage.py +++ b/g4f/Provider/airforce/AirforceImage.py @@ -25,7 +25,6 @@ class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin): 'flux-pixel', 'flux-4o', 'any-dark', - 'any-uncensored', 'stable-diffusion-xl-base', 'stable-diffusion-xl-lightning', 'Flux-1.1-Pro', -- cgit v1.2.3 From 9a0346199bdcee36e5ffb4b9ef818f60dfeb68f1 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Sun, 10 Nov 2024 20:31:11 +0200 Subject: Update (g4f/Provider/airforce/AirforceChat.py) --- g4f/Provider/airforce/AirforceChat.py | 186 +++++++++++++++++----------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/g4f/Provider/airforce/AirforceChat.py b/g4f/Provider/airforce/AirforceChat.py index 63a0460f..fc375270 100644 --- a/g4f/Provider/airforce/AirforceChat.py +++ b/g4f/Provider/airforce/AirforceChat.py @@ -1,14 +1,15 @@ from __future__ import annotations import re -from aiohttp import ClientSession import json -from typing import List +from aiohttp import ClientSession import requests +from typing import List from ...typing import AsyncResult, Messages from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin from ..helper import format_prompt +# Helper function to clean the response def clean_response(text: str) -> str: """Clean response from unwanted patterns.""" patterns = [ @@ -16,35 +17,27 @@ def clean_response(text: str) -> str: r"Rate limit \(\d+\/minute\) exceeded\. Join our discord for more: .+https:\/\/discord\.com\/invite\/\S+", r"Rate limit \(\d+\/hour\) exceeded\. Join our discord for more: https:\/\/discord\.com\/invite\/\S+", r"", # zephyr-7b-beta + r"\[ERROR\] '\w{8}-\w{4}-\w{4}-\w{4}-\w{12}'", # Matches [ERROR] 'UUID' ] - for pattern in patterns: text = re.sub(pattern, '', text) return text.strip() -def split_message(message: dict, chunk_size: int = 995) -> List[dict]: - """Split a message into chunks of specified size.""" - content = message.get('content', '') - if len(content) <= chunk_size: - return [message] - +def split_message(message: str, max_length: int = 1000) -> List[str]: + """Splits the message into chunks of a given length (max_length)""" + # Split the message into smaller chunks to avoid exceeding the limit chunks = [] - while content: - chunk = content[:chunk_size] - content = content[chunk_size:] - chunks.append({ - 'role': message['role'], - 'content': chunk - }) + while len(message) > max_length: + # Find the last space or punctuation before max_length to avoid cutting words + split_point = message.rfind(' ', 0, max_length) + if split_point == -1: # No space found, split at max_length + split_point = max_length + chunks.append(message[:split_point]) + message = message[split_point:].strip() + if message: + chunks.append(message) # Append the remaining part of the message return chunks -def split_messages(messages: Messages, chunk_size: int = 995) -> Messages: - """Split all messages that exceed chunk_size into smaller messages.""" - result = [] - for message in messages: - result.extend(split_message(message, chunk_size)) - return result - class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): label = "AirForce Chat" api_endpoint = "https://api.airforce/chat/completions" @@ -57,45 +50,44 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): data = response.json() text_models = [model['id'] for model in data['data']] - models = [*text_models] - + model_aliases = { - # openchat - "openchat-3.5": "openchat-3.5-0106", - - # deepseek-ai - "deepseek-coder": "deepseek-coder-6.7b-instruct", - - # NousResearch - "hermes-2-dpo": "Nous-Hermes-2-Mixtral-8x7B-DPO", - "hermes-2-pro": "hermes-2-pro-mistral-7b", - - # teknium - "openhermes-2.5": "openhermes-2.5-mistral-7b", - - # liquid - "lfm-40b": "lfm-40b-moe", - - # DiscoResearch - "german-7b": "discolm-german-7b-v1", - - # meta-llama - "llama-2-7b": "llama-2-7b-chat-int8", - "llama-2-7b": "llama-2-7b-chat-fp16", - "llama-3.1-70b": "llama-3.1-70b-chat", - "llama-3.1-8b": "llama-3.1-8b-chat", - "llama-3.1-70b": "llama-3.1-70b-turbo", - "llama-3.1-8b": "llama-3.1-8b-turbo", - - # inferless - "neural-7b": "neural-chat-7b-v3-1", - - # HuggingFaceH4 - "zephyr-7b": "zephyr-7b-beta", - - # llmplayground.net - #"any-uncensored": "any-uncensored", + # openchat + "openchat-3.5": "openchat-3.5-0106", + + # deepseek-ai + "deepseek-coder": "deepseek-coder-6.7b-instruct", + + # NousResearch + "hermes-2-dpo": "Nous-Hermes-2-Mixtral-8x7B-DPO", + "hermes-2-pro": "hermes-2-pro-mistral-7b", + + # teknium + "openhermes-2.5": "openhermes-2.5-mistral-7b", + + # liquid + "lfm-40b": "lfm-40b-moe", + + # DiscoResearch + "german-7b": "discolm-german-7b-v1", + + # meta-llama + "llama-2-7b": "llama-2-7b-chat-int8", + "llama-2-7b": "llama-2-7b-chat-fp16", + "llama-3.1-70b": "llama-3.1-70b-chat", + "llama-3.1-8b": "llama-3.1-8b-chat", + "llama-3.1-70b": "llama-3.1-70b-turbo", + "llama-3.1-8b": "llama-3.1-8b-turbo", + + # inferless + "neural-7b": "neural-chat-7b-v3-1", + + # HuggingFaceH4 + "zephyr-7b": "zephyr-7b-beta", + + # llmplayground.net + #"any-uncensored": "any-uncensored", } @classmethod @@ -112,8 +104,6 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): ) -> AsyncResult: model = cls.get_model(model) - chunked_messages = split_messages(messages) - headers = { 'accept': '*/*', 'accept-language': 'en-US,en;q=0.9', @@ -133,36 +123,46 @@ class AirforceChat(AsyncGeneratorProvider, ProviderModelMixin): 'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36' } - data = { - "messages": chunked_messages, - "model": model, - "max_tokens": max_tokens, - "temperature": temperature, - "top_p": top_p, - "stream": stream - } + # Format the messages for the API + formatted_messages = format_prompt(messages) + message_chunks = split_message(formatted_messages) + + full_response = "" + for chunk in message_chunks: + data = { + "messages": [{"role": "user", "content": chunk}], + "model": model, + "max_tokens": max_tokens, + "temperature": temperature, + "top_p": top_p, + "stream": stream + } + + async with ClientSession(headers=headers) as session: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() - async with ClientSession(headers=headers) as session: - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - text = "" - if stream: - async for line in response.content: - line = line.decode('utf-8') - if line.startswith('data: '): - json_str = line[6:] - try: - chunk = json.loads(json_str) - if 'choices' in chunk and chunk['choices']: - content = chunk['choices'][0].get('delta', {}).get('content', '') - text += content - except json.JSONDecodeError as e: - print(f"Error decoding JSON: {json_str}, Error: {e}") - elif line.strip() == "[DONE]": - break - yield clean_response(text) - else: - response_json = await response.json() - text = response_json["choices"][0]["message"]["content"] - yield clean_response(text) + text = "" + if stream: + async for line in response.content: + line = line.decode('utf-8').strip() + if line.startswith('data: '): + json_str = line[6:] + try: + if json_str and json_str != "[DONE]": + chunk = json.loads(json_str) + if 'choices' in chunk and chunk['choices']: + content = chunk['choices'][0].get('delta', {}).get('content', '') + text += content + except json.JSONDecodeError as e: + print(f"Error decoding JSON: {json_str}, Error: {e}") + elif line == "[DONE]": + break + full_response += clean_response(text) + else: + response_json = await response.json() + text = response_json["choices"][0]["message"]["content"] + full_response += clean_response(text) + # Return the complete response after all chunks + yield full_response -- cgit v1.2.3 From c74a6943a8bc03a212643e430a1b873da89f81a6 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 10:36:56 +0200 Subject: Update (g4f/Provider/Cloudflare.py) --- g4f/Provider/Cloudflare.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/g4f/Provider/Cloudflare.py b/g4f/Provider/Cloudflare.py index 2443f616..34d7c585 100644 --- a/g4f/Provider/Cloudflare.py +++ b/g4f/Provider/Cloudflare.py @@ -21,10 +21,7 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): supports_message_history = True default_model = '@cf/meta/llama-3.1-8b-instruct-awq' - models = [ - '@cf/tiiuae/falcon-7b-instruct', # Specific answer - - + models = [ '@hf/google/gemma-7b-it', '@cf/meta/llama-2-7b-chat-fp16', @@ -120,9 +117,12 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): scraper = cloudscraper.create_scraper() + + prompt = messages[-1]['content'] + data = { "messages": [ - {"role": "user", "content": format_prompt(messages)} + {"role": "user", "content": prompt} ], "lora": None, "model": model, @@ -147,7 +147,7 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): response.raise_for_status() - skip_tokens = ["", "", "[DONE]", "<|endoftext|>", "<|end|>"] + skip_tokens = ["", "", "", "[DONE]", "<|endoftext|>", "<|end|>"] filtered_response = "" for line in response.iter_lines(): -- cgit v1.2.3 From 8e8410c8989a21b6aad1c60f01600ce1d9dac2e7 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 19:16:02 +0200 Subject: Update (g4f/models.py g4f/Provider/Cloudflare.py) --- g4f/Provider/Cloudflare.py | 47 ++++++++++++++-------------------------------- g4f/models.py | 31 +----------------------------- 2 files changed, 15 insertions(+), 63 deletions(-) diff --git a/g4f/Provider/Cloudflare.py b/g4f/Provider/Cloudflare.py index 34d7c585..8fb37bef 100644 --- a/g4f/Provider/Cloudflare.py +++ b/g4f/Provider/Cloudflare.py @@ -1,5 +1,6 @@ from __future__ import annotations +from aiohttp import ClientSession import asyncio import json import uuid @@ -10,7 +11,6 @@ from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider, ProviderModelMixin from .helper import format_prompt - class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): label = "Cloudflare AI" url = "https://playground.ai.cloudflare.com" @@ -22,8 +22,6 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): default_model = '@cf/meta/llama-3.1-8b-instruct-awq' models = [ - '@hf/google/gemma-7b-it', - '@cf/meta/llama-2-7b-chat-fp16', '@cf/meta/llama-2-7b-chat-int8', @@ -38,21 +36,12 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): '@hf/mistral/mistral-7b-instruct-v0.2', - '@cf/microsoft/phi-2', - - '@cf/qwen/qwen1.5-0.5b-chat', - '@cf/qwen/qwen1.5-1.8b-chat', - '@cf/qwen/qwen1.5-14b-chat-awq', '@cf/qwen/qwen1.5-7b-chat-awq', '@cf/defog/sqlcoder-7b-2', ] model_aliases = { - #"falcon-7b": "@cf/tiiuae/falcon-7b-instruct", - - "gemma-7b": "@hf/google/gemma-7b-it", - "llama-2-7b": "@cf/meta/llama-2-7b-chat-fp16", "llama-2-7b": "@cf/meta/llama-2-7b-chat-int8", @@ -65,11 +54,6 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): "llama-3.2-1b": "@cf/meta/llama-3.2-1b-instruct", - "phi-2": "@cf/microsoft/phi-2", - - "qwen-1.5-0-5b": "@cf/qwen/qwen1.5-0.5b-chat", - "qwen-1.5-1-8b": "@cf/qwen/qwen1.5-1.8b-chat", - "qwen-1.5-14b": "@cf/qwen/qwen1.5-14b-chat-awq", "qwen-1.5-7b": "@cf/qwen/qwen1.5-7b-chat-awq", #"sqlcoder-7b": "@cf/defog/sqlcoder-7b-2", @@ -90,6 +74,7 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): model: str, messages: Messages, proxy: str = None, + max_tokens: int = 2048, **kwargs ) -> AsyncResult: model = cls.get_model(model) @@ -117,20 +102,19 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): scraper = cloudscraper.create_scraper() - - prompt = messages[-1]['content'] - data = { "messages": [ - {"role": "user", "content": prompt} + {"role": "user", "content": format_prompt(messages)} ], "lora": None, "model": model, - "max_tokens": 2048, + "max_tokens": max_tokens, "stream": True } - max_retries = 5 + max_retries = 3 + full_response = "" + for attempt in range(max_retries): try: response = scraper.post( @@ -138,31 +122,28 @@ class Cloudflare(AsyncGeneratorProvider, ProviderModelMixin): headers=headers, cookies=cookies, json=data, - stream=True + stream=True, + proxies={'http': proxy, 'https': proxy} if proxy else None ) if response.status_code == 403: await asyncio.sleep(2 ** attempt) continue - + response.raise_for_status() - skip_tokens = ["", "", "", "[DONE]", "<|endoftext|>", "<|end|>"] - filtered_response = "" - for line in response.iter_lines(): if line.startswith(b'data: '): if line == b'data: [DONE]': + if full_response: + yield full_response break try: content = json.loads(line[6:].decode('utf-8')) - response_text = content['response'] - if not any(token in response_text for token in skip_tokens): - filtered_response += response_text + if 'response' in content and content['response'] != '': + yield content['response'] except Exception: continue - - yield filtered_response.strip() break except Exception as e: if attempt == max_retries - 1: diff --git a/g4f/models.py b/g4f/models.py index ec0ebd32..3b82270e 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -250,7 +250,7 @@ hermes_3 = Model( phi_2 = Model( name = "phi-2", base_provider = "Microsoft", - best_provider = IterListProvider([Cloudflare, Airforce]) + best_provider = IterListProvider([Airforce]) ) phi_3_5_mini = Model( @@ -286,12 +286,6 @@ gemma_2b = Model( best_provider = IterListProvider([ReplicateHome]) ) -gemma_7b = Model( - name = 'gemma-7b', - base_provider = 'Google', - best_provider = Cloudflare -) - ### Anthropic ### claude_2_1 = Model( @@ -358,30 +352,12 @@ command_r_plus = Model( ### Qwen ### # qwen 1_5 -qwen_1_5_5b = Model( - name = 'qwen-1.5-5b', - base_provider = 'Qwen', - best_provider = Cloudflare -) - qwen_1_5_7b = Model( name = 'qwen-1.5-7b', base_provider = 'Qwen', best_provider = Cloudflare ) -qwen_1_5_8b = Model( - name = 'qwen-1.5-8b', - base_provider = 'Qwen', - best_provider = Cloudflare -) - -qwen_1_5_14b = Model( - name = 'qwen-1.5-14b', - base_provider = 'Qwen', - best_provider = IterListProvider([Cloudflare]) -) - # qwen 2 qwen_2_72b = Model( name = 'qwen-2-72b', @@ -690,7 +666,6 @@ class ModelUtils: ### Microsoft ### -'phi-2': phi_2, 'phi-3.5-mini': phi_3_5_mini, @@ -702,7 +677,6 @@ class ModelUtils: # gemma 'gemma-2b': gemma_2b, -'gemma-7b': gemma_7b, ### Anthropic ### @@ -737,10 +711,7 @@ class ModelUtils: ### Qwen ### # qwen 1.5 -'qwen-1.5-5b': qwen_1_5_5b, 'qwen-1.5-7b': qwen_1_5_7b, -'qwen-1.5-8b': qwen_1_5_8b, -'qwen-1.5-14b': qwen_1_5_14b, # qwen 2 'qwen-2-72b': qwen_2_72b, -- cgit v1.2.3 From 562a5c957997a1bb68a43b092664ac26c5c46c26 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 19:57:35 +0200 Subject: feat(g4f/Provider/airforce/AirforceImage.py): Dynamically fetch image models from API --- g4f/Provider/airforce/AirforceImage.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/g4f/Provider/airforce/AirforceImage.py b/g4f/Provider/airforce/AirforceImage.py index 62d42b4f..b74bc364 100644 --- a/g4f/Provider/airforce/AirforceImage.py +++ b/g4f/Provider/airforce/AirforceImage.py @@ -3,6 +3,7 @@ from __future__ import annotations from aiohttp import ClientSession from urllib.parse import urlencode import random +import requests from ...typing import AsyncResult, Messages from ...image import ImageResponse @@ -16,20 +17,13 @@ class AirforceImage(AsyncGeneratorProvider, ProviderModelMixin): #working = True default_model = 'flux' - image_models = [ - 'flux', - 'flux-realism', - 'flux-anime', - 'flux-3d', - 'flux-disney', - 'flux-pixel', - 'flux-4o', - 'any-dark', - 'stable-diffusion-xl-base', - 'stable-diffusion-xl-lightning', - 'Flux-1.1-Pro', - ] - models = [*image_models] + + response = requests.get('https://api.airforce/imagine/models') + data = response.json() + + image_models = data + + models = [*image_models, "stable-diffusion-xl-base", "stable-diffusion-xl-lightning", "Flux-1.1-Pro"] model_aliases = { "sdxl": "stable-diffusion-xl-base", -- cgit v1.2.3 From 82b8c22b0b90590b7aae2685852910193a0f379d Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 20:21:03 +0200 Subject: Update (g4f/models.py g4f/Provider/airforce/AirforceChat.py docs/providers-and-models.md) --- docs/providers-and-models.md | 2 +- g4f/Provider/Airforce.py | 2 +- g4f/Provider/airforce/AirforceChat.py | 8 ++++++-- g4f/models.py | 14 +------------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index dc29eb23..2a53cb22 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -20,7 +20,7 @@ This document provides an overview of various AI providers and models, including |[ai4chat.co](https://www.ai4chat.co)|`g4f.Provider.Ai4Chat`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aichatfree.info](https://aichatfree.info)|`g4f.Provider.AIChatFree`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aimathgpt.forit.ai](https://aimathgpt.forit.ai)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`gpt-4o, gpt-4o-mini, gpt-4-turbo, llama-2-7b, llama-3.1-8b, llama-3.1-70b, hermes-2-pro, hermes-2-dpo, phi-2, deepseek-coder, openchat-3.5, openhermes-2.5, cosmosrp, lfm-40b, german-7b, zephyr-7b, neural-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`gpt-4o, gpt-4o-mini, gpt-4-turbo, llama-2-7b, llama-3.1-8b, llama-3.1-70b, hermes-2-pro, hermes-2-dpo, phi-2, deepseek-coder, openchat-3.5, openhermes-2.5, lfm-40b, german-7b, zephyr-7b, neural-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[bing.com](https://bing.com/chat)|`g4f.Provider.Bing`|`gpt-4`|✔|`gpt-4-vision`|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌+✔| diff --git a/g4f/Provider/Airforce.py b/g4f/Provider/Airforce.py index 8ea0a174..c7ae44c0 100644 --- a/g4f/Provider/Airforce.py +++ b/g4f/Provider/Airforce.py @@ -20,7 +20,7 @@ class Airforce(AsyncGeneratorProvider, ProviderModelMixin): supports_message_history = AirforceChat.supports_message_history default_model = AirforceChat.default_model - models = [*AirforceChat.text_models, *AirforceImage.image_models] + models = [*AirforceChat.models, *AirforceImage.models] model_aliases = { **AirforceChat.model_aliases, diff --git a/g4f/Provider/airforce/AirforceChat.py b/g4f/Provider/airforce/AirforceChat.py index fc375270..cec911a3 100644 --- a/g4f/Provider/airforce/AirforceChat.py +++ b/g4f/Provider/airforce/AirforceChat.py @@ -1,8 +1,8 @@ from __future__ import annotations import re import json -from aiohttp import ClientSession import requests +from aiohttp import ClientSession from typing import List from ...typing import AsyncResult, Messages @@ -21,7 +21,11 @@ def clean_response(text: str) -> str: ] for pattern in patterns: text = re.sub(pattern, '', text) - return text.strip() + + # Remove the <|im_end|> token if present + text = text.replace("<|im_end|>", "").strip() + + return text def split_message(message: str, max_length: int = 1000) -> List[str]: """Splits the message into chunks of a given length (max_length)""" diff --git a/g4f/models.py b/g4f/models.py index 3b82270e..87a076a8 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -463,15 +463,6 @@ openhermes_2_5 = Model( best_provider = Airforce ) - -### Pawan ### -cosmosrp = Model( - name = 'cosmosrp', - base_provider = 'Pawan', - best_provider = Airforce -) - - ### Liquid ### lfm_40b = Model( name = 'lfm-40b', @@ -666,6 +657,7 @@ class ModelUtils: ### Microsoft ### +'phi-2': phi_2, 'phi-3.5-mini': phi_3_5_mini, @@ -764,10 +756,6 @@ class ModelUtils: ### Teknium ### 'openhermes-2.5': openhermes_2_5, - -### Pawan ### -'cosmosrp': cosmosrp, - ### Liquid ### 'lfm-40b': lfm_40b, -- cgit v1.2.3 From 618bb78fe9dd23ef05b0553e0221e7b3f81c8e0b Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 20:30:37 +0200 Subject: Removed provider (g4f/Provider/AiMathGPT.py) --- docs/providers-and-models.md | 1 - g4f/Provider/AiMathGPT.py | 74 -------------------------------------------- g4f/Provider/__init__.py | 1 - g4f/models.py | 4 +-- 4 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 g4f/Provider/AiMathGPT.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 2a53cb22..17f47378 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -19,7 +19,6 @@ This document provides an overview of various AI providers and models, including |----------|-------------|--------------|---------------|--------|--------|------| |[ai4chat.co](https://www.ai4chat.co)|`g4f.Provider.Ai4Chat`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aichatfree.info](https://aichatfree.info)|`g4f.Provider.AIChatFree`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[aimathgpt.forit.ai](https://aimathgpt.forit.ai)|`g4f.Provider.AiMathGPT`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`gpt-4o, gpt-4o-mini, gpt-4-turbo, llama-2-7b, llama-3.1-8b, llama-3.1-70b, hermes-2-pro, hermes-2-dpo, phi-2, deepseek-coder, openchat-3.5, openhermes-2.5, lfm-40b, german-7b, zephyr-7b, neural-7b`|`flux, flux-realism', flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, sdxl`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[aiuncensored.info](https://www.aiuncensored.info)|`g4f.Provider.AIUncensored`|✔|✔|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[allyfy.chat](https://allyfy.chat/)|`g4f.Provider.Allyfy`|`gpt-3.5-turbo`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| diff --git a/g4f/Provider/AiMathGPT.py b/g4f/Provider/AiMathGPT.py deleted file mode 100644 index 90931691..00000000 --- a/g4f/Provider/AiMathGPT.py +++ /dev/null @@ -1,74 +0,0 @@ -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 AiMathGPT(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://aimathgpt.forit.ai" - api_endpoint = "https://aimathgpt.forit.ai/api/ai" - working = True - supports_stream = False - supports_system_message = True - supports_message_history = True - - default_model = 'llama3' - models = ['llama3'] - - model_aliases = {"llama-3.1-70b": "llama3",} - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - 'accept': '*/*', - 'accept-language': 'en-US,en;q=0.9', - 'cache-control': 'no-cache', - 'content-type': 'application/json', - 'origin': cls.url, - 'pragma': 'no-cache', - 'priority': 'u=1, i', - 'referer': f'{cls.url}/', - 'sec-ch-ua': '"Chromium";v="129", "Not=A?Brand";v="8"', - '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/129.0.0.0 Safari/537.36' - } - - async with ClientSession(headers=headers) as session: - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ], - "model": model - } - - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - response_data = await response.json() - filtered_response = response_data['result']['response'] - yield filtered_response diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 368c4a25..60942581 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -13,7 +13,6 @@ from .local import * from .AIUncensored import AIUncensored from .Allyfy import Allyfy -from .AiMathGPT import AiMathGPT from .Airforce import Airforce from .Bing import Bing from .Blackbox import Blackbox diff --git a/g4f/models.py b/g4f/models.py index 87a076a8..8ce3688e 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -6,7 +6,6 @@ from .Provider import IterListProvider, ProviderType from .Provider import ( Ai4Chat, AIChatFree, - AiMathGPT, Airforce, AIUncensored, Allyfy, @@ -81,7 +80,6 @@ default = Model( ChatGptEs, ChatifyAI, Cloudflare, - AiMathGPT, AIUncensored, DarkAI, ]) @@ -184,7 +182,7 @@ llama_3_1_8b = Model( llama_3_1_70b = Model( name = "llama-3.1-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, TeachAnything, DarkAI, AiMathGPT, Airforce, RubiksAI, HuggingChat, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, TeachAnything, DarkAI, Airforce, RubiksAI, HuggingChat, HuggingFace, PerplexityLabs]) ) llama_3_1_405b = Model( -- cgit v1.2.3 From 5e4485f9a8e82bb14c6ad85be14dd6fece694a99 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 20:38:44 +0200 Subject: Update (docs/providers-and-models.md g4f/Provider/) --- docs/providers-and-models.md | 1 - g4f/Provider/Chatgpt4Online.py | 78 ------------------------------ g4f/Provider/__init__.py | 1 - g4f/Provider/not_working/Chatgpt4Online.py | 78 ++++++++++++++++++++++++++++++ g4f/Provider/not_working/__init__.py | 1 + 5 files changed, 79 insertions(+), 80 deletions(-) delete mode 100644 g4f/Provider/Chatgpt4Online.py create mode 100644 g4f/Provider/not_working/Chatgpt4Online.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 17f47378..a305b481 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -28,7 +28,6 @@ This document provides an overview of various AI providers and models, including |[chatgot.one](https://www.chatgot.one/)|`g4f.Provider.ChatGot`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chatgpt4online.org](https://chatgpt4online.org)|`g4f.Provider.Chatgpt4Online`|`gpt-4`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-1b, phi-2, qwen-1.5-0-5b, qwen-1.5-8b, qwen-1.5-14b, qwen-1.5-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[darkai.foundation/chat](https://darkai.foundation/chat)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| diff --git a/g4f/Provider/Chatgpt4Online.py b/g4f/Provider/Chatgpt4Online.py deleted file mode 100644 index 627facf6..00000000 --- a/g4f/Provider/Chatgpt4Online.py +++ /dev/null @@ -1,78 +0,0 @@ -from __future__ import annotations - -import json -from aiohttp import ClientSession - -from ..typing import AsyncResult, Messages -from .base_provider import AsyncGeneratorProvider -from .helper import format_prompt - - -class Chatgpt4Online(AsyncGeneratorProvider): - url = "https://chatgpt4online.org" - api_endpoint = "/wp-json/mwai-ui/v1/chats/submit" - working = True - - default_model = 'gpt-4' - models = [default_model] - - async def get_nonce(headers: dict) -> str: - async with ClientSession(headers=headers) as session: - async with session.post(f"https://chatgpt4online.org/wp-json/mwai/v1/start_session") as response: - return (await response.json())["restNonce"] - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - headers = { - "accept": "text/event-stream", - "accept-language": "en-US,en;q=0.9", - "content-type": "application/json", - "dnt": "1", - "origin": cls.url, - "priority": "u=1, i", - "referer": f"{cls.url}/", - "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", - } - headers['x-wp-nonce'] = await cls.get_nonce(headers) - async with ClientSession(headers=headers) as session: - prompt = format_prompt(messages) - data = { - "botId": "default", - "newMessage": prompt, - "stream": True, - } - - async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: - response.raise_for_status() - full_response = "" - - async for chunk in response.content.iter_any(): - if chunk: - try: - # Extract the JSON object from the chunk - for line in chunk.decode().splitlines(): - if line.startswith("data: "): - json_data = json.loads(line[6:]) - if json_data["type"] == "live": - full_response += json_data["data"] - elif json_data["type"] == "end": - final_data = json.loads(json_data["data"]) - full_response = final_data["reply"] - break - except json.JSONDecodeError: - continue - - yield full_response - diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 60942581..6b9f131f 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -17,7 +17,6 @@ from .Airforce import Airforce from .Bing import Bing from .Blackbox import Blackbox from .ChatGpt import ChatGpt -from .Chatgpt4Online import Chatgpt4Online from .ChatGptEs import ChatGptEs from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare diff --git a/g4f/Provider/not_working/Chatgpt4Online.py b/g4f/Provider/not_working/Chatgpt4Online.py new file mode 100644 index 00000000..b0552e45 --- /dev/null +++ b/g4f/Provider/not_working/Chatgpt4Online.py @@ -0,0 +1,78 @@ +from __future__ import annotations + +import json +from aiohttp import ClientSession + +from ...typing import AsyncResult, Messages +from ..base_provider import AsyncGeneratorProvider +from ..helper import format_prompt + + +class Chatgpt4Online(AsyncGeneratorProvider): + url = "https://chatgpt4online.org" + api_endpoint = "/wp-json/mwai-ui/v1/chats/submit" + working = False + + default_model = 'gpt-4' + models = [default_model] + + async def get_nonce(headers: dict) -> str: + async with ClientSession(headers=headers) as session: + async with session.post(f"https://chatgpt4online.org/wp-json/mwai/v1/start_session") as response: + return (await response.json())["restNonce"] + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + headers = { + "accept": "text/event-stream", + "accept-language": "en-US,en;q=0.9", + "content-type": "application/json", + "dnt": "1", + "origin": cls.url, + "priority": "u=1, i", + "referer": f"{cls.url}/", + "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", + } + headers['x-wp-nonce'] = await cls.get_nonce(headers) + async with ClientSession(headers=headers) as session: + prompt = format_prompt(messages) + data = { + "botId": "default", + "newMessage": prompt, + "stream": True, + } + + async with session.post(f"{cls.url}{cls.api_endpoint}", json=data, proxy=proxy) as response: + response.raise_for_status() + full_response = "" + + async for chunk in response.content.iter_any(): + if chunk: + try: + # Extract the JSON object from the chunk + for line in chunk.decode().splitlines(): + if line.startswith("data: "): + json_data = json.loads(line[6:]) + if json_data["type"] == "live": + full_response += json_data["data"] + elif json_data["type"] == "end": + final_data = json.loads(json_data["data"]) + full_response = final_data["reply"] + break + except json.JSONDecodeError: + continue + + yield full_response + diff --git a/g4f/Provider/not_working/__init__.py b/g4f/Provider/not_working/__init__.py index e1da3032..051d3486 100644 --- a/g4f/Provider/not_working/__init__.py +++ b/g4f/Provider/not_working/__init__.py @@ -12,3 +12,4 @@ from .FreeNetfly import FreeNetfly from .GPROChat import GPROChat from .Koala import Koala from .MyShell import MyShell +from .Chatgpt4Online import Chatgpt4Online -- cgit v1.2.3 From 19af1654cdb5b89efbd04103c40e1b3aee09bad7 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 20:43:12 +0200 Subject: Removed provider (g4f/Provider/ChatifyAI.py) --- docs/providers-and-models.md | 1 - g4f/Provider/ChatifyAI.py | 79 -------------------------------------------- g4f/Provider/__init__.py | 1 - g4f/models.py | 2 -- 4 files changed, 83 deletions(-) delete mode 100644 g4f/Provider/ChatifyAI.py diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index a305b481..64084ebd 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -28,7 +28,6 @@ This document provides an overview of various AI providers and models, including |[chatgot.one](https://www.chatgot.one/)|`g4f.Provider.ChatGot`|`gemini-pro`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|`?`|`?`|`?`|?|![Unknown](https://img.shields.io/badge/Unknown-grey) |❌| |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4o, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -|[chatify-ai.vercel.app](https://chatify-ai.vercel.app)|`g4f.Provider.ChatifyAI`|`llama-3.1-8b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[playground.ai.cloudflare.com](https://playground.ai.cloudflare.com)|`g4f.Provider.Cloudflare`|`gemma-7b, llama-2-7b, llama-3-8b, llama-3.1-8b, llama-3.2-1b, phi-2, qwen-1.5-0-5b, qwen-1.5-8b, qwen-1.5-14b, qwen-1.5-7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[darkai.foundation/chat](https://darkai.foundation/chat)|`g4f.Provider.DarkAI`|`gpt-4o, gpt-3.5-turbo, llama-3-70b, llama-3-405b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[duckduckgo.com](https://duckduckgo.com/duckchat/v1/chat)|`g4f.Provider.DDG`|`gpt-4o-mini, claude-3-haiku, llama-3.1-70b, mixtral-8x7b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| diff --git a/g4f/Provider/ChatifyAI.py b/g4f/Provider/ChatifyAI.py deleted file mode 100644 index 7e43b065..00000000 --- a/g4f/Provider/ChatifyAI.py +++ /dev/null @@ -1,79 +0,0 @@ -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 ChatifyAI(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://chatify-ai.vercel.app" - api_endpoint = "https://chatify-ai.vercel.app/api/chat" - working = True - supports_stream = False - supports_system_message = True - supports_message_history = True - - default_model = 'llama-3.1' - models = [default_model] - model_aliases = { - "llama-3.1-8b": "llama-3.1", - } - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases.get(model, cls.default_model) - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": cls.url, - "pragma": "no-cache", - "priority": "u=1, i", - "referer": f"{cls.url}/", - "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', - "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/129.0.0.0 Safari/537.36" - } - async with ClientSession(headers=headers) as session: - data = { - "messages": [{"role": "user", "content": format_prompt(messages)}] - } - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - response_text = await response.text() - - filtered_response = cls.filter_response(response_text) - yield filtered_response - - @staticmethod - def filter_response(response_text: str) -> str: - parts = response_text.split('"') - - text_parts = parts[1::2] - - clean_text = ''.join(text_parts) - - return clean_text diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 6b9f131f..d1badfc9 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -18,7 +18,6 @@ from .Bing import Bing from .Blackbox import Blackbox from .ChatGpt import ChatGpt from .ChatGptEs import ChatGptEs -from .ChatifyAI import ChatifyAI from .Cloudflare import Cloudflare from .DarkAI import DarkAI from .DDG import DDG diff --git a/g4f/models.py b/g4f/models.py index 8ce3688e..dd87d8de 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -14,7 +14,6 @@ from .Provider import ( ChatGpt, Chatgpt4Online, ChatGptEs, - ChatifyAI, Cloudflare, DarkAI, DDG, @@ -78,7 +77,6 @@ default = Model( DeepInfraChat, Airforce, ChatGptEs, - ChatifyAI, Cloudflare, AIUncensored, DarkAI, -- cgit v1.2.3 From 254228707bf2c2b9b1f0ef55ceca0c775fcc1d7a Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 21:18:12 +0200 Subject: fix(g4f/Provider/HuggingChat.py): update conversation data request parameter --- g4f/Provider/HuggingChat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/HuggingChat.py b/g4f/Provider/HuggingChat.py index 7ebbf570..a3f0157e 100644 --- a/g4f/Provider/HuggingChat.py +++ b/g4f/Provider/HuggingChat.py @@ -83,7 +83,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): raise RuntimeError(f"Request failed with status code: {response.status_code}, response: {response.text}") conversationId = response.json().get('conversationId') - response = session.get(f'https://huggingface.co/chat/conversation/{conversationId}/__data.json?x-sveltekit-invalidated=11') + response = session.get(f'https://huggingface.co/chat/conversation/{conversationId}/__data.json?x-sveltekit-invalidated=01') data: list = response.json()["nodes"][1]["data"] keys: list[int] = data[data[0]["messages"]] -- cgit v1.2.3 From 2a29f1b2ac7a3bd3ac40682a4e11908e576e1af0 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Mon, 11 Nov 2024 21:18:50 +0200 Subject: Update (g4f/Provider/GizAI.py) --- g4f/Provider/GizAI.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/g4f/Provider/GizAI.py b/g4f/Provider/GizAI.py index a5ce0ec2..f00b344e 100644 --- a/g4f/Provider/GizAI.py +++ b/g4f/Provider/GizAI.py @@ -8,7 +8,7 @@ from .helper import format_prompt class GizAI(AsyncGeneratorProvider, ProviderModelMixin): - url = "https://app.giz.ai" + url = "https://app.giz.ai/assistant" api_endpoint = "https://app.giz.ai/api/data/users/inferenceServer.infer" working = True supports_stream = False @@ -46,7 +46,7 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin): 'Connection': 'keep-alive', 'Content-Type': 'application/json', 'DNT': '1', - 'Origin': cls.url, + 'Origin': 'https://app.giz.ai', 'Pragma': 'no-cache', 'Sec-Fetch-Dest': 'empty', 'Sec-Fetch-Mode': 'cors', @@ -56,16 +56,21 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin): 'sec-ch-ua-mobile': '?0', 'sec-ch-ua-platform': '"Linux"' } + + prompt = format_prompt(messages) + async with ClientSession(headers=headers) as session: data = { "model": model, "input": { - "messages": messages, + "messages": [{"type": "human", "content": prompt}], "mode": "plan" }, "noStream": True } async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - result = await response.json() - yield result['output'].strip() + if response.status == 201: + result = await response.json() + yield result['output'].strip() + else: + raise Exception(f"Unexpected response status: {response.status}") -- cgit v1.2.3 From 21a26f68826778afa7ab932ef4cd488b422fdc68 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 08:44:48 +0200 Subject: Update (docs/ README.md g4f/client/client.py) --- README.md | 2 +- docs/async_client.md | 9 +++++---- docs/client.md | 4 ++-- docs/docker.md | 2 +- docs/git.md | 2 +- docs/interference-api.md | 6 +++--- g4f/client/client.py | 28 +++++++++++++++++++++------- 7 files changed, 34 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 53f759f4..a47791ee 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ from g4f.client import Client client = Client() response = client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[{"role": "user", "content": "Hello"}], # Add any other necessary parameters ) diff --git a/docs/async_client.md b/docs/async_client.md index 0719a463..7194c792 100644 --- a/docs/async_client.md +++ b/docs/async_client.md @@ -57,7 +57,7 @@ client = Client( **Here’s an improved example of creating chat completions:** ```python response = await async_client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", @@ -99,7 +99,7 @@ async def main(): client = Client() response = await client.chat.completions.async_create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", @@ -230,7 +230,7 @@ async def main(): client = Client() task1 = client.chat.completions.async_create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", @@ -262,6 +262,7 @@ The G4F AsyncClient supports a wide range of AI models and providers, allowing y ### Models - GPT-3.5-Turbo + - GPT-4o-Mini - GPT-4 - DALL-E 3 - Gemini @@ -306,7 +307,7 @@ Implementing proper error handling and following best practices is crucial when ```python try: response = await client.chat.completions.async_create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", diff --git a/docs/client.md b/docs/client.md index 388b2e4b..da45d7fd 100644 --- a/docs/client.md +++ b/docs/client.md @@ -62,7 +62,7 @@ client = Client( **Here’s an improved example of creating chat completions:** ```python response = client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", @@ -104,7 +104,7 @@ from g4f.client import Client client = Client() response = client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", diff --git a/docs/docker.md b/docs/docker.md index e1caaf3d..8017715c 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -71,7 +71,7 @@ import requests url = "http://localhost:1337/v1/chat/completions" body = { - "model": "gpt-3.5-turbo", + "model": "gpt-4o-mini", "stream": False, "messages": [ {"role": "assistant", "content": "What can you do?"} diff --git a/docs/git.md b/docs/git.md index 33a0ff42..ff6c8091 100644 --- a/docs/git.md +++ b/docs/git.md @@ -95,7 +95,7 @@ from g4f.client import Client client = Client() response = client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[ { "role": "user", diff --git a/docs/interference-api.md b/docs/interference-api.md index 2e18e7b5..324334c4 100644 --- a/docs/interference-api.md +++ b/docs/interference-api.md @@ -64,7 +64,7 @@ curl -X POST "http://localhost:1337/v1/chat/completions" \ "content": "Hello" } ], - "model": "gpt-3.5-turbo" + "model": "gpt-4o-mini" }' ``` @@ -104,7 +104,7 @@ client = OpenAI( ) response = client.chat.completions.create( - model="gpt-3.5-turbo", + model="gpt-4o-mini", messages=[{"role": "user", "content": "Write a poem about a tree"}], stream=True, ) @@ -131,7 +131,7 @@ import requests url = "http://localhost:1337/v1/chat/completions" body = { - "model": "gpt-3.5-turbo", + "model": "gpt-4o-mini", "stream": False, "messages": [ {"role": "assistant", "content": "What can you do?"} diff --git a/g4f/client/client.py b/g4f/client/client.py index 8e195213..63358302 100644 --- a/g4f/client/client.py +++ b/g4f/client/client.py @@ -154,14 +154,29 @@ class AsyncClient(Client): stacklevel=2 ) super().__init__(*args, **kwargs) + self.chat = Chat(self) + self._images = Images(self) + self.completions = Completions(self) - async def chat_complete(self, *args, **kwargs): - """Legacy method that redirects to async_create""" - return await self.chat.completions.async_create(*args, **kwargs) + @property + def images(self) -> 'Images': + return self._images + + async def async_create(self, *args, **kwargs) -> Union['ChatCompletion', AsyncIterator['ChatCompletionChunk']]: + response = await super().async_create(*args, **kwargs) + async for result in response: + return result - async def create_image(self, *args, **kwargs): - """Legacy method that redirects to async_generate""" - return await self.images.async_generate(*args, **kwargs) + async def async_generate(self, *args, **kwargs) -> 'ImagesResponse': + return await super().async_generate(*args, **kwargs) + + async def _fetch_image(self, url: str) -> bytes: + async with ClientSession() as session: + async with session.get(url) as resp: + if resp.status == 200: + return await resp.read() + else: + raise Exception(f"Failed to fetch image from {url}, status code {resp.status}") class Completions: def __init__(self, client: Client, provider: ProviderType = None): @@ -531,4 +546,3 @@ class Images: async def create_variation(self, image: Union[str, bytes], model: str = None, response_format: str = "url", **kwargs): # Existing implementation, adjust if you want to support b64_json here as well pass - -- cgit v1.2.3 From fde29c53e8c8c53cd289414db873c134273f7c68 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 09:04:33 +0200 Subject: feat(g4f/Provider/HuggingChat.py: Enhance HuggingChat provider functionality --- g4f/Provider/HuggingChat.py | 46 ++++++++++++++++++++++++++++++++++++++------- g4f/models.py | 10 ++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/g4f/Provider/HuggingChat.py b/g4f/Provider/HuggingChat.py index a3f0157e..d4a4b497 100644 --- a/g4f/Provider/HuggingChat.py +++ b/g4f/Provider/HuggingChat.py @@ -19,6 +19,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): 'CohereForAI/c4ai-command-r-plus-08-2024', 'Qwen/Qwen2.5-72B-Instruct', 'nvidia/Llama-3.1-Nemotron-70B-Instruct-HF', + 'Qwen/Qwen2.5-Coder-32B-Instruct', 'meta-llama/Llama-3.2-11B-Vision-Instruct', 'NousResearch/Hermes-3-Llama-3.1-8B', 'mistralai/Mistral-Nemo-Instruct-2407', @@ -30,6 +31,7 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): "command-r-plus": "CohereForAI/c4ai-command-r-plus-08-2024", "qwen-2-72b": "Qwen/Qwen2.5-72B-Instruct", "nemotron-70b": "nvidia/Llama-3.1-Nemotron-70B-Instruct-HF", + "qwen-2.5-coder-32b": "Qwen/Qwen2.5-Coder-32B-Instruct", "llama-3.2-11b": "meta-llama/Llama-3.2-11B-Vision-Instruct", "hermes-3": "NousResearch/Hermes-3-Llama-3.1-8B", "mistral-nemo": "mistralai/Mistral-Nemo-Instruct-2407", @@ -83,12 +85,33 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): raise RuntimeError(f"Request failed with status code: {response.status_code}, response: {response.text}") conversationId = response.json().get('conversationId') - response = session.get(f'https://huggingface.co/chat/conversation/{conversationId}/__data.json?x-sveltekit-invalidated=01') + + # Get the data response and parse it properly + response = session.get(f'https://huggingface.co/chat/conversation/{conversationId}/__data.json?x-sveltekit-invalidated=11') + + # Split the response content by newlines and parse each line as JSON + try: + json_data = None + for line in response.text.split('\n'): + if line.strip(): + try: + parsed = json.loads(line) + if isinstance(parsed, dict) and "nodes" in parsed: + json_data = parsed + break + except json.JSONDecodeError: + continue + + if not json_data: + raise RuntimeError("Failed to parse response data") + + data: list = json_data["nodes"][1]["data"] + keys: list[int] = data[data[0]["messages"]] + message_keys: dict = data[keys[0]] + messageId: str = data[message_keys["id"]] - data: list = response.json()["nodes"][1]["data"] - keys: list[int] = data[data[0]["messages"]] - message_keys: dict = data[keys[0]] - messageId: str = data[message_keys["id"]] + except (KeyError, IndexError, TypeError) as e: + raise RuntimeError(f"Failed to extract message ID: {str(e)}") settings = { "inputs": format_prompt(messages), @@ -120,7 +143,8 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): 'data': (None, json.dumps(settings, separators=(',', ':'))), } - response = requests.post(f'https://huggingface.co/chat/conversation/{conversationId}', + response = requests.post( + f'https://huggingface.co/chat/conversation/{conversationId}', cookies=session.cookies, headers=headers, files=files, @@ -142,10 +166,18 @@ class HuggingChat(AbstractProvider, ProviderModelMixin): elif line["type"] == "stream": token = line["token"].replace('\u0000', '') full_response += token + if stream: + yield token elif line["type"] == "finalAnswer": break full_response = full_response.replace('<|im_end|', '').replace('\u0000', '').strip() - yield full_response + if not stream: + yield full_response + + @classmethod + def supports_model(cls, model: str) -> bool: + """Check if the model is supported by the provider.""" + return model in cls.models or model in cls.model_aliases diff --git a/g4f/models.py b/g4f/models.py index dd87d8de..a0cee01d 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -361,6 +361,13 @@ qwen_2_72b = Model( best_provider = IterListProvider([DeepInfraChat, HuggingChat, HuggingFace]) ) +# qwen 2.5 +qwen_2_5_coder_32b = Model( + name = 'qwen-2.5-coder-32b', + base_provider = 'Qwen', + best_provider = IterListProvider([HuggingChat, HuggingFace]) +) + ### Upstage ### solar_mini = Model( name = 'solar-mini', @@ -703,6 +710,9 @@ class ModelUtils: # qwen 2 'qwen-2-72b': qwen_2_72b, + +# qwen 2.5 +'qwen-2.5-coder-32b': qwen_2_5_coder_32b, ### Upstage ### -- cgit v1.2.3 From 18be49027d7321b493f95152efbe2ae6e61b9d06 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 10:31:28 +0200 Subject: feat(g4f/Provider/Blackbox.py): Enhance Blackbox AI with dynamic validated token retrieval --- g4f/Provider/Blackbox.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 998ec593..f93b0718 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -5,6 +5,7 @@ import random import string import json import re +import aiohttp from ..typing import AsyncResult, Messages, ImageType from .base_provider import AsyncGeneratorProvider, ProviderModelMixin @@ -18,6 +19,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): supports_stream = True supports_system_message = True supports_message_history = True + _last_validated_value = None default_model = 'blackboxai' @@ -82,6 +84,23 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "flux": "Image Generation", } + @classmethod + async def fetch_validated(cls): + async with aiohttp.ClientSession() as session: + try: + async with session.get('https://www.blackbox.ai/_next/static/chunks/2052-0407a0af8bffe0a9.js') as response: + page_content = await response.text() + validated_match = re.search(r'w="([0-9a-fA-F-]{36})"', page_content) + + if validated_match: + validated_value = validated_match.group(1) + cls._last_validated_value = validated_value + return validated_value + except Exception as e: + pass + + return cls._last_validated_value + @staticmethod def generate_id(length=7): characters = string.ascii_letters + string.digits @@ -125,6 +144,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): model = cls.get_model(model) message_id = cls.generate_id() messages_with_prefix = cls.add_prefix_to_messages(messages, model) + validated_value = await cls.fetch_validated() if image is not None: messages_with_prefix[-1]['data'] = { @@ -173,7 +193,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "mobileClient": False, "userSelectedModel": model if model in cls.userSelectedModel else None, "webSearchMode": web_search, - "validated": "00f37b34-a166-4efb-bce5-1312d87f2f94" + "validated": validated_value, } async with ClientSession(headers=headers) as session: -- cgit v1.2.3 From 867bcb057a28c566efc1b5b6abc5f03fe489e508 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 11:15:40 +0200 Subject: Update (g4f/Provider/Blackbox.py) --- g4f/Provider/Blackbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index f93b0718..f2cc264a 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -97,7 +97,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): cls._last_validated_value = validated_value return validated_value except Exception as e: - pass + print(f"Error fetching validated value: {e}") return cls._last_validated_value -- cgit v1.2.3 From 24f80c5165037963d1e50e1f7a7ac366c60c7e98 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 19:24:14 +0200 Subject: Update (g4f/Provider/Liaobots.py) --- g4f/Provider/Liaobots.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/g4f/Provider/Liaobots.py b/g4f/Provider/Liaobots.py index addd3ed7..7ccfa877 100644 --- a/g4f/Provider/Liaobots.py +++ b/g4f/Provider/Liaobots.py @@ -9,15 +9,6 @@ from .helper import get_connector from ..requests import raise_for_status models = { - "gpt-3.5-turbo": { - "id": "gpt-3.5-turbo", - "name": "GPT-3.5-Turbo", - "model": "ChatGPT", - "provider": "OpenAI", - "maxLength": 48000, - "tokenLimit": 14000, - "context": "16K", - }, "gpt-4o-mini-free": { "id": "gpt-4o-mini-free", "name": "GPT-4o-Mini-Free", @@ -179,7 +170,7 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin): working = True supports_message_history = True supports_system_message = True - default_model = "gpt-3.5-turbo" + default_model = "gpt-4o-2024-08-06" models = list(models.keys()) model_aliases = { -- cgit v1.2.3 From 257410157054e0ac18eebc3507bcf0853867107e Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 20:04:00 +0200 Subject: Update (g4f/models.py g4f/Provider/PerplexityLabs.py) --- g4f/Provider/PerplexityLabs.py | 1 + g4f/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/PerplexityLabs.py b/g4f/Provider/PerplexityLabs.py index b776e96a..364898bd 100644 --- a/g4f/Provider/PerplexityLabs.py +++ b/g4f/Provider/PerplexityLabs.py @@ -21,6 +21,7 @@ class PerplexityLabs(AsyncGeneratorProvider, ProviderModelMixin): "llama-3.1-sonar-small-128k-chat", "llama-3.1-8b-instruct", "llama-3.1-70b-instruct", + "/models/LiquidCloud", ] model_aliases = { diff --git a/g4f/models.py b/g4f/models.py index a0cee01d..ce2588e4 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -107,7 +107,7 @@ gpt_4o = Model( gpt_4o_mini = Model( name = 'gpt-4o-mini', base_provider = 'OpenAI', - best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, MagickPen, ChatGpt, Airforce, RubiksAI, Liaobots, OpenaiChat]) + best_provider = IterListProvider([DDG, ChatGptEs, FreeNetfly, Pizzagpt, ChatGpt, Airforce, RubiksAI, MagickPen, Liaobots, OpenaiChat]) ) gpt_4_turbo = Model( -- cgit v1.2.3 From 330d920e4efb8a590b531ca4a18fa2711eff3e18 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 20:50:15 +0200 Subject: Update (g4f/models.py g4f/Provider/ReplicateHome.py) --- g4f/Provider/ReplicateHome.py | 32 +++++++++++++++++--------------- g4f/models.py | 18 ++---------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/g4f/Provider/ReplicateHome.py b/g4f/Provider/ReplicateHome.py index 7f443a7d..a7fc9b54 100644 --- a/g4f/Provider/ReplicateHome.py +++ b/g4f/Provider/ReplicateHome.py @@ -17,7 +17,13 @@ class ReplicateHome(AsyncGeneratorProvider, ProviderModelMixin): supports_system_message = True supports_message_history = True - default_model = 'meta/meta-llama-3-70b-instruct' + default_model = 'yorickvp/llava-13b' + + image_models = [ + 'stability-ai/stable-diffusion-3', + 'bytedance/sdxl-lightning-4step', + 'playgroundai/playground-v2.5-1024px-aesthetic', + ] text_models = [ 'meta/meta-llama-3-70b-instruct', @@ -26,35 +32,31 @@ class ReplicateHome(AsyncGeneratorProvider, ProviderModelMixin): 'yorickvp/llava-13b', ] - image_models = [ - 'black-forest-labs/flux-schnell', - 'stability-ai/stable-diffusion-3', - 'bytedance/sdxl-lightning-4step', - 'playgroundai/playground-v2.5-1024px-aesthetic', - ] + models = text_models + image_models model_aliases = { - "flux-schnell": "black-forest-labs/flux-schnell", + # image_models "sd-3": "stability-ai/stable-diffusion-3", "sdxl": "bytedance/sdxl-lightning-4step", "playground-v2.5": "playgroundai/playground-v2.5-1024px-aesthetic", - "llama-3-70b": "meta/meta-llama-3-70b-instruct", - "mixtral-8x7b": "mistralai/mixtral-8x7b-instruct-v0.1", + + # text_models "gemma-2b": "google-deepmind/gemma-2b-it", "llava-13b": "yorickvp/llava-13b", } model_versions = { - "meta/meta-llama-3-70b-instruct": "fbfb20b472b2f3bdd101412a9f70a0ed4fc0ced78a77ff00970ee7a2383c575d", - "mistralai/mixtral-8x7b-instruct-v0.1": "5d78bcd7a992c4b793465bcdcf551dc2ab9668d12bb7aa714557a21c1e77041c", - "google-deepmind/gemma-2b-it": "dff94eaf770e1fc211e425a50b51baa8e4cac6c39ef074681f9e39d778773626", - "yorickvp/llava-13b": "80537f9eead1a5bfa72d5ac6ea6414379be41d4d4f6679fd776e9535d1eb58bb", - 'black-forest-labs/flux-schnell': "f2ab8a5bfe79f02f0789a146cf5e73d2a4ff2684a98c2b303d1e1ff3814271db", + # image_models 'stability-ai/stable-diffusion-3': "527d2a6296facb8e47ba1eaf17f142c240c19a30894f437feee9b91cc29d8e4f", 'bytedance/sdxl-lightning-4step': "5f24084160c9089501c1b3545d9be3c27883ae2239b6f412990e82d4a6210f8f", 'playgroundai/playground-v2.5-1024px-aesthetic': "a45f82a1382bed5c7aeb861dac7c7d191b0fdf74d8d57c4a0e6ed7d4d0bf7d24", + + # text_models + "google-deepmind/gemma-2b-it": "dff94eaf770e1fc211e425a50b51baa8e4cac6c39ef074681f9e39d778773626", + "yorickvp/llava-13b": "80537f9eead1a5bfa72d5ac6ea6414379be41d4d4f6679fd776e9535d1eb58bb", + } @classmethod diff --git a/g4f/models.py b/g4f/models.py index ce2588e4..1cefae8b 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -164,12 +164,6 @@ llama_3_8b = Model( best_provider = IterListProvider([Cloudflare]) ) -llama_3_70b = Model( - name = "llama-3-70b", - base_provider = "Meta Llama", - best_provider = IterListProvider([ReplicateHome]) -) - # llama 3.1 llama_3_1_8b = Model( name = "llama-3.1-8b", @@ -212,7 +206,7 @@ mistral_7b = Model( mixtral_8x7b = Model( name = "mixtral-8x7b", base_provider = "Mistral", - best_provider = IterListProvider([DDG, ReplicateHome]) + best_provider = DDG ) mistral_nemo = Model( @@ -279,7 +273,7 @@ gemini = Model( gemma_2b = Model( name = 'gemma-2b', base_provider = 'Google', - best_provider = IterListProvider([ReplicateHome]) + best_provider = ReplicateHome ) @@ -583,12 +577,6 @@ flux_4o = Model( ) -flux_schnell = Model( - name = 'flux-schnell', - base_provider = 'Flux AI', - best_provider = ReplicateHome - -) ### Other ### @@ -635,7 +623,6 @@ class ModelUtils: # llama-3 'llama-3-8b': llama_3_8b, -'llama-3-70b': llama_3_70b, # llama-3.1 'llama-3.1-8b': llama_3_1_8b, @@ -802,7 +789,6 @@ class ModelUtils: 'flux-disney': flux_disney, 'flux-pixel': flux_pixel, 'flux-4o': flux_4o, -'flux-schnell': flux_schnell, ### Other ### -- cgit v1.2.3 From b78843e905b560918cb2f0562aaeef6bb33384a3 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 20:52:52 +0200 Subject: Update (docs/providers-and-models.md) --- docs/providers-and-models.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/providers-and-models.md b/docs/providers-and-models.md index 64084ebd..7c6bc613 100644 --- a/docs/providers-and-models.md +++ b/docs/providers-and-models.md @@ -58,7 +58,7 @@ This document provides an overview of various AI providers and models, including |[raycast.com](https://raycast.com)|`g4f.Provider.Raycast`|✔|❌|❌|✔|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[chat.reka.ai](https://chat.reka.ai/)|`g4f.Provider.Reka`|✔|❌|✔|✔|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| |[replicate.com](https://replicate.com)|`g4f.Provider.Replicate`|✔|❌|❌|?|![Unknown](https://img.shields.io/badge/Unknown-grey)|✔| -|[replicate.com](https://replicate.com)|`g4f.Provider.ReplicateHome`|`llama-3-70b, mixtral-8x7b, llava-13b`|`flux-schnell, sdxl, sdxl, playground-v2.5`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| +|[replicate.com](https://replicate.com)|`g4f.Provider.ReplicateHome`|`gemma-2b, llava-13b`|`sd-3, sdxl, playground-v2.5`|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[replicate.com](https://replicate.com)|`g4f.Provider.RubiksAI`|`llama-3.1-70b, gpt-4o-mini`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| |[talkai.info](https://talkai.info)|`g4f.Provider.TalkAi`|✔|❌|❌|✔|![Disabled](https://img.shields.io/badge/Disabled-red)|❌| |[teach-anything.com](https://www.teach-anything.com)|`g4f.Provider.TeachAnything`|`llama-3.1-70b`|❌|❌|✔|![Active](https://img.shields.io/badge/Active-brightgreen)|❌| -- cgit v1.2.3 From 4e606a4916b19fac2046bd2138a2eff9900cfcc9 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 20:56:23 +0200 Subject: Update (g4f/models.py g4f/Provider/PerplexityLabs.py) --- g4f/Provider/PerplexityLabs.py | 1 + g4f/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/PerplexityLabs.py b/g4f/Provider/PerplexityLabs.py index 364898bd..b3119cb6 100644 --- a/g4f/Provider/PerplexityLabs.py +++ b/g4f/Provider/PerplexityLabs.py @@ -31,6 +31,7 @@ class PerplexityLabs(AsyncGeneratorProvider, ProviderModelMixin): "sonar-chat": "llama-3.1-sonar-small-128k-chat", "llama-3.1-8b": "llama-3.1-8b-instruct", "llama-3.1-70b": "llama-3.1-70b-instruct", + "lfm-40b": "/models/LiquidCloud", } @classmethod diff --git a/g4f/models.py b/g4f/models.py index 1cefae8b..aebe305f 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -464,7 +464,7 @@ openhermes_2_5 = Model( lfm_40b = Model( name = 'lfm-40b', base_provider = 'Liquid', - best_provider = Airforce + best_provider = IterListProvider([Airforce, PerplexityLabs]) ) -- cgit v1.2.3 From eaaa53d701607f33eb046b4488737ef33669f013 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Tue, 12 Nov 2024 21:05:29 +0200 Subject: Update (g4f/Provider/TeachAnything.py) --- g4f/Provider/TeachAnything.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/g4f/Provider/TeachAnything.py b/g4f/Provider/TeachAnything.py index 3d34293f..97fe0272 100644 --- a/g4f/Provider/TeachAnything.py +++ b/g4f/Provider/TeachAnything.py @@ -14,6 +14,17 @@ class TeachAnything(AsyncGeneratorProvider, ProviderModelMixin): api_endpoint = "/api/generate" working = True default_model = "llama-3.1-70b" + models = [default_model] + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + @classmethod async def create_async_generator( @@ -24,6 +35,7 @@ class TeachAnything(AsyncGeneratorProvider, ProviderModelMixin): **kwargs: Any ) -> AsyncResult: headers = cls._get_headers() + model = cls.get_model(model) async with ClientSession(headers=headers) as session: prompt = format_prompt(messages) @@ -61,16 +73,18 @@ class TeachAnything(AsyncGeneratorProvider, ProviderModelMixin): return { "accept": "*/*", "accept-language": "en-US,en;q=0.9", + "cache-control": "no-cache", "content-type": "application/json", "dnt": "1", "origin": "https://www.teach-anything.com", + "pragma": "no-cache", "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-ch-us": '"Not?A_Brand";v="99", "Chromium";v="130"', + "sec-ch-us-mobile": "?0", + "sec-ch-us-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" + "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36" } -- cgit v1.2.3 From 75316a233b0d01ddb060cfd19b366cebe7fa47fe Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 14:25:07 +0200 Subject: Update (g4f/Provider/Blackbox.py) --- g4f/Provider/Blackbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index f2cc264a..952507ff 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -88,7 +88,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): async def fetch_validated(cls): async with aiohttp.ClientSession() as session: try: - async with session.get('https://www.blackbox.ai/_next/static/chunks/2052-0407a0af8bffe0a9.js') as response: + async with session.get('https://www.blackbox.ai/_next/static/chunks/2052-cdfeaea1ea292ff5.js') as response: page_content = await response.text() validated_match = re.search(r'w="([0-9a-fA-F-]{36})"', page_content) -- cgit v1.2.3 From 17057742ac3729f5a5bd551c84b7a03212c61a40 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 14:30:44 +0200 Subject: refactor(g4f/client/client.py): Simplify AsyncClient methods --- g4f/client/client.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/g4f/client/client.py b/g4f/client/client.py index 63358302..73d8fea3 100644 --- a/g4f/client/client.py +++ b/g4f/client/client.py @@ -144,39 +144,32 @@ class Client(BaseClient): class AsyncClient(Client): """Legacy AsyncClient that redirects to the main Client class. This class exists for backwards compatibility.""" - + def __init__(self, *args, **kwargs): import warnings warnings.warn( - "AsyncClient is deprecated and will be removed in a future version. " + "AsyncClient is deprecated and will be removed in future versions." "Use Client instead, which now supports both sync and async operations.", DeprecationWarning, stacklevel=2 ) super().__init__(*args, **kwargs) - self.chat = Chat(self) - self._images = Images(self) - self.completions = Completions(self) - - @property - def images(self) -> 'Images': - return self._images - async def async_create(self, *args, **kwargs) -> Union['ChatCompletion', AsyncIterator['ChatCompletionChunk']]: - response = await super().async_create(*args, **kwargs) - async for result in response: - return result + async def async_create(self, *args, **kwargs): + """Asynchronous create method that calls the synchronous method.""" + return await super().async_create(*args, **kwargs) - async def async_generate(self, *args, **kwargs) -> 'ImagesResponse': + async def async_generate(self, *args, **kwargs): + """Asynchronous image generation method.""" return await super().async_generate(*args, **kwargs) - async def _fetch_image(self, url: str) -> bytes: - async with ClientSession() as session: - async with session.get(url) as resp: - if resp.status == 200: - return await resp.read() - else: - raise Exception(f"Failed to fetch image from {url}, status code {resp.status}") + async def async_images(self) -> Images: + """Asynchronous access to images.""" + return await super().async_images() + + async def async_fetch_image(self, url: str) -> bytes: + """Asynchronous fetching of an image by URL.""" + return await self._fetch_image(url) class Completions: def __init__(self, client: Client, provider: ProviderType = None): -- cgit v1.2.3 From 795e42a2967f43364128f93fb71625e9e573bf5c Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 14:38:39 +0200 Subject: Update (g4f/Provider/needs_auth/GeminiPro.py) --- g4f/Provider/needs_auth/GeminiPro.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/g4f/Provider/needs_auth/GeminiPro.py b/g4f/Provider/needs_auth/GeminiPro.py index 5c170ae5..7e52a194 100644 --- a/g4f/Provider/needs_auth/GeminiPro.py +++ b/g4f/Provider/needs_auth/GeminiPro.py @@ -104,4 +104,8 @@ class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin): lines.append(chunk) else: data = await response.json() - yield data["candidates"][0]["content"]["parts"][0]["text"] + candidate = data["candidates"][0] + if candidate["finishReason"] == "STOP": + yield candidate["content"]["parts"][0]["text"] + else: + yield candidate["finishReason"] + ' ' + candidate["safetyRatings"] \ No newline at end of file -- cgit v1.2.3 From 9cb608327752a1188f70ae19195bc9d516ade9f2 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 14:50:49 +0200 Subject: Update (g4f/models.py) --- g4f/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/g4f/models.py b/g4f/models.py index aebe305f..87dcd988 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -29,6 +29,7 @@ from .Provider import ( HuggingFace, Liaobots, MagickPen, + Mhystical, MetaAI, OpenaiChat, PerplexityLabs, @@ -80,6 +81,7 @@ default = Model( Cloudflare, AIUncensored, DarkAI, + Mhystical, ]) ) @@ -119,7 +121,7 @@ gpt_4_turbo = Model( gpt_4 = Model( name = 'gpt-4', base_provider = 'OpenAI', - best_provider = IterListProvider([Chatgpt4Online, ChatGpt, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) + best_provider = IterListProvider([Mhystical, Chatgpt4Online, ChatGpt, Bing, OpenaiChat, gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider]) ) # o1 -- cgit v1.2.3 From 4d4190b3c47df69920971da244a6a798b4c91307 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 16:16:44 +0200 Subject: feat(g4f/Provider/Blackbox.py): Improve validated token retrieval mechanism --- g4f/Provider/Blackbox.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 952507ff..3dc4236f 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -85,22 +85,38 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): } @classmethod - async def fetch_validated(cls): + async def fetch_validated(cls): async with aiohttp.ClientSession() as session: try: - async with session.get('https://www.blackbox.ai/_next/static/chunks/2052-cdfeaea1ea292ff5.js') as response: + # Get the HTML of the page + async with session.get(cls.url) as response: + if response.status != 200: + print("Failed to load the page.") + return cls._last_validated_value + page_content = await response.text() - validated_match = re.search(r'w="([0-9a-fA-F-]{36})"', page_content) - - if validated_match: - validated_value = validated_match.group(1) - cls._last_validated_value = validated_value - return validated_value + # Find all JavaScript file links + js_files = re.findall(r'static/chunks/\d{4}-[a-fA-F0-9]+\.js', page_content) + + key_pattern = re.compile(r'w="([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"') + + # Check each JavaScript file for the key + for js_file in js_files: + js_url = f"{cls.url}/_next/{js_file}" + async with session.get(js_url) as js_response: + if js_response.status == 200: + js_content = await js_response.text() + match = key_pattern.search(js_content) + if match: + validated_value = match.group(1) + cls._last_validated_value = validated_value + return validated_value except Exception as e: print(f"Error fetching validated value: {e}") return cls._last_validated_value + @staticmethod def generate_id(length=7): characters = string.ascii_letters + string.digits -- cgit v1.2.3 From df08275b396f479782642ab493bba1f3f60450e4 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 22:46:46 +0200 Subject: ### refactor(g4f/Provider/Blackbox.py): Optimize fetch_validated method --- g4f/Provider/Blackbox.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 3dc4236f..8eb310b6 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -35,7 +35,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): "gemini-1.5-flash": {'mode': True, 'id': 'Gemini'}, "llama-3.1-8b": {'mode': True, 'id': "llama-3.1-8b"}, 'llama-3.1-70b': {'mode': True, 'id': "llama-3.1-70b"}, - 'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"}, + 'llama-3.1-405b': {'mode': True, 'id': "llama-3.1-405"}, # 'Python Agent': {'mode': True, 'id': "Python Agent"}, 'Java Agent': {'mode': True, 'id': "Java Agent"}, @@ -86,21 +86,23 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): @classmethod async def fetch_validated(cls): + # Якщо ключ вже збережений в пам'яті, повертаємо його + if cls._last_validated_value: + return cls._last_validated_value + + # Якщо ключ не знайдено, виконуємо пошук async with aiohttp.ClientSession() as session: try: - # Get the HTML of the page async with session.get(cls.url) as response: if response.status != 200: print("Failed to load the page.") return cls._last_validated_value page_content = await response.text() - # Find all JavaScript file links js_files = re.findall(r'static/chunks/\d{4}-[a-fA-F0-9]+\.js', page_content) key_pattern = re.compile(r'w="([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})"') - # Check each JavaScript file for the key for js_file in js_files: js_url = f"{cls.url}/_next/{js_file}" async with session.get(js_url) as js_response: @@ -109,7 +111,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): match = key_pattern.search(js_content) if match: validated_value = match.group(1) - cls._last_validated_value = validated_value + cls._last_validated_value = validated_value # Зберігаємо в пам'яті return validated_value except Exception as e: print(f"Error fetching validated value: {e}") -- cgit v1.2.3 From 054eef11cbb31dafd3a259d9fc92057aa22e93d4 Mon Sep 17 00:00:00 2001 From: kqlio67 Date: Wed, 13 Nov 2024 22:48:01 +0200 Subject: ### refactor(g4f/Provider/Blackbox.py): Optimize fetch_validated method --- g4f/Provider/Blackbox.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py index 8eb310b6..8d820344 100644 --- a/g4f/Provider/Blackbox.py +++ b/g4f/Provider/Blackbox.py @@ -86,11 +86,11 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): @classmethod async def fetch_validated(cls): - # Якщо ключ вже збережений в пам'яті, повертаємо його + # If the key is already stored in memory, return it if cls._last_validated_value: return cls._last_validated_value - # Якщо ключ не знайдено, виконуємо пошук + # If the key is not found, perform a search async with aiohttp.ClientSession() as session: try: async with session.get(cls.url) as response: @@ -111,7 +111,7 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin): match = key_pattern.search(js_content) if match: validated_value = match.group(1) - cls._last_validated_value = validated_value # Зберігаємо в пам'яті + cls._last_validated_value = validated_value # Keep in mind return validated_value except Exception as e: print(f"Error fetching validated value: {e}") -- cgit v1.2.3 From 2341b7ef9d9b8c528b3e11d99f7e58e25d15954d Mon Sep 17 00:00:00 2001 From: Tekky <98614666+xtekky@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:13:51 +0100 Subject: Update models.py Liaobots and Darkai do not work for gpt-3.5-turbo --- g4f/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g4f/models.py b/g4f/models.py index 87dcd988..6d3ef2ad 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -96,7 +96,7 @@ default = Model( gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', - best_provider = IterListProvider([DarkAI, Liaobots, Allyfy]) + best_provider = IterListProvider([Airforce]) ) # gpt-4 -- cgit v1.2.3 From b3779313347fc264b688f3a03b50668f8d0c4dca Mon Sep 17 00:00:00 2001 From: Tekky <98614666+xtekky@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:18:41 +0100 Subject: quick fix for Conflicts --- g4f/Provider/Ai4Chat.py | 88 ++++++++++++++++++++++++++++++++++++ g4f/Provider/not_working/Ai4Chat.py | 88 ------------------------------------ g4f/Provider/not_working/__init__.py | 1 - 3 files changed, 88 insertions(+), 89 deletions(-) create mode 100644 g4f/Provider/Ai4Chat.py delete mode 100644 g4f/Provider/not_working/Ai4Chat.py diff --git a/g4f/Provider/Ai4Chat.py b/g4f/Provider/Ai4Chat.py new file mode 100644 index 00000000..9f9874bb --- /dev/null +++ b/g4f/Provider/Ai4Chat.py @@ -0,0 +1,88 @@ +from __future__ import annotations + +import json +import re +import logging +from aiohttp import ClientSession + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin +from .helper import format_prompt + + +class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin): + label = "AI4Chat" + url = "https://www.ai4chat.co" + api_endpoint = "https://www.ai4chat.co/generate-response" + working = False + supports_stream = True + supports_system_message = True + supports_message_history = True + + default_model = 'gpt-4' + models = [default_model] + + model_aliases = {} + + @classmethod + def get_model(cls, model: str) -> str: + if model in cls.models: + return model + elif model in cls.model_aliases: + return cls.model_aliases[model] + else: + return cls.default_model + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + + headers = { + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "cache-control": "no-cache", + "content-type": "application/json", + "origin": "https://www.ai4chat.co", + "pragma": "no-cache", + "priority": "u=1, i", + "referer": "https://www.ai4chat.co/gpt/talkdirtytome", + "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', + "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/129.0.0.0 Safari/537.36" + } + + async with ClientSession(headers=headers) as session: + data = { + "messages": [ + { + "role": "user", + "content": format_prompt(messages) + } + ] + } + + try: + async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: + response.raise_for_status() + result = await response.text() + + json_result = json.loads(result) + + message = json_result.get("message", "") + + clean_message = re.sub(r'<[^>]+>', '', message) + + yield clean_message + except Exception as e: + logging.exception("Error while calling AI 4Chat API: %s", e) + yield f"Error: {e}" diff --git a/g4f/Provider/not_working/Ai4Chat.py b/g4f/Provider/not_working/Ai4Chat.py deleted file mode 100644 index ff829783..00000000 --- a/g4f/Provider/not_working/Ai4Chat.py +++ /dev/null @@ -1,88 +0,0 @@ -from __future__ import annotations - -import json -import re -import logging -from aiohttp import ClientSession - -from ...typing import AsyncResult, Messages -from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin -from ..helper import format_prompt - - -class Ai4Chat(AsyncGeneratorProvider, ProviderModelMixin): - label = "AI4Chat" - url = "https://www.ai4chat.co" - api_endpoint = "https://www.ai4chat.co/generate-response" - working = False - supports_stream = True - supports_system_message = True - supports_message_history = True - - default_model = 'gpt-4' - models = [default_model] - - model_aliases = {} - - @classmethod - def get_model(cls, model: str) -> str: - if model in cls.models: - return model - elif model in cls.model_aliases: - return cls.model_aliases[model] - else: - return cls.default_model - - @classmethod - async def create_async_generator( - cls, - model: str, - messages: Messages, - proxy: str = None, - **kwargs - ) -> AsyncResult: - model = cls.get_model(model) - - headers = { - "accept": "*/*", - "accept-language": "en-US,en;q=0.9", - "cache-control": "no-cache", - "content-type": "application/json", - "origin": "https://www.ai4chat.co", - "pragma": "no-cache", - "priority": "u=1, i", - "referer": "https://www.ai4chat.co/gpt/talkdirtytome", - "sec-ch-ua": '"Chromium";v="129", "Not=A?Brand";v="8"', - "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/129.0.0.0 Safari/537.36" - } - - async with ClientSession(headers=headers) as session: - data = { - "messages": [ - { - "role": "user", - "content": format_prompt(messages) - } - ] - } - - try: - async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response: - response.raise_for_status() - result = await response.text() - - json_result = json.loads(result) - - message = json_result.get("message", "") - - clean_message = re.sub(r'<[^>]+>', '', message) - - yield clean_message - except Exception as e: - logging.exception("Error while calling AI 4Chat API: %s", e) - yield f"Error: {e}" diff --git a/g4f/Provider/not_working/__init__.py b/g4f/Provider/not_working/__init__.py index 051d3486..a6edf5f8 100644 --- a/g4f/Provider/not_working/__init__.py +++ b/g4f/Provider/not_working/__init__.py @@ -1,4 +1,3 @@ -from .Ai4Chat import Ai4Chat from .AI365VIP import AI365VIP from .AIChatFree import AIChatFree from .AiChatOnline import AiChatOnline -- cgit v1.2.3