Merge pull request #39 from kevinbackhouse/mcp_data_dir

Fix mcp_data_dir instances

Author: kevinbackhouse

src/seclab_taskflows/mcp_servers/alert_results_models.py

@@ -4,6 +4,9 @@
 from sqlalchemy import String, Text, Integer, ForeignKey, Column
 from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped, relationship
 from typing import Optional
+from seclab_taskflow_agent.path_utils import mcp_data_dir
+
+ALERT_RESULTS_DIR = mcp_data_dir("seclab-taskflows", "report_alert_state", "ALERT_RESULTS_DIR")
 
 
 class Base(DeclarativeBase):

src/seclab_taskflows/mcp_servers/codeql_python/mcp_server.py

@@ -21,6 +21,7 @@
 
 from .codeql_sqlite_models import Base, Source
 from ..utils import process_repo
+from ..codeql_utils import CODEQL_DBS_BASE_PATH
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -30,7 +31,6 @@
 )
 
 MEMORY = mcp_data_dir("seclab-taskflows", "codeql", "DATA_DIR")
-CODEQL_DBS_BASE_PATH = mcp_data_dir("seclab-taskflows", "codeql", "CODEQL_DBS_BASE_PATH")
 
 mcp = FastMCP("CodeQL-Python")
 

src/seclab_taskflows/mcp_servers/codeql_utils.py

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2025 GitHub
+# SPDX-License-Identifier: MIT
+
+from seclab_taskflow_agent.path_utils import mcp_data_dir
+
+CODEQL_DBS_BASE_PATH = mcp_data_dir("seclab-taskflows", "codeql", "CODEQL_DBS_BASE_PATH")

src/seclab_taskflows/mcp_servers/gh_code_scanning.py

@@ -14,9 +14,10 @@
 import zipfile
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session
-from seclab_taskflow_agent.path_utils import mcp_data_dir, log_file_name
+from seclab_taskflow_agent.path_utils import log_file_name
 
-from .alert_results_models import AlertResults, AlertFlowGraph, Base
+from .alert_results_models import AlertResults, AlertFlowGraph, Base, ALERT_RESULTS_DIR
+from .codeql_utils import CODEQL_DBS_BASE_PATH
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -29,9 +30,6 @@
 
 GH_TOKEN = os.getenv("GH_TOKEN", default="")
 
-CODEQL_DBS_BASE_PATH = mcp_data_dir("seclab-taskflows", "codeql", "CODEQL_DBS_BASE_PATH")
-ALERT_RESULTS_DIR = mcp_data_dir("seclab-taskflows", "gh_code_scanning", "ALERT_RESULTS_DIR")
-
 
 def parse_alert(alert: dict) -> dict:
     """Parse the alert dictionary to extract relevant information."""

src/seclab_taskflows/mcp_servers/local_file_viewer.py

@@ -10,8 +10,8 @@
 from pathlib import Path
 import aiofiles
 import zipfile
-import tempfile
-from seclab_taskflow_agent.path_utils import mcp_data_dir, log_file_name
+from seclab_taskflow_agent.path_utils import log_file_name
+from .local_gh_resources import LOCAL_GH_DIR
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -22,8 +22,6 @@
 
 mcp = FastMCP("LocalFileViewer")
 
-LOCAL_GH_DIR = mcp_data_dir("seclab-taskflows", "local_file_viewer", "LOCAL_GH_DIR")
-
 LINE_LIMIT_FOR_FETCHING_FILE_CONTENT = int(os.getenv("LINE_LIMIT_FOR_FETCHING_FILE_CONTENT", default=1000))
 
 FILE_LIMIT_FOR_LIST_FILES = int(os.getenv("FILE_LIMIT_FOR_LIST_FILES", default=100))

src/seclab_taskflows/mcp_servers/report_alert_state.py

@@ -10,9 +10,9 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session
 from pydantic import Field
-from seclab_taskflow_agent.path_utils import mcp_data_dir, log_file_name
+from seclab_taskflow_agent.path_utils import log_file_name
 
-from .alert_results_models import AlertResults, AlertFlowGraph, Base
+from .alert_results_models import AlertResults, AlertFlowGraph, Base, ALERT_RESULTS_DIR
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -61,9 +61,6 @@ def remove_line_numbers(location: str) -> str:
     return ":".join(parts[:-4])
 
 
-MEMORY = mcp_data_dir("seclab-taskflows", "report_alert_state", "ALERT_RESULTS_DIR")
-
-
 class ReportAlertStateBackend:
     def __init__(self, memcache_state_dir: str):
         self.memcache_state_dir = memcache_state_dir
@@ -296,7 +293,7 @@ def clear_flow_graphs(self) -> str:
 
 mcp = FastMCP("ReportAlertState")
 
-backend = ReportAlertStateBackend(MEMORY)
+backend = ReportAlertStateBackend(ALERT_RESULTS_DIR)
 
 
 def process_repo(repo):