Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix agent non stream #1904

Merged
merged 32 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
69a1b56
Update wikipedia.py
guoyuhao2330 Jul 15, 2024
6bbb1df
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 15, 2024
4e3067a
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 17, 2024
bc8d5ad
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 17, 2024
678994d
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 17, 2024
268c0c7
Update requirements.txt
guoyuhao2330 Jul 17, 2024
757ca5b
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 18, 2024
dfe71cb
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 18, 2024
7aba129
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 18, 2024
e52e08f
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 19, 2024
c140c70
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 19, 2024
92cf451
Update llm_service.py
guoyuhao2330 Jul 19, 2024
ad5a5b8
Update index.tsx
guoyuhao2330 Jul 19, 2024
4b49bb9
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 22, 2024
12baffc
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 22, 2024
585a0f6
Update init_data.py
guoyuhao2330 Jul 22, 2024
f3b3451
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 25, 2024
31af72c
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 25, 2024
e23f5b5
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 26, 2024
941c29d
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 26, 2024
bace5b5
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 26, 2024
8936941
Merge branch 'infiniflow:main' into main
guoyuhao2330 Jul 29, 2024
4fe66d8
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 2, 2024
3cad1dd
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 5, 2024
4ce659e
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 7, 2024
764de5b
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 8, 2024
addfea5
Update __init__.py
guoyuhao2330 Aug 8, 2024
ab10427
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 9, 2024
898dcbd
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 9, 2024
6b7e08b
Merge branch 'infiniflow:main' into main
guoyuhao2330 Aug 12, 2024
fa21ad7
Update base.py
guoyuhao2330 Aug 12, 2024
63fcf9c
Update api_app.py
guoyuhao2330 Aug 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions agent/component/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,13 +460,11 @@ def get_input(self):
upstream_outs.append(pd.DataFrame([{"content": c}]))
break
break
if self.component_name.lower().find("answer") >= 0:
if self.get_component_name(u) in ["relevant"]:
continue
else:
o = self._canvas.get_component(u)["obj"].output(allow_partial=False)[1]
if o is not None:
upstream_outs.append(o)
if self.component_name.lower().find("answer") >= 0 and self.get_component_name(u) in ["relevant"]:
continue
o = self._canvas.get_component(u)["obj"].output(allow_partial=False)[1]
if o is not None:
upstream_outs.append(o)
break

if upstream_outs:
Expand Down
10 changes: 3 additions & 7 deletions api/apps/api_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,9 @@ def sse():
canvas.reference.append(final_ans["reference"])
cvs.dsl = json.loads(str(canvas))

result = None
for ans in answer():
ans = {"answer": ans["content"], "reference": ans.get("reference", [])}
result = ans
fillin_conv(ans)
API4ConversationService.append_message(conv.id, conv.to_dict())
break
result = {"answer": final_ans["content"], "reference": final_ans.get("reference", [])}
fillin_conv(result)
API4ConversationService.append_message(conv.id, conv.to_dict())
rename_field(result)
return get_json_result(data=result)

Expand Down