diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml index dd8cff0..661af21 100644 --- a/.github/workflows/release-pypi.yml +++ b/.github/workflows/release-pypi.yml @@ -1,12 +1,12 @@ name: release-pypi -# Publishes keeperhub-mcp-client (Python) to PyPI via trusted publishing (OIDC). +# Publishes keeperhub-mcp (Python) to PyPI via trusted publishing (OIDC). # Triggered by a Python release tag, e.g. `git tag py-v0.1.0 && git push origin py-v0.1.0`. # # ONE-TIME SETUP (PyPI supports pending publishers, so do this BEFORE the first release): # On pypi.org: Your projects -> Publishing -> Add a pending publisher -> -# PyPI project name: keeperhub-mcp-client -# Owner: KeeperHub Repository: mcp-client +# PyPI project name: keeperhub-mcp +# Owner: KeeperHub Repository: mcp # Workflow name: release-pypi.yml Environment: pypi # Create the matching `pypi` environment under repo Settings -> Environments. @@ -25,6 +25,9 @@ concurrency: jobs: publish: + # Only publish from a py-v* tag. A manual workflow_dispatch (which can run + # from any branch) must not push a release to PyPI. + if: startsWith(github.ref, 'refs/tags/py-v') runs-on: ubuntu-latest environment: pypi permissions: @@ -34,6 +37,16 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.12" + - name: Verify tag matches pyproject version + working-directory: python + run: | + tag="${GITHUB_REF_NAME#py-v}" + ver="$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml','rb'))['project']['version'])")" + echo "tag=$tag pyproject=$ver" + if [ "$tag" != "$ver" ]; then + echo "::error::tag py-v$tag does not match pyproject version $ver" + exit 1 + fi - name: Build sdist and wheel working-directory: python run: | diff --git a/README.md b/README.md index 433f44e..57c360a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This repo holds the small, framework-agnostic MCP kernel that framework adapters | Package | Language | Path | Registry | | -- | -- | -- | -- | | `@keeperhub/mcp` | TypeScript | `packages/mcp` | npm | -| `keeperhub-mcp-client` | Python | `python` | PyPI | +| `keeperhub-mcp` | Python | `python` | PyPI | Both clients implement the same kernel: diff --git a/python/LICENSE b/python/LICENSE new file mode 100644 index 0000000..4b9d3ea --- /dev/null +++ b/python/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2026 KeeperHub + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/python/README.md b/python/README.md index 1ab9545..a96c4da 100644 --- a/python/README.md +++ b/python/README.md @@ -1,4 +1,4 @@ -# keeperhub-mcp-client +# keeperhub-mcp Python MCP client foundation for connecting agent frameworks (Hermes and others) to [KeeperHub](https://keeperhub.com). @@ -7,7 +7,7 @@ The Python counterpart to [`@keeperhub/mcp`](https://www.npmjs.com/package/@keep ## Usage ```python -from keeperhub_mcp_client import get_client, resolve_api_key +from keeperhub_mcp import get_client, resolve_api_key api_key = resolve_api_key() if not api_key: diff --git a/python/keeperhub_mcp_client/__init__.py b/python/keeperhub_mcp/__init__.py similarity index 92% rename from python/keeperhub_mcp_client/__init__.py rename to python/keeperhub_mcp/__init__.py index 73ae3e8..002eb51 100644 --- a/python/keeperhub_mcp_client/__init__.py +++ b/python/keeperhub_mcp/__init__.py @@ -1,13 +1,13 @@ """KeeperHub MCP HTTP client for Python integrators.""" -from keeperhub_mcp_client.client import ( +from keeperhub_mcp.client import ( DEFAULT_MCP_URL, MCP_PROTOCOL_VERSION, KeeperHubMcpClient, get_client, reset_client_for_tests, ) -from keeperhub_mcp_client.keys import ( +from keeperhub_mcp.keys import ( ENV_VAR_NAMES, ORG_KEY_HINT, SUPPORTED_ENV_VARS, diff --git a/python/keeperhub_mcp_client/client.py b/python/keeperhub_mcp/client.py similarity index 91% rename from python/keeperhub_mcp_client/client.py rename to python/keeperhub_mcp/client.py index d75583d..5596ccb 100644 --- a/python/keeperhub_mcp_client/client.py +++ b/python/keeperhub_mcp/client.py @@ -1,4 +1,4 @@ -"""KeeperHub MCP HTTP client (sync). Mirrors @keeperhub/mcp-client.""" +"""KeeperHub MCP HTTP client (sync). Mirrors @keeperhub/mcp.""" from __future__ import annotations @@ -9,13 +9,13 @@ import httpx -from keeperhub_mcp_client.keys import classify_api_key, validate_api_key_for_mcp +from keeperhub_mcp.keys import classify_api_key, validate_api_key_for_mcp logger = logging.getLogger(__name__) DEFAULT_MCP_URL = "https://app.keeperhub.com/mcp" MCP_PROTOCOL_VERSION = "2024-11-05" -DEFAULT_CLIENT_NAME = "keeperhub-mcp-client" +DEFAULT_CLIENT_NAME = "keeperhub-mcp" DEFAULT_CLIENT_VERSION = "0.1.0" @@ -99,25 +99,31 @@ def _ensure_session_unlocked(self) -> None: self.session_id = sid logger.info("[KeeperHub] MCP session established") - def _post_mcp_unlocked(self, body: dict[str, Any]) -> Any: + def _post_mcp_unlocked(self, body: dict[str, Any], attempt: int = 0) -> Any: if not self.session_id: raise RuntimeError("No active MCP session") hdrs = {**self.headers_base(), "mcp-session-id": self.session_id} res = self._http.post(self.base_url, headers=hdrs, json=body) if res.status_code == 401: + if attempt >= 1: + raise RuntimeError( + "KeeperHub MCP error (401): unauthorized after session re-init" + ) logger.warning("[KeeperHub] Session unauthorized, re-initializing") self.session_id = None self._ensure_session_unlocked() - return self._post_mcp_unlocked(body) + return self._post_mcp_unlocked(body, attempt + 1) if res.status_code == 404: text = res.text or "" if "session" in text.lower(): + if attempt >= 1: + raise RuntimeError(f"KeeperHub MCP error (404): {text}") logger.warning("[KeeperHub] Session expired, re-initializing") self.session_id = None self._ensure_session_unlocked() - return self._post_mcp_unlocked(body) + return self._post_mcp_unlocked(body, attempt + 1) raise RuntimeError(f"KeeperHub MCP error (404): {text}") if not res.is_success: diff --git a/python/keeperhub_mcp_client/keys.py b/python/keeperhub_mcp/keys.py similarity index 100% rename from python/keeperhub_mcp_client/keys.py rename to python/keeperhub_mcp/keys.py diff --git a/python/keeperhub_mcp/py.typed b/python/keeperhub_mcp/py.typed new file mode 100644 index 0000000..e69de29 diff --git a/python/pyproject.toml b/python/pyproject.toml index 0178345..7a8d9a8 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -3,11 +3,12 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "keeperhub-mcp-client" +name = "keeperhub-mcp" version = "0.1.0" description = "Shared MCP client foundation for KeeperHub agent-framework adapters." readme = "README.md" license = "Apache-2.0" +license-files = ["LICENSE"] requires-python = ">=3.9" authors = [{ name = "KeeperHub" }] dependencies = ["httpx>=0.27"] @@ -22,7 +23,7 @@ Repository = "https://github.com/KeeperHub/mcp" Issues = "https://github.com/KeeperHub/mcp/issues" [tool.hatch.build.targets.wheel] -packages = ["keeperhub_mcp_client"] +packages = ["keeperhub_mcp"] [tool.pytest.ini_options] testpaths = ["tests"] diff --git a/python/tests/test_client.py b/python/tests/test_client.py index 69902b5..0ffd1a3 100644 --- a/python/tests/test_client.py +++ b/python/tests/test_client.py @@ -7,7 +7,7 @@ import httpx import pytest -from keeperhub_mcp_client import ( +from keeperhub_mcp import ( KeeperHubMcpClient, classify_api_key, reset_client_for_tests, @@ -98,3 +98,58 @@ def handler(request: httpx.Request) -> httpx.Response: assert phase["initialize"] == 2 finally: c.close() + + +def test_persistent_401_reinit_cap(): + calls = {"n": 0} + + def handler(request: httpx.Request) -> httpx.Response: + body = json.loads(request.content.decode()) + rid = body["id"] + calls["n"] += 1 + if body["method"] == "initialize": + return httpx.Response( + 200, + headers={"mcp-session-id": f"sess-{calls['n']}"}, + json={"jsonrpc": "2.0", "id": rid, "result": {}}, + ) + if body["method"] == "tools/call": + return httpx.Response(401, text="unauthorized") + return httpx.Response(400) + + transport = httpx.MockTransport(handler) + c = KeeperHubMcpClient("kh_test", http_client=httpx.Client(transport=transport, timeout=10.0)) + try: + with pytest.raises(RuntimeError, match=r"401"): + c.call_tool("list_workflows", {}) + # initialize, tools/call (401), re-initialize, tools/call (401) -> stop + assert calls["n"] == 4 + finally: + c.close() + + +def test_persistent_session_404_reinit_cap(): + calls = {"n": 0} + + def handler(request: httpx.Request) -> httpx.Response: + body = json.loads(request.content.decode()) + rid = body["id"] + calls["n"] += 1 + if body["method"] == "initialize": + return httpx.Response( + 200, + headers={"mcp-session-id": f"sess-{calls['n']}"}, + json={"jsonrpc": "2.0", "id": rid, "result": {}}, + ) + if body["method"] == "tools/call": + return httpx.Response(404, text="session expired") + return httpx.Response(400) + + transport = httpx.MockTransport(handler) + c = KeeperHubMcpClient("kh_test", http_client=httpx.Client(transport=transport, timeout=10.0)) + try: + with pytest.raises(RuntimeError, match=r"404"): + c.call_tool("list_workflows", {}) + assert calls["n"] == 4 + finally: + c.close()