chore(tools): Extract one tool as a file

timothedelion · timothedelion · commit 88d9246c34e1 · 2025-10-16T17:48:30.000+02:00
diff --git a/packages/developer_mcp_server/src/developer_mcp_server/server.py b/packages/developer_mcp_server/src/developer_mcp_server/server.py
@@ -8,13 +8,11 @@
 from gg_api_core.mcp_server import GitGuardianFastMCP
 from gg_api_core.scopes import get_developer_scopes, is_self_hosted_instance, validate_scopes
 from gg_api_core.utils import parse_repo_url
-from pydantic import Field
 
-from gg_api_core.tools.generate_honey_token import generate_honeytoken
 from gg_api_core.tools.list_repo_incidents import list_repo_incidents
+from gg_api_core.tools.list_repo_occurrences import list_repo_occurrences
 from gg_api_core.tools.remediate_secret_incidents import remediate_secret_incidents
 from gg_api_core.tools.scan_secret import scan_secrets
-from secops_mcp_server.server import list_honeytokens
 
 # Configure more detailed logging
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
@@ -122,133 +120,13 @@
 )
 
 
-@mcp.tool(
+mcp.add_tool(
+    list_repo_occurrences,
     description="List secret occurrences for a specific repository with exact match locations. "
     "Returns detailed occurrence data including file paths, line numbers, and character indices where secrets were detected. "
     "Use this tool when you need to locate and remediate secrets in the codebase with precise file locations.",
     required_scopes=["incidents:read"],
 )
-async def list_repo_occurrences(
-    repository_name: str | None = Field(
-        default=None,
-        description="The full repository name. For example, for https://github.com/GitGuardian/gg-mcp.git the full name is GitGuardian/gg-mcp. Pass the current repository name if not provided. Not required if source_id is provided."
-    ),
-    source_id: str | None = Field(
-        default=None,
-        description="The GitGuardian source ID to filter by. Can be obtained using find_current_repo_source_id. If provided, repository_name is not required."
-    ),
-    from_date: str | None = Field(
-        default=None, description="Filter occurrences created after this date (ISO format: YYYY-MM-DD)"
-    ),
-    to_date: str | None = Field(
-        default=None, description="Filter occurrences created before this date (ISO format: YYYY-MM-DD)"
-    ),
-    presence: str | None = Field(default=None, description="Filter by presence status"),
-    tags: list[str] | None = Field(default=None, description="Filter by tags (list of tag IDs)"),
-    ordering: str | None = Field(default=None, description="Sort field (e.g., 'date', '-date' for descending)"),
-    per_page: int = Field(default=20, description="Number of results per page (default: 20, min: 1, max: 100)"),
-    cursor: str | None = Field(default=None, description="Pagination cursor for fetching next page of results"),
-    get_all: bool = Field(default=False, description="If True, fetch all results using cursor-based pagination"),
-) -> dict[str, Any]:
-    """
-    List secret occurrences for a specific repository using the GitGuardian v1/occurrences/secrets API.
-
-    This tool returns detailed occurrence data with EXACT match locations, including:
-    - File path where the secret was found
-    - Line number in the file
-    - Start and end character indices of the match
-    - The type of secret detected
-    - Match context and patterns
-
-    This is particularly useful for automated remediation workflows where the agent needs to:
-    1. Locate the exact position of secrets in files
-    2. Read the surrounding code context
-    3. Make precise edits to remove or replace secrets
-    4. Verify that secrets have been properly removed
-
-    Use list_repo_incidents for a higher-level view of incidents grouped by secret type.
-
-    Args:
-        repository_name: The full repository name (e.g., 'GitGuardian/gg-mcp')
-        source_id: The GitGuardian source ID (alternative to repository_name)
-        from_date: Filter occurrences created after this date (ISO format: YYYY-MM-DD)
-        to_date: Filter occurrences created before this date (ISO format: YYYY-MM-DD)
-        presence: Filter by presence status
-        tags: Filter by tags (list of tag IDs)
-        ordering: Sort field (e.g., 'date', '-date' for descending)
-        per_page: Number of results per page (default: 20, min: 1, max: 100)
-        cursor: Pagination cursor for fetching next page of results
-        get_all: If True, fetch all results using cursor-based pagination
-
-    Returns:
-        List of secret occurrences with detailed match information including file locations and indices
-    """
-    client = mcp.get_client()
-
-    # Validate that at least one of repository_name or source_id is provided
-    if not repository_name and not source_id:
-        return {"error": "Either repository_name or source_id must be provided"}
-
-    logger.debug(f"Listing occurrences with repository_name={repository_name}, source_id={source_id}")
-
-    try:
-        # Call the list_occurrences method with appropriate filter
-        if source_id:
-            # Use source_id directly
-            result = await client.list_occurrences(
-                source_id=source_id,
-                from_date=from_date,
-                to_date=to_date,
-                presence=presence,
-                tags=tags,
-                per_page=per_page,
-                cursor=cursor,
-                ordering=ordering,
-                get_all=get_all,
-            )
-        else:
-            # Use source_name (legacy path)
-            source_name = repository_name.strip()
-            result = await client.list_occurrences(
-                source_name=source_name,
-                source_type="github",  # Default to github, could be made configurable
-                from_date=from_date,
-                to_date=to_date,
-                presence=presence,
-                tags=tags,
-                per_page=per_page,
-                cursor=cursor,
-                ordering=ordering,
-                get_all=get_all,
-            )
-
-        # Handle the response format
-        if isinstance(result, dict):
-            occurrences = result.get("occurrences", [])
-            return {
-                "repository": repository_name,
-                "occurrences_count": len(occurrences),
-                "occurrences": occurrences,
-                "cursor": result.get("cursor"),
-                "has_more": result.get("has_more", False),
-            }
-        elif isinstance(result, list):
-            # If get_all=True, we get a list directly
-            return {
-                "repository": repository_name,
-                "occurrences_count": len(result),
-                "occurrences": result,
-            }
-        else:
-            return {
-                "repository": repository_name,
-                "occurrences_count": 0,
-                "occurrences": [],
-            }
-
-    except Exception as e:
-        logger.error(f"Error listing repository occurrences: {str(e)}")
-        return {"error": f"Failed to list repository occurrences: {str(e)}"}
 
 
 @mcp.tool(
diff --git a/packages/gg_api_core/src/gg_api_core/tools/list_repo_occurrences.py b/packages/gg_api_core/src/gg_api_core/tools/list_repo_occurrences.py
@@ -0,0 +1,131 @@
+from typing import Any
+import logging
+
+from pydantic import Field
+
+from gg_api_core.utils import get_client
+
+logger = logging.getLogger(__name__)
+
+
+async def list_repo_occurrences(
+    repository_name: str | None = Field(
+        default=None,
+        description="The full repository name. For example, for https://github.com/GitGuardian/gg-mcp.git the full name is GitGuardian/gg-mcp. Pass the current repository name if not provided. Not required if source_id is provided."
+    ),
+    source_id: str | None = Field(
+        default=None,
+        description="The GitGuardian source ID to filter by. Can be obtained using find_current_repo_source_id. If provided, repository_name is not required."
+    ),
+    from_date: str | None = Field(
+        default=None, description="Filter occurrences created after this date (ISO format: YYYY-MM-DD)"
+    ),
+    to_date: str | None = Field(
+        default=None, description="Filter occurrences created before this date (ISO format: YYYY-MM-DD)"
+    ),
+    presence: str | None = Field(default=None, description="Filter by presence status"),
+    tags: list[str] | None = Field(default=None, description="Filter by tags (list of tag IDs)"),
+    ordering: str | None = Field(default=None, description="Sort field (e.g., 'date', '-date' for descending)"),
+    per_page: int = Field(default=20, description="Number of results per page (default: 20, min: 1, max: 100)"),
+    cursor: str | None = Field(default=None, description="Pagination cursor for fetching next page of results"),
+    get_all: bool = Field(default=False, description="If True, fetch all results using cursor-based pagination"),
+) -> dict[str, Any]:
+    """
+    List secret occurrences for a specific repository using the GitGuardian v1/occurrences/secrets API.
+
+    This tool returns detailed occurrence data with EXACT match locations, including:
+    - File path where the secret was found
+    - Line number in the file
+    - Start and end character indices of the match
+    - The type of secret detected
+    - Match context and patterns
+
+    This is particularly useful for automated remediation workflows where the agent needs to:
+    1. Locate the exact position of secrets in files
+    2. Read the surrounding code context
+    3. Make precise edits to remove or replace secrets
+    4. Verify that secrets have been properly removed
+
+    Use list_repo_incidents for a higher-level view of incidents grouped by secret type.
+
+    Args:
+        repository_name: The full repository name (e.g., 'GitGuardian/gg-mcp')
+        source_id: The GitGuardian source ID (alternative to repository_name)
+        from_date: Filter occurrences created after this date (ISO format: YYYY-MM-DD)
+        to_date: Filter occurrences created before this date (ISO format: YYYY-MM-DD)
+        presence: Filter by presence status
+        tags: Filter by tags (list of tag IDs)
+        ordering: Sort field (e.g., 'date', '-date' for descending)
+        per_page: Number of results per page (default: 20, min: 1, max: 100)
+        cursor: Pagination cursor for fetching next page of results
+        get_all: If True, fetch all results using cursor-based pagination
+
+    Returns:
+        List of secret occurrences with detailed match information including file locations and indices
+    """
+    client = get_client()
+
+    # Validate that at least one of repository_name or source_id is provided
+    if not repository_name and not source_id:
+        return {"error": "Either repository_name or source_id must be provided"}
+
+    logger.debug(f"Listing occurrences with repository_name={repository_name}, source_id={source_id}")
+
+    try:
+        # Call the list_occurrences method with appropriate filter
+        if source_id:
+            # Use source_id directly
+            result = await client.list_occurrences(
+                source_id=source_id,
+                from_date=from_date,
+                to_date=to_date,
+                presence=presence,
+                tags=tags,
+                per_page=per_page,
+                cursor=cursor,
+                ordering=ordering,
+                get_all=get_all,
+            )
+        else:
+            # Use source_name (legacy path)
+            source_name = repository_name.strip()
+            result = await client.list_occurrences(
+                source_name=source_name,
+                source_type="github",  # Default to github, could be made configurable
+                from_date=from_date,
+                to_date=to_date,
+                presence=presence,
+                tags=tags,
+                per_page=per_page,
+                cursor=cursor,
+                ordering=ordering,
+                get_all=get_all,
+            )
+
+        # Handle the response format
+        if isinstance(result, dict):
+            occurrences = result.get("occurrences", [])
+            return {
+                "repository": repository_name,
+                "occurrences_count": len(occurrences),
+                "occurrences": occurrences,
+                "cursor": result.get("cursor"),
+                "has_more": result.get("has_more", False),
+            }
+        elif isinstance(result, list):
+            # If get_all=True, we get a list directly
+            return {
+                "repository": repository_name,
+                "occurrences_count": len(result),
+                "occurrences": result,
+            }
+        else:
+            return {
+                "repository": repository_name,
+                "occurrences_count": 0,
+                "occurrences": [],
+            }
+
+    except Exception as e:
+        logger.error(f"Error listing repository occurrences: {str(e)}")
+        return {"error": f"Failed to list repository occurrences: {str(e)}"}
diff --git a/packages/gg_api_core/src/gg_api_core/tools/remediate_secret_incidents.py b/packages/gg_api_core/src/gg_api_core/tools/remediate_secret_incidents.py
@@ -3,7 +3,8 @@
 
 from pydantic import Field
 
-from developer_mcp_server.server import list_repo_occurrences
+from gg_api_core.utils import get_client
+from .list_repo_occurrences import list_repo_occurrences
 from .list_repo_incidents import list_repo_incidents
 
 logger = logging.getLogger(__name__)
@@ -90,7 +91,7 @@ async def remediate_secret_incidents(
         # Filter by assignee if mine=True
         if mine:
             # Get current user info to filter by assignee
-            client = mcp.get_client()
+            client = get_client()
             try:
                 token_info = await client.get_current_token_info()
                 current_user_id = token_info.get("user_id") if token_info else None
