Skip to content

Commit 051f9f3

Browse files
authored
Merge pull request #76 from karlsbeard/feature_stream
feat: add stream output for stream mode
2 parents 973fa8a + 4efe2c9 commit 051f9f3

File tree

5 files changed

+176
-5
lines changed

5 files changed

+176
-5
lines changed

demo.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
api_key=os.getenv("DEFAULT_LLM_API_KEY"),
1313
base_url=os.getenv("DEFAULT_LLM_BASE_URL"),
1414
model_name=os.getenv("DEFAULT_LLM_MODEL_NAME"),
15+
# llm_params={"stream": True}, # 开启流式输出
1516
),
1617
preset_tools.time_tools,
1718
oxy.ReActAgent(
@@ -35,6 +36,7 @@
3536
is_master=True,
3637
name="master_agent",
3738
sub_agents=["time_agent", "file_agent", "math_agent"],
39+
# team_size=2, # 开启团队协作,每个agent会调用2次llm
3840
),
3941
]
4042

oxygent/oxy/llms/http_llm.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ async def _execute(self, oxy_request: OxyRequest) -> OxyResponse:
142142
await oxy_request.send_message(
143143
{
144144
"type": "stream",
145-
"content": {"delta": delta},
145+
"content": {
146+
"delta": delta,
147+
"agent": oxy_request.caller,
148+
"node_id": oxy_request.node_id,
149+
},
146150
"_is_stored": False,
147151
}
148152
)

oxygent/oxy/llms/openai_llm.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ async def _execute(self, oxy_request: OxyRequest) -> OxyResponse:
7878
await oxy_request.send_message(
7979
{
8080
"type": "stream",
81-
"content": {"delta": "<think>"},
81+
"content": {
82+
"delta": "<think>",
83+
"agent": oxy_request.caller,
84+
"node_id": oxy_request.node_id,
85+
},
8286
"_is_stored": False,
8387
}
8488
)
@@ -91,7 +95,11 @@ async def _execute(self, oxy_request: OxyRequest) -> OxyResponse:
9195
await oxy_request.send_message(
9296
{
9397
"type": "stream",
94-
"content": {"delta": "</think>"},
98+
"content": {
99+
"delta": "</think>",
100+
"agent": oxy_request.caller,
101+
"node_id": oxy_request.node_id,
102+
},
95103
"_is_stored": False,
96104
}
97105
)
@@ -103,7 +111,11 @@ async def _execute(self, oxy_request: OxyRequest) -> OxyResponse:
103111
await oxy_request.send_message(
104112
{
105113
"type": "stream",
106-
"content": {"delta": char},
114+
"content": {
115+
"delta": char,
116+
"agent": oxy_request.caller,
117+
"node_id": oxy_request.node_id,
118+
},
107119
"_is_stored": False,
108120
}
109121
)

oxygent/web/css/main.css

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oxygent/web/index.html

Lines changed: 137 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)