nextmv 1.1.3.dev1__tar.gz → 1.1.3.dev2__tar.gz

{nextmv-1.1.3.dev1 → nextmv-1.1.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.1.3.dev1
+Version: 1.1.3.dev2
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://nextmv-py.docs.nextmv.io/en/latest/nextmv/

nextmv-1.1.3.dev2/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.1.3.dev2"

{nextmv-1.1.3.dev1 → nextmv-1.1.3.dev2}/nextmv/cli/mcp/server.py

@@ -17,12 +17,32 @@ from nextmv.cloud import (
 )
 from nextmv.polling import default_polling_options
 
+# Session-level profile. None means "default" (top-level config keys).
+_current_profile: str | None = None
 
-def _get_client() -> Client:
-    """Build a Cloud client from env var or CLI config."""
+
+def _mask_key(key: str | None) -> str | None:
+    """Mask an API key, keeping only the last 4 characters visible."""
+
+    if not key:
+        return None
+    if len(key) <= 4:
+        return key
+    return "X" * (len(key) - 4) + key[-4:]
+
+
+def _get_client(profile: str | None = None) -> Client:
+    """Build a Cloud client from env var or CLI config.
+
+    Args:
+        profile: Optional profile override. If not provided, uses the
+            session-level ``_current_profile``.
+    """
+
+    resolved = profile or _current_profile
 
     api_key = os.getenv("NEXTMV_API_KEY")
-    if api_key:
+    if api_key and not resolved:
         endpoint = os.getenv("NEXTMV_ENDPOINT", "https://api.cloud.nextmv.io")
         if not endpoint.startswith("http"):
             endpoint = f"https://{endpoint}"
@@ -32,7 +52,9 @@ def _get_client() -> Client:
     try:
         from nextmv.cli.configuration.config import build_client
 
-        return build_client()
+        # "default" means use top-level keys (profile=None in build_client).
+        p = None if resolved is None or resolved == "default" else resolved
+        return build_client(profile=p)
     except Exception as e:
         raise ValueError(
             "No Nextmv API key found. Either set the NEXTMV_API_KEY "
@@ -41,10 +63,10 @@ def _get_client() -> Client:
         ) from e
 
 
-def _get_app(app_id: str) -> Application:
+def _get_app(app_id: str, profile: str | None = None) -> Application:
     """Build a cloud Application handle for the given ID."""
 
-    client = _get_client()
+    client = _get_client(profile=profile)
     return Application(client=client, id=app_id)
 
 
@@ -69,6 +91,83 @@ def _save_to_file(data: Any, prefix: str) -> str:
     return f"Data saved to {path} — use file-reading tools to inspect the contents."
 
 
+# ════════════════════════════════════════════════════════════════
+# Cloud: Profile management
+# ════════════════════════════════════════════════════════════════
+
+
+def _register_profile_tools(mcp: FastMCP) -> None:
+    """Register profile management tools."""
+
+    @mcp.tool()
+    def cloud_list_profiles() -> list[dict[str, str | None]]:
+        """List available Nextmv Cloud profiles from ~/.nextmv/config.yaml.
+
+        Returns a list of profiles. Each profile has a name, endpoint,
+        and a masked API key (last 4 characters visible).
+        The "default" profile uses the top-level configuration keys.
+        """
+
+        from nextmv.cli.configuration.config import (
+            API_KEY_KEY,
+            ENDPOINT_KEY,
+            load_config,
+            non_profile_keys,
+        )
+
+        config = load_config()
+        profiles: list[dict[str, str | None]] = []
+
+        # Add the default profile (top-level keys).
+        if config:
+            profiles.append(
+                {
+                    "name": "default",
+                    "endpoint": config.get(ENDPOINT_KEY),
+                    "api_key": _mask_key(config.get(API_KEY_KEY)),
+                }
+            )
+
+        # Add named profiles.
+        reserved = non_profile_keys()
+        for key, value in config.items():
+            if key in reserved:
+                continue
+            if isinstance(value, dict):
+                profiles.append(
+                    {
+                        "name": key,
+                        "endpoint": value.get(ENDPOINT_KEY),
+                        "api_key": _mask_key(value.get(API_KEY_KEY)),
+                    }
+                )
+
+        return profiles
+
+    @mcp.tool()
+    def cloud_set_profile(profile: str) -> str:
+        """Set the active Nextmv Cloud profile for this session.
+
+        All subsequent cloud tool calls will use this profile's
+        credentials unless overridden. Use "default" to switch back
+        to the default profile.
+
+        Args:
+            profile: Profile name from ~/.nextmv/config.yaml, or
+                "default" for the top-level configuration.
+        """
+
+        global _current_profile
+        _current_profile = None if profile == "default" else profile
+        return f"Active profile set to \"{profile}\"."
+
+    @mcp.tool()
+    def cloud_get_profile() -> str:
+        """Get the currently active Nextmv Cloud profile name."""
+
+        return _current_profile or "default"
+
+
 # ════════════════════════════════════════════════════════════════
 # Cloud: App management
 # ════════════════════════════════════════════════════════════════
@@ -1790,11 +1889,20 @@ def create_server() -> FastMCP:
             "inputs, logs) are automatically saved to local temp files to "
             "keep the context window small — the tool will return the file "
             "path so you can selectively read what you need. Large inputs "
-            "can be passed directly as tool parameters without concern."
+            "can be passed directly as tool parameters without concern.\n\n"
+            "PROFILES: The server supports multiple profiles from "
+            "~/.nextmv/config.yaml. Use cloud_list_profiles to see "
+            "available profiles and cloud_set_profile to switch. The "
+            "default profile is used unless changed. When the user asks "
+            "to use a specific profile (e.g. \"list apps in my dev "
+            "profile\"), call cloud_set_profile first. Always state which "
+            "profile you are using when calling cloud tools, e.g. "
+            "(profile: \"default\")."
         ),
     )
 
     # Cloud tools
