Spaces:

monra
/

freegpt-webui

Paused

App Files Files Community

machsix commited on Jul 12, 2023

Commit

9ca54c4

1 Parent(s): 7f44f4d

use Blueprint to handle static files, add "url_prefix" in config.json for reverse proxy

Browse files

Files changed (8) hide show

client/html/index.html +11 -11
client/js/chat.js +8 -7
config.json +1 -0
run.py +12 -7
server/app.py +0 -3
server/backend.py +47 -47
server/bp.py +6 -0
server/website.py +7 -16

client/html/index.html CHANGED Viewed

@@ -11,18 +11,18 @@
 			property="og:description"
 			content="A conversational AI system that listens, learns, and challenges" />
 		<meta property="og:url" content="https://chat.acy.dev" />
-		<link rel="stylesheet" href="/assets/css/style.css" />
-		<link rel="apple-touch-icon" sizes="180x180" href="/assets/img/apple-touch-icon.png" />
-		<link rel="icon" type="image/png" sizes="32x32" href="/assets/img/favicon-32x32.png" />
-		<link rel="icon" type="image/png" sizes="16x16" href="/assets/img/favicon-16x16.png" />
-		<link rel="manifest" href="/assets/img/site.webmanifest" />
 		<link
 			rel="stylesheet"
 			href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/styles/base16/dracula.min.css" />
 		<title>FreeGPT</title>
 	</head>
-	<body>
 		<div class="main-container">
 			<div class="box sidebar">
 				<div class="top">
@@ -109,11 +109,11 @@
 		<script>
 			window.conversation_id = "{{ chat_id }}";
 		</script>
-		<script src="/assets/js/icons.js"></script>
-		<script src="/assets/js/chat.js" defer></script>
 		<script src="https://cdn.jsdelivr.net/npm/markdown-it@latest/dist/markdown-it.min.js"></script>
-		<script src="/assets/js/highlight.min.js"></script>
-		<script src="/assets/js/highlightjs-copy.min.js"></script>
-		<script src="/assets/js/theme-toggler.js"></script>
 	</body>
 </html>

 			property="og:description"
 			content="A conversational AI system that listens, learns, and challenges" />
 		<meta property="og:url" content="https://chat.acy.dev" />
+		<link rel="stylesheet" href="{{ url_for('bp.static', filename='css/style.css') }}" />
+		<link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('bp.static', filename='img/apple-touch-icon.png') }}" />
+		<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('bp.static', filename='img/favicon-32x32.png') }}" />
+		<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('bp.static', filename='img/favicon-16x16.png') }}" />
+		<link rel="manifest" href="{{ url_for('bp.static', filename='img/site.webmanifest') }}" />
 		<link
 			rel="stylesheet"
 			href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@latest/build/styles/base16/dracula.min.css" />
 		<title>FreeGPT</title>
 	</head>
+	<body data-urlprefix="{{ url_prefix}}">
 		<div class="main-container">
 			<div class="box sidebar">
 				<div class="top">
 		<script>
 			window.conversation_id = "{{ chat_id }}";
 		</script>
+		<script src="{{ url_for('bp.static', filename='js/icons.js') }}"></script>
+		<script src="{{ url_for('bp.static', filename='js/chat.js') }}" defer></script>
 		<script src="https://cdn.jsdelivr.net/npm/markdown-it@latest/dist/markdown-it.min.js"></script>
+		<script src="{{ url_for('bp.static', filename='js/highlight.min.js') }}"></script>
+		<script src="{{ url_for('bp.static', filename='js/highlightjs-copy.min.js') }}"></script>
+		<script src="{{ url_for('bp.static', filename='js/theme-toggler.js') }}"></script>
 	</body>
 </html>

client/js/chat.js CHANGED Viewed

@@ -2,6 +2,7 @@ const query = (obj) =>
 	Object.keys(obj)
 		.map((k) => encodeURIComponent(k) + "=" + encodeURIComponent(obj[k]))
 		.join("&");
 const markdown = window.markdownit();
 const message_box = document.getElementById(`messages`);
 const message_input = document.getElementById(`message-input`);
@@ -9,8 +10,8 @@ const box_conversations = document.querySelector(`.top`);
 const spinner = box_conversations.querySelector(".spinner");
 const stop_generating = document.querySelector(`.stop-generating`);
 const send_button = document.querySelector(`#send-button`);
-const user_image = `<img src="/assets/img/user.png" alt="User Avatar">`;
-const gpt_image = `<img src="/assets/img/gpt.png" alt="GPT Avatar">`;
 let prompt_lock = false;
 hljs.addPlugin(new CopyButtonPlugin());
