agentscope-runtime 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- agentscope_runtime/engine/agents/agentscope_agent/agent.py +1 -0
- agentscope_runtime/engine/agents/agno_agent.py +1 -0
- agentscope_runtime/engine/agents/autogen_agent.py +245 -0
- agentscope_runtime/engine/schemas/agent_schemas.py +1 -1
- agentscope_runtime/engine/services/memory_service.py +2 -2
- agentscope_runtime/engine/services/redis_memory_service.py +187 -0
- agentscope_runtime/engine/services/redis_session_history_service.py +155 -0
- agentscope_runtime/sandbox/build.py +1 -1
- agentscope_runtime/sandbox/custom/custom_sandbox.py +0 -1
- agentscope_runtime/sandbox/custom/example.py +0 -1
- agentscope_runtime/sandbox/manager/container_clients/__init__.py +2 -0
- agentscope_runtime/sandbox/manager/container_clients/docker_client.py +246 -4
- agentscope_runtime/sandbox/manager/container_clients/kubernetes_client.py +550 -0
- agentscope_runtime/sandbox/manager/sandbox_manager.py +21 -82
- agentscope_runtime/sandbox/manager/server/app.py +55 -24
- agentscope_runtime/sandbox/manager/server/config.py +28 -16
- agentscope_runtime/sandbox/model/container.py +3 -1
- agentscope_runtime/sandbox/model/manager_config.py +19 -2
- agentscope_runtime/sandbox/tools/tool.py +111 -0
- agentscope_runtime/version.py +1 -1
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/METADATA +74 -13
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/RECORD +26 -23
- agentscope_runtime/sandbox/manager/utils.py +0 -78
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/WHEEL +0 -0
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/entry_points.txt +0 -0
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/licenses/LICENSE +0 -0
- {agentscope_runtime-0.1.0.dist-info → agentscope_runtime-0.1.1.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,245 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
from typing import Optional, Type
|
|
3
|
+
|
|
4
|
+
from autogen_core.models import ChatCompletionClient
|
|
5
|
+
from autogen_core.tools import FunctionTool
|
|
6
|
+
from autogen_agentchat.agents import AssistantAgent
|
|
7
|
+
from autogen_agentchat.messages import (
|
|
8
|
+
TextMessage,
|
|
9
|
+
ToolCallExecutionEvent,
|
|
10
|
+
ToolCallRequestEvent,
|
|
11
|
+
ModelClientStreamingChunkEvent,
|
|
12
|
+
)
|
|
13
|
+
|
|
14
|
+
from ..agents import Agent
|
|
15
|
+
from ..schemas.context import Context
|
|
16
|
+
from ..schemas.agent_schemas import (
|
|
17
|
+
Message,
|
|
18
|
+
TextContent,
|
|
19
|
+
DataContent,
|
|
20
|
+
FunctionCall,
|
|
21
|
+
FunctionCallOutput,
|
|
22
|
+
MessageType,
|
|
23
|
+
RunStatus,
|
|
24
|
+
)
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
class AutogenContextAdapter:
|
|
28
|
+
def __init__(self, context: Context, attr: dict):
|
|
29
|
+
self.context = context
|
|
30
|
+
self.attr = attr
|
|
31
|
+
|
|
32
|
+
# Adapted attribute
|
|
33
|
+
self.toolkit = None
|
|
34
|
+
self.model = None
|
|
35
|
+
self.memory = None
|
|
36
|
+
self.new_message = None
|
|
37
|
+
|
|
38
|
+
async def initialize(self):
|
|
39
|
+
self.model = await self.adapt_model()
|
|
40
|
+
self.memory = await self.adapt_memory()
|
|
41
|
+
self.new_message = await self.adapt_new_message()
|
|
42
|
+
self.toolkit = await self.adapt_tools()
|
|
43
|
+
|
|
44
|
+
async def adapt_memory(self):
|
|
45
|
+
messages = []
|
|
46
|
+
|
|
47
|
+
# Build context
|
|
48
|
+
for msg in self.context.session.messages[:-1]: # Exclude the last one
|
|
49
|
+
messages.append(AutogenContextAdapter.converter(msg))
|
|
50
|
+
|
|
51
|
+
return messages
|
|
52
|
+
|
|
53
|
+
@staticmethod
|
|
54
|
+
def converter(message: Message):
|
|
55
|
+
# TODO: support more message type
|
|
56
|
+
return TextMessage.load(
|
|
57
|
+
{
|
|
58
|
+
"id": message.id,
|
|
59
|
+
"source": message.role,
|
|
60
|
+
"content": message.content[0].text if message.content else "",
|
|
61
|
+
},
|
|
62
|
+
)
|
|
63
|
+
|
|
64
|
+
async def adapt_new_message(self):
|
|
65
|
+
last_message = self.context.session.messages[-1]
|
|
66
|
+
|
|
67
|
+
return AutogenContextAdapter.converter(last_message)
|
|
68
|
+
|
|
69
|
+
async def adapt_model(self):
|
|
70
|
+
return self.attr["model"]
|
|
71
|
+
|
|
72
|
+
async def adapt_tools(self):
|
|
73
|
+
toolkit = self.attr["agent_config"].get("toolkit", [])
|
|
74
|
+
tools = self.attr["tools"]
|
|
75
|
+
|
|
76
|
+
# in case, tools is None and tools == []
|
|
77
|
+
if not tools:
|
|
78
|
+
return toolkit
|
|
79
|
+
|
|
80
|
+
if self.context.activate_tools:
|
|
81
|
+
# Only add activated tool
|
|
82
|
+
activated_tools = self.context.activate_tools
|
|
83
|
+
else:
|
|
84
|
+
from ...sandbox.tools.utils import setup_tools
|
|
85
|
+
|
|
86
|
+
activated_tools = setup_tools(
|
|
87
|
+
tools=self.attr["tools"],
|
|
88
|
+
environment_manager=self.context.environment_manager,
|
|
89
|
+
session_id=self.context.session.id,
|
|
90
|
+
user_id=self.context.session.user_id,
|
|
91
|
+
include_schemas=False,
|
|
92
|
+
)
|
|
93
|
+
|
|
94
|
+
for tool in activated_tools:
|
|
95
|
+
func = FunctionTool(
|
|
96
|
+
func=tool.make_function(),
|
|
97
|
+
description=tool.schema["function"]["description"],
|
|
98
|
+
name=tool.name,
|
|
99
|
+
)
|
|
100
|
+
toolkit.append(func)
|
|
101
|
+
|
|
102
|
+
return toolkit
|
|
103
|
+
|
|
104
|
+
|
|
105
|
+
class AutogenAgent(Agent):
|
|
106
|
+
def __init__(
|
|
107
|
+
self,
|
|
108
|
+
name: str,
|
|
109
|
+
model: ChatCompletionClient,
|
|
110
|
+
tools=None,
|
|
111
|
+
agent_config=None,
|
|
112
|
+
agent_builder: Optional[Type[AssistantAgent]] = AssistantAgent,
|
|
113
|
+
):
|
|
114
|
+
super().__init__(name=name, agent_config=agent_config)
|
|
115
|
+
|
|
116
|
+
assert isinstance(
|
|
117
|
+
model,
|
|
118
|
+
ChatCompletionClient,
|
|
119
|
+
), "model must be a subclass of ChatCompletionClient in autogen"
|
|
120
|
+
|
|
121
|
+
# Set default agent_builder
|
|
122
|
+
if agent_builder is None:
|
|
123
|
+
agent_builder = AssistantAgent
|
|
124
|
+
|
|
125
|
+
assert issubclass(
|
|
126
|
+
agent_builder,
|
|
127
|
+
AssistantAgent,
|
|
128
|
+
), "agent_builder must be a subclass of AssistantAgent in autogen"
|
|
129
|
+
|
|
130
|
+
# Replace name if not exists
|
|
131
|
+
self.agent_config["name"] = self.agent_config.get("name") or name
|
|
132
|
+
|
|
133
|
+
self._attr = {
|
|
134
|
+
"model": model,
|
|
135
|
+
"tools": tools,
|
|
136
|
+
"agent_config": self.agent_config,
|
|
137
|
+
"agent_builder": agent_builder,
|
|
138
|
+
}
|
|
139
|
+
self._agent = None
|
|
140
|
+
self.tools = tools
|
|
141
|
+
|
|
142
|
+
def copy(self) -> "AutogenAgent":
|
|
143
|
+
return AutogenAgent(**self._attr)
|
|
144
|
+
|
|
145
|
+
def build(self, as_context):
|
|
146
|
+
self._agent = self._attr["agent_builder"](
|
|
147
|
+
**self._attr["agent_config"],
|
|
148
|
+
model_client=as_context.model,
|
|
149
|
+
tools=as_context.toolkit,
|
|
150
|
+
)
|
|
151
|
+
|
|
152
|
+
return self._agent
|
|
153
|
+
|
|
154
|
+
async def run(self, context):
|
|
155
|
+
ag_context = AutogenContextAdapter(context=context, attr=self._attr)
|
|
156
|
+
await ag_context.initialize()
|
|
157
|
+
|
|
158
|
+
# We should always build a new agent since the state is manage outside
|
|
159
|
+
# the agent
|
|
160
|
+
self._agent = self.build(ag_context)
|
|
161
|
+
|
|
162
|
+
resp = self._agent.run_stream(
|
|
163
|
+
task=ag_context.memory + [ag_context.new_message],
|
|
164
|
+
)
|
|
165
|
+
|
|
166
|
+
text_message = Message(
|
|
167
|
+
type=MessageType.MESSAGE,
|
|
168
|
+
role="assistant",
|
|
169
|
+
status=RunStatus.InProgress,
|
|
170
|
+
)
|
|
171
|
+
yield text_message
|
|
172
|
+
|
|
173
|
+
text_delta_content = TextContent(delta=True)
|
|
174
|
+
is_text_delta = False
|
|
175
|
+
stream_mode = False
|
|
176
|
+
async for event in resp:
|
|
177
|
+
if getattr(event, "source", "user") == "user":
|
|
178
|
+
continue
|
|
179
|
+
|
|
180
|
+
if isinstance(event, TextMessage):
|
|
181
|
+
if stream_mode:
|
|
182
|
+
continue
|
|
183
|
+
is_text_delta = True
|
|
184
|
+
text_delta_content.text = event.content
|
|
185
|
+
text_delta_content = text_message.add_delta_content(
|
|
186
|
+
new_content=text_delta_content,
|
|
187
|
+
)
|
|
188
|
+
yield text_delta_content
|
|
189
|
+
elif isinstance(event, ModelClientStreamingChunkEvent):
|
|
190
|
+
stream_mode = True
|
|
191
|
+
is_text_delta = True
|
|
192
|
+
text_delta_content.text = event.content
|
|
193
|
+
text_delta_content = text_message.add_delta_content(
|
|
194
|
+
new_content=text_delta_content,
|
|
195
|
+
)
|
|
196
|
+
yield text_delta_content
|
|
197
|
+
elif isinstance(event, ToolCallRequestEvent):
|
|
198
|
+
data = DataContent(
|
|
199
|
+
data=FunctionCall(
|
|
200
|
+
call_id=event.id,
|
|
201
|
+
name=event.content[0].name,
|
|
202
|
+
arguments=event.content[0].arguments,
|
|
203
|
+
).model_dump(),
|
|
204
|
+
)
|
|
205
|
+
message = Message(
|
|
206
|
+
type=MessageType.PLUGIN_CALL,
|
|
207
|
+
role="assistant",
|
|
208
|
+
status=RunStatus.Completed,
|
|
209
|
+
content=[data],
|
|
210
|
+
)
|
|
211
|
+
yield message
|
|
212
|
+
elif isinstance(event, ToolCallExecutionEvent):
|
|
213
|
+
data = DataContent(
|
|
214
|
+
data=FunctionCallOutput(
|
|
215
|
+
call_id=event.id,
|
|
216
|
+
output=event.content[0].content,
|
|
217
|
+
).model_dump(),
|
|
218
|
+
)
|
|
219
|
+
message = Message(
|
|
220
|
+
type=MessageType.PLUGIN_CALL_OUTPUT,
|
|
221
|
+
role="assistant",
|
|
222
|
+
status=RunStatus.Completed,
|
|
223
|
+
content=[data],
|
|
224
|
+
)
|
|
225
|
+
yield message
|
|
226
|
+
|
|
227
|
+
# Add to message
|
|
228
|
+
is_text_delta = True
|
|
229
|
+
text_delta_content.text = event.content[0].content
|
|
230
|
+
text_delta_content = text_message.add_delta_content(
|
|
231
|
+
new_content=text_delta_content,
|
|
232
|
+
)
|
|
233
|
+
yield text_delta_content
|
|
234
|
+
|
|
235
|
+
if is_text_delta:
|
|
236
|
+
yield text_message.content_completed(text_delta_content.index)
|
|
237
|
+
yield text_message.completed()
|
|
238
|
+
|
|
239
|
+
async def run_async(
|
|
240
|
+
self,
|
|
241
|
+
context,
|
|
242
|
+
**kwargs,
|
|
243
|
+
):
|
|
244
|
+
async for event in self.run(context):
|
|
245
|
+
yield event
|
|
@@ -58,8 +58,8 @@ class MemoryService(ServiceWithLifecycleManager):
|
|
|
58
58
|
Args:
|
|
59
59
|
user_id: The user id.
|
|
60
60
|
messages: The user query or the query with history messages,
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
both in the format of list of messages. If messages is a list,
|
|
62
|
+
the search will be based on the content of the last message.
|
|
63
63
|
filters: The filters used to search memory
|
|
64
64
|
"""
|
|
65
65
|
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
from typing import Optional, Dict, Any
|
|
3
|
+
import json
|
|
4
|
+
import redis.asyncio as aioredis
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
from .memory_service import MemoryService
|
|
8
|
+
from ..schemas.agent_schemas import Message, MessageType
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class RedisMemoryService(MemoryService):
|
|
12
|
+
"""
|
|
13
|
+
A Redis-based implementation of the memory service.
|
|
14
|
+
"""
|
|
15
|
+
|
|
16
|
+
def __init__(
|
|
17
|
+
self,
|
|
18
|
+
redis_url: str = "redis://localhost:6379/0",
|
|
19
|
+
redis_client: Optional[aioredis.Redis] = None,
|
|
20
|
+
):
|
|
21
|
+
self._redis_url = redis_url
|
|
22
|
+
self._redis = redis_client
|
|
23
|
+
self._DEFAULT_SESSION_ID = "default"
|
|
24
|
+
|
|
25
|
+
async def start(self) -> None:
|
|
26
|
+
"""Starts the Redis connection."""
|
|
27
|
+
if self._redis is None:
|
|
28
|
+
self._redis = aioredis.from_url(
|
|
29
|
+
self._redis_url,
|
|
30
|
+
decode_responses=True,
|
|
31
|
+
)
|
|
32
|
+
|
|
33
|
+
async def stop(self) -> None:
|
|
34
|
+
"""Closes the Redis connection."""
|
|
35
|
+
if self._redis:
|
|
36
|
+
await self._redis.close()
|
|
37
|
+
self._redis = None
|
|
38
|
+
|
|
39
|
+
async def health(self) -> bool:
|
|
40
|
+
"""Checks the health of the service."""
|
|
41
|
+
|
|
42
|
+
if not self._redis:
|
|
43
|
+
return False
|
|
44
|
+
try:
|
|
45
|
+
pong = await self._redis.ping()
|
|
46
|
+
return pong is True or pong == "PONG"
|
|
47
|
+
except Exception:
|
|
48
|
+
return False
|
|
49
|
+
|
|
50
|
+
def _user_key(self, user_id):
|
|
51
|
+
# Each user is a Redis hash
|
|
52
|
+
return f"user_memory:{user_id}"
|
|
53
|
+
|
|
54
|
+
def _serialize(self, messages):
|
|
55
|
+
return json.dumps([msg.dict() for msg in messages])
|
|
56
|
+
|
|
57
|
+
def _deserialize(self, messages_json):
|
|
58
|
+
if not messages_json:
|
|
59
|
+
return []
|
|
60
|
+
return [Message.parse_obj(m) for m in json.loads(messages_json)]
|
|
61
|
+
|
|
62
|
+
async def add_memory(
|
|
63
|
+
self,
|
|
64
|
+
user_id: str,
|
|
65
|
+
messages: list,
|
|
66
|
+
session_id: Optional[str] = None,
|
|
67
|
+
) -> None:
|
|
68
|
+
if not self._redis:
|
|
69
|
+
raise RuntimeError("Redis connection is not available")
|
|
70
|
+
key = self._user_key(user_id)
|
|
71
|
+
field = session_id if session_id else self._DEFAULT_SESSION_ID
|
|
72
|
+
|
|
73
|
+
existing_json = await self._redis.hget(key, field)
|
|
74
|
+
existing_msgs = self._deserialize(existing_json)
|
|
75
|
+
all_msgs = existing_msgs + messages
|
|
76
|
+
await self._redis.hset(key, field, self._serialize(all_msgs))
|
|
77
|
+
|
|
78
|
+
async def search_memory(
|
|
79
|
+
self,
|
|
80
|
+
user_id: str,
|
|
81
|
+
messages: list,
|
|
82
|
+
filters: Optional[Dict[str, Any]] = None,
|
|
83
|
+
) -> list:
|
|
84
|
+
key = self._user_key(user_id)
|
|
85
|
+
if (
|
|
86
|
+
not messages
|
|
87
|
+
or not isinstance(messages, list)
|
|
88
|
+
or len(messages) == 0
|
|
89
|
+
):
|
|
90
|
+
return []
|
|
91
|
+
|
|
92
|
+
message = messages[-1]
|
|
93
|
+
query = await self.get_query_text(message)
|
|
94
|
+
if not query:
|
|
95
|
+
return []
|
|
96
|
+
|
|
97
|
+
keywords = set(query.lower().split())
|
|
98
|
+
|
|
99
|
+
all_msgs = []
|
|
100
|
+
hash_keys = await self._redis.hkeys(key)
|
|
101
|
+
for session_id in hash_keys:
|
|
102
|
+
msgs_json = await self._redis.hget(key, session_id)
|
|
103
|
+
msgs = self._deserialize(msgs_json)
|
|
104
|
+
all_msgs.extend(msgs)
|
|
105
|
+
|
|
106
|
+
matched_messages = []
|
|
107
|
+
for msg in all_msgs:
|
|
108
|
+
candidate_content = await self.get_query_text(msg)
|
|
109
|
+
if candidate_content:
|
|
110
|
+
msg_content_lower = candidate_content.lower()
|
|
111
|
+
if any(keyword in msg_content_lower for keyword in keywords):
|
|
112
|
+
matched_messages.append(msg)
|
|
113
|
+
|
|
114
|
+
if (
|
|
115
|
+
filters
|
|
116
|
+
and "top_k" in filters
|
|
117
|
+
and isinstance(filters["top_k"], int)
|
|
118
|
+
):
|
|
119
|
+
return matched_messages[-filters["top_k"] :]
|
|
120
|
+
|
|
121
|
+
return matched_messages
|
|
122
|
+
|
|
123
|
+
async def get_query_text(self, message: Message) -> str:
|
|
124
|
+
if message:
|
|
125
|
+
if message.type == MessageType.MESSAGE:
|
|
126
|
+
for content in message.content:
|
|
127
|
+
if content.type == "text":
|
|
128
|
+
return content.text
|
|
129
|
+
return ""
|
|
130
|
+
|
|
131
|
+
async def list_memory(
|
|
132
|
+
self,
|
|
133
|
+
user_id: str,
|
|
134
|
+
filters: Optional[Dict[str, Any]] = None,
|
|
135
|
+
) -> list:
|
|
136
|
+
key = self._user_key(user_id)
|
|
137
|
+
all_msgs = []
|
|
138
|
+
hash_keys = await self._redis.hkeys(key)
|
|
139
|
+
for session_id in sorted(hash_keys):
|
|
140
|
+
msgs_json = await self._redis.hget(key, session_id)
|
|
141
|
+
msgs = self._deserialize(msgs_json)
|
|
142
|
+
all_msgs.extend(msgs)
|
|
143
|
+
|
|
144
|
+
page_num = filters.get("page_num", 1) if filters else 1
|
|
145
|
+
page_size = filters.get("page_size", 10) if filters else 10
|
|
146
|
+
|
|
147
|
+
start_index = (page_num - 1) * page_size
|
|
148
|
+
end_index = start_index + page_size
|
|
149
|
+
|
|
150
|
+
return all_msgs[start_index:end_index]
|
|
151
|
+
|
|
152
|
+
async def delete_memory(
|
|
153
|
+
self,
|
|
154
|
+
user_id: str,
|
|
155
|
+
session_id: Optional[str] = None,
|
|
156
|
+
) -> None:
|
|
157
|
+
key = self._user_key(user_id)
|
|
158
|
+
if session_id:
|
|
159
|
+
await self._redis.hdel(key, session_id)
|
|
160
|
+
else:
|
|
161
|
+
await self._redis.delete(key)
|
|
162
|
+
|
|
163
|
+
async def clear_all_memory(self) -> None:
|
|
164
|
+
"""
|
|
165
|
+
Clears all memory data from Redis.
|
|
166
|
+
This method removes all user memory keys from the Redis database.
|
|
167
|
+
"""
|
|
168
|
+
if not self._redis:
|
|
169
|
+
raise RuntimeError("Redis connection is not available")
|
|
170
|
+
|
|
171
|
+
keys = await self._redis.keys(self._user_key("*"))
|
|
172
|
+
if keys:
|
|
173
|
+
await self._redis.delete(*keys)
|
|
174
|
+
|
|
175
|
+
async def delete_user_memory(self, user_id: str) -> None:
|
|
176
|
+
"""
|
|
177
|
+
Deletes all memory data for a specific user.
|
|
178
|
+
|
|
179
|
+
Args:
|
|
180
|
+
user_id (str): The ID of the user whose memory data should be
|
|
181
|
+
deleted
|
|
182
|
+
"""
|
|
183
|
+
if not self._redis:
|
|
184
|
+
raise RuntimeError("Redis connection is not available")
|
|
185
|
+
|
|
186
|
+
key = self._user_key(user_id)
|
|
187
|
+
await self._redis.delete(key)
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
import uuid
|
|
3
|
+
|
|
4
|
+
from typing import Optional, Dict, Any, List, Union
|
|
5
|
+
|
|
6
|
+
import redis.asyncio as aioredis
|
|
7
|
+
|
|
8
|
+
from .session_history_service import SessionHistoryService, Session
|
|
9
|
+
from ..schemas.agent_schemas import Message
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class RedisSessionHistoryService(SessionHistoryService):
|
|
13
|
+
def __init__(
|
|
14
|
+
self,
|
|
15
|
+
redis_url: str = "redis://localhost:6379/0",
|
|
16
|
+
redis_client: Optional[aioredis.Redis] = None,
|
|
17
|
+
):
|
|
18
|
+
self._redis_url = redis_url
|
|
19
|
+
self._redis = redis_client
|
|
20
|
+
|
|
21
|
+
async def start(self):
|
|
22
|
+
if self._redis is None:
|
|
23
|
+
self._redis = aioredis.from_url(
|
|
24
|
+
self._redis_url,
|
|
25
|
+
decode_responses=True,
|
|
26
|
+
)
|
|
27
|
+
|
|
28
|
+
async def stop(self):
|
|
29
|
+
if self._redis:
|
|
30
|
+
await self._redis.close()
|
|
31
|
+
self._redis = None
|
|
32
|
+
|
|
33
|
+
async def health(self) -> bool:
|
|
34
|
+
try:
|
|
35
|
+
pong = await self._redis.ping()
|
|
36
|
+
return pong is True or pong == "PONG"
|
|
37
|
+
except Exception:
|
|
38
|
+
return False
|
|
39
|
+
|
|
40
|
+
def _session_key(self, user_id: str, session_id: str):
|
|
41
|
+
return f"session:{user_id}:{session_id}"
|
|
42
|
+
|
|
43
|
+
def _index_key(self, user_id: str):
|
|
44
|
+
return f"session_index:{user_id}"
|
|
45
|
+
|
|
46
|
+
def _session_to_json(self, session: Session) -> str:
|
|
47
|
+
return session.model_dump_json()
|
|
48
|
+
|
|
49
|
+
def _session_from_json(self, s: str) -> Session:
|
|
50
|
+
return Session.model_validate_json(s)
|
|
51
|
+
|
|
52
|
+
async def create_session(
|
|
53
|
+
self,
|
|
54
|
+
user_id: str,
|
|
55
|
+
session_id: Optional[str] = None,
|
|
56
|
+
) -> Session:
|
|
57
|
+
if session_id and session_id.strip():
|
|
58
|
+
sid = session_id.strip()
|
|
59
|
+
else:
|
|
60
|
+
sid = str(uuid.uuid4())
|
|
61
|
+
|
|
62
|
+
session = Session(id=sid, user_id=user_id, messages=[])
|
|
63
|
+
key = self._session_key(user_id, sid)
|
|
64
|
+
|
|
65
|
+
await self._redis.set(key, self._session_to_json(session))
|
|
66
|
+
await self._redis.sadd(self._index_key(user_id), sid)
|
|
67
|
+
return session
|
|
68
|
+
|
|
69
|
+
async def get_session(
|
|
70
|
+
self,
|
|
71
|
+
user_id: str,
|
|
72
|
+
session_id: str,
|
|
73
|
+
) -> Optional[Session]:
|
|
74
|
+
key = self._session_key(user_id, session_id)
|
|
75
|
+
session_json = await self._redis.get(key)
|
|
76
|
+
if session_json is None:
|
|
77
|
+
session = Session(id=session_id, user_id=user_id)
|
|
78
|
+
await self._redis.set(key, self._session_to_json(session))
|
|
79
|
+
await self._redis.sadd(self._index_key(user_id), session_id)
|
|
80
|
+
return session
|
|
81
|
+
return self._session_from_json(session_json)
|
|
82
|
+
|
|
83
|
+
async def delete_session(self, user_id: str, session_id: str):
|
|
84
|
+
key = self._session_key(user_id, session_id)
|
|
85
|
+
await self._redis.delete(key)
|
|
86
|
+
await self._redis.srem(self._index_key(user_id), session_id)
|
|
87
|
+
|
|
88
|
+
async def list_sessions(self, user_id: str) -> list[Session]:
|
|
89
|
+
idx_key = self._index_key(user_id)
|
|
90
|
+
session_ids = await self._redis.smembers(idx_key)
|
|
91
|
+
sessions = []
|
|
92
|
+
for sid in session_ids:
|
|
93
|
+
key = self._session_key(user_id, sid)
|
|
94
|
+
session_json = await self._redis.get(key)
|
|
95
|
+
if session_json:
|
|
96
|
+
session = self._session_from_json(session_json)
|
|
97
|
+
session.messages = []
|
|
98
|
+
sessions.append(session)
|
|
99
|
+
return sessions
|
|
100
|
+
|
|
101
|
+
async def append_message(
|
|
102
|
+
self,
|
|
103
|
+
session: Session,
|
|
104
|
+
message: Union[
|
|
105
|
+
"Message",
|
|
106
|
+
List["Message"],
|
|
107
|
+
Dict[str, Any],
|
|
108
|
+
List[Dict[str, Any]],
|
|
109
|
+
],
|
|
110
|
+
):
|
|
111
|
+
if not isinstance(message, list):
|
|
112
|
+
message = [message]
|
|
113
|
+
norm_message = []
|
|
114
|
+
for msg in message:
|
|
115
|
+
if not isinstance(msg, Message):
|
|
116
|
+
msg = Message.model_validate(msg)
|
|
117
|
+
norm_message.append(msg)
|
|
118
|
+
|
|
119
|
+
session.messages.extend(norm_message)
|
|
120
|
+
|
|
121
|
+
user_id = session.user_id
|
|
122
|
+
session_id = session.id
|
|
123
|
+
key = self._session_key(user_id, session_id)
|
|
124
|
+
|
|
125
|
+
session_json = await self._redis.get(key)
|
|
126
|
+
if session_json:
|
|
127
|
+
stored_session = self._session_from_json(session_json)
|
|
128
|
+
stored_session.messages.extend(norm_message)
|
|
129
|
+
await self._redis.set(key, self._session_to_json(stored_session))
|
|
130
|
+
await self._redis.sadd(self._index_key(user_id), session_id)
|
|
131
|
+
else:
|
|
132
|
+
print(
|
|
133
|
+
f"Warning: Session {session.id} not found in storage for "
|
|
134
|
+
f"append_message.",
|
|
135
|
+
)
|
|
136
|
+
|
|
137
|
+
async def delete_user_sessions(self, user_id: str) -> None:
|
|
138
|
+
"""
|
|
139
|
+
Deletes all session history data for a specific user.
|
|
140
|
+
|
|
141
|
+
Args:
|
|
142
|
+
user_id (str): The ID of the user whose session history data should
|
|
143
|
+
be deleted
|
|
144
|
+
"""
|
|
145
|
+
if not self._redis:
|
|
146
|
+
raise RuntimeError("Redis connection is not available")
|
|
147
|
+
|
|
148
|
+
index_key = self._index_key(user_id)
|
|
149
|
+
session_ids = await self._redis.smembers(index_key)
|
|
150
|
+
|
|
151
|
+
for session_id in session_ids:
|
|
152
|
+
key = self._session_key(user_id, session_id)
|
|
153
|
+
await self._redis.delete(key)
|
|
154
|
+
|
|
155
|
+
await self._redis.delete(index_key)
|
|
@@ -14,7 +14,6 @@ SANDBOXTYPE = "custom_sandbox"
|
|
|
14
14
|
@SandboxRegistry.register(
|
|
15
15
|
f"agentscope/runtime-sandbox-{SANDBOXTYPE}:{IMAGE_TAG}",
|
|
16
16
|
sandbox_type=SANDBOXTYPE,
|
|
17
|
-
resource_limits={"memory": "16Gi", "cpu": "4"},
|
|
18
17
|
security_level="medium",
|
|
19
18
|
timeout=60,
|
|
20
19
|
description="my sandbox",
|
|
@@ -12,7 +12,6 @@ SANDBOX_TYPE = "example"
|
|
|
12
12
|
@SandboxRegistry.register(
|
|
13
13
|
f"agentscope/runtime-sandbox-{SANDBOX_TYPE}:{IMAGE_TAG}",
|
|
14
14
|
sandbox_type=SANDBOX_TYPE,
|
|
15
|
-
resource_limits={"memory": "16Gi", "cpu": "4"},
|
|
16
15
|
security_level="medium",
|
|
17
16
|
timeout=60,
|
|
18
17
|
description="Example sandbox",
|