From e236e93a79a43383ddc567c3ac61effe063c12f1 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Fri, 20 Oct 2023 18:26:41 -0600
Subject: [PATCH] clean up a bit

---
 llm_server/routes/request_handler.py |  2 +-
 llm_server/workers/printer.py        |  5 ++---
 other/tests/start-bulk.sh            | 12 ++++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/llm_server/routes/request_handler.py b/llm_server/routes/request_handler.py
index 8e25b1b..2d81d6a 100644
--- a/llm_server/routes/request_handler.py
+++ b/llm_server/routes/request_handler.py
@@ -222,7 +222,7 @@ class RequestHandler:
             processing_ip = 0
 
         if queued_ip_count + processing_ip >= self.token_simultaneous_ip:
-            print(f'Rejecting request from {self.client_ip} - {queued_ip_count} queued, {processing_ip} processing.')
+            print(f'Rejecting request from {self.client_ip} - {processing_ip} processing, {queued_ip_count} queued')
             return True
         else:
             return False
diff --git a/llm_server/workers/printer.py b/llm_server/workers/printer.py
index a62f85c..759ae67 100644
--- a/llm_server/workers/printer.py
+++ b/llm_server/workers/printer.py
@@ -25,6 +25,7 @@ def console_printer():
             for k in processing:
                 processing_count += redis.get(k, default=0, dtype=int)
         backends = [k for k, v in cluster_config.all().items() if v['online']]
+        activity = priority_queue.activity()
 
         # Calculate the queue size the same way it's done on the stats.
         queue_size = 0
@@ -32,8 +33,6 @@ def console_printer():
         for model in running_models:
             queue_size += priority_queue.len(model)
 
-        activity = priority_queue.activity()
-
         # Active Workers and Processing should read the same. If not, that's an issue.
         logger.info(f'REQUEST QUEUE -> Active Workers: {len([i for i in activity if i[1]])} | Processing: {processing_count} | Queued: {queue_size} | Backends Online: {len(backends)}')
-        time.sleep(2)
+        time.sleep(10)
diff --git a/other/tests/start-bulk.sh b/other/tests/start-bulk.sh
index 49e92a6..6f254d5 100755
--- a/other/tests/start-bulk.sh
+++ b/other/tests/start-bulk.sh
@@ -44,21 +44,21 @@ rows=$(echo "sqrt($num_windows)" | bc)
 columns=$(echo "($num_windows + $rows - 1) / $rows" | bc)
 
 # Create a new tmux session
-tmux new-session -d -s my_session "$command -p 0"
+tmux new-session -d -s llm_tester "$command -p 0"
 
 # Create the remaining windows
 for ((i = 1; i < $num_windows; i++)); do
   if ((i % $columns == 0)); then
-    tmux select-layout -t my_session:0 tiled
+    tmux select-layout -t llm_tester:0 tiled
     tmux select-pane -t 0
-    tmux split-window -t my_session:0 -v "$command -p $i"
+    tmux split-window -t llm_tester:0 -v "$command -p $i"
   else
-    tmux split-window -t my_session:0 -h "$command -p $i"
+    tmux split-window -t llm_tester:0 -h "$command -p $i"
   fi
 done
 
 # Balance the windows
-tmux select-layout -t my_session:0 tiled
+tmux select-layout -t llm_tester:0 tiled
 
 # Attach to the session
-tmux attach-session -t my_session
+tmux attach-session -t llm_tester