bugfix

llmage/llmclient.py

@@ -142,40 +142,39 @@ async def async_uapi_request(request, llm, sor):
 	if isinstance(b, bytes):
 		b = b.decode('utf-8')
 	debug(f'task sumbited:{b}')
-	d = json.loads(b)
+	d = DictObject(**json.loads(b))
-	if not d.get('taskid'):
+	if not d.get('context'):
 		debug(f'{b} error')
 		yield '{"content":"server return no taskid"}\n'
 		return
 	uapi = UAPI(request, sor=sor)
-	while True:
+	apinames = [ name.strip() for name in llm.query_apiname.split(',') ]
-		b = None
+	for apiname in apinames:
-		try:
+		while True:
-			b = await uapi.call(llm.upappid, llm.query_apiname, userid, 
+			b = None
-					params={
+			try:
-						"taskid": d.get('taskid')
+				b = await uapi.call(llm.upappid, llm.query_apiname, userid, params=d.context)
-					}
+			except Exception as e:
-			)
+				exception(f'{e=},{format_exc()}')
-		except Exception as e:
+				yield f'{{"content": f"ERROR:{e=}"}}\n'
-			exception(f'{e=},{format_exc()}')
+				break
-			yield f'{{"content": f"ERROR:{e=}"}}\n'
-			return
 
-		if isinstance(b, bytes):
+			if isinstance(b, bytes):
-			b = b.decode('utf-8')
+				b = b.decode('utf-8')
-		b = ''.join(b.split('\n'))
+			b = ''.join(b.split('\n'))
-		debug(f'response line = {b}')
+			debug(f'response line = {b}')
-		rzt = DictObject(**json.loads(b))
+			rzt = DictObject(**json.loads(b))
-		yield b + '\n'
+			yield b + '\n'
-		if not rzt.status or rzt.status == 'FAILED':
+			if not rzt.status or rzt.status == 'FAILED':
-			debug(f'{b=} return error')
+				debug(f'{b=} return error')
-			return
+				return
-		if rzt.status == 'SUCCEEDED':
+			if rzt.status == 'SUCCEEDED':
-			debug(f'{b=} return successed')
+				debug(f'{b=} return successed')
-			await asyncio.sleep(1)
+				await asyncio.sleep(1)
-			return
+				d = rzt
-		period = llm.query_period or 30
+				break
-		await asyncio.sleep(period)
+			period = llm.query_period or 30
+			await asyncio.sleep(period)
 
 def b64media2url(request, mediafile):
 	env = request._run_ns