Skip to content

fix: proto descriptor collision and PyPI wheel packaging #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beonde merged 2 commits into from
Mar 27, 2026
Merged

fix: proto descriptor collision and PyPI wheel packaging #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c14e4
fix: eager proto registration to avoid descriptor pool collision
beonde Mar 27, 2026
9d6eea2
fix: address review — harden proto collision except clause with messa…
beonde Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions capiscio_mcp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ async def read_database(query: str) -> list[dict]:
ServerErrorCode,
TrustLevel,
)

# Eagerly register MCP proto descriptor before capiscio-sdk can register its
# simpler version. The MCP proto is a superset (has PolicyDecision* etc.), so
# the SDK can safely fall back to it when it detects a duplicate.
import capiscio_mcp._proto.gen.capiscio.v1.mcp_pb2 as _mcp_pb2 # noqa: F401, E402

from capiscio_mcp.errors import (
GuardError,
ServerVerifyError,
Expand Down
20 changes: 19 additions & 1 deletion capiscio_mcp/_proto/gen/capiscio/v1/mcp_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ Issues = "https://github.com/capiscio/capiscio-mcp-python/issues"
[tool.hatch.build.targets.wheel]
packages = ["capiscio_mcp"]

[tool.hatch.build.targets.wheel.force-include]
"capiscio_mcp/_proto/gen/capiscio" = "capiscio_mcp/_proto/gen/capiscio"

[tool.hatch.build.targets.sdist.force-include]
"capiscio_mcp/_proto/gen/capiscio" = "capiscio_mcp/_proto/gen/capiscio"

[tool.pytest.ini_options]
asyncio_mode = "auto"
testpaths = ["tests"]
Expand Down
Loading