cyberes
/
local-llm-server
Archived
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

reorganize stats page again

This commit is contained in:
Cyberes 2023-08-27 22:24:44 -06:00
parent f43336c92c
commit 1a4cb5f786
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llm_server/routes/v1/generate_stats.py
View File

@ -72,11 +72,7 @@ def generate_stats():
'1_min': SemaphoreCheckerThread.proompters_1_min, '1_min': SemaphoreCheckerThread.proompters_1_min,
'24_hrs': get_distinct_ips_24h(), '24_hrs': get_distinct_ips_24h(),
}, },
'proompts': { 'proompts_total': get_total_proompts() if opts.show_num_prompts else None,
'processing': active_gen_workers,
'queued': proompters_in_queue,
'total': get_total_proompts() if opts.show_num_prompts else None,
},
'uptime': int((datetime.now() - server_start_time).total_seconds()) if opts.show_uptime else None, 'uptime': int((datetime.now() - server_start_time).total_seconds()) if opts.show_uptime else None,
'average_generation_elapsed_sec': int(gen_time_calc), 'average_generation_elapsed_sec': int(gen_time_calc),
'average_tps': average_tps, 'average_tps': average_tps,
@ -87,7 +83,11 @@ def generate_stats():
'endpoints': { 'endpoints': {
'blocking': opts.full_client_api, 'blocking': opts.full_client_api,
}, },
'estimated_wait_sec': int(estimated_wait_sec), 'queue': {
'processing': active_gen_workers,
'queued': proompters_in_queue,
'estimated_wait_sec': int(estimated_wait_sec),
},
'timestamp': int(time.time()), 'timestamp': int(time.time()),
'config': { 'config': {
'gatekeeper': 'none' if opts.auth_required is False else 'token', 'gatekeeper': 'none' if opts.auth_required is False else 'token',

3
requirements.txt
View File

@ -6,4 +6,5 @@ requests
tiktoken tiktoken
gunicorn gunicorn
redis redis
gevent gevent
async-timeout

4
server.py
View File

@ -106,12 +106,12 @@ def home():
else: else:
running_model = opts.running_model running_model = opts.running_model
if stats['estimated_wait_sec'] == 0 and stats['stats']['proompts']['processing'] > 0: if stats['queue']['queued'] == 0 and stats['queue']['processing'] > 0:
# There will be a wait if the queue is empty but prompts are processing, but we don't # There will be a wait if the queue is empty but prompts are processing, but we don't
# know how long. # know how long.
estimated_wait_sec = f"less than {stats['stats']['average_generation_elapsed_sec']} seconds" estimated_wait_sec = f"less than {stats['stats']['average_generation_elapsed_sec']} seconds"
else: else:
estimated_wait_sec = f"{stats['estimated_wait_sec']} seconds" estimated_wait_sec = f"{stats['queue']['estimated_wait_sec']} seconds"
if len(config['analytics_tracking_code']): if len(config['analytics_tracking_code']):
analytics_tracking_code = f"<script>\n{config['analytics_tracking_code']}\n</script>" analytics_tracking_code = f"<script>\n{config['analytics_tracking_code']}\n</script>"