H commited on
Commit
8f1a7d6
·
1 Parent(s): 89708fb

Fix agent non stream (#1904)

Browse files

### What problem does this PR solve?

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

Files changed (2) hide show
  1. agent/component/base.py +5 -7
  2. api/apps/api_app.py +3 -7
agent/component/base.py CHANGED
@@ -460,13 +460,11 @@ class ComponentBase(ABC):
460
  upstream_outs.append(pd.DataFrame([{"content": c}]))
461
  break
462
  break
463
- if self.component_name.lower().find("answer") >= 0:
464
- if self.get_component_name(u) in ["relevant"]:
465
- continue
466
- else:
467
- o = self._canvas.get_component(u)["obj"].output(allow_partial=False)[1]
468
- if o is not None:
469
- upstream_outs.append(o)
470
  break
471
 
472
  if upstream_outs:
 
460
  upstream_outs.append(pd.DataFrame([{"content": c}]))
461
  break
462
  break
463
+ if self.component_name.lower().find("answer") >= 0 and self.get_component_name(u) in ["relevant"]:
464
+ continue
465
+ o = self._canvas.get_component(u)["obj"].output(allow_partial=False)[1]
466
+ if o is not None:
467
+ upstream_outs.append(o)
 
 
468
  break
469
 
470
  if upstream_outs:
api/apps/api_app.py CHANGED
@@ -282,13 +282,9 @@ def completion():
282
  canvas.reference.append(final_ans["reference"])
283
  cvs.dsl = json.loads(str(canvas))
284
 
285
- result = None
286
- for ans in answer():
287
- ans = {"answer": ans["content"], "reference": ans.get("reference", [])}
288
- result = ans
289
- fillin_conv(ans)
290
- API4ConversationService.append_message(conv.id, conv.to_dict())
291
- break
292
  rename_field(result)
293
  return get_json_result(data=result)
294
 
 
282
  canvas.reference.append(final_ans["reference"])
283
  cvs.dsl = json.loads(str(canvas))
284
 
285
+ result = {"answer": final_ans["content"], "reference": final_ans.get("reference", [])}
286
+ fillin_conv(result)
287
+ API4ConversationService.append_message(conv.id, conv.to_dict())
 
 
 
 
288
  rename_field(result)
289
  return get_json_result(data=result)
290