agstack 1.17.0__tar.gz → 1.17.1__tar.gz
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.
- {agstack-1.17.0 → agstack-1.17.1}/PKG-INFO +1 -1
- {agstack-1.17.0 → agstack-1.17.1}/agstack/messagebus/redis.py +12 -5
- {agstack-1.17.0 → agstack-1.17.1}/agstack.egg-info/PKG-INFO +1 -1
- {agstack-1.17.0 → agstack-1.17.1}/pyproject.toml +1 -1
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_messagebus_redis.py +16 -12
- {agstack-1.17.0 → agstack-1.17.1}/LICENSE +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/README.md +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/cache/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/cache/base.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/cache/memory.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/cache/redis.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/config/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/config/logger.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/config/manager.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/config/types.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/contexts.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/decorators.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/events.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/exceptions.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/fastapi/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/fastapi/exception.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/fastapi/middleware.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/fastapi/offline.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/fastapi/sse.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/infra/db/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/infra/es/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/infra/kg/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/infra/mq/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/client.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/agent.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/context.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/event.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/exceptions.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/factory.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/flow.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/loader.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/agent_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/base.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/detect_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/echo_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/llm_chat_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/llm_embed_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/llm_rerank_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/python_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/subflow_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/switch_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/nodes/tool_node.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/records.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/registry.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/sandbox.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/state.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/flow/tool.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/prompts.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/llm/token.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/messagebus/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/messagebus/base.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/messagebus/memory.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/schema.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/security/__init__.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/security/casbin.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/security/crypt.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack/status.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack.egg-info/SOURCES.txt +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack.egg-info/dependency_links.txt +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack.egg-info/requires.txt +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/agstack.egg-info/top_level.txt +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/setup.cfg +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_cache_memory.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_cache_redis.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_flow_io.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_flow_switch_subflow.py +0 -0
- {agstack-1.17.0 → agstack-1.17.1}/tests/test_messagebus_memory.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: agstack
|
|
3
|
-
Version: 1.17.
|
|
3
|
+
Version: 1.17.1
|
|
4
4
|
Summary: Production-ready toolkit for building FastAPI and LLM applications
|
|
5
5
|
Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
|
|
6
6
|
Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import asyncio
|
|
4
4
|
from collections.abc import AsyncIterator
|
|
5
|
+
from typing import Self
|
|
5
6
|
|
|
6
7
|
import redis.asyncio as aioredis
|
|
7
8
|
from redis.asyncio.client import PubSub
|
|
@@ -17,15 +18,21 @@ class RedisSubscription(Subscription):
|
|
|
17
18
|
self._channels = channels
|
|
18
19
|
self._task: asyncio.Task[None] | None = None
|
|
19
20
|
self._queue: asyncio.Queue[tuple[str, bytes]] = asyncio.Queue()
|
|
21
|
+
self._started = False
|
|
20
22
|
self._closed = False
|
|
21
23
|
|
|
22
24
|
async def _start(self) -> None:
|
|
23
|
-
|
|
25
|
+
if self._started:
|
|
26
|
+
return
|
|
27
|
+
self._started = True
|
|
24
28
|
await self._pubsub.subscribe(*self._channels)
|
|
25
29
|
self._task = asyncio.create_task(self._listen())
|
|
26
30
|
|
|
31
|
+
async def __aenter__(self) -> Self:
|
|
32
|
+
await self._start()
|
|
33
|
+
return self
|
|
34
|
+
|
|
27
35
|
async def _listen(self) -> None:
|
|
28
|
-
"""后台监听 Redis Pub/Sub 消息"""
|
|
29
36
|
try:
|
|
30
37
|
async for msg in self._pubsub.listen():
|
|
31
38
|
if self._closed:
|
|
@@ -47,6 +54,8 @@ class RedisSubscription(Subscription):
|
|
|
47
54
|
return self
|
|
48
55
|
|
|
49
56
|
async def __anext__(self) -> tuple[str, bytes]:
|
|
57
|
+
if not self._started:
|
|
58
|
+
await self._start()
|
|
50
59
|
if self._closed and self._queue.empty():
|
|
51
60
|
raise StopAsyncIteration
|
|
52
61
|
try:
|
|
@@ -79,9 +88,7 @@ class RedisMessageBus(MessageBus):
|
|
|
79
88
|
|
|
80
89
|
def subscribe(self, *channels: str) -> RedisSubscription:
|
|
81
90
|
pubsub = self._client.pubsub()
|
|
82
|
-
|
|
83
|
-
# 调用方需要在 async with 或手动 await _start() 后使用
|
|
84
|
-
return sub
|
|
91
|
+
return RedisSubscription(pubsub, channels)
|
|
85
92
|
|
|
86
93
|
async def close(self) -> None:
|
|
87
94
|
await self._client.aclose()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: agstack
|
|
3
|
-
Version: 1.17.
|
|
3
|
+
Version: 1.17.1
|
|
4
4
|
Summary: Production-ready toolkit for building FastAPI and LLM applications
|
|
5
5
|
Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
|
|
6
6
|
Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
|
|
@@ -26,40 +26,44 @@ async def bus():
|
|
|
26
26
|
|
|
27
27
|
class TestPublishSubscribe:
|
|
28
28
|
async def test_single_channel(self, bus: RedisMessageBus) -> None:
|
|
29
|
-
|
|
30
|
-
await sub._start()
|
|
31
|
-
async with sub:
|
|
29
|
+
async with bus.subscribe("test:ch1") as sub:
|
|
32
30
|
await asyncio.sleep(0.1)
|
|
33
31
|
await bus.publish("test:ch1", b"hello")
|
|
34
|
-
channel, message = await asyncio.wait_for(sub
|
|
32
|
+
channel, message = await asyncio.wait_for(anext(sub), timeout=3)
|
|
35
33
|
assert channel == "test:ch1"
|
|
36
34
|
assert message == b"hello"
|
|
37
35
|
|
|
38
36
|
async def test_multi_channel(self, bus: RedisMessageBus) -> None:
|
|
39
|
-
|
|
40
|
-
await sub._start()
|
|
41
|
-
async with sub:
|
|
37
|
+
async with bus.subscribe("test:ch1", "test:ch2") as sub:
|
|
42
38
|
await asyncio.sleep(0.1)
|
|
43
39
|
await bus.publish("test:ch1", b"msg1")
|
|
44
40
|
await bus.publish("test:ch2", b"msg2")
|
|
45
41
|
results = []
|
|
46
42
|
for _ in range(2):
|
|
47
|
-
ch, msg = await asyncio.wait_for(sub
|
|
43
|
+
ch, msg = await asyncio.wait_for(anext(sub), timeout=3)
|
|
48
44
|
results.append((ch, msg))
|
|
49
45
|
channels = [r[0] for r in results]
|
|
50
46
|
assert "test:ch1" in channels
|
|
51
47
|
assert "test:ch2" in channels
|
|
52
48
|
|
|
49
|
+
async def test_lazy_start_without_context_manager(self, bus: RedisMessageBus) -> None:
|
|
50
|
+
sub = bus.subscribe("test:ch1")
|
|
51
|
+
await asyncio.sleep(0.1)
|
|
52
|
+
await bus.publish("test:ch1", b"world")
|
|
53
|
+
channel, message = await asyncio.wait_for(anext(sub), timeout=3)
|
|
54
|
+
assert channel == "test:ch1"
|
|
55
|
+
assert message == b"world"
|
|
56
|
+
await sub.close()
|
|
57
|
+
|
|
53
58
|
async def test_publish_no_subscribers(self, bus: RedisMessageBus) -> None:
|
|
54
59
|
await bus.publish("test:nobody", b"lost message")
|
|
55
60
|
|
|
56
61
|
|
|
57
62
|
class TestSubscriptionClose:
|
|
58
63
|
async def test_close(self, bus: RedisMessageBus) -> None:
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
await sub.close()
|
|
64
|
+
async with bus.subscribe("test:ch1") as sub:
|
|
65
|
+
await asyncio.sleep(0.1)
|
|
66
|
+
assert sub._closed
|
|
63
67
|
|
|
64
68
|
|
|
65
69
|
class TestBusClose:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|