Merge cluster to master #3

Merged
cyberes merged 163 commits from cluster into master 2023-10-27 19:19:22 -06:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit 7af3dbd76b - Show all commits

View File

@ -10,7 +10,7 @@ old_v1_bp = Blueprint('v1', __name__)
@old_v1_bp.route('/<path:path>', methods=['GET', 'POST'])
def fallback(path):
base_client_api = redis.get('base_client_api', dtype=str)
error_msg = f'The /v1/ endpoint has been depreciated. Please visit {base_client_api} for more information.'
error_msg = f'The /v1/ endpoint has been depreciated. Please visit {base_client_api} for more information.\nAlso, you must enable "Relaxed API URLS" in settings.'
response_msg = format_sillytavern_err(error_msg, error_type='API')
return jsonify({
'results': [{'text': response_msg}],

View File

@ -1,5 +1,3 @@
from llm_server.routes.v1 import old_v1_bp
try:
import gevent.monkey
@ -23,6 +21,7 @@ from llm_server.database.create import create_db
from llm_server.pre_fork import server_startup
from llm_server.routes.openai import openai_bp
from llm_server.routes.server_error import handle_server_error
from llm_server.routes.v1 import old_v1_bp
from llm_server.routes.v2 import bp
from llm_server.sock import init_socketio

View File

@ -111,6 +111,7 @@
<h3>Instructions</h3>
<div id="instructions">
<ol>
<li>In Settings > Power User Options, enable <kbd>Relaxed API URLS</kbd></li>
<li>Set your API type to <kbd>{{ mode_name }}</kbd></li>
<li>Enter <kbd>{{ client_api }}</kbd> in the <kbd>{{ api_input_textbox }}</kbd> textbox.</li>
{% if enable_streaming %}