Skip to content

Commit f5febdd

Browse files
gusye1234gusye1234
committed
refactor: groups to group
1 parent 3f6d09a commit f5febdd

File tree

10 files changed

+50
-50
lines changed

10 files changed

+50
-50
lines changed

‎drive_events/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .core import EventEngineCls
22
from .types import EventInput
33

4-
__version__ = "0.0.1.alpha"
4+
__version__ = "0.0.1.alpha1"
55
__author__ = "Jianbai Ye"
66
__url__ = "https://github.com/memodb-io/drive-events"
77

‎drive_events/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def make_event(self, func: Union[EventFunction, BaseEvent]) -> BaseEvent:
4040
self.__event_maps[event.id] = event
4141
return event
4242

43-
def listen_groups(
43+
def listen_group(
4444
self, group_markers: list[BaseEvent], group_name: Optional[str] = None
4545
) -> Callable[[BaseEvent], BaseEvent]:
4646
assert all(

‎examples/1_hello_world_in_order.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ async def hello(event: EventInput, global_ctx):
77
print("hello")
88

99

10-
@default_drive.listen_groups([hello])
10+
@default_drive.listen_group([hello])
1111
async def world(event: EventInput, global_ctx):
1212
print("world")
1313

‎examples/2_hello_world_parallele.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ async def start(event: EventInput, global_ctx):
88
print("start")
99

1010

11-
@default_drive.listen_groups([start])
11+
@default_drive.listen_group([start])
1212
async def hello(event: EventInput, global_ctx):
1313
print(datetime.now(), "hello")
1414
await asyncio.sleep(0.2)
1515
print(datetime.now(), "hello done")
1616

1717

18-
@default_drive.listen_groups([start])
18+
@default_drive.listen_group([start])
1919
async def world(event: EventInput, global_ctx):
2020
print(datetime.now(), "world")
2121
await asyncio.sleep(0.2)

‎examples/3_use_event_output.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ async def start(event: EventInput, global_ctx):
88
print("start")
99

1010

11-
@default_drive.listen_groups([start])
11+
@default_drive.listen_group([start])
1212
async def hello(event: EventInput, global_ctx):
1313
return 1
1414

1515

16-
@default_drive.listen_groups([start])
16+
@default_drive.listen_group([start])
1717
async def world(event: EventInput, global_ctx):
1818
return 2
1919

2020

21-
@default_drive.listen_groups([hello, world])
21+
@default_drive.listen_group([hello, world])
2222
async def adding(event: EventInput, global_ctx):
2323
results = event.results
2424
print("adding", hello, world)

‎examples/4_endless_tick_timer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async def tick(event: EventInput, global_ctx):
1010
return "tick"
1111

1212

13-
@default_drive.listen_groups([tick])
13+
@default_drive.listen_group([tick])
1414
async def tok(event: EventInput, global_ctx):
1515
print(datetime.now(), f"{event.results[tick.id]}, then tok")
1616
return goto_events([tick])

‎readme.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ from drive_events import EventInput, default_drive
5454
async def hello(event: EventInput, global_ctx):
5555
print("hello")
5656

57-
@default_drive.listen_groups([hello])
57+
@default_drive.listen_group([hello])
5858
async def world(event: EventInput, global_ctx):
5959
print("world")
6060

@@ -68,7 +68,7 @@ To make an event function, there are few elements:
6868
* Input Signature: must be `(event: EventInput, global_ctx)`
6969
* `EventInput` is the returns of the listening groups.
7070
* `global_ctx` is set by you when invoking events, it can be anything and default to `None`
71-
* Make sure you decorate the function with `@default_drive.make_event` or `@default_drive.listen_groups([EVENT,...])`
71+
* Make sure you decorate the function with `@default_drive.make_event` or `@default_drive.listen_group([EVENT,...])`
7272

7373
Then, run your workflow from any event:
7474

@@ -92,17 +92,17 @@ Check out [examples](./examples) for more user cases!
9292
async def start(event: EventInput, global_ctx):
9393
print("start")
9494

95-
@default_drive.listen_groups([start])
95+
@default_drive.listen_group([start])
9696
async def hello(event: EventInput, global_ctx):
9797
return 1
9898

9999

100-
@default_drive.listen_groups([start])
100+
@default_drive.listen_group([start])
101101
async def world(event: EventInput, global_ctx):
102102
return 2
103103

104104

105-
@default_drive.listen_groups([hello, world])
105+
@default_drive.listen_group([hello, world])
106106
async def adding(event: EventInput, global_ctx):
107107
results = event.results
108108
print("adding", hello, world)
@@ -128,14 +128,14 @@ assert results[adding.id] == 3
128128
async def start(event: EventInput, global_ctx):
129129
print("start")
130130

131-
@default_drive.listen_groups([start])
131+
@default_drive.listen_group([start])
132132
async def hello(event: EventInput, global_ctx):
133133
print(datetime.now(), "hello")
134134
await asyncio.sleep(0.2)
135135
print(datetime.now(), "hello done")
136136

137137

138-
@default_drive.listen_groups([start])
138+
@default_drive.listen_group([start])
139139
async def world(event: EventInput, global_ctx):
140140
print(datetime.now(), "world")
141141
await asyncio.sleep(0.2)
@@ -163,7 +163,7 @@ from drive_events.dynamic import abort_this
163163
async def a(event: EventInput, global_ctx):
164164
return abort_this()
165165

166-
@default_drive.listen_groups([a])
166+
@default_drive.listen_group([a])
167167
async def b(event: EventInput, global_ctx):
168168
assert False, "should not be called"
169169

@@ -192,11 +192,11 @@ async def a(event: EventInput, global_ctx):
192192
call_a_count += 1
193193
return 1
194194

195-
@default_drive.listen_groups([a])
195+
@default_drive.listen_group([a])
196196
async def b(event: EventInput, global_ctx):
197197
return goto_events([a], 2)
198198

199-
@default_drive.listen_groups([b])
199+
@default_drive.listen_group([b])
200200
async def c(event: EventInput, global_ctx):
201201
assert False, "should not be called"
202202

‎tests/test_define.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async def a(event: EventInput, global_ctx):
2020

2121
with pytest.raises(AssertionError):
2222

23-
@default_drive.listen_groups([a])
23+
@default_drive.listen_group([a])
2424
async def b(event: EventInput, global_ctx):
2525
return 1
2626

@@ -31,15 +31,15 @@ async def test_set_and_reset():
3131
async def a(event: EventInput, global_ctx):
3232
return 1
3333

34-
@default_drive.listen_groups([a])
34+
@default_drive.listen_group([a])
3535
async def b(event: EventInput, global_ctx):
3636
return 2
3737

3838
default_drive.reset()
3939

4040
with pytest.raises(AssertionError):
4141

42-
@default_drive.listen_groups([a])
42+
@default_drive.listen_group([a])
4343
async def b(event: EventInput, global_ctx):
4444
return 2
4545

@@ -69,11 +69,11 @@ async def test_order():
6969
async def a(event: EventInput, global_ctx):
7070
return 1
7171

72-
@default_drive.listen_groups([a])
72+
@default_drive.listen_group([a])
7373
async def b(event: EventInput, global_ctx):
7474
return 2
7575

76-
@default_drive.listen_groups([b])
76+
@default_drive.listen_group([b])
7777
async def c(event: EventInput, global_ctx):
7878
return 3
7979

@@ -92,11 +92,11 @@ async def test_multi_send():
9292
async def a(event: EventInput, global_ctx):
9393
return 1
9494

95-
@default_drive.listen_groups([a])
95+
@default_drive.listen_group([a])
9696
async def b(event: EventInput, global_ctx):
9797
return 2
9898

99-
@default_drive.listen_groups([a])
99+
@default_drive.listen_group([a])
100100
async def c(event: EventInput, global_ctx):
101101
return 3
102102

@@ -114,15 +114,15 @@ async def test_multi_recv():
114114
async def a(event: EventInput, global_ctx):
115115
return 1
116116

117-
@default_drive.listen_groups([a])
117+
@default_drive.listen_group([a])
118118
async def a1(event: EventInput, global_ctx):
119119
return 1
120120

121121
@default_drive.make_event
122122
async def b(event: EventInput, global_ctx):
123123
return 2
124124

125-
@default_drive.listen_groups([a1, b])
125+
@default_drive.listen_group([a1, b])
126126
async def c(event: EventInput, global_ctx):
127127
return 3
128128

@@ -144,9 +144,9 @@ async def a0(event: EventInput, global_ctx):
144144
async def a1(event: EventInput, global_ctx):
145145
return 0
146146

147-
@default_drive.listen_groups([a0, a1])
148-
@default_drive.listen_groups([a0, a1])
149-
@default_drive.listen_groups([a0, a1])
147+
@default_drive.listen_group([a0, a1])
148+
@default_drive.listen_group([a0, a1])
149+
@default_drive.listen_group([a0, a1])
150150
async def a(event: EventInput, global_ctx):
151151
return 1
152152

@@ -159,13 +159,13 @@ async def test_loop():
159159
async def a(event: EventInput, global_ctx):
160160
return 1
161161

162-
@default_drive.listen_groups([a])
162+
@default_drive.listen_group([a])
163163
async def b(event: EventInput, global_ctx):
164164
return 2
165165

166-
a = default_drive.listen_groups([b])(a)
166+
a = default_drive.listen_group([b])(a)
167167

168-
@default_drive.listen_groups([a, b])
168+
@default_drive.listen_group([a, b])
169169
async def c(event: EventInput, global_ctx):
170170
return 3
171171

‎tests/test_dynamic_run.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async def a(event: EventInput, global_ctx):
2020
assert global_ctx == {"test_ctx": 1}
2121
return abort_this()
2222

23-
@default_drive.listen_groups([a])
23+
@default_drive.listen_group([a])
2424
async def b(event: EventInput, global_ctx):
2525
assert False, "should not be called"
2626

@@ -47,11 +47,11 @@ async def a(event: EventInput, global_ctx):
4747
call_a_count += 1
4848
return 1
4949

50-
@default_drive.listen_groups([a])
50+
@default_drive.listen_group([a])
5151
async def b(event: EventInput, global_ctx):
5252
return goto_events([a], 2)
5353

54-
@default_drive.listen_groups([b])
54+
@default_drive.listen_group([b])
5555
async def c(event: EventInput, global_ctx):
5656
assert False, "should not be called"
5757

‎tests/test_run.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ async def a(event: EventInput, global_ctx):
1414
assert global_ctx == {"test_ctx": 1}
1515
return 1
1616

17-
@default_drive.listen_groups([a])
17+
@default_drive.listen_group([a])
1818
async def b(event: EventInput, global_ctx):
1919
assert global_ctx == {"test_ctx": 1}
2020
assert event.group_name == "0"
2121
assert event.behavior == ReturnBehavior.DISPATCH
2222
assert event.results == {a.id: 1}
2323
return 2
2424

25-
@default_drive.listen_groups([b])
25+
@default_drive.listen_group([b])
2626
async def c(event: EventInput, global_ctx):
2727
assert global_ctx == {"test_ctx": 1}
2828
assert event.group_name == "0"
@@ -40,14 +40,14 @@ async def test_multi_send():
4040
async def a(event: EventInput, global_ctx):
4141
return 1
4242

43-
@default_drive.listen_groups([a])
43+
@default_drive.listen_group([a])
4444
async def b(event: EventInput, global_ctx):
4545
assert event.group_name == "0"
4646
assert event.behavior == ReturnBehavior.DISPATCH
4747
assert event.results == {a.id: 1}
4848
return 2
4949

50-
@default_drive.listen_groups([a])
50+
@default_drive.listen_group([a])
5151
async def c(event: EventInput, global_ctx):
5252
assert event.group_name == "0"
5353
assert event.behavior == ReturnBehavior.DISPATCH
@@ -64,15 +64,15 @@ async def test_multi_recv():
6464
async def start(event: EventInput, global_ctx):
6565
return None
6666

67-
@default_drive.listen_groups([start])
67+
@default_drive.listen_group([start])
6868
async def a(event: EventInput, global_ctx):
6969
return 1
7070

71-
@default_drive.listen_groups([start])
71+
@default_drive.listen_group([start])
7272
async def b(event: EventInput, global_ctx):
7373
return 2
7474

75-
@default_drive.listen_groups([a, b])
75+
@default_drive.listen_group([a, b])
7676
async def c(event: EventInput, global_ctx):
7777
assert event.group_name == "0"
7878
assert event.behavior == ReturnBehavior.DISPATCH
@@ -89,14 +89,14 @@ async def test_multi_groups():
8989
async def a(event: EventInput, global_ctx):
9090
return 1
9191

92-
@default_drive.listen_groups([a])
92+
@default_drive.listen_group([a])
9393
async def b(event: EventInput, global_ctx):
9494
return 2
9595

9696
call_c_count = 0
9797

98-
@default_drive.listen_groups([a])
99-
@default_drive.listen_groups([b, a])
98+
@default_drive.listen_group([a])
99+
@default_drive.listen_group([b, a])
100100
async def c(event: EventInput, global_ctx):
101101
nonlocal call_c_count
102102
if call_c_count == 0:
@@ -133,13 +133,13 @@ async def a(event: EventInput, global_ctx):
133133
call_a_count += 1
134134
return 1
135135

136-
@default_drive.listen_groups([a])
136+
@default_drive.listen_group([a])
137137
async def b(event: EventInput, global_ctx):
138138
return 2
139139

140-
a = default_drive.listen_groups([b])(a)
140+
a = default_drive.listen_group([b])(a)
141141

142-
@default_drive.listen_groups([a, b])
142+
@default_drive.listen_group([a, b])
143143
async def c(event: EventInput, global_ctx):
144144
return 3
145145

0 commit comments

Comments
 (0)