hadadrjt commited on
Commit
28ea51f
·
1 Parent(s): 9a014e8

ai: Switch to stable server-side configuration.

Browse files
Files changed (1) hide show
  1. jarvis.py +2 -4
jarvis.py CHANGED
@@ -34,8 +34,6 @@ SYSTEM_PROMPT_MAPPING = json.loads(os.getenv("SYSTEM_PROMPT_MAPPING", "{}"))
34
  SYSTEM_PROMPT_DEFAULT = os.getenv("DEFAULT_SYSTEM")
35
 
36
  LINUX_SERVER_HOSTS = [h for h in json.loads(os.getenv("LINUX_SERVER_HOST", "[]")) if h]
37
- LINUX_SERVER_HOSTS_MARKED = set()
38
- LINUX_SERVER_HOSTS_ATTEMPTS = {}
39
 
40
  LINUX_SERVER_PROVIDER_KEYS = [k for k in json.loads(os.getenv("LINUX_SERVER_PROVIDER_KEY", "[]")) if k]
41
  LINUX_SERVER_PROVIDER_KEYS_MARKED = set()
@@ -239,7 +237,7 @@ async def fetch_response_stream_async(host, key, model, msgs, cfg, sid, stop_eve
239
  async def chat_with_model_async(history, user_input, model_display, sess, custom_prompt):
240
  ensure_stop_event(sess)
241
  sess.stop_event.clear()
242
- if not get_available_items(LINUX_SERVER_PROVIDER_KEYS, LINUX_SERVER_PROVIDER_KEYS_MARKED) or not get_available_items(LINUX_SERVER_HOSTS, LINUX_SERVER_HOSTS_ATTEMPTS):
243
  yield ("content", RESPONSES["RESPONSE_3"])
244
  return
245
  if not hasattr(sess, "session_id") or not sess.session_id:
@@ -260,7 +258,7 @@ async def chat_with_model_async(history, user_input, model_display, sess, custom
260
  yield chunk
261
  return
262
  keys = get_available_items(LINUX_SERVER_PROVIDER_KEYS, LINUX_SERVER_PROVIDER_KEYS_MARKED)
263
- hosts = get_available_items(LINUX_SERVER_HOSTS, LINUX_SERVER_HOSTS_ATTEMPTS)
264
  random.shuffle(keys)
265
  random.shuffle(hosts)
266
  for k in keys:
 
34
  SYSTEM_PROMPT_DEFAULT = os.getenv("DEFAULT_SYSTEM")
35
 
36
  LINUX_SERVER_HOSTS = [h for h in json.loads(os.getenv("LINUX_SERVER_HOST", "[]")) if h]
 
 
37
 
38
  LINUX_SERVER_PROVIDER_KEYS = [k for k in json.loads(os.getenv("LINUX_SERVER_PROVIDER_KEY", "[]")) if k]
39
  LINUX_SERVER_PROVIDER_KEYS_MARKED = set()
 
237
  async def chat_with_model_async(history, user_input, model_display, sess, custom_prompt):
238
  ensure_stop_event(sess)
239
  sess.stop_event.clear()
240
+ if not get_available_items(LINUX_SERVER_PROVIDER_KEYS, LINUX_SERVER_PROVIDER_KEYS_MARKED) or not LINUX_SERVER_HOSTS:
241
  yield ("content", RESPONSES["RESPONSE_3"])
242
  return
243
  if not hasattr(sess, "session_id") or not sess.session_id:
 
258
  yield chunk
259
  return
260
  keys = get_available_items(LINUX_SERVER_PROVIDER_KEYS, LINUX_SERVER_PROVIDER_KEYS_MARKED)
261
+ hosts = list(LINUX_SERVER_HOSTS)
262
  random.shuffle(keys)
263
  random.shuffle(hosts)
264
  for k in keys: