From 9ca54c4afa276b913476883b781aa68da5f65475 Mon Sep 17 00:00:00 2001 From: machsix <28209092+machsix@users.noreply.github.com> Date: Wed, 12 Jul 2023 01:04:22 -0700 Subject: [PATCH 1/3] use Blueprint to handle static files, add "url_prefix" in config.json for reverse proxy --- client/html/index.html | 22 +++++----- client/js/chat.js | 15 +++---- config.json | 1 + run.py | 19 +++++---- server/app.py | 3 -- server/backend.py | 94 +++++++++++++++++++++--------------------- server/bp.py | 6 +++ server/website.py | 23 ++++------- 8 files changed, 92 insertions(+), 91 deletions(-) delete mode 100644 server/app.py create mode 100644 server/bp.py diff --git a/client/html/index.html b/client/html/index.html index 9e3dabcd..b2a0be6d 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -11,18 +11,18 @@ property="og:description" content="A conversational AI system that listens, learns, and challenges" /> - - - - - + + + + + FreeGPT - +
@@ -109,11 +109,11 @@ - - + + - - - + + + diff --git a/client/js/chat.js b/client/js/chat.js index fc31aa60..b8052cb5 100644 --- a/client/js/chat.js +++ b/client/js/chat.js @@ -2,6 +2,7 @@ const query = (obj) => 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`); @@ -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 = `User Avatar`; -const gpt_image = `GPT Avatar`; +const user_image = `User Avatar`; +const gpt_image = `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`, { + const response = await fetch(`${url_prefix}/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(`
None: - """ - Initialize the Backend_Api class. + def __init__(self, bp, config: dict) -> None: + """ + Initialize the Backend_Api class. - :param app: Flask application instance - :param config: Configuration dictionary + :param app: Flask application instance + :param config: Configuration dictionary """ - self.app = app + self.bp = bp self.use_auto_proxy = config['use_auto_proxy'] self.routes = { '/backend-api/v2/conversation': { @@ -33,15 +33,15 @@ def __init__(self, app, config: dict) -> None: # update_proxies.start() def _conversation(self): - """ - Handles the conversation route. + """ + Handles the conversation route. - :return: Response object containing the generated conversation stream + :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 @@ def _conversation(self): # Generate response response = ChatCompletion.create( - model=model, - stream=True, + model=model, + stream=True, chatId=conversation_id, messages=messages ) - return self.app.response_class(generate_stream(response, jailbreak), mimetype='text/event-stream') + return Response(stream_with_context(generate_stream(response, jailbreak)), mimetype='text/event-stream') except Exception as e: print(e) @@ -73,11 +73,11 @@ def _conversation(self): def build_messages(jailbreak): - """ - Build the messages for the conversation. + """ + Build the messages for the conversation. - :param jailbreak: Jailbreak instruction string - :return: List of 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. + """ + Fetch search results for a given query. - :param query: Search query string - :return: List of search results + :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. + """ + Generate the conversation stream. - :param response: Response object from ChatCompletion.create - :param jailbreak: Jailbreak instruction string - :return: Generator object yielding messages in the conversation + :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. + """ + Check if the response has not been jailbroken. - :param response: Response string - :return: Boolean indicating 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 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. + """ + 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": special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction'] diff --git a/server/bp.py b/server/bp.py new file mode 100644 index 00000000..61d41679 --- /dev/null +++ b/server/bp.py @@ -0,0 +1,6 @@ +from flask import Blueprint + +bp = Blueprint('bp', __name__, + template_folder='./../client/html', + static_folder='./../client', + static_url_path='assets') diff --git a/server/website.py b/server/website.py index 98f39c15..795966cd 100644 --- a/server/website.py +++ b/server/website.py @@ -1,14 +1,15 @@ -from flask import render_template, send_file, redirect +from flask import render_template, redirect, url_for from time import time from os import urandom class Website: - def __init__(self, app) -> None: - self.app = app + def __init__(self, bp, url_prefix) -> None: + self.bp = bp + self.url_prefix = url_prefix self.routes = { '/': { - 'function': lambda: redirect('/chat'), + 'function': lambda: redirect(url_for('._index')), 'methods': ['GET', 'POST'] }, '/chat/': { @@ -18,24 +19,14 @@ def __init__(self, app) -> None: '/chat/': { 'function': self._chat, 'methods': ['GET', 'POST'] - }, - '/assets//': { - 'function': self._assets, - 'methods': ['GET', 'POST'] } } def _chat(self, conversation_id): if '-' not in conversation_id: - return redirect('/chat') + 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:]}') - - def _assets(self, folder: str, file: str): - try: - return send_file(f"./../client/{folder}/{file}", as_attachment=False) - except: - return "File not found", 404 + 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) From c07be57a62e85c523e9090e9d80fec8b1e11a06a Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Wed, 12 Jul 2023 08:07:23 +0000 Subject: [PATCH 2/3] 'Refactored by Sourcery' --- server/backend.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/server/backend.py b/server/backend.py index f61ba96c..01ea3efa 100644 --- a/server/backend.py +++ b/server/backend.py @@ -128,14 +128,11 @@ def fetch_search_results(query): 'limit': 3, }) - results = [] snippets = "" for index, result in enumerate(search.json()): snippet = f'[{index + 1}] "{result["snippet"]}" URL:{result["link"]}.' snippets += snippet - results.append({'role': 'system', 'content': snippets}) - - return results + return [{'role': 'system', 'content': snippets}] def generate_stream(response, jailbreak): @@ -205,12 +202,10 @@ def getJailbreak(jailbreak): :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'] - if jailbreak in special_instructions: - special_instructions[jailbreak] - return special_instructions[jailbreak] - else: - return None - else: - return None \ No newline at end of file + if jailbreak == "default": + return None + special_instructions[jailbreak][0]['content'] += special_instructions['two_responses_instruction'] + if jailbreak not in special_instructions: + return None + special_instructions[jailbreak] + return special_instructions[jailbreak] \ No newline at end of file From f2b6ea4b11414a392672ef91541096d330176004 Mon Sep 17 00:00:00 2001 From: Ramon Date: Thu, 13 Jul 2023 15:44:06 -0300 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 249dad1d..a1b00b74 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ I have created a new version of FreeGPT WebUI using the [ChimeraGPT API](https:/

This free API allows you to use various AI chat models, including GPT-4, GPT-4-32k, Claude-2, Claude-2-100k, and more.
-Check out the project here: [FreeGPT WebUI - Chimera Version](https://github.com/ramonvc/freegpt-webui-chimera) +Check out the project here: [FreeGPT WebUI - Chimera Version](https://github.com/ramonvc/freegpt-webui/tree/chimeragpt-version). ## Note ℹ️