Skip to content

Commit a98db00

Browse files
eskpeskp
authored
Merge pull request #6 from KeeperHub/refactor/python-keeperhub-mcp
refactor(python): rename to keeperhub-mcp and align packaging with npm
2 parents 608568f + b614391 commit a98db00

10 files changed

Lines changed: 294 additions & 17 deletions

File tree

‎.github/workflows/release-pypi.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: release-pypi
22

3-
# Publishes keeperhub-mcp-client (Python) to PyPI via trusted publishing (OIDC).
3+
# Publishes keeperhub-mcp (Python) to PyPI via trusted publishing (OIDC).
44
# Triggered by a Python release tag, e.g. `git tag py-v0.1.0 && git push origin py-v0.1.0`.
55
#
66
# ONE-TIME SETUP (PyPI supports pending publishers, so do this BEFORE the first release):
77
# On pypi.org: Your projects -> Publishing -> Add a pending publisher ->
8-
# PyPI project name: keeperhub-mcp-client
9-
# Owner: KeeperHub Repository: mcp-client
8+
# PyPI project name: keeperhub-mcp
9+
# Owner: KeeperHub Repository: mcp
1010
# Workflow name: release-pypi.yml Environment: pypi
1111
# Create the matching `pypi` environment under repo Settings -> Environments.
1212

@@ -25,6 +25,9 @@ concurrency:
2525

2626
jobs:
2727
publish:
28+
# Only publish from a py-v* tag. A manual workflow_dispatch (which can run
29+
# from any branch) must not push a release to PyPI.
30+
if: startsWith(github.ref, 'refs/tags/py-v')
2831
runs-on: ubuntu-latest
2932
environment: pypi
3033
permissions:
@@ -34,6 +37,16 @@ jobs:
3437
- uses: actions/setup-python@v5
3538
with:
3639
python-version: "3.12"
40+
- name: Verify tag matches pyproject version
41+
working-directory: python
42+
run: |
43+
tag="${GITHUB_REF_NAME#py-v}"
44+
ver="$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml','rb'))['project']['version'])")"
45+
echo "tag=$tag pyproject=$ver"
46+
if [ "$tag" != "$ver" ]; then
47+
echo "::error::tag py-v$tag does not match pyproject version $ver"
48+
exit 1
49+
fi
3750
- name: Build sdist and wheel
3851
working-directory: python
3952
run: |

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This repo holds the small, framework-agnostic MCP kernel that framework adapters
99
| Package | Language | Path | Registry |
1010
| -- | -- | -- | -- |
1111
| `@keeperhub/mcp` | TypeScript | `packages/mcp` | npm |
12-
| `keeperhub-mcp-client` | Python | `python` | PyPI |
12+
| `keeperhub-mcp` | Python | `python` | PyPI |
1313

1414
Both clients implement the same kernel:
1515

‎python/LICENSE‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 KeeperHub
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.

‎python/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# keeperhub-mcp-client
1+
# keeperhub-mcp
22

