background thread
This commit is contained in:
parent
6f65791795
commit
2ed0e01db6
|
@ -1,5 +1,6 @@
|
||||||
import json
|
import json
|
||||||
import threading
|
import threading
|
||||||
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
|
@ -16,6 +17,23 @@ stream_redis = Redis(db=8)
|
||||||
STREAM_NAME_PREFIX = 'stream'
|
STREAM_NAME_PREFIX = 'stream'
|
||||||
|
|
||||||
|
|
||||||
|
def check_cancellation(event, event_id):
|
||||||
|
"""
|
||||||
|
This thread checks the pub/sub channel in the background so the main process
|
||||||
|
isn't bogged down with Redis calls.
|
||||||
|
:param event:
|
||||||
|
:param event_id:
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
|
pubsub = redis.pubsub()
|
||||||
|
pubsub.subscribe(f'notifications:{event_id}')
|
||||||
|
while not event.is_set():
|
||||||
|
message = pubsub.get_message()
|
||||||
|
if message and message['data'] == b'canceled':
|
||||||
|
event.set()
|
||||||
|
time.sleep(0.5) # check every half second
|
||||||
|
|
||||||
|
|
||||||
def get_stream_name(name: str):
|
def get_stream_name(name: str):
|
||||||
return f'{STREAM_NAME_PREFIX}:{name}'
|
return f'{STREAM_NAME_PREFIX}:{name}'
|
||||||
|
|
||||||
|
@ -23,9 +41,10 @@ def get_stream_name(name: str):
|
||||||
def inference_do_stream(stream_name: str, msg_to_backend: dict, backend_url: str, event_id: str):
|
def inference_do_stream(stream_name: str, msg_to_backend: dict, backend_url: str, event_id: str):
|
||||||
prompt = msg_to_backend['prompt']
|
prompt = msg_to_backend['prompt']
|
||||||
stream_name = get_stream_name(stream_name)
|
stream_name = get_stream_name(stream_name)
|
||||||
pubsub = redis.pubsub()
|
|
||||||
pubsub.subscribe(f'notifications:{event_id}')
|
|
||||||
stream_redis.delete(get_stream_name(stream_name)) # be extra sure
|
stream_redis.delete(get_stream_name(stream_name)) # be extra sure
|
||||||
|
event = threading.Event()
|
||||||
|
t = threading.Thread(target=check_cancellation, args=(event, event_id))
|
||||||
|
t.start()
|
||||||
try:
|
try:
|
||||||
response = generator(msg_to_backend, backend_url)
|
response = generator(msg_to_backend, backend_url)
|
||||||
generated_text = ''
|
generated_text = ''
|
||||||
|
@ -34,8 +53,7 @@ def inference_do_stream(stream_name: str, msg_to_backend: dict, backend_url: str
|
||||||
# If there is no more data, break the loop
|
# If there is no more data, break the loop
|
||||||
if not chunk:
|
if not chunk:
|
||||||
break
|
break
|
||||||
message = pubsub.get_message(timeout=0.001)
|
if event.is_set():
|
||||||
if message and message['data'] == b'canceled':
|
|
||||||
print('Client canceled generation')
|
print('Client canceled generation')
|
||||||
response.close()
|
response.close()
|
||||||
return
|
return
|
||||||
|
@ -59,6 +77,7 @@ def inference_do_stream(stream_name: str, msg_to_backend: dict, backend_url: str
|
||||||
finally:
|
finally:
|
||||||
# Publish final message to Redis stream
|
# Publish final message to Redis stream
|
||||||
stream_redis.xadd(stream_name, {'data': ujson.dumps({'new': None, 'completed': True, 'error': None})})
|
stream_redis.xadd(stream_name, {'data': ujson.dumps({'new': None, 'completed': True, 'error': None})})
|
||||||
|
event.set() # stop the cancellation checking thread
|
||||||
|
|
||||||
|
|
||||||
def worker(backend_url):
|
def worker(backend_url):
|
||||||
|
|
Reference in New Issue