refactoring

pmcp/mcp_server/{github.py → github/github.py}

@@ -2,7 +2,7 @@ import os
 
 from dotenv import load_dotenv
 
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 # Load environment variables

pmcp/{mcp_github_main.py → mcp_server/github/mcp_github_main.py}

@@ -1,13 +1,9 @@
 import logging
-import os
 
-import uvicorn
 from dotenv import load_dotenv
 from mcp.server.fastmcp import FastMCP
-from starlette.applications import Starlette
-from starlette.routing import Mount
 
-from pmcp.mcp_server.tools.tools import register_tools
+from pmcp.mcp_server.github.tools.tools import register_tools
 
 # Configure logging
 logging.basicConfig(

pmcp/mcp_server/{services → github/services}/branches.py

@@ -1,4 +1,4 @@
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 class BranchService:

pmcp/mcp_server/{services → github/services}/contents.py

@@ -1,4 +1,4 @@
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 class ContentService:

pmcp/mcp_server/{services → github/services}/issues.py

@@ -1,7 +1,7 @@
 """
 Service for managing GitHub issues in the MCP server.
 """
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 

pmcp/mcp_server/{services → github/services}/pull_requests.py

@@ -1,4 +1,4 @@
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 class PullRequestService:

pmcp/mcp_server/{services → github/services}/repo.py

@@ -1,4 +1,4 @@
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 class RepoService:

pmcp/mcp_server/{services → github/services}/repo_to_text.py

@@ -1,7 +1,7 @@
 """
 Service for managing Github issues in MCP server.
 """
-from pmcp.mcp_server.utils.github_api import GithubClient
+from pmcp.mcp_server.github.utils.github_api import GithubClient
 
 
 

pmcp/mcp_server/{tools → github/tools}/branches.py

@@ -3,7 +3,7 @@ Branch listing tool.
 """
 from typing import List, Dict
 from mcp.server.fastmcp import Context
-from pmcp.mcp_server.services.branches import BranchService
+from pmcp.mcp_server.github.services.branches import BranchService
 from pmcp.mcp_server.github import client
 
 service = BranchService(client)

pmcp/mcp_server/{tools → github/tools}/contents.py

@@ -4,7 +4,7 @@ Commit and file-content tools.
 import base64
 from typing import List, Dict
 from mcp.server.fastmcp import Context
-from pmcp.mcp_server.services.contents import ContentService
+from pmcp.mcp_server.github.services.contents import ContentService
 from pmcp.mcp_server.github import client
 
 service = ContentService(client)
@@ -57,6 +57,6 @@ async def get_file_contents(
         content = base64.b64decode(blob["content"]).decode()
         return {"path": path, "content": content}
     except Exception as exc:
-        error_msg = f"Error while getting the content of file {path} in repository {repo}. Error: {error_msg}"      
-        await ctx.error(str(exc))
+        error_msg = f"Error while getting the content of file {path} in repository {repo}. Error: {exc}"      
+        await ctx.error(str(error_msg))
         raise

pmcp/mcp_server/{tools → github/tools}/issues.py

@@ -4,7 +4,7 @@ MCP Tools exposing GitHub issue operations.
 from typing import List, Dict, Any
 from mcp.server.fastmcp import Context
 
-from pmcp.mcp_server.services.issues import IssueService
+from pmcp.mcp_server.github.services.issues import IssueService
 from pmcp.mcp_server.github import client
 
 

pmcp/mcp_server/{tools → github/tools}/pull_requests.py

@@ -3,7 +3,7 @@ Pull-request utilities (read-only).
 """
 from typing import List, Dict
 from mcp.server.fastmcp import Context
-from pmcp.mcp_server.services.pull_requests import PullRequestService
+from pmcp.mcp_server.github.services.pull_requests import PullRequestService
 from pmcp.mcp_server.github import client
 
 service = PullRequestService(client)

pmcp/mcp_server/{tools → github/tools}/repo.py

@@ -2,7 +2,7 @@
 Repository-level stats tool.
 """
 from mcp.server.fastmcp import Context
-from pmcp.mcp_server.services.repo import RepoService
+from pmcp.mcp_server.github.services.repo import RepoService
 from pmcp.mcp_server.github import client
 
 

pmcp/mcp_server/{tools → github/tools}/repo_to_text.py

@@ -2,7 +2,7 @@
 This module contains tools for managing Github.
 """
 
-from pmcp.mcp_server.services.repo_to_text import RepoToTextService
+from pmcp.mcp_server.github.services.repo_to_text import RepoToTextService
 from pmcp.mcp_server.github import client
 
 from mcp.server.fastmcp import Context

pmcp/mcp_server/{tools → github/tools}/tools.py

@@ -2,7 +2,7 @@
 This module contains tools for managing Github Issues
 """
 
-from pmcp.mcp_server.tools import issues, pull_requests, repo, repo_to_text,branches, contents
+from pmcp.mcp_server.github.tools import issues, pull_requests, repo, repo_to_text,branches, contents
 
 
 def register_tools(mcp):

pmcp/mcp_server/{utils → github/utils}/github_api.py

@@ -1,6 +1,6 @@
 import logging
 import httpx
-from pmcp.mcp_server.utils.repo_to_text_utils import fetch_file_contents, fetch_repo_sha, fetch_repo_tree, format_repo_contents, parse_repo_url
+from pmcp.mcp_server.github.utils.repo_to_text_utils import fetch_file_contents, fetch_repo_sha, fetch_repo_tree, format_repo_contents, parse_repo_url
 
 
 GITHUB_API_BASE = "https://api.github.com/repos"

pmcp/{mcp_trello_main.py → mcp_server/trello/mcp_trello_main.py}

@@ -1,13 +1,9 @@
 import logging
-import os
 
-import uvicorn
 from dotenv import load_dotenv
 from mcp.server.fastmcp import FastMCP
-from starlette.applications import Starlette
-from starlette.routing import Mount
 
-from server.tools.tools import register_tools
+from pmcp.mcp_server.trello.tools.tools import register_tools
 
 # Configure logging
 logging.basicConfig(

pmcp/{trello_server → mcp_server/trello}/services/board.py

@@ -4,8 +4,8 @@ Service for managing Trello boards in MCP server.
 
 from typing import List
 
-from pmcp.trello_server.models import TrelloBoard, TrelloLabel
-from pmcp.trello_server.utils.trello_api import TrelloClient
+from pmcp.mcp_server.trello.models import TrelloBoard, TrelloLabel
+from pmcp.mcp_server.trello.utils.trello_api import TrelloClient
 
 
 class BoardService:

pmcp/{trello_server → mcp_server/trello}/services/card.py

@@ -4,8 +4,8 @@ Service for managing Trello cards in MCP server.
 
 from typing import Any, Dict, List
 
-from pmcp.trello_server.models import TrelloCard
-from pmcp.trello_server.utils.trello_api import TrelloClient
+from pmcp.mcp_server.trello.models import TrelloCard
+from pmcp.mcp_server.trello.utils.trello_api import TrelloClient
 
 
 class CardService:

pmcp/{trello_server → mcp_server/trello}/services/checklist.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict, List, Optional
 
-from pmcp.trello_server.utils.trello_api import TrelloClient
+from pmcp.mcp_server.trello.utils.trello_api import TrelloClient
 
 
 class ChecklistService:

pmcp/{trello_server → mcp_server/trello}/services/list.py

@@ -1,7 +1,7 @@
 from typing import List
 
-from pmcp.trello_server.models import TrelloList
-from pmcp.trello_server.utils.trello_api import TrelloClient
+from pmcp.mcp_server.trello.models import TrelloList
+from pmcp.mcp_server.trello.utils.trello_api import TrelloClient
 
 
 class ListService:

pmcp/{trello_server → mcp_server/trello}/tools/board.py

@@ -7,9 +7,9 @@ from typing import List
 
 from mcp.server.fastmcp import Context
 
-from pmcp.trello_server.models import TrelloBoard, TrelloLabel
-from pmcp.trello_server.services.board import BoardService
-from pmcp.trello_server.trello import client
+from pmcp.mcp_server.trello.models import TrelloBoard, TrelloLabel
+from pmcp.mcp_server.trello.services.board import BoardService
+from pmcp.mcp_server.trello.trello import client
 
 
 

pmcp/{trello_server → mcp_server/trello}/tools/card.py

@@ -7,10 +7,10 @@ from typing import List
 
 from mcp.server.fastmcp import Context
 
-from pmcp.trello_server.models import TrelloCard
-from pmcp.trello_server.services.card import CardService
-from pmcp.trello_server.trello import client
-from pmcp.trello_server.dtos.update_card import UpdateCardPayload
+from pmcp.mcp_server.trello.models import TrelloCard
+from pmcp.mcp_server.trello.services.card import CardService
+from pmcp.mcp_server.trello.trello import client
+from pmcp.mcp_server.trello.dtos.update_card import UpdateCardPayload
 
 
 service = CardService(client)

pmcp/{trello_server → mcp_server/trello}/tools/checklist.py

@@ -5,8 +5,8 @@ This module contains tools for managing Trello checklists.
 import logging
 from typing import Dict, List, Optional
 
-from pmcp.trello_server.services.checklist import ChecklistService
-from pmcp.trello_server.trello import client
+from pmcp.mcp_server.trello.services.checklist import ChecklistService
+from pmcp.mcp_server.trello.trello import client
 
 service = ChecklistService(client)
 

pmcp/{trello_server → mcp_server/trello}/tools/list.py

@@ -7,9 +7,9 @@ from typing import List
 
 from mcp.server.fastmcp import Context
 
-from pmcp.trello_server.models import TrelloList
-from pmcp.trello_server.services.list import ListService
-from pmcp.trello_server.trello import client
+from pmcp.mcp_server.trello.models import TrelloList
+from pmcp.mcp_server.trello.services.list import ListService
+from pmcp.mcp_server.trello.trello import client
 
 
 

pmcp/{trello_server → mcp_server/trello}/tools/tools.py

@@ -2,7 +2,7 @@
 This module contains tools for managing Trello boards, lists, and cards.
 """
 
-from pmcp.trello_server.tools import board, card, checklist, list
+from pmcp.mcp_server.trello.tools import board, card, checklist, list
 
 
 def register_tools(mcp):

pmcp/{trello_server → mcp_server/trello}/trello.py

@@ -3,7 +3,7 @@ import os
 
 from dotenv import load_dotenv
 
-from pmcp.trello_server.utils.trello_api import TrelloClient
+from pmcp.mcp_server.trello.utils.trello_api import TrelloClient
 
 
 # Load environment variables