From 2d9ec153028ac3a0ed409f7e383836127fc0c6b3 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Tue, 29 Aug 2023 14:57:49 -0600
Subject: [PATCH] I swear I know what I'm doing

---
 llm_server/database.py           |  2 ++
 llm_server/routes/v1/generate.py | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/llm_server/database.py b/llm_server/database.py
index 41a5fa1..a105c74 100644
--- a/llm_server/database.py
+++ b/llm_server/database.py
@@ -66,6 +66,8 @@ def log_prompt(ip, token, prompt, response, gen_time, parameters, headers, backe
         # TODO: test and verify this works as expected
         response = None
 
+    print(response)
+
     timestamp = int(time.time())
     conn = sqlite3.connect(opts.database_path)
     c = conn.cursor()
diff --git a/llm_server/routes/v1/generate.py b/llm_server/routes/v1/generate.py
index b025da6..c88edde 100644
--- a/llm_server/routes/v1/generate.py
+++ b/llm_server/routes/v1/generate.py
@@ -114,12 +114,13 @@ def generate():
                 backend_err = True
                 error_type = response_json_body.get('error_type')
                 error_type_string = 'returned an error' if opts.mode == 'oobabooga' else f'returned {indefinite_article(error_type)} {error_type} error'
+                backend_response = format_sillytavern_err(
+                    f'Backend ({opts.mode}) {error_type_string}: {response_json_body.get("error")}',
+                    'error')
                 response_json_body = {
                     'results': [
                         {
-                            'text': format_sillytavern_err(
-                                f'Backend ({opts.mode}) {error_type_string}: {response_json_body.get("error")}',
-                                'error')
+                            'text': backend_response
                         }
                     ]
                 }
@@ -133,7 +134,8 @@ def generate():
                 }
         else:
             raise Exception
-        redis.incr('proompts')
+        if not backend_err:
+            redis.incr('proompts')
         log_prompt(client_ip, token, request_json_body['prompt'], backend_response, elapsed_time if not backend_err else None, parameters, dict(request.headers), response.status_code if response else 0, response_json_body.get('details', {}).get('generated_tokens'), is_error=backend_err)
         return jsonify({
             **response_json_body