Skip to content

Commit c89e8db

Browse files
committed
feat: fix src import
1 parent 108a3fd commit c89e8db

16 files changed

+46
-38
lines changed

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ build-backend = "pdm.backend"
4040

4141
[tool.pdm]
4242
version = {source = "scm"}
43+
[tool.pdm.build]
44+
package-dir = "src"
4345

4446
[tool.ruff]
4547
line-length = 120

src/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""MetricFlow MCP server package."""

src/main/main_sse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import uvicorn
66

7-
from src.server.sse_server import app
8-
from src.utils.logger import configure_logging
7+
from server.sse_server import app
8+
from utils.logger import configure_logging
99

1010
# Configure logging
1111
logger = configure_logging()

src/main/main_stdio.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
"""Main entry point for MetricFlow MCP server (STDIO mode)."""
22

3-
from src.server.stdio_server import main as stdio_main
4-
from src.utils.logger import configure_logging
3+
from server.stdio_server import main as stdio_main
4+
from utils.logger import configure_logging
55

66
# Configure logging
77
logger = configure_logging()
88

99

10+
def main() -> None:
11+
"""Run the MetricFlow MCP server in STDIO mode."""
12+
stdio_main()
13+
14+
1015
if __name__ == "__main__":
1116
# Run in STDIO mode
12-
stdio_main()
17+
main()

src/server/auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from fastapi import Depends, HTTPException, Request, status
1010
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
1111

12-
from src.utils.logger import logger
12+
from utils.logger import logger
1313

1414
# Security scheme for Bearer token authentication
1515
security = HTTPBearer(auto_error=False)

src/server/sse_server.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
from mcp.server.fastmcp import FastMCP
1010
from mcp.server.sse import SseServerTransport
1111

12-
from src.config.config import load_mf_config
13-
from src.server.auth import Authenticated, validate_auth_config
14-
from src.tools.cli_tools import register_mf_cli_tools
15-
from src.utils.logger import logger
12+
from config.config import load_mf_config
13+
from server.auth import Authenticated, validate_auth_config
14+
from tools.cli_tools import register_mf_cli_tools
15+
from utils.logger import logger
1616

1717
# Global variables
1818
transport = SseServerTransport("/messages/")

src/server/stdio_server.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from mcp.server.fastmcp import FastMCP
77
from mcp.server.stdio import stdio_server
88

9-
from src.config.config import load_mf_config
10-
from src.tools.cli_tools import register_mf_cli_tools
11-
from src.utils.logger import logger
9+
from config.config import load_mf_config
10+
from tools.cli_tools import register_mf_cli_tools
11+
from utils.logger import logger
1212

1313

1414
async def _register_tools(mcp_server: FastMCP, config: Any) -> None:

src/tools/cli_tools.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
from mcp.server.fastmcp import FastMCP
44

5-
from src.config.config import MfCliConfig
6-
from src.tools.metricflow.health_checks import health_checks
7-
from src.tools.metricflow.list_dimension_values import list_dimension_values
8-
from src.tools.metricflow.list_dimensions import list_dimensions
9-
from src.tools.metricflow.list_entities import list_entities
10-
from src.tools.metricflow.list_metrics import list_metrics
11-
from src.tools.metricflow.query import query
12-
from src.tools.metricflow.validate_configs import validate_configs
13-
from src.utils.prompts import load_prompt
5+
from config.config import MfCliConfig
6+
from tools.metricflow.health_checks import health_checks
7+
from tools.metricflow.list_dimension_values import list_dimension_values
8+
from tools.metricflow.list_dimensions import list_dimensions
9+
from tools.metricflow.list_entities import list_entities
10+
from tools.metricflow.list_metrics import list_metrics
11+
from tools.metricflow.query import query
12+
from tools.metricflow.validate_configs import validate_configs
13+
from utils.prompts import load_prompt
1414

1515

1616
def register_mf_cli_tools(mf_mcp: FastMCP, config: MfCliConfig) -> None:

src/tools/metricflow/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import os
44
import subprocess # nosec B404
55

6-
from src.config.config import MfCliConfig
7-
from src.utils.logger import logger
6+
from config.config import MfCliConfig
7+
from utils.logger import logger
88

99

1010
def run_mf_command(command: list[str], config: MfCliConfig) -> tuple[str, str]:

src/tools/metricflow/health_checks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import json
44

5-
from src.config.config import MfCliConfig
6-
from src.tools.metricflow.base import run_mf_command
5+
from config.config import MfCliConfig
6+
from tools.metricflow.base import run_mf_command
77

88

99
def health_checks(config: MfCliConfig) -> tuple[str, str]:

0 commit comments

Comments
 (0)