+    _register_profile_tools(mcp)
     _register_app_tools(mcp)
     _register_run_tools(mcp)
     _register_version_tools(mcp)

{nextmv-1.1.3.dev1 → nextmv-1.1.3.dev2}/tests/cli/test_mcp.py

@@ -71,6 +71,15 @@ class TestMCPServerTools(unittest.TestCase):
         server = create_server()
         self.assertEqual(server.name, "nextmv")
 
+    def test_server_has_all_profile_tools(self):
+        """Test that profile tools are registered."""
+        from nextmv.cli.mcp.server import create_server
+
+        server = create_server()
+        tool_names = list(server._tool_manager._tools.keys())
+        for name in ["cloud_list_profiles", "cloud_set_profile", "cloud_get_profile"]:
+            self.assertIn(name, tool_names, f"Missing tool: {name}")
+
     def test_server_has_all_cloud_app_tools(self):
         """Test that cloud app tools are registered."""
         from nextmv.cli.mcp.server import create_server
@@ -238,8 +247,8 @@ class TestMCPServerTools(unittest.TestCase):
 
         server = create_server()
         tool_names = list(server._tool_manager._tools.keys())
-        # Should have 65+ tools covering all CLI commands.
-        self.assertGreaterEqual(len(tool_names), 65, f"Only {len(tool_names)} tools registered")
+        # Should have 68+ tools covering all CLI commands.
+        self.assertGreaterEqual(len(tool_names), 68, f"Only {len(tool_names)} tools registered")
 
     @patch("nextmv.cli.mcp.server._get_client")
     def test_cloud_list_apps_calls_sdk(self, mock_get_client):
@@ -510,3 +519,104 @@ class TestSaveToFile(unittest.TestCase):
         # Second scenario: explicit type + list config.
         self.assertEqual(scenarios[1].scenario_input.scenario_input_data, "other-set")
         self.assertEqual(scenarios[1].configuration[0].values, ["10", "30"])