33
Python MCP client foundation for connecting agent frameworks (Hermes and others) to [KeeperHub](https://keeperhub.com).
44

@@ -7,7 +7,7 @@ The Python counterpart to [`@keeperhub/mcp`](https://www.npmjs.com/package/@keep
77
## Usage
88

99
```python
10-
from keeperhub_mcp_client import get_client, resolve_api_key
10+
from keeperhub_mcp import get_client, resolve_api_key
1111

1212
api_key = resolve_api_key()
1313
if not api_key:

python/keeperhub_mcp_client/__init__.py renamed to python/keeperhub_mcp/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""KeeperHub MCP HTTP client for Python integrators."""
22

3-
from keeperhub_mcp_client.client import (
3+
from keeperhub_mcp.client import (
44
DEFAULT_MCP_URL,
55
MCP_PROTOCOL_VERSION,
66
KeeperHubMcpClient,
77
get_client,
88
reset_client_for_tests,
99
)
10-
from keeperhub_mcp_client.keys import (
10+
from keeperhub_mcp.keys import (
1111
ENV_VAR_NAMES,
1212
ORG_KEY_HINT,
1313
SUPPORTED_ENV_VARS,

python/keeperhub_mcp_client/client.py renamed to python/keeperhub_mcp/client.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""KeeperHub MCP HTTP client (sync). Mirrors @keeperhub/mcp-client."""
1+
"""KeeperHub MCP HTTP client (sync). Mirrors @keeperhub/mcp."""
22

33
from __future__ import annotations
44

@@ -9,13 +9,13 @@
99

1010
import httpx
1111

12-
from keeperhub_mcp_client.keys import classify_api_key, validate_api_key_for_mcp
12+
from keeperhub_mcp.keys import classify_api_key, validate_api_key_for_mcp
1313

1414
logger = logging.getLogger(__name__)
1515

1616
DEFAULT_MCP_URL = "https://app.keeperhub.com/mcp"
1717
MCP_PROTOCOL_VERSION = "2024-11-05"
18-
DEFAULT_CLIENT_NAME = "keeperhub-mcp-client"
18+
DEFAULT_CLIENT_NAME = "keeperhub-mcp"
1919
DEFAULT_CLIENT_VERSION = "0.1.0"
2020

2121

@@ -99,25 +99,31 @@ def _ensure_session_unlocked(self) -> None:
9999
self.session_id = sid
100100
logger.info("[KeeperHub] MCP session established")
101101

102-
def _post_mcp_unlocked(self, body: dict[str, Any]) -> Any:
102+
def _post_mcp_unlocked(self, body: dict[str, Any], attempt: int = 0) -> Any:
103103
if not self.session_id:
104104
raise RuntimeError("No active MCP session")
105105
hdrs = {**self.headers_base(), "mcp-session-id": self.session_id}
106106
res = self._http.post(self.base_url, headers=hdrs, json=body)
107107

108108
if res.status_code == 401:
109+
if attempt >= 1:
110+
raise RuntimeError(
111+
"KeeperHub MCP error (401): unauthorized after session re-init"
112+
)
109113
logger.warning("[KeeperHub] Session unauthorized, re-initializing")
110114
self.session_id = None
111115
self._ensure_session_unlocked()
112-
return self._post_mcp_unlocked(body)
116+
return self._post_mcp_unlocked(body, attempt + 1)
113117

114118
if res.status_code == 404:
115119
text = res.text or ""
116120
if "session" in text.lower():
121+
if attempt >= 1:
122+
raise RuntimeError(f"KeeperHub MCP error (404): {text}")
117123
logger.warning("[KeeperHub] Session expired, re-initializing")
118124
self.session_id = None
119125
self._ensure_session_unlocked()
120-
return self._post_mcp_unlocked(body)
126+
return self._post_mcp_unlocked(body, attempt + 1)
121127
raise RuntimeError(f"KeeperHub MCP error (404): {text}")
122128

123129
if not res.is_success:

python/keeperhub_mcp_client/keys.py renamed to python/keeperhub_mcp/keys.py

File renamed without changes.

‎python/keeperhub_mcp/py.typed‎

Whitespace-only changes.

‎python/pyproject.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ requires = ["hatchling"]
33
build-backend = "hatchling.build"
44

55
[project]
6-
name = "keeperhub-mcp-client"
6+
name = "keeperhub-mcp"
77
version = "0.1.0"
88
description = "Shared MCP client foundation for KeeperHub agent-framework adapters."
99
readme = "README.md"
1010
license = "Apache-2.0"
11+
license-files = ["LICENSE"]
1112
requires-python = ">=3.9"
1213
authors = [{ name = "KeeperHub" }]
1314
dependencies = ["httpx>=0.27"]
@@ -22,7 +23,7 @@ Repository = "https://github.com/KeeperHub/mcp"
2223
Issues = "https://github.com/KeeperHub/mcp/issues"
2324

2425
[tool.hatch.build.targets.wheel]
25-
packages = ["keeperhub_mcp_client"]
26+
packages = ["keeperhub_mcp"]
2627

2728
[tool.pytest.ini_options]
2829
testpaths = ["tests"]

0 commit comments

Comments
 (0)