Spaces:
Sleeping
Sleeping
Update megumin_agent/chat.py
Browse files- megumin_agent/chat.py +42 -8
megumin_agent/chat.py
CHANGED
|
@@ -10,6 +10,8 @@ from .bootstrap import bootstrap_environment
|
|
| 10 |
|
| 11 |
bootstrap_environment()
|
| 12 |
|
|
|
|
|
|
|
| 13 |
from google.adk.runners import Runner
|
| 14 |
from google.adk.sessions import InMemorySessionService
|
| 15 |
from google.genai import types
|
|
@@ -170,14 +172,13 @@ def _extract_text(event: Any) -> str:
|
|
| 170 |
return "".join(texts).strip()
|
| 171 |
|
| 172 |
|
| 173 |
-
async def
|
| 174 |
user_message: str,
|
| 175 |
services: ChatServices,
|
| 176 |
session_id: str | None = None,
|
| 177 |
user_id: str = "local-user",
|
| 178 |
-
) -> tuple[str, str]:
|
| 179 |
active_session_id = session_id or str(uuid.uuid4())
|
| 180 |
-
last_text = ""
|
| 181 |
existing_session = await services.session_service.get_session(
|
| 182 |
app_name=APP_NAME,
|
| 183 |
user_id=user_id,
|
|
@@ -190,17 +191,34 @@ async def chat_once(
|
|
| 190 |
session_id=active_session_id,
|
| 191 |
)
|
| 192 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 193 |
async for event in services.runner.run_async(
|
| 194 |
user_id=user_id,
|
| 195 |
session_id=active_session_id,
|
| 196 |
new_message=types.UserContent(parts=[types.Part(text=user_message)]),
|
|
|
|
| 197 |
):
|
| 198 |
-
if
|
|
|
|
|
|
|
|
|
|
|
|
|
| 199 |
continue
|
| 200 |
-
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 204 |
|
| 205 |
_trim_session_history(
|
| 206 |
services,
|
|
@@ -208,4 +226,20 @@ async def chat_once(
|
|
| 208 |
session_id=active_session_id,
|
| 209 |
)
|
| 210 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 211 |
return last_text, active_session_id
|
|
|
|
| 10 |
|
| 11 |
bootstrap_environment()
|
| 12 |
|
| 13 |
+
from google.adk.agents.run_config import RunConfig
|
| 14 |
+
from google.adk.agents.run_config import StreamingMode
|
| 15 |
from google.adk.runners import Runner
|
| 16 |
from google.adk.sessions import InMemorySessionService
|
| 17 |
from google.genai import types
|
|
|
|
| 172 |
return "".join(texts).strip()
|
| 173 |
|
| 174 |
|
| 175 |
+
async def stream_chat(
|
| 176 |
user_message: str,
|
| 177 |
services: ChatServices,
|
| 178 |
session_id: str | None = None,
|
| 179 |
user_id: str = "local-user",
|
| 180 |
+
) -> AsyncIterator[tuple[str, str]]:
|
| 181 |
active_session_id = session_id or str(uuid.uuid4())
|
|
|
|
| 182 |
existing_session = await services.session_service.get_session(
|
| 183 |
app_name=APP_NAME,
|
| 184 |
user_id=user_id,
|
|
|
|
| 191 |
session_id=active_session_id,
|
| 192 |
)
|
| 193 |
|
| 194 |
+
streamed_text = ""
|
| 195 |
+
final_text = ""
|
| 196 |
+
run_config = RunConfig(streaming_mode=StreamingMode.SSE)
|
| 197 |
+
|
| 198 |
async for event in services.runner.run_async(
|
| 199 |
user_id=user_id,
|
| 200 |
session_id=active_session_id,
|
| 201 |
new_message=types.UserContent(parts=[types.Part(text=user_message)]),
|
| 202 |
+
run_config=run_config,
|
| 203 |
):
|
| 204 |
+
if getattr(event, "author", None) == "user":
|
| 205 |
+
continue
|
| 206 |
+
|
| 207 |
+
text = _extract_text(event)
|
| 208 |
+
if not text:
|
| 209 |
continue
|
| 210 |
+
|
| 211 |
+
if getattr(event, "partial", None) is True:
|
| 212 |
+
streamed_text += text
|
| 213 |
+
yield streamed_text, active_session_id
|
| 214 |
+
continue
|
| 215 |
+
|
| 216 |
+
if getattr(event, "is_final_response", None) and event.is_final_response():
|
| 217 |
+
final_text = text
|
| 218 |
+
|
| 219 |
+
if final_text and final_text != streamed_text:
|
| 220 |
+
streamed_text = final_text
|
| 221 |
+
yield streamed_text, active_session_id
|
| 222 |
|
| 223 |
_trim_session_history(
|
| 224 |
services,
|
|
|
|
| 226 |
session_id=active_session_id,
|
| 227 |
)
|
| 228 |
|
| 229 |
+
|
| 230 |
+
async def chat_once(
|
| 231 |
+
user_message: str,
|
| 232 |
+
services: ChatServices,
|
| 233 |
+
session_id: str | None = None,
|
| 234 |
+
user_id: str = "local-user",
|
| 235 |
+
) -> tuple[str, str]:
|
| 236 |
+
last_text = ""
|
| 237 |
+
active_session_id = session_id or str(uuid.uuid4())
|
| 238 |
+
async for chunk_text, active_session_id in stream_chat(
|
| 239 |
+
user_message=user_message,
|
| 240 |
+
services=services,
|
| 241 |
+
session_id=active_session_id,
|
| 242 |
+
user_id=user_id,
|
| 243 |
+
):
|
| 244 |
+
last_text = chunk_text
|
| 245 |
return last_text, active_session_id
|