+
+
+class TestProfiles(unittest.TestCase):
+    """Tests for profile management tools."""
+
+    def test_mask_key(self):
+        """Test that _mask_key masks all but the last 4 characters."""
+        from nextmv.cli.mcp.server import _mask_key
+
+        self.assertIsNone(_mask_key(None))
+        self.assertEqual(_mask_key("abcd"), "abcd")
+        self.assertEqual(_mask_key("abcde12345"), "XXXXXX2345")
+
+    def test_set_and_get_profile(self):
+        """Test that cloud_set_profile and cloud_get_profile work together."""
+        import nextmv.cli.mcp.server as srv
+        from nextmv.cli.mcp.server import create_server
+
+        server = create_server()
+        set_tool = server._tool_manager._tools["cloud_set_profile"]
+        get_tool = server._tool_manager._tools["cloud_get_profile"]
+
+        # Default profile.
+        result = asyncio.run(get_tool.run({}))
+        text = json.loads(result[0].text) if hasattr(result[0], "text") else str(result)
+        self.assertIn("default", str(text))
+
+        # Switch to a named profile.
+        asyncio.run(set_tool.run({"profile": "staging"}))
+        self.assertEqual(srv._current_profile, "staging")
+
+        result = asyncio.run(get_tool.run({}))
+        text = json.loads(result[0].text) if hasattr(result[0], "text") else str(result)
+        self.assertIn("staging", str(text))
+
+        # Switch back to default.
+        asyncio.run(set_tool.run({"profile": "default"}))
+        self.assertIsNone(srv._current_profile)
+
+    def test_list_profiles(self):
+        """Test that cloud_list_profiles reads config correctly."""
+        from nextmv.cli.mcp.server import create_server
+
+        mock_config = {
+            "apikey": "my-secret-key-1234",
+            "endpoint": "api.cloud.nextmv.io",
+            "staging": {
+                "apikey": "stg-key-5678",
+                "endpoint": "staging.api.nextmv.io",
+            },
+        }
+
+        with patch(
+            "nextmv.cli.configuration.config.load_config",
+            return_value=mock_config,
+        ):
+            server = create_server()
+            tool = server._tool_manager._tools["cloud_list_profiles"]
+            result = asyncio.run(tool.run({}))
+            profiles = json.loads(result[0].text) if hasattr(result[0], "text") else result
+            self.assertEqual(len(profiles), 2)
+            self.assertEqual(profiles[0]["name"], "default")
+            self.assertEqual(profiles[0]["endpoint"], "api.cloud.nextmv.io")
+            self.assertIn("1234", profiles[0]["api_key"])
+            self.assertNotIn("my-secret", profiles[0]["api_key"])
+            self.assertEqual(profiles[1]["name"], "staging")
+            self.assertIn("5678", profiles[1]["api_key"])
+
+    @patch.dict("os.environ", {}, clear=True)
+    @patch("nextmv.cli.configuration.config.build_client")
+    def test_get_client_uses_profile(self, mock_build_client):
+        """Test that _get_client passes the profile to build_client."""
+        import nextmv.cli.mcp.server as srv
+        from nextmv.cli.mcp.server import _get_client
+
+        mock_build_client.return_value = MagicMock()
+
+        # Explicit profile override.
+        _get_client(profile="staging")
+        mock_build_client.assert_called_with(profile="staging")
+
+        # Session-level profile.
+        srv._current_profile = "prod"
+        _get_client()
+        mock_build_client.assert_called_with(profile="prod")
+
+        # Reset.
+        srv._current_profile = None
+
+    @patch.dict("os.environ", {"NEXTMV_API_KEY": "env-key"}, clear=False)
+    def test_get_client_env_skipped_when_profile_set(self):
+        """Test that env var is skipped when a profile is active."""
+        import nextmv.cli.mcp.server as srv
+        from nextmv.cli.mcp.server import _get_client
+
+        with patch("nextmv.cli.configuration.config.build_client") as mock_build:
+            mock_build.return_value = MagicMock()
+            srv._current_profile = "staging"
+            _get_client()
+            mock_build.assert_called_with(profile="staging")
+            srv._current_profile = None

nextmv-1.1.3.dev1/nextmv/__about__.py

@@ -1 +0,0 @@
-__version__ = "v1.1.3.dev1"