Repository navigation
Commit 93cc81c
committed
refactor: define terminal and interrupted task states once in a2a.utils.constants
The set of terminal task states was defined four times (active_task,
default_request_handler, the cluster VersionedDatabaseTaskStore and
TaskUpdater), and default_request_handler_v2 imported the task state sets
from the ActiveTask module. Define TERMINAL_TASK_STATES and
INTERRUPTED_TASK_STATES once, as frozensets, in a2a.utils.constants and use
them everywhere.
The previous public names (active_task.TERMINAL_TASK_STATES,
active_task.INTERRUPTED_TASK_STATES and
default_request_handler.TERMINAL_TASK_STATES) still resolve to the shared
sets, so existing imports keep working. The private copies in the cluster
store and TaskUpdater are removed. The legacy EventConsumer stop condition is
left as is, since it intentionally covers a different set of states.
a2a.utils.constants now imports a2a.types.a2a_pb2. a2a.types imports
a2a.utils.errors, so errors must not import constants.
Verification:
- Every a2a module imported first in a fresh interpreter: no new failures
compared with upstream/main (the same 3 pre-existing failures on both).
- 27 first-import orders and ordered pairs of constants, errors, types and
a2a.utils: all pass.
- ./scripts/lint.sh: ruff and ty pass (3 pre-existing ty warnings in
unrelated files).
- pytest: 2487 passed, 203 skipped, 4 xfailed, 1 xpassed; the 4 cross-version
integration errors also occur on upstream/main in this environment.
- scripts/test_install_smoke.sh: all 6 profiles pass.1 parent e615a8d commit 93cc81c
7 files changed
Lines changed: 48 additions & 40 deletions
File tree
- src/a2a
- server
- agent_execution
- cluster
- request_handlers
- tasks
- utils
- tests/utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
78 | 82 | | |
79 | 83 | | |
80 | 84 | | |
| |||
86 | 90 | | |
87 | 91 | | |
88 | 92 | | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | 93 | | |
102 | 94 | | |
103 | 95 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | 53 | | |
62 | 54 | | |
63 | 55 | | |
| |||
195 | 187 | | |
196 | 188 | | |
197 | 189 | | |
198 | | - | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
199 | 194 | | |
200 | 195 | | |
201 | 196 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
56 | 57 | | |
57 | 58 | | |
58 | 59 | | |
| |||
74 | 75 | | |
75 | 76 | | |
76 | 77 | | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | 78 | | |
85 | 79 | | |
86 | 80 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | 18 | | |
23 | 19 | | |
24 | 20 | | |
| |||
57 | 53 | | |
58 | 54 | | |
59 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | 55 | | |
61 | 56 | | |
62 | 57 | | |
| |||
105 | 100 | | |
106 | 101 | | |
107 | 102 | | |
108 | | - | |
| 103 | + | |
109 | 104 | | |
110 | 105 | | |
111 | 106 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
29 | 31 | | |
30 | 32 | | |
31 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
3 | 5 | | |
4 | 6 | | |
5 | 7 | | |
| |||
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
0 commit comments