@@ -90,7 +91,7 @@ const ask_gpt = async (message) => {
 		await new Promise((r) => setTimeout(r, 1000));
 		window.scrollTo(0, 0);
-		const response = await fetch(`/backend-api/v2/conversation`, {
 			method: `POST`,
 			signal: window.controller.signal,
 			headers: {
@@ -127,7 +128,7 @@ const ask_gpt = async (message) => {
 			chunk = decodeUnicode(new TextDecoder().decode(value));
-			if (chunk.includes(`<form id="challenge-form" action="/backend-api/v2/conversation?`)) {
 				chunk = `cloudflare token expired, please refresh the page.`;
 			}
@@ -243,7 +244,7 @@ const delete_conversation = async (conversation_id) => {
 };
 const set_conversation = async (conversation_id) => {
-	history.pushState({}, null, `/chat/${conversation_id}`);
 	window.conversation_id = conversation_id;
 	await clear_conversation();
@@ -252,7 +253,7 @@ const set_conversation = async (conversation_id) => {
 };
 const new_conversation = async () => {
-	history.pushState({}, null, `/chat/`);
 	window.conversation_id = uuid();
 	await clear_conversation();
@@ -426,7 +427,7 @@ window.onload = async () => {
 	}, 1);
 	if (!window.location.href.endsWith(`#`)) {
-		if (/\/chat\/.+/.test(window.location.href)) {
 			await load_conversation(window.conversation_id);
 		}
 	}

 	Object.keys(obj)
 		.map((k) => encodeURIComponent(k) + "=" + encodeURIComponent(obj[k]))
 		.join("&");
+const url_prefix = document.querySelector('body').getAttribute('data-urlprefix')
 const markdown = window.markdownit();
 const message_box = document.getElementById(`messages`);
 const message_input = document.getElementById(`message-input`);
 const spinner = box_conversations.querySelector(".spinner");
 const stop_generating = document.querySelector(`.stop-generating`);
 const send_button = document.querySelector(`#send-button`);
+const user_image = `<img src="${url_prefix}/assets/img/user.png" alt="User Avatar">`;
+const gpt_image = `<img src="${url_prefix}/assets/img/gpt.png" alt="GPT Avatar">`;
 let prompt_lock = false;
 hljs.addPlugin(new CopyButtonPlugin());
 		await new Promise((r) => setTimeout(r, 1000));
 		window.scrollTo(0, 0);
+		const response = await fetch(`${url_prefix}/backend-api/v2/conversation`, {
 			method: `POST`,
 			signal: window.controller.signal,
 			headers: {
 			chunk = decodeUnicode(new TextDecoder().decode(value));
+			if (chunk.includes(`<form id="challenge-form" action="${url_prefix}/backend-api/v2/conversation?`)) {
 				chunk = `cloudflare token expired, please refresh the page.`;
 			}
 };
 const set_conversation = async (conversation_id) => {
+	history.pushState({}, null, `${url_prefix}/chat/${conversation_id}`);
 	window.conversation_id = conversation_id;
 	await clear_conversation();
 };
 const new_conversation = async () => {
+	history.pushState({}, null, `${url_prefix}/chat/`);
 	window.conversation_id = uuid();
 	await clear_conversation();
 	}, 1);
 	if (!window.location.href.endsWith(`#`)) {
+		if (/\/chat\/.+/.test(window.location.href.slice(url_prefix.length))) {
 			await load_conversation(window.conversation_id);
 		}
 	}

config.json CHANGED Viewed

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

 		"port": 1338,
 		"debug": false
 	},
+	"url_prefix": "",
 	"use_auto_proxy": false
 }

run.py CHANGED Viewed

@@ -1,34 +1,39 @@
-from server.app import app
 from server.website import Website
 from server.backend import Backend_Api
 from json import load
 if __name__ == '__main__':
     # Load configuration from config.json
     config = load(open('config.json', 'r'))
     site_config = config['site_config']
     # Set up the website routes
-    site = Website(app)
     for route in site.routes:
-        app.add_url_rule(
             route,
             view_func=site.routes[route]['function'],
             methods=site.routes[route]['methods'],
         )
     # Set up the backend API routes
-    backend_api = Backend_Api(app, config)
     for route in backend_api.routes:
-        app.add_url_rule(
             route,
             view_func=backend_api.routes[route]['function'],
             methods=backend_api.routes[route]['methods'],
         )
     # Run the Flask server
-    print(f"Running on port {site_config['port']}")
     app.run(**site_config)
     print(f"Closing port {site_config['port']}")

+from server.bp import bp
 from server.website import Website
 from server.backend import Backend_Api
 from json import load
+from flask import Flask
 if __name__ == '__main__':
     # Load configuration from config.json
     config = load(open('config.json', 'r'))
     site_config = config['site_config']
+    url_prefix = config.pop('url_prefix')
     # Set up the website routes
+    site = Website(bp, url_prefix)
     for route in site.routes:
+        bp.add_url_rule(
             route,
             view_func=site.routes[route]['function'],
             methods=site.routes[route]['methods'],
         )
     # Set up the backend API routes
+    backend_api = Backend_Api(bp, config)
     for route in backend_api.routes:
+        bp.add_url_rule(
             route,
             view_func=backend_api.routes[route]['function'],
             methods=backend_api.routes[route]['methods'],
         )
+    # Create the app and register the blueprint
+    app = Flask(__name__)
+    app.register_blueprint(bp, url_prefix=url_prefix)
     # Run the Flask server
+    print(f"Running on {site_config['port']}{url_prefix}")
     app.run(**site_config)
     print(f"Closing port {site_config['port']}")

server/app.py DELETED Viewed

@@ -1,3 +0,0 @@
-from flask import Flask
-app = Flask(__name__, template_folder='./../client/html')

server/backend.py CHANGED Viewed

@@ -3,7 +3,7 @@ import time
 import g4f
 from g4f import ChatCompletion
 from googletrans import Translator
-from flask import request
 from datetime import datetime
 from requests import get
 from server.auto_proxy import get_random_proxy, update_working_proxies
@@ -11,14 +11,14 @@ from server.config import special_instructions
 class Backend_Api:
-    def __init__(self, app, config: dict) -> None:
-        """
-        Initialize the Backend_Api class.
-        :param app: Flask application instance
-        :param config: Configuration dictionary
         """
-        self.app = app
         self.use_auto_proxy = config['use_auto_proxy']
         self.routes = {
             '/backend-api/v2/conversation': {
@@ -33,15 +33,15 @@ class Backend_Api:
         #    update_proxies.start()
     def _conversation(self):
-        """
-        Handles the conversation route.
-        :return: Response object containing the generated conversation stream
         """
         max_retries = 3
         retries = 0
         conversation_id = request.json['conversation_id']
         while retries < max_retries:
             try:
                 jailbreak = request.json['jailbreak']
@@ -50,13 +50,13 @@ class Backend_Api:
                 # Generate response
                 response = ChatCompletion.create(
-                    model=model,
-                    stream=True,
                     chatId=conversation_id,
                     messages=messages
                 )
-                return self.app.response_class(generate_stream(response, jailbreak), mimetype='text/event-stream')
             except Exception as e:
                 print(e)
@@ -73,11 +73,11 @@ class Backend_Api:
 def build_messages(jailbreak):
-    """
-    Build the messages for the conversation.
-    :param jailbreak: Jailbreak instruction string
-    :return: List of messages for the conversation
     """
     _conversation = request.json['meta']['content']['conversation']
     internet_access = request.json['meta']['content']['internet_access']
@@ -116,11 +116,11 @@ def build_messages(jailbreak):
 def fetch_search_results(query):
-    """
-    Fetch search results for a given query.
-    :param query: Search query string
-    :return: List of search results
     """
     search = get('https://ddg-api.herokuapp.com/search',
                  params={
@@ -139,12 +139,12 @@ def fetch_search_results(query):
 def generate_stream(response, jailbreak):
-    """
-    Generate the conversation stream.
-    :param response: Response object from ChatCompletion.create
-    :param jailbreak: Jailbreak instruction string
-    :return: Generator object yielding messages in the conversation
     """
     if getJailbreak(jailbreak):
         response_jailbreak = ''
@@ -174,36 +174,36 @@ def response_jailbroken_success(response: str) -> bool:
 def response_jailbroken_failed(response):
-    """
-    Check if the response has not been jailbroken.
-    :param response: Response string
-    :return: Boolean indicating if the response has not been jailbroken
     """
     return False if len(response) < 4 else not (response.startswith("GPT:") or response.startswith("ACT:"))
-def set_response_language(prompt):
-    """
-    Set the response language based on the prompt content.
-    :param prompt: Prompt dictionary
-    :return: String indicating the language to be used for the response
-    """
-    translator = Translator()
-    max_chars = 256
-    content_sample = prompt['content'][:max_chars]
-    detected_language = translator.detect(content_sample).lang
-    return f"You will respond in the language: {detected_language}. "
 def getJailbreak(jailbreak):
-    """
-    Check if jailbreak instructions are provided.
-    :param jailbreak: Jailbreak instruction string
-    :return: Jailbreak instructions if provided, otherwise None
     """
     if jailbreak != "default":
         special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction']

 import g4f
 from g4f import ChatCompletion
 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
 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': {
         #    update_proxies.start()
     def _conversation(self):
+        """
+        Handles the conversation route.
+        :return: Response object containing the generated conversation stream
         """
         max_retries = 3
         retries = 0
         conversation_id = request.json['conversation_id']
         while retries < max_retries:
             try:
                 jailbreak = request.json['jailbreak']
                 # Generate response
                 response = ChatCompletion.create(
+                    model=model,
+                    stream=True,
                     chatId=conversation_id,
                     messages=messages
                 )
+                return Response(stream_with_context(generate_stream(response, jailbreak)), mimetype='text/event-stream')
             except Exception as e:
                 print(e)
 def build_messages(jailbreak):
+    """
+    Build the messages for the conversation.
+    :param jailbreak: Jailbreak instruction string
+    :return: List of messages for the conversation
     """
     _conversation = request.json['meta']['content']['conversation']
     internet_access = request.json['meta']['content']['internet_access']
 def fetch_search_results(query):
+    """
+    Fetch search results for a given query.
+    :param query: Search query string
+    :return: List of search results
     """
     search = get('https://ddg-api.herokuapp.com/search',
                  params={
 def generate_stream(response, jailbreak):
+    """
+    Generate the conversation stream.
+    :param response: Response object from ChatCompletion.create
+    :param jailbreak: Jailbreak instruction string
+    :return: Generator object yielding messages in the conversation
     """
     if getJailbreak(jailbreak):
         response_jailbreak = ''
 def response_jailbroken_failed(response):
+    """
+    Check if the response has not been jailbroken.
+    :param response: Response string
+    :return: Boolean indicating if the response has not been jailbroken
     """
     return False if len(response) < 4 else not (response.startswith("GPT:") or response.startswith("ACT:"))
+def set_response_language(prompt):
+    """
+    Set the response language based on the prompt content.
+    :param prompt: Prompt dictionary
+    :return: String indicating the language to be used for the response
+    """
+    translator = Translator()
+    max_chars = 256
+    content_sample = prompt['content'][:max_chars]
+    detected_language = translator.detect(content_sample).lang
+    return f"You will respond in the language: {detected_language}. "
 def getJailbreak(jailbreak):
+    """
+    Check if jailbreak instructions are provided.
+    :param jailbreak: Jailbreak instruction string
+    :return: Jailbreak instructions if provided, otherwise None
     """
     if jailbreak != "default":
         special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction']

server/bp.py ADDED Viewed

	@@ -0,0 +1,6 @@

+from flask import Blueprint
+bp = Blueprint('bp', __name__,
+               template_folder='./../client/html',
+               static_folder='./../client',
+               static_url_path='assets')

server/website.py CHANGED Viewed

@@ -1,14 +1,15 @@
-from flask import render_template, send_file, redirect
 from time import time
 from os import urandom
 class Website:
-    def __init__(self, app) -> None:
-        self.app = app
         self.routes = {
             '/': {
-                'function': lambda: redirect('/chat'),
                 'methods': ['GET', 'POST']
             },
             '/chat/': {
@@ -18,24 +19,14 @@ class Website:
             '/chat/<conversation_id>': {
                 'function': self._chat,
                 'methods': ['GET', 'POST']
-            },
-            '/assets/<folder>/<file>': {
-                'function': self._assets,
-                'methods': ['GET', 'POST']
             }
         }
     def _chat(self, conversation_id):
         if '-' not in conversation_id:
-            return redirect('/chat')
         return render_template('index.html', chat_id=conversation_id)
     def _index(self):
-        return render_template('index.html', chat_id=f'{urandom(4).hex()}-{urandom(2).hex()}-{urandom(2).hex()}-{urandom(2).hex()}-{hex(int(time() * 1000))[2:]}')
-    def _assets(self, folder: str, file: str):
-        try:
-            return send_file(f"./../client/{folder}/{file}", as_attachment=False)
-        except:
-            return "File not found", 404

+from flask import render_template, redirect, url_for
 from time import time
 from os import urandom
 class Website:
+    def __init__(self, bp, url_prefix) -> None:
+        self.bp = bp
+        self.url_prefix = url_prefix
         self.routes = {
             '/': {
+                'function': lambda: redirect(url_for('._index')),
                 'methods': ['GET', 'POST']
             },
             '/chat/': {
             '/chat/<conversation_id>': {
                 'function': self._chat,
                 'methods': ['GET', 'POST']
             }
         }
     def _chat(self, conversation_id):
         if '-' not in conversation_id:
+            return redirect(url_for('._index'))
         return render_template('index.html', chat_id=conversation_id)
     def _index(self):
+        return render_template('index.html', chat_id=f'{urandom(4).hex()}-{urandom(2).hex()}-{urandom(2).hex()}-{urandom(2).hex()}-{hex(int(time() * 1000))[2:]}', url_prefix=self.url_prefix)