From ca2b609e82b67633815c3953c057019d99169bd8 Mon Sep 17 00:00:00 2001 From: kqlio67 <166700875+kqlio67@users.noreply.github.com> Date: Sun, 15 Dec 2024 22:27:10 +0000 Subject: Add support for multiple AI models and enhance agent functionality in Blackbox provider (#2484) * refactor(g4f/Provider/Airforce.py): improve model handling and filtering - Add hidden_models set to exclude specific models - Add evil alias for uncensored model handling - Extend filtering for model-specific response tokens - Add response buffering for streamed content - Update model fetching with error handling * refactor(g4f/Provider/Blackbox.py): improve caching and model handling - Add caching system for validated values with file-based storage - Rename 'flux' model to 'ImageGeneration' and update references - Add temperature, top_p and max_tokens parameters to generator - Simplify HTTP headers and remove redundant options - Add model alias mapping for ImageGeneration - Add file system utilities for cache management * feat(g4f/Provider/RobocodersAPI.py): add caching and error handling - Add file-based caching system for access tokens and sessions - Add robust error handling with specific error messages - Add automatic dialog continuation on resource limits - Add HTML parsing with BeautifulSoup for token extraction - Add debug logging for error tracking - Add timeout configuration for API requests * refactor(g4f/Provider/DarkAI.py): update DarkAI default model and aliases - Change default model from llama-3-405b to llama-3-70b - Remove llama-3-405b from supported models list - Remove llama-3.1-405b from model aliases * feat(g4f/Provider/Blackbox2.py): add image generation support - Add image model 'flux' with dedicated API endpoint - Refactor generator to support both text and image outputs - Extract headers into reusable static method - Add type hints for AsyncGenerator return type - Split generation logic into _generate_text and _generate_image methods - Add ImageResponse handling for image generation results BREAKING CHANGE: create_async_generator now returns AsyncGenerator instead of AsyncResult * refactor(g4f/Provider/ChatGptEs.py): update ChatGptEs model configuration - Update models list to include gpt-3.5-turbo - Remove chatgpt-4o-latest from supported models - Remove model_aliases mapping for gpt-4o * feat(g4f/Provider/DeepInfraChat.py): add Accept-Language header support - Add Accept-Language header for internationalization - Maintain existing header configuration - Improve request compatibility with language preferences * refactor(g4f/Provider/needs_auth/Gemini.py): add ProviderModelMixin inheritance - Add ProviderModelMixin to class inheritance - Import ProviderModelMixin from base_provider - Move BaseConversation import to base_provider imports * refactor(g4f/Provider/Liaobots.py): update model details and aliases - Add version suffix to o1 model IDs - Update model aliases for o1-preview and o1-mini - Standardize version format across model definitions * refactor(g4f/Provider/PollinationsAI.py): enhance model support and generation - Split generation logic into dedicated image/text methods - Add additional text models including sur and claude - Add width/height parameters for image generation - Add model existence validation - Add hasattr checks for model lists initialization * chore(gitignore): add provider cache directory - Add g4f/Provider/.cache to gitignore patterns * refactor(g4f/Provider/ReplicateHome.py): update model configuration - Update default model to gemma-2b-it - Add default_image_model configuration - Remove llava-13b from supported models - Simplify request headers * feat(g4f/models.py): expand provider and model support - Add new providers DarkAI and PollinationsAI - Add new models for Mistral, Flux and image generation - Update provider lists for existing models - Add P1 and Evil models with experimental providers BREAKING CHANGE: Remove llava-13b model support * refactor(Airforce): Update type hint for split_message return - Change return type of from to for consistency with import. - Maintain overall functionality and structure of the class. - Ensure compatibility with type hinting standards in Python. * refactor(g4f/Provider/Airforce.py): Update type hint for split_message return - Change return type of 'split_message' from 'list[str]' to 'List[str]' for consistency with import. - Maintain overall functionality and structure of the 'Airforce' class. - Ensure compatibility with type hinting standards in Python. * feat(g4f/Provider/RobocodersAPI.py): Add support for optional BeautifulSoup dependency - Introduce a check for the BeautifulSoup library and handle its absence gracefully. - Raise a if BeautifulSoup is not installed, prompting the user to install it. - Remove direct import of BeautifulSoup to avoid import errors when the library is missing. * fix: Updating provider documentation and small fixes in providers * Disabled the provider (RobocodersAPI) * Fix: Conflicting file g4f/models.py * Update g4f/models.py g4f/Provider/Airforce.py * Update docs/providers-and-models.md g4f/models.py g4f/Provider/Airforce.py g4f/Provider/PollinationsAI.py * Update docs/providers-and-models.md * Update .gitignore * Update g4f/models.py * Update g4f/Provider/PollinationsAI.py * feat(g4f/Provider/Blackbox.py): add support for additional AI models and agents - Introduce new agent modes for Meta-Llama, Mistral, DeepSeek, DBRX, Qwen, and Nous-Hermes - Update model aliases to include newly supported models * Update (g4f/Provider/Blackbox.py) * Update (g4f/Provider/Blackbox.py) * feat(g4f/Provider/Blackbox2.py): add license key caching and validation - Add cache file management for license key persistence - Implement async license key extraction from JavaScript files - Add license key validation to text generation requests - Update type hints for async generators - Add error handling for cache file operations Breaking changes: - Text generation now requires license key validation --------- Co-authored-by: kqlio67 <> --- g4f/models.py | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) (limited to 'g4f/models.py') diff --git a/g4f/models.py b/g4f/models.py index cb7d9697..96fead58 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -76,8 +76,9 @@ default = Model( DeepInfraChat, Airforce, Cloudflare, - Mhystical, PollinationsAI, + ChatGptEs, + ChatGpt, ]) ) @@ -195,10 +196,16 @@ llama_3_2_11b = Model( llama_3_3_70b = Model( name = "llama-3.3-70b", base_provider = "Meta Llama", - best_provider = IterListProvider([HuggingChat, HuggingFace, PerplexityLabs]) + best_provider = IterListProvider([Blackbox, HuggingChat, HuggingFace, PerplexityLabs]) ) ### Mistral ### +mixtral_7b = Model( + name = "mixtral-7b", + base_provider = "Mistral", + best_provider = Blackbox +) + mixtral_8x7b = Model( name = "mixtral-8x7b", base_provider = "Mistral", @@ -221,7 +228,7 @@ mistral_large = Model( hermes_2_dpo = Model( name = "hermes-2-dpo", base_provider = "NousResearch", - best_provider = Airforce + best_provider = IterListProvider([Blackbox, Airforce]) ) hermes_2_pro = Model( @@ -368,7 +375,7 @@ qwen_2_5_coder_32b = Model( qwq_32b = Model( name = 'qwq-32b', base_provider = 'Qwen', - best_provider = IterListProvider([DeepInfraChat, HuggingChat, HuggingFace]) + best_provider = IterListProvider([DeepInfraChat, Blackbox, HuggingChat, HuggingFace]) ) ### Inflection ### @@ -379,6 +386,12 @@ pi = Model( ) ### DeepSeek ### +deepseek_chat = Model( + name = 'deepseek-chat', + base_provider = 'DeepSeek', + best_provider = Blackbox +) + deepseek_coder = Model( name = 'deepseek-coder', base_provider = 'DeepSeek', @@ -463,6 +476,20 @@ neural_7b = Model( best_provider = Airforce ) +### Databricks ### +dbrx_instruct = Model( + name = 'dbrx-instruct', + base_provider = 'Databricks', + best_provider = Blackbox +) + +### PollinationsAI ### +p1 = Model( + name = 'p1', + base_provider = 'PollinationsAI', + best_provider = PollinationsAI +) + ### Uncensored AI ### evil = Model( name = 'evil', @@ -654,6 +681,7 @@ class ModelUtils: llama_3_3_70b.name: llama_3_3_70b, ### Mistral ### + mixtral_7b.name: mixtral_7b, mixtral_8x7b.name: mixtral_8x7b, mistral_nemo.name: mistral_nemo, mistral_large.name: mistral_large, @@ -728,6 +756,7 @@ class ModelUtils: sonar_chat.name: sonar_chat, ### DeepSeek ### + deepseek_chat.name: deepseek_chat, deepseek_coder.name: deepseek_coder, ### TheBloke ### @@ -748,6 +777,12 @@ class ModelUtils: ### Inferless ### neural_7b.name: neural_7b, + ### Databricks ### + dbrx_instruct.name: dbrx_instruct, + + ### PollinationsAI ### + p1.name: p1, + ### Uncensored AI ### evil.name: evil, -- cgit v1.2.3