Merge branch 'main' into main

README.md

@@ -7,9 +7,14 @@ This project features a WebUI utilizing the [G4F API](https://github.com/xtekky/
 Experience the power of ChatGPT with a user-friendly interface, enhanced jailbreaks, and completely free.
 
 ## Known bugs 🚧
-- Auto Proxy is not working.
+- GPT-4 model offline.
 
-_Coding to solve as quickly as possible_
+## News 📢
+I have created a new version of FreeGPT WebUI using the [ChimeraGPT API](https://chimeragpt.adventblocks.cc/). 
+<br>
+<br>
+This free API allows you to use various AI chat models, including <strong>GPT-4, GPT-4-32k, Claude-2, Claude-2-100k, and more.</strong> <br>
+Check out the project here: [FreeGPT WebUI - Chimera Version](https://github.com/ramonvc/freegpt-webui/tree/chimeragpt-version).
 
 ## Note ℹ️ 
 <p>
@@ -28,8 +33,6 @@ Please note that the choice and integration of additional Providers are the user
   - [Cloning the Repository](#cloning-the-repository-inbox_tray)  
   - [Install Dependencies](#install-dependencies-wrench)  
 - [Running the Application](#running-the-application-rocket)  
-- [Auto Proxy](#auto-proxy-)
-  - [Enable Auto Proxy](#enable-auto-proxy)
 - [Docker](#docker-)  
   - [Prerequisites](#prerequisites)  
   - [Running the Docker](#running-the-docker)
@@ -49,9 +52,8 @@ Please note that the choice and integration of additional Providers are the user
 - [x] Add the GPT-4 model
 - [x] Enhance the user interface
 - [ ] Check status of API Providers (online/offline)
-- [ ] Auto Proxy
 - [ ] Enable editing and creating Jailbreaks/Roles in the WebUI
-- [ ] Migrate the interface to React.js (?)
+- [ ] Refactor web client
 
 ## Getting Started :white_check_mark:  
 To get started with this project, you'll need to clone the repository and have [Python](https://www.python.org/downloads/) installed on your system.  
@@ -87,20 +89,6 @@ or
 ```
 http://localhost:1338
 ```
-## Auto Proxy 🔑  
-The application includes an auto proxy feature that allows it to work with multiple free proxy servers. 
-The freeGPT API refuses some connections, especially when hosted in the cloud (Azure, AWS, Google Cloud). 
-Auto proxy solves this problem automatically for you. 
-When enabled, the application will automatically fetch and test proxy servers, updating the list of working proxies every 30 minutes.  
-  
-### Enable Auto Proxy
-To enable it, just go to the `config.json` file and change the value of the "use_auto_proxy" to `true`.  
-
-```
-"use_auto_proxy": true
-```
-![use-auto-proxy-gif](https://github.com/ramonvc/gptfree-webui/assets/13617054/f83c6217-411c-404c-9f4c-8ae700a486d1)
-
 
 
 ## Docker 🐳

config.json

@@ -4,6 +4,5 @@
 		"port": 1338,
 		"debug": false
 	},
-	"url_prefix": "",
-	"use_auto_proxy": false
+	"url_prefix": ""
 }

g4f/models.py

@@ -10,22 +10,22 @@ class Model:
     class gpt_35_turbo:
         name: str = 'gpt-3.5-turbo'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = random.choice([Provider.DeepAi, Provider.Gravityengine])
+        best_provider: Provider.Provider = random.choice([Provider.DeepAi, Provider.Easychat])
 
     class gpt_35_turbo_0613:
         name: str = 'gpt-3.5-turbo-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Gravityengine
+        best_provider: Provider.Provider = random.choice([Provider.Gravityengine, Provider.Easychat])
 
     class gpt_35_turbo_16k_0613:
         name: str = 'gpt-3.5-turbo-16k-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Gravityengine
+        best_provider: Provider.Provider = random.choice([Provider.Gravityengine, Provider.Easychat])
 
     class gpt_35_turbo_16k:
         name: str = 'gpt-3.5-turbo-16k'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Gravityengine
+        best_provider: Provider.Provider = random.choice([Provider.Gravityengine, Provider.Easychat])
 
     class gpt_4_dev:
         name: str = 'gpt-4-for-dev'

server/auto_proxy.py

@@ -1,103 +0,0 @@
-import random  
-import requests  
-import time  
-import threading  
-  
-  
-def fetch_proxies():
-    """Fetch a list of proxy servers from proxyscrape.com.  
-  
-    Returns:  
-        list: A list of proxy servers in the format "IP:Port".  
-    """  
-    url = "https://api.proxyscrape.com/v2/?request=displayproxies&protocol=http&timeout=10000&country=all&ssl=all&anonymity=all"
-    response = requests.get(url)
-    if response.status_code == 200:
-        return response.text.split("\r\n")[:-1]
-    print(f"Error fetching proxies: {response.status_code}")
-    return []  
-  
-  
-def test_proxy(proxy, prompt, timeout):  
-    """Test the given proxy server with a specified prompt and timeout.  
-  
-    Args:  
-        proxy (str): The proxy server in the format "IP:Port".  
-        prompt (str): The test prompt to be used for testing.  
-        timeout (int): The maximum time in seconds allowed for the test.  
-    """  
-    try:  
-        start_time = time.time()  
-        # res = gpt3.Completion.create(prompt=prompt, proxy=proxy)  
-        end_time = time.time()  
-        response_time = end_time - start_time  
-  
-        if response_time < timeout:  
-            response_time = int(response_time*1000)  
-            print(f'proxy: {proxy} [{response_time}ms] ✅')  
-            add_working_proxy((proxy))  
-    except Exception as e:  
-        pass  
-  
-  
-def add_working_proxy(proxy):  
-    """Add a working proxy server to the global working_proxies list.  
-  
-    Args:  
-        proxy (str): The proxy server in the format "IP:Port". 
-    """  
-    global working_proxies  
-    working_proxies.append(proxy)  
-  
-  
-def remove_proxy(proxy):  
-    """Remove a proxy server from the global working_proxies list.  
-  
-    Args:  
-        proxy (str): The proxy server in the format "IP:Port".  
-    """  
-    global working_proxies  
-    if proxy in working_proxies:  
-        working_proxies.remove(proxy)  
-  
-  
-def get_working_proxies(prompt, timeout=5):  
-    """Fetch and test proxy servers, adding working proxies to the global working_proxies list.  
-  
-    Args:  
-        prompt (str): The test prompt to be used for testing.  
-        timeout (int, optional): The maximum time in seconds allowed for testing. Defaults to 5.  
-    """  
-    proxy_list = fetch_proxies()  
-    threads = []  
-  
-    for proxy in proxy_list:  
-        thread = threading.Thread(target=test_proxy, args=(  
-            proxy, prompt, timeout))  
-        threads.append(thread)  
-        thread.start()  
-  
-    for t in threads:  
-        t.join(timeout)  
-  
-  
-def update_working_proxies():  
-    """Continuously update the global working_proxies list with working proxy servers."""  
-    global working_proxies  
-    test_prompt = "What is the capital of France?"  
-  
-    while True:  
-        working_proxies = []  # Clear the list before updating  
-        get_working_proxies(test_prompt)  
-        print('proxies updated')  
-        time.sleep(1800)  # Update proxies list every 30 minutes  
-  
-  
-def get_random_proxy():  
-    """Get a random working proxy server from the global working_proxies list.  
-  
-    Returns:  
-        str: A random working proxy server in the format "IP:Port".  
-    """  
-    global working_proxies  
-    return random.choice(working_proxies)  

server/backend.py

@@ -6,7 +6,6 @@ from googletrans import Translator
 from flask import request, Response, stream_with_context
 from datetime import datetime
 from requests import get
-from server.auto_proxy import get_random_proxy, update_working_proxies
 from server.config import special_instructions
 
 
@@ -14,24 +13,17 @@ class Backend_Api:
     def __init__(self, bp, config: dict) -> None:
         """
         Initialize the Backend_Api class.
-
         :param app: Flask application instance
         :param config: Configuration dictionary
         """
         self.bp = bp
-        self.use_auto_proxy = config['use_auto_proxy']
         self.routes = {
             '/backend-api/v2/conversation': {
                 'function': self._conversation,
                 'methods': ['POST']
             }
         }
-
-        # if self.use_auto_proxy:
-        #    update_proxies = threading.Thread(
-        #        target=update_working_proxies, daemon=True)
-        #    update_proxies.start()
-
+        
     def _conversation(self):
         """
         Handles the conversation route.
@@ -181,11 +173,11 @@ def response_jailbroken_failed(response):
 
 
 def set_response_language(prompt):
-    """
-    Set the response language based on the prompt content.
+    """  
+    Set the response language based on the prompt content.  
 
-    :param prompt: Prompt dictionary
-    :return: String indicating the language to be used for the response
+    :param prompt: Prompt dictionary  
+    :return: String indicating the language to be used for the response  
     """
     translator = Translator()
     max_chars = 256
@@ -194,18 +186,19 @@ def set_response_language(prompt):
     return f"You will respond in the language: {detected_language}. "
 
 
-
 def getJailbreak(jailbreak):
-    """
-    Check if jailbreak instructions are provided.
+    """  
+    Check if jailbreak instructions are provided.  
 
-    :param jailbreak: Jailbreak instruction string
-    :return: Jailbreak instructions if provided, otherwise None
+    :param jailbreak: Jailbreak instruction string  
+    :return: Jailbreak instructions if provided, otherwise None  
     """
-    if jailbreak == "default":
-        return None
-    special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction']
-    if jailbreak not in special_instructions:
+    if jailbreak != "default":
+        special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction']
+        if jailbreak in special_instructions:
+            special_instructions[jailbreak]
+            return special_instructions[jailbreak]
+        else:
+            return None
+    else:
         return None
-    special_instructions[jailbreak]
-    return special_instructions[jailbreak]