holon-sh 0.0.1.dev3__tar.gz → 0.0.1.dev5__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.
- holon_sh-0.0.1.dev5/LICENSE +202 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/PKG-INFO +22 -5
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/README.md +20 -3
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/holon/client.py +94 -37
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/pyproject.toml +2 -2
- holon_sh-0.0.1.dev5/tests/test_elicit.py +195 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/test_runtime.py +7 -4
- holon_sh-0.0.1.dev3/LICENSE +0 -21
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/.gitignore +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/holon/binding.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/holon/py.typed +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/holon/view.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/scripts/fixtures.sh +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/scripts/verify_distribution.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/fixtures/caller/holon/apps/__init__.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/fixtures/caller/requirements.txt +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/fixtures/caller/server.json +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/fixtures/orders/server.json +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/fixtures/orders/server.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/test_package.py +0 -0
- {holon_sh-0.0.1.dev3 → holon_sh-0.0.1.dev5}/tests/test_view.py +0 -0
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
5
|
+
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
7
|
+
|
|
8
|
+
1. Definitions.
|
|
9
|
+
|
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
12
|
+
|
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
14
|
+
the copyright owner that is granting the License.
|
|
15
|
+
|
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
17
|
+
other entities that control, are controlled by, or are under common
|
|
18
|
+
control with that entity. For the purposes of this definition,
|
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
20
|
+
direction or management of such entity, whether by contract or
|
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
23
|
+
|
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
25
|
+
exercising permissions granted by this License.
|
|
26
|
+
|
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
28
|
+
including but not limited to software source code, documentation
|
|
29
|
+
source, and configuration files.
|
|
30
|
+
|
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
|
32
|
+
transformation or translation of a Source form, including but
|
|
33
|
+
not limited to compiled object code, generated documentation,
|
|
34
|
+
and conversions to other media types.
|
|
35
|
+
|
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
37
|
+
Object form, made available under the License, as indicated by a
|
|
38
|
+
copyright notice that is included in or attached to the work
|
|
39
|
+
(an example is provided in the Appendix below).
|
|
40
|
+
|
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
47
|
+
the Work and Derivative Works thereof.
|
|
48
|
+
|
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
|
50
|
+
the original version of the Work and any modifications or additions
|
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
62
|
+
|
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
65
|
+
subsequently incorporated within the Work.
|
|
66
|
+
|
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
|
73
|
+
|
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
79
|
+
where such license applies only to those patent claims licensable
|
|
80
|
+
by such Contributor that are necessarily infringed by their
|
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
83
|
+
institute patent litigation against any entity (including a
|
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
86
|
+
or contributory patent infringement, then any patent licenses
|
|
87
|
+
granted to You under this License for that Work shall terminate
|
|
88
|
+
as of the date such litigation is filed.
|
|
89
|
+
|
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
92
|
+
modifications, and in Source or Object form, provided that You
|
|
93
|
+
meet the following conditions:
|
|
94
|
+
|
|
95
|
+
(a) You must give any other recipients of the Work or
|
|
96
|
+
Derivative Works a copy of this License; and
|
|
97
|
+
|
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
|
99
|
+
stating that You changed the files; and
|
|
100
|
+
|
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
|
103
|
+
attribution notices from the Source form of the Work,
|
|
104
|
+
excluding those notices that do not pertain to any part of
|
|
105
|
+
the Derivative Works; and
|
|
106
|
+
|
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
|
109
|
+
include a readable copy of the attribution notices contained
|
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
|
112
|
+
of the following places: within a NOTICE text file distributed
|
|
113
|
+
as part of the Derivative Works; within the Source form or
|
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
|
115
|
+
within a display generated by the Derivative Works, if and
|
|
116
|
+
wherever such third-party notices normally appear. The contents
|
|
117
|
+
of the NOTICE file are for informational purposes only and
|
|
118
|
+
do not modify the License. You may add Your own attribution
|
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
121
|
+
that such additional attribution notices cannot be construed
|
|
122
|
+
as modifying the License.
|
|
123
|
+
|
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
|
125
|
+
may provide additional or different license terms and conditions
|
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
129
|
+
the conditions stated in this License.
|
|
130
|
+
|
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
134
|
+
this License, without any additional terms or conditions.
|
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
136
|
+
the terms of any separate license agreement you may have executed
|
|
137
|
+
with Licensor regarding such Contributions.
|
|
138
|
+
|
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
141
|
+
except as required for reasonable and customary use in describing the
|
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
143
|
+
|
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
|
153
|
+
|
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
|
159
|
+
incidental, or consequential damages of any character arising as a
|
|
160
|
+
result of this License or out of the use or inability to use the
|
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
163
|
+
other commercial damages or losses), even if such Contributor
|
|
164
|
+
has been advised of the possibility of such damages.
|
|
165
|
+
|
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
169
|
+
or other liability obligations and/or rights consistent with this
|
|
170
|
+
License. However, in accepting such obligations, You may act only
|
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
175
|
+
of your accepting any such warranty or additional liability.
|
|
176
|
+
|
|
177
|
+
END OF TERMS AND CONDITIONS
|
|
178
|
+
|
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
180
|
+
|
|
181
|
+
To apply the Apache License to your work, attach the following
|
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
183
|
+
replaced with your own identifying information. (Don't include
|
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
185
|
+
comment syntax for the file format. We also recommend that a
|
|
186
|
+
file or class name and description of purpose be included on the
|
|
187
|
+
same "printed page" as the copyright notice for easier
|
|
188
|
+
identification within third-party archives.
|
|
189
|
+
|
|
190
|
+
Copyright 2026 Holon Systems, Inc.
|
|
191
|
+
|
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
|
+
you may not use this file except in compliance with the License.
|
|
194
|
+
You may obtain a copy of the License at
|
|
195
|
+
|
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
197
|
+
|
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
201
|
+
See the License for the specific language governing permissions and
|
|
202
|
+
limitations under the License.
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: holon-sh
|
|
3
|
-
Version: 0.0.1.
|
|
3
|
+
Version: 0.0.1.dev5
|
|
4
4
|
Summary: Typed MCP clients, bindings, and app views
|
|
5
5
|
Project-URL: Repository, https://github.com/holon-sh/sdk-py
|
|
6
|
-
License-Expression:
|
|
6
|
+
License-Expression: Apache-2.0
|
|
7
7
|
License-File: LICENSE
|
|
8
8
|
Requires-Python: >=3.11
|
|
9
9
|
Requires-Dist: httpx2<3,>=2.10
|
|
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
|
|
|
16
16
|
[](https://github.com/holon-sh/sdk-py/actions/workflows/ci.yml)
|
|
17
17
|
[](https://pypi.org/project/holon-sh/)
|
|
18
18
|
[](https://www.python.org/downloads/)
|
|
19
|
-
[](LICENSE)
|
|
20
20
|
|
|
21
21
|
This repository contains the Python runtime for [`holon`](https://github.com/holon-sh/cli).
|
|
22
22
|
|
|
@@ -63,8 +63,7 @@ from holon.client import ToolCallError
|
|
|
63
63
|
try:
|
|
64
64
|
await apps.bar.tools.greet(name="world")
|
|
65
65
|
except ToolCallError as error:
|
|
66
|
-
error.
|
|
67
|
-
error.result # the original MCP result
|
|
66
|
+
error.result # the original MCP result
|
|
68
67
|
```
|
|
69
68
|
|
|
70
69
|
</details>
|
|
@@ -88,6 +87,24 @@ The options dict also accepts `input_responses`, `request_state` and `meta`.
|
|
|
88
87
|
|
|
89
88
|
</details>
|
|
90
89
|
|
|
90
|
+
<details open>
|
|
91
|
+
<summary><h3>Answer a server's question</h3></summary>
|
|
92
|
+
|
|
93
|
+
A tool can stop and ask for input through an [MCP elicitation](https://modelcontextprotocol.io/specification/2026-07-28/client/elicitation). Pass `elicit` to answer in place, and the call returns its usual typed output:
|
|
94
|
+
|
|
95
|
+
```python
|
|
96
|
+
from mcp.types import ElicitResult
|
|
97
|
+
|
|
98
|
+
async def elicit(params):
|
|
99
|
+
return ElicitResult(action="accept", content=await ask(params.message))
|
|
100
|
+
|
|
101
|
+
greeting = await apps.bar.tools.greet({"elicit": elicit}, name="world")
|
|
102
|
+
```
|
|
103
|
+
|
|
104
|
+
Without `elicit`, the question arrives on `ToolCallError.result`, or as an `input_required` result from `call_tool`. To answer later, for example in another request, call again with `input_responses` and `request_state`.
|
|
105
|
+
|
|
106
|
+
</details>
|
|
107
|
+
|
|
91
108
|
## Serve an [MCP App](https://modelcontextprotocol.io/extensions/apps/overview) view
|
|
92
109
|
|
|
93
110
|
`holon.view.app_view` registers a built HTML file as an MCP App resource:
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
[](https://github.com/holon-sh/sdk-py/actions/workflows/ci.yml)
|
|
4
4
|
[](https://pypi.org/project/holon-sh/)
|
|
5
5
|
[](https://www.python.org/downloads/)
|
|
6
|
-
[](LICENSE)
|
|
7
7
|
|
|
8
8
|
This repository contains the Python runtime for [`holon`](https://github.com/holon-sh/cli).
|
|
9
9
|
|
|
@@ -50,8 +50,7 @@ from holon.client import ToolCallError
|
|
|
50
50
|
try:
|
|
51
51
|
await apps.bar.tools.greet(name="world")
|
|
52
52
|
except ToolCallError as error:
|
|
53
|
-
error.
|
|
54
|
-
error.result # the original MCP result
|
|
53
|
+
error.result # the original MCP result
|
|
55
54
|
```
|
|
56
55
|
|
|
57
56
|
</details>
|
|
@@ -75,6 +74,24 @@ The options dict also accepts `input_responses`, `request_state` and `meta`.
|
|
|
75
74
|
|
|
76
75
|
</details>
|
|
77
76
|
|
|
77
|
+
<details open>
|
|
78
|
+
<summary><h3>Answer a server's question</h3></summary>
|
|
79
|
+
|
|
80
|
+
A tool can stop and ask for input through an [MCP elicitation](https://modelcontextprotocol.io/specification/2026-07-28/client/elicitation). Pass `elicit` to answer in place, and the call returns its usual typed output:
|
|
81
|
+
|
|
82
|
+
```python
|
|
83
|
+
from mcp.types import ElicitResult
|
|
84
|
+
|
|
85
|
+
async def elicit(params):
|
|
86
|
+
return ElicitResult(action="accept", content=await ask(params.message))
|
|
87
|
+
|
|
88
|
+
greeting = await apps.bar.tools.greet({"elicit": elicit}, name="world")
|
|
89
|
+
```
|
|
90
|
+
|
|
91
|
+
Without `elicit`, the question arrives on `ToolCallError.result`, or as an `input_required` result from `call_tool`. To answer later, for example in another request, call again with `input_responses` and `request_state`.
|
|
92
|
+
|
|
93
|
+
</details>
|
|
94
|
+
|
|
78
95
|
## Serve an [MCP App](https://modelcontextprotocol.io/extensions/apps/overview) view
|
|
79
96
|
|
|
80
97
|
`holon.view.app_view` registers a built HTML file as an MCP App resource:
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from __future__ import annotations
|
|
2
2
|
|
|
3
3
|
import os
|
|
4
|
-
from collections.abc import Mapping
|
|
4
|
+
from collections.abc import Awaitable, Callable, Mapping
|
|
5
5
|
from functools import partial
|
|
6
6
|
from types import SimpleNamespace
|
|
7
7
|
from typing import Any, Generic, Literal, Protocol, TypeAlias, TypedDict, TypeVar
|
|
@@ -9,16 +9,21 @@ from typing import Any, Generic, Literal, Protocol, TypeAlias, TypedDict, TypeVa
|
|
|
9
9
|
import httpx2
|
|
10
10
|
import jsonschema # type: ignore[import-untyped,unused-ignore]
|
|
11
11
|
from mcp import Client
|
|
12
|
+
from mcp.client.session import ClientRequestContext
|
|
12
13
|
from mcp.client.streamable_http import streamable_http_client
|
|
13
14
|
from mcp.types import (
|
|
14
15
|
CallToolRequest,
|
|
15
16
|
CallToolRequestParams,
|
|
16
17
|
CallToolResult,
|
|
17
18
|
ContentBlock,
|
|
19
|
+
ElicitRequest,
|
|
20
|
+
ElicitRequestParams,
|
|
21
|
+
ElicitResult,
|
|
18
22
|
Implementation,
|
|
19
23
|
InputRequiredResult,
|
|
20
24
|
InputResponses,
|
|
21
25
|
RequestParamsMeta,
|
|
26
|
+
TextContent,
|
|
22
27
|
)
|
|
23
28
|
from pydantic import TypeAdapter
|
|
24
29
|
from referencing import Registry
|
|
@@ -26,7 +31,14 @@ from referencing import Registry
|
|
|
26
31
|
from holon.binding import Binding, resolve_default_binding
|
|
27
32
|
|
|
28
33
|
# Binding is re-exported for the generated holon.apps module.
|
|
29
|
-
__all__ = [
|
|
34
|
+
__all__ = [
|
|
35
|
+
"Apps",
|
|
36
|
+
"Binding",
|
|
37
|
+
"CallOptions",
|
|
38
|
+
"CompleteResult",
|
|
39
|
+
"ToolCallError",
|
|
40
|
+
"ToolResult",
|
|
41
|
+
]
|
|
30
42
|
|
|
31
43
|
Output = TypeVar("Output")
|
|
32
44
|
|
|
@@ -63,31 +75,77 @@ class CallOptions(TypedDict, total=False):
|
|
|
63
75
|
input_responses: InputResponses | None
|
|
64
76
|
request_state: str | None
|
|
65
77
|
meta: RequestParamsMeta | None
|
|
78
|
+
elicit: Callable[[ElicitRequestParams], Awaitable[ElicitResult]]
|
|
66
79
|
|
|
67
80
|
|
|
68
81
|
class ToolCallError(RuntimeError):
|
|
69
82
|
"""Raised by ``tools.<name>`` for tool errors or additional input requests.
|
|
70
83
|
|
|
71
84
|
Attributes:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
result: Original MCP error or input-required result.
|
|
75
|
-
code: ``tool_error`` or ``input_required``. Use ``call_tool`` when you
|
|
76
|
-
need to inspect these results and submit additional input.
|
|
85
|
+
result: Original MCP error or input-required result. Pass ``elicit`` to
|
|
86
|
+
answer questions in place, or continue later through ``call_tool``.
|
|
77
87
|
"""
|
|
78
88
|
|
|
79
89
|
def __init__(
|
|
80
90
|
self, app: str, tool: str, result: CallToolResult | InputRequiredResult
|
|
81
91
|
) -> None:
|
|
82
|
-
self.app = app
|
|
83
|
-
self.tool = tool
|
|
84
92
|
self.result = result
|
|
85
|
-
self.code: Literal["tool_error", "input_required"]
|
|
86
93
|
if isinstance(result, InputRequiredResult):
|
|
87
|
-
|
|
94
|
+
message = "additional input required"
|
|
95
|
+
detail = " ".join(
|
|
96
|
+
f"{request.params.message} {getattr(request.params, 'url', '')}".strip()
|
|
97
|
+
for request in (result.input_requests or {}).values()
|
|
98
|
+
if isinstance(request, ElicitRequest)
|
|
99
|
+
)
|
|
88
100
|
else:
|
|
89
|
-
|
|
90
|
-
|
|
101
|
+
message = "tool failed"
|
|
102
|
+
detail = next(
|
|
103
|
+
(part.text for part in result.content if isinstance(part, TextContent)),
|
|
104
|
+
"",
|
|
105
|
+
)
|
|
106
|
+
if detail:
|
|
107
|
+
message = f"{message}: {detail}"
|
|
108
|
+
super().__init__(f"{app}.{tool}: {message}")
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
async def _declare_elicitation(
|
|
112
|
+
context: ClientRequestContext, params: ElicitRequestParams
|
|
113
|
+
) -> ElicitResult:
|
|
114
|
+
"""Declare that every client can be asked; the MCP client infers it from this."""
|
|
115
|
+
return ElicitResult(action="decline")
|
|
116
|
+
|
|
117
|
+
|
|
118
|
+
async def _send(
|
|
119
|
+
client: Client, name: str, arguments: dict[str, Any], options: CallOptions
|
|
120
|
+
) -> CallToolResult | InputRequiredResult:
|
|
121
|
+
elicit = options.get("elicit")
|
|
122
|
+
responses, state = options.get("input_responses"), options.get("request_state")
|
|
123
|
+
answered = 0
|
|
124
|
+
while True:
|
|
125
|
+
result = await client.session.send_request(
|
|
126
|
+
CallToolRequest(
|
|
127
|
+
params=CallToolRequestParams(
|
|
128
|
+
name=name,
|
|
129
|
+
arguments=arguments,
|
|
130
|
+
input_responses=responses,
|
|
131
|
+
request_state=state,
|
|
132
|
+
_meta=options.get("meta"),
|
|
133
|
+
)
|
|
134
|
+
),
|
|
135
|
+
_result,
|
|
136
|
+
request_read_timeout_seconds=options.get("timeout"),
|
|
137
|
+
)
|
|
138
|
+
# A server may keep asking, so answering stops after ten rounds, the MCP
|
|
139
|
+
# clients' own limit, and the last question reaches the caller.
|
|
140
|
+
if not (elicit and answered < 10 and isinstance(result, InputRequiredResult)):
|
|
141
|
+
return result
|
|
142
|
+
answered += 1
|
|
143
|
+
responses = {
|
|
144
|
+
key: await elicit(request.params)
|
|
145
|
+
for key, request in (result.input_requests or {}).items()
|
|
146
|
+
if isinstance(request, ElicitRequest)
|
|
147
|
+
}
|
|
148
|
+
state = result.request_state
|
|
91
149
|
|
|
92
150
|
|
|
93
151
|
def validate(schema: dict[str, Any], value: object, label: str) -> None:
|
|
@@ -121,8 +179,8 @@ class _App:
|
|
|
121
179
|
)
|
|
122
180
|
self.tools = SimpleNamespace(
|
|
123
181
|
**{
|
|
124
|
-
name: partial(self._call_tool,
|
|
125
|
-
for name in self._definitions or ()
|
|
182
|
+
name: partial(self._call_tool, tool)
|
|
183
|
+
for name, tool in (self._definitions or {}).items()
|
|
126
184
|
if not name.startswith("_")
|
|
127
185
|
}
|
|
128
186
|
)
|
|
@@ -139,12 +197,14 @@ class _App:
|
|
|
139
197
|
Args:
|
|
140
198
|
name: Tool name. Contracted dependencies reject unknown tools.
|
|
141
199
|
options: Request timeout in seconds, input responses, continuation
|
|
142
|
-
state, and
|
|
200
|
+
state, metadata, and ``elicit`` to answer the server's questions in
|
|
201
|
+
place. Passed positionally, separate from tool input.
|
|
143
202
|
**arguments: Tool input, validated against the contract if present.
|
|
144
203
|
|
|
145
204
|
Returns:
|
|
146
|
-
A complete or input-required result
|
|
147
|
-
|
|
205
|
+
A complete result, or an input-required result for a question left
|
|
206
|
+
unanswered. Tool error results are returned unchanged; successful
|
|
207
|
+
structured output is contract-validated.
|
|
148
208
|
|
|
149
209
|
Raises:
|
|
150
210
|
ValueError: Unknown tool, invalid input/output, or undeclared dependency.
|
|
@@ -176,6 +236,7 @@ class _App:
|
|
|
176
236
|
f"Dependency {self._name} is unavailable ({variable}). Set the endpoint or supply a binding."
|
|
177
237
|
)
|
|
178
238
|
http_client = partial(httpx2.AsyncClient, trust_env=False)
|
|
239
|
+
failure: Exception | None = None
|
|
179
240
|
async with (
|
|
180
241
|
binding.get("http_client", http_client) if binding else http_client
|
|
181
242
|
)() as http:
|
|
@@ -186,20 +247,15 @@ class _App:
|
|
|
186
247
|
name=self._identity["name"], version=self._identity["version"]
|
|
187
248
|
),
|
|
188
249
|
mode="2026-07-28",
|
|
250
|
+
elicitation_callback=_declare_elicitation,
|
|
189
251
|
) as client:
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
_meta=options.get("meta"),
|
|
198
|
-
)
|
|
199
|
-
),
|
|
200
|
-
_result,
|
|
201
|
-
request_read_timeout_seconds=options.get("timeout"),
|
|
202
|
-
)
|
|
252
|
+
try:
|
|
253
|
+
result = await _send(client, name, arguments, options)
|
|
254
|
+
except Exception as error: # noqa: BLE001
|
|
255
|
+
# Raised below: the client's task group would wrap it in an ExceptionGroup.
|
|
256
|
+
failure = error
|
|
257
|
+
if failure is not None:
|
|
258
|
+
raise failure
|
|
203
259
|
if (
|
|
204
260
|
definition is not None
|
|
205
261
|
and isinstance(result, CallToolResult)
|
|
@@ -215,15 +271,15 @@ class _App:
|
|
|
215
271
|
|
|
216
272
|
async def _call_tool(
|
|
217
273
|
self,
|
|
218
|
-
|
|
274
|
+
tool: dict[str, Any],
|
|
219
275
|
options: CallOptions | None = None,
|
|
220
276
|
/,
|
|
221
277
|
**arguments: object,
|
|
222
278
|
) -> object:
|
|
223
|
-
result = await self.call_tool(name, options, **arguments)
|
|
279
|
+
result = await self.call_tool(tool["name"], options, **arguments)
|
|
224
280
|
if isinstance(result, InputRequiredResult) or result.is_error:
|
|
225
|
-
raise ToolCallError(self._name, name, result)
|
|
226
|
-
return result.structured_content
|
|
281
|
+
raise ToolCallError(self._name, tool["name"], result)
|
|
282
|
+
return result.structured_content if "outputSchema" in tool else result
|
|
227
283
|
|
|
228
284
|
|
|
229
285
|
class Apps:
|
|
@@ -243,8 +299,9 @@ class Apps:
|
|
|
243
299
|
ValueError: A binding names an unknown dependency.
|
|
244
300
|
|
|
245
301
|
Access a client with ``clients[name]`` or ``clients.name``. Its
|
|
246
|
-
``tools.<name>(**arguments)`` methods return structured output
|
|
247
|
-
|
|
302
|
+
``tools.<name>(**arguments)`` methods return structured output, or the
|
|
303
|
+
complete result for a tool without an output schema, and raise
|
|
304
|
+
:class:`ToolCallError` for tool errors or questions left unanswered.
|
|
248
305
|
Use its ``call_tool`` method for the full result envelope.
|
|
249
306
|
"""
|
|
250
307
|
|
|
@@ -4,10 +4,10 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "holon-sh"
|
|
7
|
-
version = "0.0.1.
|
|
7
|
+
version = "0.0.1.dev5"
|
|
8
8
|
description = "Typed MCP clients, bindings, and app views"
|
|
9
9
|
readme = "README.md"
|
|
10
|
-
license = "
|
|
10
|
+
license = "Apache-2.0"
|
|
11
11
|
license-files = ["LICENSE"]
|
|
12
12
|
requires-python = ">=3.11"
|
|
13
13
|
dependencies = ["mcp>=2.3,<3", "jsonschema>=4.26,<5", "httpx2>=2.10,<3"]
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
from typing import Annotated
|
|
3
|
+
|
|
4
|
+
import httpx2
|
|
5
|
+
import pytest
|
|
6
|
+
from mcp.server import MCPServer
|
|
7
|
+
from mcp.server.mcpserver import Elicit, Resolve
|
|
8
|
+
from mcp.types import (
|
|
9
|
+
CallToolResult,
|
|
10
|
+
ElicitRequest,
|
|
11
|
+
ElicitRequestFormParams,
|
|
12
|
+
ElicitRequestURLParams,
|
|
13
|
+
ElicitResult,
|
|
14
|
+
InputRequiredResult,
|
|
15
|
+
)
|
|
16
|
+
from pydantic import BaseModel
|
|
17
|
+
|
|
18
|
+
from holon.client import Apps, ToolCallError
|
|
19
|
+
|
|
20
|
+
QUESTION = "Which size should I ship?"
|
|
21
|
+
ID_ONLY = {
|
|
22
|
+
"type": "object",
|
|
23
|
+
"properties": {"id": {"type": "string"}},
|
|
24
|
+
"required": ["id"],
|
|
25
|
+
}
|
|
26
|
+
CONTRACT = {
|
|
27
|
+
"tools": [
|
|
28
|
+
{
|
|
29
|
+
"name": "ship",
|
|
30
|
+
"inputSchema": ID_ONLY,
|
|
31
|
+
"outputSchema": {
|
|
32
|
+
"type": "object",
|
|
33
|
+
"properties": {"shipped": {"type": "string"}},
|
|
34
|
+
"required": ["shipped"],
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
{"name": "nag", "inputSchema": ID_ONLY},
|
|
38
|
+
]
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
class Choice(BaseModel):
|
|
43
|
+
size: str
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
class Shipped(BaseModel):
|
|
47
|
+
shipped: str
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
def ask_size() -> Elicit[Choice]:
|
|
51
|
+
return Elicit(QUESTION, Choice)
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
def exercise(body, contract=CONTRACT):
|
|
55
|
+
"""Run body against a real server."""
|
|
56
|
+
|
|
57
|
+
async def run():
|
|
58
|
+
server = MCPServer("orders")
|
|
59
|
+
|
|
60
|
+
@server.tool()
|
|
61
|
+
async def ship(
|
|
62
|
+
id: str, choice: Annotated[Choice, Resolve(ask_size)]
|
|
63
|
+
) -> Shipped:
|
|
64
|
+
return Shipped(shipped=choice.size)
|
|
65
|
+
|
|
66
|
+
@server.tool()
|
|
67
|
+
async def nag(id: str) -> CallToolResult | InputRequiredResult:
|
|
68
|
+
params = ElicitRequestFormParams(
|
|
69
|
+
message=QUESTION,
|
|
70
|
+
requested_schema={"type": "object", "properties": {}},
|
|
71
|
+
)
|
|
72
|
+
return InputRequiredResult(
|
|
73
|
+
input_requests={"q": ElicitRequest(params=params)}
|
|
74
|
+
)
|
|
75
|
+
|
|
76
|
+
app = server.streamable_http_app(stateless_http=True)
|
|
77
|
+
|
|
78
|
+
def http_client():
|
|
79
|
+
return httpx2.AsyncClient(transport=httpx2.ASGITransport(app=app))
|
|
80
|
+
|
|
81
|
+
apps = Apps(
|
|
82
|
+
{"name": "checkout", "version": "1", "requires": {}},
|
|
83
|
+
{"orders": contract},
|
|
84
|
+
{
|
|
85
|
+
"orders": {
|
|
86
|
+
"endpoint": "http://127.0.0.1:8000/mcp",
|
|
87
|
+
"http_client": http_client,
|
|
88
|
+
}
|
|
89
|
+
},
|
|
90
|
+
)
|
|
91
|
+
async with app.router.lifespan_context(app):
|
|
92
|
+
await body(apps.orders)
|
|
93
|
+
|
|
94
|
+
asyncio.run(asyncio.wait_for(run(), timeout=15))
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
async def large(params):
|
|
98
|
+
return ElicitResult(action="accept", content={"size": "large"})
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
def test_elicit_answers_in_place_and_the_call_returns_typed_output():
|
|
102
|
+
asked = []
|
|
103
|
+
|
|
104
|
+
async def elicit(params):
|
|
105
|
+
asked.append(params.message)
|
|
106
|
+
return await large(params)
|
|
107
|
+
|
|
108
|
+
async def body(orders):
|
|
109
|
+
assert await orders.tools.ship({"elicit": elicit}, id="A-1") == {
|
|
110
|
+
"shipped": "large"
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
exercise(body)
|
|
114
|
+
assert asked == [QUESTION]
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
def test_accepted_output_is_still_validated():
|
|
118
|
+
tool = CONTRACT["tools"][0]
|
|
119
|
+
wrong = {"type": "object", "required": ["total"]}
|
|
120
|
+
|
|
121
|
+
async def body(orders):
|
|
122
|
+
with pytest.raises(ValueError, match="structured output"):
|
|
123
|
+
await orders.tools.ship({"elicit": large}, id="A-1")
|
|
124
|
+
|
|
125
|
+
exercise(body, {"tools": [{**tool, "outputSchema": wrong}]})
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
def test_a_declined_question_reaches_the_tool():
|
|
129
|
+
async def decline(params):
|
|
130
|
+
return ElicitResult(action="decline")
|
|
131
|
+
|
|
132
|
+
async def body(orders):
|
|
133
|
+
with pytest.raises(ToolCallError, match="elicitation was decline"):
|
|
134
|
+
await orders.tools.ship({"elicit": decline}, id="A-1")
|
|
135
|
+
|
|
136
|
+
exercise(body)
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
def test_a_server_that_keeps_asking_stops_after_ten_answers():
|
|
140
|
+
answers = []
|
|
141
|
+
|
|
142
|
+
async def elicit(params):
|
|
143
|
+
answers.append(params)
|
|
144
|
+
return ElicitResult(action="decline")
|
|
145
|
+
|
|
146
|
+
async def body(orders):
|
|
147
|
+
with pytest.raises(ToolCallError, match=QUESTION):
|
|
148
|
+
await orders.tools.nag({"elicit": elicit}, id="A-1")
|
|
149
|
+
|
|
150
|
+
exercise(body)
|
|
151
|
+
assert len(answers) == 10
|
|
152
|
+
|
|
153
|
+
|
|
154
|
+
def test_without_elicit_the_question_reaches_the_caller_who_continues():
|
|
155
|
+
async def body(orders):
|
|
156
|
+
with pytest.raises(ToolCallError) as error:
|
|
157
|
+
await orders.tools.ship(id="A-1")
|
|
158
|
+
assert str(error.value) == f"orders.ship: additional input required: {QUESTION}"
|
|
159
|
+
result = error.value.result
|
|
160
|
+
assert isinstance(result, InputRequiredResult)
|
|
161
|
+
[(key, request)] = result.input_requests.items()
|
|
162
|
+
assert request.params.message == QUESTION
|
|
163
|
+
answer = ElicitResult(action="accept", content={"size": "small"})
|
|
164
|
+
continued = await orders.call_tool(
|
|
165
|
+
"ship",
|
|
166
|
+
{"input_responses": {key: answer}, "request_state": result.request_state},
|
|
167
|
+
id="A-1",
|
|
168
|
+
)
|
|
169
|
+
assert continued.structured_content == {"shipped": "small"}
|
|
170
|
+
|
|
171
|
+
exercise(body)
|
|
172
|
+
|
|
173
|
+
|
|
174
|
+
def test_an_error_while_answering_reaches_the_caller_unwrapped():
|
|
175
|
+
async def elicit(params):
|
|
176
|
+
raise LookupError("no answer")
|
|
177
|
+
|
|
178
|
+
async def body(orders):
|
|
179
|
+
with pytest.raises(LookupError, match="no answer"):
|
|
180
|
+
await orders.tools.ship({"elicit": elicit}, id="A-1")
|
|
181
|
+
|
|
182
|
+
exercise(body)
|
|
183
|
+
|
|
184
|
+
|
|
185
|
+
def test_a_url_question_names_its_url():
|
|
186
|
+
params = ElicitRequestURLParams(
|
|
187
|
+
message="Connect your account.",
|
|
188
|
+
url="https://orders.example/connect",
|
|
189
|
+
elicitation_id="link",
|
|
190
|
+
)
|
|
191
|
+
result = InputRequiredResult(input_requests={"link": ElicitRequest(params=params)})
|
|
192
|
+
assert str(ToolCallError("orders", "ship", result)) == (
|
|
193
|
+
"orders.ship: additional input required: "
|
|
194
|
+
"Connect your account. https://orders.example/connect"
|
|
195
|
+
)
|
|
@@ -138,13 +138,10 @@ def test_clients_preserve_mcp_results_validate_and_cancel(monkeypatch):
|
|
|
138
138
|
if request["method"] == "tools/call"
|
|
139
139
|
]
|
|
140
140
|
assert set(callers) == {"checkout", "other"}
|
|
141
|
-
for value
|
|
141
|
+
for value in ["error", "input"]:
|
|
142
142
|
raw = await apps.orders.call_tool("read", id=value)
|
|
143
143
|
with pytest.raises(ToolCallError) as error:
|
|
144
144
|
await apps.orders.tools.read(id=value)
|
|
145
|
-
assert error.value.code == code
|
|
146
|
-
assert error.value.app == "orders"
|
|
147
|
-
assert error.value.tool == "read"
|
|
148
145
|
assert type(error.value.result) is type(raw)
|
|
149
146
|
assert error.value.result.meta["preserved"] is True
|
|
150
147
|
if isinstance(raw, InputRequiredResult):
|
|
@@ -158,6 +155,7 @@ def test_clients_preserve_mcp_results_validate_and_cancel(monkeypatch):
|
|
|
158
155
|
assert requests[-1]["params"]["inputResponses"] == {}
|
|
159
156
|
else:
|
|
160
157
|
assert error.value.result == raw
|
|
158
|
+
assert "Unavailable" in str(error.value)
|
|
161
159
|
before = len(requests)
|
|
162
160
|
with pytest.raises(ValueError, match="arguments"):
|
|
163
161
|
await apps.orders.tools.read(id=1)
|
|
@@ -174,6 +172,11 @@ def test_clients_preserve_mcp_results_validate_and_cancel(monkeypatch):
|
|
|
174
172
|
raw = await untyped.orders.call_tool("read", id="good")
|
|
175
173
|
assert raw.structured_content == {"total": 5}
|
|
176
174
|
assert not hasattr(untyped.orders.tools, "read")
|
|
175
|
+
tool = {
|
|
176
|
+
k: v for k, v in CONTRACT["tools"][0].items() if k != "outputSchema"
|
|
177
|
+
}
|
|
178
|
+
plain = Apps(identity, {"orders": {"tools": [tool]}})
|
|
179
|
+
assert (await plain.orders.tools.read(id="good")).content[0].text == "Order"
|
|
177
180
|
with pytest.raises(RuntimeError, match=r"unavailable \(MISSING_MCP_URL\)"):
|
|
178
181
|
await untyped.missing.call_tool("read")
|
|
179
182
|
# Explicit bindings work without a declaration and override the resolver.
|
holon_sh-0.0.1.dev3/LICENSE
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2026 Holon Systems, Inc.
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
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
|