Skip to content

Commit 43cb5c4

Browse files
committed
bug: tangled dependencies
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
1 parent d186c2d commit 43cb5c4

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

mcpserver/core/base.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
import json
33
import time
44

5-
from resource_secretary.apps import discover_applications
6-
from resource_secretary.providers import discover_providers
7-
from resource_secretary.providers.mock import discover_mock_providers
8-
95
import mcpserver.utils as utils
106
from mcpserver.logger import logger
117

@@ -22,9 +18,6 @@ def jsonify_response(self, result):
2218
Ensure we get the text, and separate and parse tool calls,
2319
which the agent will return in a verbose mode.
2420
"""
25-
print("result")
26-
print(result)
27-
print(type(result))
2821
if isinstance(result, dict):
2922
return result
3023
if not isinstance(result, str) and hasattr(result, "content"):
@@ -49,6 +42,11 @@ def init_providers(self, mock=False):
4942
Probe the local system on startup. E.g., "we found spack, flux, etc."
5043
These can be faux (mock) or real discovered providers
5144
"""
45+
# Not required unless serving a worker or hub.
46+
from resource_secretary.apps import discover_applications
47+
from resource_secretary.providers import discover_providers
48+
from resource_secretary.providers.mock import discover_mock_providers
49+
5250
# We can use apps in mock or regular
5351
apps = discover_applications()
5452
logger.info("📡 Probing local system for resource providers...")

mcpserver/tools/system/system.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import os
22
import time
3-
from typing import Any, Dict, List
4-
5-
from resource_secretary.agents.backends import get_backend
6-
from resource_secretary.agents.secretary import SecretaryAgent
7-
from resource_secretary.providers import discover_providers
3+
from typing import Any, Dict
84

95
from mcpserver.tools.base import BaseTool
10-
from mcpserver.tools.decorator import mcp
116

127

138
class SystemTool(BaseTool):
@@ -16,6 +11,8 @@ class SystemTool(BaseTool):
1611
"""
1712

1813
def setup(self, manager=None):
14+
from resource_secretary.providers import discover_providers
15+
1916
self.manager = manager
2017
self.catalog = discover_providers()
2118

@@ -42,6 +39,12 @@ async def ask_secretary(self, request: str, verbose=False) -> Dict[str, Any]:
4239
"""
4340
Wakes up the local Secretary Agent using the configured backend.
4441
"""
42+
try:
43+
from resource_secretary.agents.backends import get_backend
44+
from resource_secretary.agents.secretary import SecretaryAgent
45+
except ImportError:
46+
return {"proposal": "This cluster cannot access resources.", "status": "SUCCESS"}
47+
4548
# Resolve the backend instance on-demand
4649
backend = get_backend(
4750
backend_type=self.backend_config["type"],

0 commit comments

Comments
 (0)