From 1164b6ef43200ee22729335ec8840ba86a625653 Mon Sep 17 00:00:00 2001 From: Jeremy Eder Date: Thu, 5 Mar 2026 10:27:51 -0500 Subject: [PATCH] fix: move utils module into mcp_acp package for PyPI distribution The utils/pylogger module was at the repo root, outside the src/mcp_acp/ package. setuptools only includes mcp_acp* from src/, so the utils module was missing from the PyPI wheel, causing ImportError on install. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/mcp_acp/client.py | 2 +- src/mcp_acp/server.py | 2 +- src/mcp_acp/settings.py | 2 +- {utils => src/mcp_acp/utils}/__init__.py | 0 {utils => src/mcp_acp/utils}/pylogger.py | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {utils => src/mcp_acp/utils}/__init__.py (100%) rename {utils => src/mcp_acp/utils}/pylogger.py (100%) diff --git a/src/mcp_acp/client.py b/src/mcp_acp/client.py index 6fc391a..0523daa 100644 --- a/src/mcp_acp/client.py +++ b/src/mcp_acp/client.py @@ -13,7 +13,7 @@ import httpx from mcp_acp.settings import _acpctl_config_path, load_clusters_config, load_settings -from utils.pylogger import get_python_logger +from mcp_acp.utils.pylogger import get_python_logger logger = get_python_logger() diff --git a/src/mcp_acp/server.py b/src/mcp_acp/server.py index 9b1e852..2b00792 100644 --- a/src/mcp_acp/server.py +++ b/src/mcp_acp/server.py @@ -8,7 +8,7 @@ from mcp.server.stdio import stdio_server from mcp.types import TextContent, Tool -from utils.pylogger import get_python_logger +from mcp_acp.utils.pylogger import get_python_logger from .client import ACPClient from .formatters import ( diff --git a/src/mcp_acp/settings.py b/src/mcp_acp/settings.py index d5bb4c9..e1505ef 100644 --- a/src/mcp_acp/settings.py +++ b/src/mcp_acp/settings.py @@ -9,7 +9,7 @@ from pydantic import Field, field_validator from pydantic_settings import BaseSettings, SettingsConfigDict -from utils.pylogger import get_python_logger +from mcp_acp.utils.pylogger import get_python_logger logger = get_python_logger() diff --git a/utils/__init__.py b/src/mcp_acp/utils/__init__.py similarity index 100% rename from utils/__init__.py rename to src/mcp_acp/utils/__init__.py diff --git a/utils/pylogger.py b/src/mcp_acp/utils/pylogger.py similarity index 100% rename from utils/pylogger.py rename to src/mcp_acp/utils/pylogger.py