From 2b830030e68e73e1cde5700807e2f382ebe02051 Mon Sep 17 00:00:00 2001 From: Richard Gebhardt Date: Wed, 11 Nov 2026 10:11:43 -0500 Subject: [PATCH] fix(validation): use SDK exports for OCI client and model resolution Resolve client and model names through the installed OCI SDK's service exports and model mappings. Validate operation and explicit model identities before constructors, and reuse validated objects for error hints instead of resolving rejected input again. Signed-off-by: Richard Gebhardt --- src/oci-cloud-mcp-server/CHANGELOG.md | 6 +- .../oracle/oci_cloud_mcp_server/server.py | 212 +++++++++--------- .../tests/sdk_fixtures.py | 64 ++++++ .../tests/test_bootstrap_and_introspection.py | 4 +- .../tests/test_discovery_and_shaping.py | 111 +++------ .../tests/test_edge_cases.py | 88 ++++---- .../tests/test_helper_branches.py | 77 +++---- .../tests/test_model_coercion.py | 8 +- .../tests/test_models_and_serialization.py | 34 ++- .../tests/test_pagination_and_invocation.py | 24 +- .../tests/test_sdk_resolution.py | 158 +++++++++++++ .../tests/test_server_extras.py | 118 ++++------ .../oci_cloud_mcp_server/tests/test_tools.py | 18 +- src/oci-cloud-mcp-server/pyproject.toml | 2 +- src/oci-cloud-mcp-server/uv.lock | 2 +- 15 files changed, 521 insertions(+), 405 deletions(-) create mode 100644 src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/sdk_fixtures.py create mode 100644 src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_sdk_resolution.py diff --git a/src/oci-cloud-mcp-server/CHANGELOG.md b/src/oci-cloud-mcp-server/CHANGELOG.md index 96093d9ad..b8782b269 100644 --- a/src/oci-cloud-mcp-server/CHANGELOG.md +++ b/src/oci-cloud-mcp-server/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## Unreleased +## 2.3.1 + +### Security + +- Resolve client and model names through the installed OCI SDK's service exports and model mappings. Validate operation and explicit model identities before constructors, and reuse validated objects for error hints instead of resolving rejected input again. ## 2.3.0 diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/server.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/server.py index 7bd84cc82..6bad1161a 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/server.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/server.py @@ -8,13 +8,12 @@ import inspect import json import os -import pkgutil import re from copy import copy from functools import lru_cache -from importlib import import_module from itertools import islice from logging import Logger +from types import ModuleType from typing import Annotated, Any, Callable, Dict, List, Literal, Optional, Tuple, get_args, get_origin import oci @@ -175,13 +174,30 @@ def _candidate_model_class_names(operation_name: str, param_name: str) -> List[s return _dedupe_preserve_order(candidates) +def _get_service_module(service_name: str) -> ModuleType: + # Only the SDK's own exports may select a service import. + if service_name.startswith("_") or service_name not in getattr(oci, "__all__", ()): + raise ValueError("Unknown OCI SDK service") + service = getattr(oci, service_name) + if not isinstance(service, ModuleType) or "models" not in vars(service).get("__all__", ()): + raise ValueError("Expected an OCI SDK service with exported models") + return service + + def _get_client_class(client_fqn: str) -> Any: - _validate_client_fqn(client_fqn) - module_name, class_name = client_fqn.rsplit(".", 1) - module = import_module(module_name) - cls = getattr(module, class_name) - if not inspect.isclass(cls): - raise ValueError(f"{client_fqn} is not a class") + _validate_client_fqn(client_fqn, require_client_class=True) + parts = client_fqn.split(".") + if len(parts) not in (3, 4): + raise ValueError("client_fqn must reference an exported OCI SDK service client") + service = _get_service_module(parts[1]) + class_name = parts[-1] + cls = vars(service).get(class_name) + if class_name not in service.__all__ or not inspect.isclass(cls): + raise ValueError("client_fqn must reference an exported OCI SDK service client class") + if not cls.__module__.startswith(f"{service.__name__}.") or client_fqn not in { + f"{service.__name__}.{class_name}", f"{cls.__module__}.{cls.__name__}", + }: + raise ValueError("client_fqn does not match the exported OCI SDK client identity") return cls @@ -232,25 +248,18 @@ def _signature_to_display(operation_name: str, signature) -> str: def _import_models_module_from_client_fqn(client_fqn: str): - module_name = client_fqn.rsplit(".", 1)[0] - candidates: List[str] = [f"{module_name}.models"] - if module_name.count(".") >= 2: - parent_module = module_name.rsplit(".", 1)[0] - candidates.append(f"{parent_module}.models") - - for candidate in _dedupe_preserve_order(candidates): - try: - return import_module(candidate) - except Exception: - continue - return None + cls = _get_client_class(client_fqn) + return _get_service_module(cls.__module__.split(".")[1]).models def _resolve_model_class(models_module: Any, class_name: str): - try: - return getattr(models_module, class_name) - except Exception: + if models_module is None or not isinstance(class_name, str): + return None + namespace = vars(models_module).get("__name__", "").split(".") + if len(namespace) != 3 or namespace[0] != "oci" or namespace[2] != "models": return None + cls = vars(models_module).get(f"{namespace[1]}_type_mapping", {}).get(class_name) + return cls if inspect.isclass(cls) else None def _get_model_schema_maps(model_class: Any) -> Tuple[Optional[Dict[str, Any]], Optional[Dict[str, Any]]]: @@ -276,29 +285,45 @@ def _get_model_schema_maps(model_class: Any) -> Tuple[Optional[Dict[str, Any]], ) -def _is_oci_sdk_model_class(model_class: Any) -> bool: - if not inspect.isclass(model_class): - return False - if not getattr(model_class, "__module__", "").startswith("oci."): - return False - swagger_types, attribute_map = _get_model_schema_maps(model_class) - return isinstance(swagger_types, dict) and isinstance(attribute_map, dict) - - def _resolve_model_class_from_fqn(fqn: str) -> Any: - if not isinstance(fqn, str) or "." not in fqn: + if not isinstance(fqn, str): raise ValueError("__model_fqn must be a fully-qualified OCI SDK model class name") - mod_name, cls_name = fqn.rsplit(".", 1) - is_models_module = mod_name.endswith(".models") or ".models." in mod_name - if not mod_name.startswith("oci.") or mod_name.startswith("oci._") or not is_models_module: - raise ValueError("__model_fqn must reference an OCI SDK model class under the 'oci.*.models' namespace") - mod = import_module(mod_name) - cls = getattr(mod, cls_name) - if not _is_oci_sdk_model_class(cls): - raise ValueError("__model_fqn must resolve to an OCI SDK model class") + parts = fqn.split(".") + if len(parts) not in (4, 5) or parts[0] != "oci" or parts[2] != "models": + raise ValueError("__model_fqn must reference an exported OCI SDK model class") + models = _get_service_module(parts[1]).models + cls = _resolve_model_class(models, parts[-1]) + if cls is None or fqn not in {f"{models.__name__}.{parts[-1]}", f"{cls.__module__}.{cls.__name__}"}: + raise ValueError("__model_fqn must reference an exported OCI SDK model class") return cls +def _validate_model_hints(value: Any, models_module: Any) -> Any: + """Resolve all explicit hints before any request model is constructed.""" + selected = None + if isinstance(value, dict): + for hint in ("__model_fqn", "__class_fqn", "__model", "__class"): + if hint not in value: + continue + name = value[hint] + if not isinstance(name, str) or not name: + raise ValueError("Model hints must be non-empty strings") + cls = (_resolve_model_class_from_fqn(name) if hint.endswith("_fqn") + else _resolve_model_class(models_module, name)) + if cls is None or (selected is not None and selected is not cls): + raise ValueError("Unknown or conflicting OCI SDK model hints") + selected = cls + if hint.endswith("_fqn"): + models_module = _get_service_module(cls.__module__.split(".")[1]).models + for key, child in value.items(): + if key not in ("__model_fqn", "__class_fqn", "__model", "__class"): + _validate_model_hints(child, models_module) + elif isinstance(value, list): + for child in value: + _validate_model_hints(child, models_module) + return selected + + def _resolve_polymorphic_model_class(model_class: Any, mapping: Dict[str, Any], models_module: Any) -> Any: subtype_resolver = getattr(model_class, "get_subtype", None) if not callable(subtype_resolver): @@ -317,7 +342,7 @@ def _resolve_polymorphic_model_class(model_class: Any, mapping: Dict[str, Any], return model_class subtype_class = _resolve_model_class(models_module, subtype_name) if models_module else None - return subtype_class if inspect.isclass(subtype_class) else model_class + return subtype_class if inspect.isclass(subtype_class) and issubclass(subtype_class, model_class) else model_class def _extract_expected_kwargs_from_source(method: Callable[..., Any]) -> Optional[set]: @@ -431,36 +456,15 @@ def _score_discovery_match( @lru_cache(maxsize=1) def _discover_client_classes() -> List[Tuple[str, Any]]: discovered: List[Tuple[str, Any]] = [] - seen: set[str] = set() - for module_info in pkgutil.walk_packages(oci.__path__, prefix="oci."): - module_name = module_info.name - if module_name.startswith("oci._"): - continue - if not module_name.endswith("_client") or module_name.endswith(".composite_operations"): - continue + for service_name in getattr(oci, "__all__", ()): try: - module = import_module(module_name) - except Exception: - continue - parent_module_name = module_name.rsplit(".", 1)[0] - if parent_module_name == "oci" or parent_module_name.startswith("oci._"): + service = _get_service_module(service_name) + except ValueError: continue - try: - parent_module = import_module(parent_module_name) - except Exception: - parent_module = None - for class_name, cls in inspect.getmembers(module, predicate=inspect.isclass): - if not class_name.endswith("Client"): - continue - if getattr(cls, "__module__", "") != module.__name__: - continue - client_fqn = f"{module_name}.{class_name}" - if parent_module is not None and getattr(parent_module, class_name, None) is cls: - client_fqn = f"{parent_module_name}.{class_name}" - if client_fqn in seen: - continue - seen.add(client_fqn) - discovered.append((client_fqn, cls)) + for class_name, cls in vars(service).items(): + if class_name in service.__all__ and class_name.endswith("Client") and inspect.isclass(cls): + client_fqn = f"{service.__name__}.{class_name}" + discovered.append((client_fqn, _get_client_class(client_fqn))) return sorted(discovered, key=lambda item: item[0]) @@ -556,12 +560,8 @@ def _resolve_model_class_from_type_name(type_name: str, models_module: Any) -> A return model_class if "." in type_name: try: - module_name, class_name = type_name.rsplit(".", 1) - module = import_module(module_name) - model_class = getattr(module, class_name) - if inspect.isclass(model_class): - return model_class - except Exception: + return _resolve_model_class_from_fqn(type_name) + except ValueError: return None return None @@ -659,8 +659,9 @@ def _coerce_mapping_values( def _construct_model_from_mapping( mapping: Dict[str, Any], models_module: Any, candidate_classnames: List[str] ): - fqn = mapping.get("__model_fqn") or mapping.get("__class_fqn") - class_name = mapping.get("__model") or mapping.get("__class") + hinted_cls = _validate_model_hints(mapping, models_module) + if hinted_cls is not None and any(hint in mapping for hint in ("__model_fqn", "__class_fqn")): + models_module = _get_service_module(hinted_cls.__module__.split(".")[1]).models clean = {k: v for k, v in mapping.items() if not k.startswith("__")} parent_prefix_hint: Optional[str] = None for cand in candidate_classnames: @@ -671,9 +672,13 @@ def _construct_model_from_mapping( if parent_prefix_hint is None: parent_prefix_hint = cand clean = _coerce_mapping_values(clean, models_module, parent_prefix_hint) - if isinstance(fqn, str): - cls = _resolve_model_class_from_fqn(fqn) + if hinted_cls is not None: + cls = hinted_cls cls = _resolve_polymorphic_model_class(cls, clean, models_module) + if not any(hint in mapping for hint in ("__model_fqn", "__class_fqn")): + swagger_types, _ = _get_model_schema_maps(cls) + if isinstance(swagger_types, dict): + clean = {key: value for key, value in clean.items() if key in swagger_types} coerced_clean = _coerce_mapping_for_model_class(clean, models_module, cls) try: return oci.util.from_dict(cls, coerced_clean) @@ -682,22 +687,6 @@ def _construct_model_from_mapping( return cls(**coerced_clean) except Exception: return mapping - if models_module and isinstance(class_name, str): - cls = _resolve_model_class(models_module, class_name) - if inspect.isclass(cls): - cls = _resolve_polymorphic_model_class(cls, clean, models_module) - filtered_clean = clean - swagger_types, _ = _get_model_schema_maps(cls) - if isinstance(swagger_types, dict): - filtered_clean = {k: v for k, v in clean.items() if k in swagger_types} - filtered_clean = _coerce_mapping_for_model_class(filtered_clean, models_module, cls) - try: - return oci.util.from_dict(cls, filtered_clean) - except Exception: - try: - return cls(**filtered_clean) - except Exception: - pass if models_module: for candidate in candidate_classnames: cls = _resolve_model_class(models_module, candidate) @@ -1319,6 +1308,8 @@ def invoke_oci_api( "Use 'auto' for compact defaults, 'summary' for a compact structural summary, or 'full' for the full payload.", ] = "auto", ) -> dict: + validated_class = None + validated_method = None try: if max_results is not None and max_results < 1: raise ValueError("max_results must be >= 1") @@ -1331,17 +1322,20 @@ def invoke_oci_api( else: normalized_fields = None _validate_client_fqn(client_fqn, require_client_class=True) - client = _import_client(client_fqn) - method = _resolve_public_client_method(client, client_fqn, operation) + validated_class = _get_client_class(client_fqn) + validated_method = _resolve_public_client_method(validated_class, client_fqn, operation) input_params = params or {} - uses_pagination = _supports_pagination(method, operation) - typed_params = _coerce_params_to_method_types(client_fqn, method, input_params) + _validate_model_hints(input_params, _import_models_module_from_client_fqn(client_fqn)) + typed_params = _coerce_params_to_method_types(client_fqn, validated_method, input_params) final_params = _align_params_to_signature( - method, + validated_method, operation, _coerce_params_to_oci_models(client_fqn, operation, typed_params), ) + client = _import_client(client_fqn) + method = _resolve_public_client_method(client, client_fqn, operation) + uses_pagination = _supports_pagination(method, operation) logger.debug(f"invoke_oci_api final_params keys: {list(final_params.keys())}") logger.debug(f"op: {operation}") pagination_metadata: Dict[str, Any] = {} @@ -1423,24 +1417,18 @@ def invoke_oci_api( error_result["available_fields"] = exc.available_fields error_text = str(exc) needs_param_hints = any(clue in error_text for clue in ("unexpected keyword argument", "required positional argument")) - try: - cls = _get_client_class(client_fqn) - try: - method = _resolve_public_client_method(cls, client_fqn, operation) - except AttributeError: + if validated_class is not None: + if validated_method is None: suggestions = difflib.get_close_matches( operation, - _public_client_operation_names(cls), + _public_client_operation_names(validated_class), n=5, cutoff=0.4, ) if suggestions: error_result["suggested_operations"] = suggestions - else: - if needs_param_hints and callable(method): - error_result.update(_build_param_error_hints(method, operation, params or {}, error_text)) - except Exception: - pass + elif needs_param_hints: + error_result.update(_build_param_error_hints(validated_method, operation, params or {}, error_text)) return error_result diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/sdk_fixtures.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/sdk_fixtures.py new file mode 100644 index 000000000..1891929ce --- /dev/null +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/sdk_fixtures.py @@ -0,0 +1,64 @@ +""" +Copyright (c) 2026, Oracle and/or its affiliates. +Licensed under the Universal Permissive License v1.0 as shown at +https://oss.oracle.com/licenses/upl. +""" + +from contextlib import contextmanager +import inspect +from types import ModuleType, SimpleNamespace +from unittest.mock import MagicMock + +import pytest + +from oracle.oci_cloud_mcp_server import server + + +def sdk_models(**exports): + models = ModuleType("oci.fake.models") + models.fake_type_mapping = {name: cls for name, cls in exports.items() if inspect.isclass(cls)} + for name, cls in exports.items(): + setattr(models, name, cls) + if inspect.isclass(cls) and not cls.__module__.startswith("oci."): + cls.__module__ = models.__name__ + return models + + +def sdk_service_loader(importer, monkeypatch): + """Adapt existing fake SDK modules into service exports, without bypassing class lookup.""" + services = {} + + def load(name): + if name not in services: + exports = importer(f"oci.{name}") + try: + models = importer(f"oci.{name}.models") + except ImportError: + models = SimpleNamespace() + service = ModuleType(f"oci.{name}") + service.__all__ = [*vars(exports), "models"] + for alias, cls in vars(exports).items(): + setattr(service, alias, cls) + if inspect.isclass(cls) and alias.endswith("Client"): + monkeypatch.setattr(cls, "__module__", f"oci.{name}.compute_client") + model_types = getattr(models, f"{name}_type_mapping", { + alias: cls for alias, cls in vars(models).items() + if inspect.isclass(cls) and not alias.endswith("Client") + }) + monkeypatch.setattr(models, "__name__", f"oci.{name}.models", raising=False) + monkeypatch.setattr(models, f"{name}_type_mapping", model_types, raising=False) + for cls in model_types.values(): + monkeypatch.setattr(cls, "__module__", f"oci.{name}.models") + service.models = models + services[name] = service + return services[name] + + return load + + +@contextmanager +def mock_sdk_services(*args, **kwargs): + importer = MagicMock(*args, **kwargs) + with pytest.MonkeyPatch.context() as monkeypatch: + monkeypatch.setattr(server, "_get_service_module", sdk_service_loader(importer, monkeypatch)) + yield importer diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_bootstrap_and_introspection.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_bootstrap_and_introspection.py index 001d4b23f..c649d7d10 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_bootstrap_and_introspection.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_bootstrap_and_introspection.py @@ -12,6 +12,8 @@ main, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_service_loader + class TestGetConfigAndSigner: @staticmethod @@ -268,7 +270,7 @@ def test_client_fqn_without_dot_raises(self): def test_attribute_not_a_class_raises(self, monkeypatch): fake_mod = SimpleNamespace(NotClass=42) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_mod) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_mod, monkeypatch)) with pytest.raises(ValueError): _import_client("oci.fake.NotClass") diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_discovery_and_shaping.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_discovery_and_shaping.py index d522b3f18..2386060e7 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_discovery_and_shaping.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_discovery_and_shaping.py @@ -1,4 +1,4 @@ -from types import ModuleType, SimpleNamespace +from types import SimpleNamespace import pytest from fastmcp import Client @@ -6,6 +6,8 @@ import oracle.oci_cloud_mcp_server.server as server_mod from oracle.oci_cloud_mcp_server.server import mcp +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models, sdk_service_loader + def _fake_tool_response(data, request_id): return SimpleNamespace(data=data, headers={"opc-request-id": request_id}) @@ -13,8 +15,8 @@ def _fake_tool_response(data, request_id): def _patch_fake_invoke_client(monkeypatch, client_cls, *, pager_response=None): monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=client_cls), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=client_cls), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -28,62 +30,11 @@ def _patch_fake_invoke_client(monkeypatch, client_cls, *, pager_response=None): class TestDiscoveryTools: - def test_discover_client_classes_skips_internal_and_base_clients(self, monkeypatch): - class ComputeClient: - __module__ = "oci.core.compute_client" - - class BaseClient: - __module__ = "oci.base_client" - - class PyJWKClient: - __module__ = "oci._vendor.jwt.foo_client" - - compute_client_module = ModuleType("oci.core.compute_client") - compute_client_module.ComputeClient = ComputeClient - core_module = ModuleType("oci.core") - core_module.ComputeClient = ComputeClient - base_client_module = ModuleType("oci.base_client") - base_client_module.BaseClient = BaseClient - oci_module = ModuleType("oci") - oci_module.BaseClient = BaseClient - vendor_client_module = ModuleType("oci._vendor.jwt.foo_client") - vendor_client_module.PyJWKClient = PyJWKClient - vendor_parent_module = ModuleType("oci._vendor.jwt") - vendor_parent_module.PyJWKClient = PyJWKClient - - fake_modules = { - "oci.core.compute_client": compute_client_module, - "oci.core": core_module, - "oci.base_client": base_client_module, - "oci": oci_module, - "oci._vendor.jwt.foo_client": vendor_client_module, - "oci._vendor.jwt": vendor_parent_module, - } - - class ModuleInfo: - def __init__(self, name): - self.name = name - - monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.pkgutil.walk_packages", - lambda path, prefix="oci.": [ - ModuleInfo("oci.base_client"), - ModuleInfo("oci._vendor.jwt.foo_client"), - ModuleInfo("oci.core.compute_client"), - ], - ) - monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: fake_modules[name], - ) - - server_mod._discover_client_classes.cache_clear() - try: - discovered = server_mod._discover_client_classes() - finally: - server_mod._discover_client_classes.cache_clear() - - assert discovered == [("oci.core.ComputeClient", ComputeClient)] + def test_discover_client_classes_skips_internal_and_base_clients(self): + discovered = server_mod._discover_client_classes() + assert ("oci.core.ComputeClient", server_mod.oci.core.ComputeClient) in discovered + assert all(not fqn.startswith("oci._") and fqn != "oci.base_client.BaseClient" + and not fqn.endswith("CompositeOperations") for fqn, _ in discovered) @pytest.mark.asyncio async def test_find_oci_api_returns_ranked_matches(self, monkeypatch): @@ -170,7 +121,7 @@ def fake_import(name): return SimpleNamespace(CreateVcnDetails=CreateVcnDetails) raise ImportError(name) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", fake_import) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(fake_import, monkeypatch)) async with Client(mcp) as client: res = ( @@ -202,8 +153,8 @@ def get_thing(self, thing_id): # noqa: ARG002 return None monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) async with Client(mcp) as client: @@ -300,8 +251,8 @@ def fake_retrying_call(method, **kwargs): return method(**kwargs) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -376,8 +327,8 @@ def fake_retrying_call(method, **kwargs): return method(**kwargs) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -444,8 +395,8 @@ def get_thing(self, thing_id): # noqa: ARG002 ) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -695,8 +646,8 @@ def get_thing(self, compartment_id): return {"ok": True} monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -779,8 +730,8 @@ def get_thing(self, compartment_id, retry_count=None): # noqa: ARG002 return FakeResponse({"retry_count": retry_count}) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -815,14 +766,14 @@ def __init__(self, **kwargs): self._data = dict(kwargs) MyModel.__module__ = "oci.fake.models" - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping from oracle.oci_cloud_mcp_server.server import oci as _oci monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(MyModel=MyModel) if name == "oci.fake.models" else fake_models, + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(MyModel=MyModel) if name == "oci.fake.models" else fake_models, monkeypatch), ) monkeypatch.setattr(_oci.util, "from_dict", lambda cls, data: cls(**data), raising=False) @@ -851,7 +802,7 @@ def __init__(self, **kwargs): def test_construct_model_rejects_non_oci_model_fqn(self): from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping - with pytest.raises(ValueError, match="under the 'oci\\.\\*\\.models' namespace"): + with pytest.raises(ValueError, match="exported OCI SDK model class"): _construct_model_from_mapping( { "__model_fqn": "subprocess.Popen", @@ -866,12 +817,14 @@ class NotModel: pass NotModel.__module__ = "oci.fake.models" + fake_models = sdk_models() + fake_models.NotModel = NotModel # Present as an attribute, absent from SDK model exports. from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(NotModel=NotModel), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: fake_models, monkeypatch), ) with pytest.raises(ValueError, match="OCI SDK model class"): @@ -894,7 +847,7 @@ class MyModel: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping from oracle.oci_cloud_mcp_server.server import oci as _oci diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_edge_cases.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_edge_cases.py index d367bf0da..b00b3da25 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_edge_cases.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_edge_cases.py @@ -14,6 +14,9 @@ mcp, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_service_loader +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models + class TestCandidateSwaggerFilter: def test_candidate_ctor_with_swagger_filter_on_from_dict_failure(self, monkeypatch): @@ -24,7 +27,7 @@ class MyDetails: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(MyDetails=MyDetails) + fake_models = sdk_models(MyDetails=MyDetails) # force from_dict to raise so ctor path is used with swagger filtering from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -45,7 +48,7 @@ class ShapeConfig: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(ShapeConfig=ShapeConfig) + fake_models = sdk_models(ShapeConfig=ShapeConfig) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -77,8 +80,8 @@ def create_vcn(self, create_vcn_details): # noqa: ARG001 # patch import_module to provide FakeClient monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) # avoid models module monkeypatch.setattr( @@ -117,7 +120,7 @@ async def test_list_client_operations_import_error(self, monkeypatch): def boom(name): raise ImportError("fail") - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", boom) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(boom, monkeypatch)) async with Client(mcp) as client: with pytest.raises(ToolError): @@ -136,8 +139,8 @@ def get_list(self): return [10, 20, 30] monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -158,25 +161,25 @@ def get_list(self): class TestConstructFqnValidation: def test_construct_model_from_fqn_rejects_non_oci_namespace(self): - with pytest.raises(ValueError, match="under the 'oci\\.\\*\\.models' namespace"): + with pytest.raises(ValueError, match="exported OCI SDK model class"): _construct_model_from_mapping({"__class_fqn": "mymod9.Kiwi", "a": 7}, None, []) class TestConstructModelFqnAttrNotClass: def test_fqn_points_to_non_oci_class_is_rejected(self): mapping = {"__model_fqn": "mymod8.Const", "a": 1} - with pytest.raises(ValueError, match="under the 'oci\\.\\*\\.models' namespace"): + with pytest.raises(ValueError, match="exported OCI SDK model class"): _construct_model_from_mapping(mapping, None, []) class TestConstructModelSimpleNameNotClass: - def test_simple_name_resolves_to_non_class_returns_mapping(self): + def test_simple_name_resolves_to_non_class_is_rejected(self): class models: Foo = 123 # not a class mapping = {"__model": "Foo", "a": 1} - out = _construct_model_from_mapping(mapping, models, []) - assert out is mapping + with pytest.raises(ValueError, match="Unknown or conflicting OCI SDK model hints"): + _construct_model_from_mapping(mapping, models, []) class TestListClientOperationsGetdocRaises: @@ -188,7 +191,7 @@ def foo(self, a): # noqa: ARG002 return 1 fake_module = SimpleNamespace(KlassClient=KlassClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) # force inspect.getdoc to raise to hit exception path for summary extraction import inspect as _inspect @@ -216,7 +219,7 @@ class Foo: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(Foo=Foo) + fake_models = sdk_models(Foo=Foo) from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -243,7 +246,7 @@ class CreateVcnDetails: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(CreateVcnDetails=CreateVcnDetails) + fake_models = sdk_models(CreateVcnDetails=CreateVcnDetails) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -262,7 +265,7 @@ class UpdateVcnDetails: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(UpdateVcnDetails=UpdateVcnDetails) + fake_models = sdk_models(UpdateVcnDetails=UpdateVcnDetails) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -285,7 +288,7 @@ def test_list_item_with_non_oci_class_fqn_is_rejected(self, monkeypatch): lambda fqn: None, ) - with pytest.raises(ValueError, match="under the 'oci\\.\\*\\.models' namespace"): + with pytest.raises(ValueError, match="exported OCI SDK model class"): _coerce_params_to_oci_models( "oci.fake.Client", "op", @@ -295,7 +298,7 @@ def test_list_item_with_non_oci_class_fqn_is_rejected(self, monkeypatch): class TestListPassThroughNonDict: def test_list_of_scalars_passthrough(self): - out = _coerce_params_to_oci_models("oci.fake.Client", "op", {"items": [1, 2, 3]}) + out = _coerce_params_to_oci_models("oci.core.ComputeClient", "op", {"items": [1, 2, 3]}) assert out["items"] == [1, 2, 3] @@ -318,8 +321,8 @@ def raising_from_dict(cls, data): # noqa: ARG001 monkeypatch.setattr(_oci.util, "from_dict", raising_from_dict, raising=False) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(Apple=Apple), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(Apple=Apple), monkeypatch), ) inst = _construct_model_from_mapping({"__model_fqn": "oci.fake.models.Apple", "a": 10}, None, []) @@ -357,7 +360,7 @@ def _private(self): return 1 fake_module = SimpleNamespace(KlassClient=KlassClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) async with Client(mcp) as client: res = (await client.call_tool("list_client_operations", {"client_fqn": "oci.fake.KlassClient"})).data assert res == { @@ -368,10 +371,7 @@ def _private(self): class TestResolveModelClassSuccess: def test_resolve_model_class_returns_class(self): - class MM: - pass - - MM.ModelX = type("ModelX", (), {}) + MM = sdk_models(ModelX=type("ModelX", (), {})) cls = _resolve_model_class(MM, "ModelX") assert cls.__name__ == "ModelX" @@ -388,7 +388,7 @@ class InstanceShapeConfig: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace( + fake_models = sdk_models( InstanceDetails=InstanceDetails, InstanceShapeConfig=InstanceShapeConfig, ) @@ -443,7 +443,7 @@ class BoomModel: def __init__(self, **kwargs): raise Exception("ctor boom") - fake_models = SimpleNamespace(BoomModel=BoomModel) + fake_models = sdk_models(BoomModel=BoomModel) # force from_dict to raise as well to hit nested except path from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -465,7 +465,7 @@ class Candidate: def __init__(self, **kwargs): raise Exception("ctor fail") - fake_models = SimpleNamespace(Candidate=Candidate) + fake_models = sdk_models(Candidate=Candidate) from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -485,7 +485,7 @@ class SourceDetails: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(SourceDetails=SourceDetails) + fake_models = sdk_models(SourceDetails=SourceDetails) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -501,7 +501,7 @@ class Foo: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(Foo=Foo) + fake_models = sdk_models(Foo=Foo) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -547,8 +547,8 @@ def get_tuple(self): # noqa: ARG002 return FakeResponse((1, 2, 3)) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -600,8 +600,8 @@ def get_crash(self): raise RuntimeError("boom") monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -649,8 +649,8 @@ def __init__(self): # no signer kw pass monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(BadClient=BadClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(BadClient=BadClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -672,8 +672,8 @@ def get_plain(self): return {"ok": True} monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -701,7 +701,7 @@ class MyModel2: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(MyModel2=MyModel2) + fake_models = sdk_models(MyModel2=MyModel2) from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -729,8 +729,8 @@ def get(self): return FakeResp({"ok": True}) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -767,8 +767,8 @@ def raising_from_dict(cls, data): # noqa: ARG001 monkeypatch.setattr(_oci.util, "from_dict", raising_from_dict, raising=False) monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(Boom=Boom), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(Boom=Boom), monkeypatch), ) mapping = {"__model_fqn": "oci.fake.models.Boom", "a": 1} @@ -785,7 +785,7 @@ def foo(self): return 1 fake_module = SimpleNamespace(KlassClient=KlassClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) def boom(*args, **kwargs): raise Exception("scan boom") diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_helper_branches.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_helper_branches.py index 52bef9dbb..fddd536ad 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_helper_branches.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_helper_branches.py @@ -26,6 +26,9 @@ mcp, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_service_loader +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models + class TestValidationAndFormattingHelpers: def test_validate_client_fqn_rejects_invalid_values(self): @@ -99,52 +102,25 @@ def test_score_discovery_match_prefers_compute_shapes_for_ambiguous_list_shapes( assert compute_score > rover_score class TestDiscoveryAndImportHelpers: - def test_discover_client_classes_covers_skip_paths(self, monkeypatch): + def test_discover_client_classes_uses_sdk_exports(self, monkeypatch): class GoodClient: __module__ = "oci.good.compute_client" - class WrongModuleClient: - __module__ = "oci.somewhere_else" - - good_module = ModuleType("oci.good.compute_client") - good_module.GoodClient = GoodClient - good_module.WrongModuleClient = WrongModuleClient - good_parent = ModuleType("oci.good") - good_parent.GoodClient = GoodClient - - class ModuleInfo: - def __init__(self, name): - self.name = name - - monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.pkgutil.walk_packages", - lambda path, prefix="oci.": [ - ModuleInfo("oci._private.secret_client"), - ModuleInfo("oci.not_a_client"), - ModuleInfo("oci.bad_client"), - ModuleInfo("oci.good.compute_client"), - ], - ) - - def fake_import(name): - if name == "oci.bad_client": - raise ImportError("boom") - if name == "oci.good.compute_client": - return good_module - if name == "oci.good": - return good_parent - raise ImportError(name) - - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", fake_import) - + service = ModuleType("oci.good") + service.__all__ = ["GoodClient", "LazyClient", "models"] + service.GoodClient = GoodClient + service.models = ModuleType("oci.good.models") + sdk = ModuleType("oci") + sdk.__all__ = ["good", "BaseClient", "_private"] + sdk.good = service + sdk.BaseClient = type("BaseClient", (), {}) + monkeypatch.setattr(server_mod, "oci", sdk) _discover_client_classes.cache_clear() try: - discovered = _discover_client_classes() + assert _discover_client_classes() == [("oci.good.GoodClient", GoodClient)] finally: _discover_client_classes.cache_clear() - assert discovered == [("oci.good.GoodClient", GoodClient)] - def test_import_client_falls_back_when_signature_introspection_fails(self, monkeypatch): class FakeClient: def __init__(self, config, **kwargs): @@ -152,8 +128,8 @@ def __init__(self, config, **kwargs): self.kwargs = kwargs monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -177,9 +153,6 @@ def fake_signature(obj): class TestTypeAndModelHelpers: def test_resolve_polymorphic_model_class_covers_success_and_error(self): - class ChildModel: - pass - class BaseModel: attribute_map = {"resource_type": "resourceType"} @@ -187,12 +160,15 @@ class BaseModel: def get_subtype(payload): return "ChildModel" if payload.get("resourceType") == "child" else "BaseModel" + class ChildModel(BaseModel): + pass + class FailingModel: @staticmethod def get_subtype(payload): # noqa: ARG004 raise RuntimeError("bad subtype") - models_module = SimpleNamespace(ChildModel=ChildModel) + models_module = sdk_models(ChildModel=ChildModel) assert ( _resolve_polymorphic_model_class(BaseModel, {"resource_type": "child"}, models_module) @@ -206,7 +182,8 @@ def test_coerce_primitive_value_covers_false_invalid_float_and_integral_float(se assert _coerce_primitive_value("no", "bool") is False def test_resolve_model_class_from_type_name_covers_fqn_and_failure(self): - assert _resolve_model_class_from_type_name("datetime.datetime", None).__name__ == "datetime" + assert _resolve_model_class_from_type_name("oci.core.models.CreateVcnDetails", None).__name__ == "CreateVcnDetails" + assert _resolve_model_class_from_type_name("datetime.datetime", None) is None assert _resolve_model_class_from_type_name("missing.module.Type", None) is None assert _resolve_model_class_from_type_name("", None) is None @@ -214,7 +191,7 @@ def test_coerce_value_to_type_covers_dict_and_model_paths(self, monkeypatch): class FakeModel: pass - models_module = SimpleNamespace(FakeModel=FakeModel) + models_module = sdk_models(FakeModel=FakeModel) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._construct_model_from_mapping", @@ -256,8 +233,8 @@ def list_things(self, compartment_id, opc_retry_token=None): # noqa: ARG002 return None monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) with pytest.raises(AttributeError, match="Similar operations"): @@ -443,8 +420,8 @@ def get_instance(self, instance_id): # noqa: ARG002 return None monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) async with Client(mcp) as client: diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_model_coercion.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_model_coercion.py index 5cfa081ff..bcdf7c90c 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_model_coercion.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_model_coercion.py @@ -7,6 +7,9 @@ from fastmcp import Client from oracle.oci_cloud_mcp_server.server import mcp +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import mock_sdk_services +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models + class TestModelCoercion: def test_create_operation_coerces_model_and_renames_key(self): @@ -40,7 +43,7 @@ def create_vcn(self, create_vcn_details): ) fake_client_module = SimpleNamespace(FakeClient=FakeClient) - fake_models_module = SimpleNamespace(CreateVcnDetails=CreateVcnDetails) + fake_models_module = sdk_models(CreateVcnDetails=CreateVcnDetails) def import_side_effect(name): # return appropriate fake module depending on requested import @@ -51,8 +54,7 @@ def import_side_effect(name): raise ImportError(name) with ( - patch( - "oracle.oci_cloud_mcp_server.server.import_module", + mock_sdk_services( side_effect=import_side_effect, ), patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_models_and_serialization.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_models_and_serialization.py index 7249ae798..afa3348b1 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_models_and_serialization.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_models_and_serialization.py @@ -1,5 +1,3 @@ -from types import SimpleNamespace - from oracle.oci_cloud_mcp_server.server import ( _import_models_module_from_client_fqn, _resolve_model_class, @@ -7,6 +5,8 @@ _snake_to_camel, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models + class TestSnakeToCamel: def test_basic_conversion(self): @@ -20,29 +20,21 @@ def test_ignores_empty_segments(self): class TestImportModelsModuleFromClientFqn: - def test_success_returns_module(self, monkeypatch): - # only return a module-like object for the specific ".models" path - def fake_import(name): - if name == "oci.fake.models": - return SimpleNamespace() - raise ImportError("nope") - - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", fake_import) - mod = _import_models_module_from_client_fqn("oci.fake.ClientClass") - assert mod is not None - - def test_failure_returns_none(self, monkeypatch): - monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: (_ for _ in ()).throw(ImportError("boom")), - ) - mod = _import_models_module_from_client_fqn("oci.fake.ClientClass") - assert mod is None + def test_success_returns_module(self): + import oci + + assert _import_models_module_from_client_fqn("oci.core.compute_client.ComputeClient") is oci.core.models + + def test_invalid_client_is_rejected(self): + import pytest + + with pytest.raises(ValueError, match="Unknown OCI SDK service"): + _import_models_module_from_client_fqn("oci.not_a_service.MissingClient") class TestResolveModelClass: def test_not_found_returns_none(self): - mm = SimpleNamespace() + mm = sdk_models() assert _resolve_model_class(mm, "Missing") is None diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_pagination_and_invocation.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_pagination_and_invocation.py index d456915c8..b2101e4df 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_pagination_and_invocation.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_pagination_and_invocation.py @@ -9,6 +9,8 @@ mcp, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_service_loader + class TestSupportsPaginationAllowlistIntrospectionFailure: def test_allowlist_true_when_signature_introspection_fails(self, monkeypatch): @@ -41,8 +43,8 @@ def __init__(self, config, signer): # noqa: ARG002 # patch module import and config/signer bootstrap monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -65,14 +67,14 @@ def __init__(self, config, signer): # noqa: ARG002 assert "not found" in res["error"].lower() @pytest.mark.asyncio - async def test_attribute_present_but_not_callable_returns_error(self, monkeypatch): + async def test_instance_only_attribute_is_rejected_before_construction(self, monkeypatch): class FakeClient: def __init__(self, config, signer): # noqa: ARG002 self.get_thing = 123 # not callable monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -92,7 +94,7 @@ def __init__(self, config, signer): # noqa: ARG002 ).data assert "error" in res - assert "not callable" in res["error"].lower() + assert "not found or is not public" in res["error"].lower() class TestImportClientHappyPath: @@ -107,7 +109,7 @@ def __init__(self, config, signer=None, **kwargs): # module with GoodClient fake_mod = SimpleNamespace(GoodClient=GoodClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_mod) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_mod, monkeypatch)) # basic config/signer monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -195,8 +197,8 @@ def search_logs(self, search_logs_details, limit=None, page=None): # noqa: ARG0 return Response([{"id": "result-3"}, {"id": "result-4"}], "req-2") monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(LogSearchClient=LogSearchClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(LogSearchClient=LogSearchClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -342,8 +344,8 @@ def create_vcn(self, foo): # noqa: ARG002 return {"ok": True} monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_sdk_resolution.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_sdk_resolution.py new file mode 100644 index 000000000..8f9f9cd9e --- /dev/null +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_sdk_resolution.py @@ -0,0 +1,158 @@ +""" +Copyright (c) 2026, Oracle and/or its affiliates. +Licensed under the Universal Permissive License v1.0 as shown at +https://oss.oracle.com/licenses/upl. +""" + +from unittest.mock import Mock, patch + +import oci +import pytest +from fastmcp import Client + +from oracle.oci_cloud_mcp_server import server + + +@pytest.mark.parametrize("fqn", ["oci.core.ComputeClient", "oci.core.compute_client.ComputeClient"]) +def test_client_aliases_resolve_to_the_sdk_export(fqn): + assert server._get_client_class(fqn) is oci.core.ComputeClient + + +@pytest.mark.parametrize("fqn", [ + "oci.base_client.BaseClient", + "oci.core.compute_client.BaseClient", + "oci.core.not_a_client.ComputeClient", + "oci.core.ComputeClientCompositeOperations", + "oci._vendor.fake.FakeClient", + "oci.not_a_service.FakeClient", + "subprocess.Popen", +]) +def test_unexported_client_names_are_rejected_without_importing_the_requested_path(fqn): + _ = oci.core.ComputeClient # Load the trusted service before watching imports. + with patch("importlib.import_module") as importer, pytest.raises(ValueError): + server._get_client_class(fqn) + importer.assert_not_called() + + +@pytest.mark.parametrize("fqn", [ + "oci.core.models.CreateVcnDetails", "oci.core.models.create_vcn_details.CreateVcnDetails", +]) +def test_model_aliases_resolve_without_model_construction(fqn): + cls = oci.core.models.CreateVcnDetails + with patch.object(cls, "__init__", side_effect=AssertionError("constructed model")) as constructor: + assert server._resolve_model_class_from_fqn(fqn) is cls + constructor.assert_not_called() + + +@pytest.mark.asyncio +@pytest.mark.parametrize("fqn", ["oci.base_client.BaseClient", "oci._vendor.fake.FakeClient"]) +async def test_rejected_client_is_not_resolved_again_for_error_hints(monkeypatch, fqn): + credentials = Mock(side_effect=AssertionError("loaded credentials")) + monkeypatch.setattr(server, "_get_config_and_signer", credentials) + with patch.object(server, "_get_client_class", wraps=server._get_client_class) as resolver: + async with Client(server.mcp) as client: + result = (await client.call_tool("invoke_oci_api", { + "client_fqn": fqn, "operation": "call_api", + })).data + assert "Unknown OCI SDK service" in result["error"] + assert resolver.call_count == 1 + credentials.assert_not_called() + + +@pytest.mark.asyncio +async def test_parameter_error_hints_reuse_the_validated_sdk_method(monkeypatch): + class ExecutionClient: + def get_instance(self, instance_id): + raise AssertionError("method must fail argument binding before execution") + + lookups_before_execution = [] + + def construct(fqn): + lookups_before_execution.append(resolver.call_count) + return ExecutionClient() + + monkeypatch.setattr(server, "_import_client", construct) + with patch.object(server, "_get_client_class", wraps=server._get_client_class) as resolver: + async with Client(server.mcp) as client: + result = (await client.call_tool("invoke_oci_api", { + "client_fqn": "oci.core.ComputeClient", "operation": "get_instance", + })).data + assert result["expected_params"] == ["instance_id"] + assert lookups_before_execution == [resolver.call_count] + + +@pytest.mark.parametrize("fqn", [ + "oci.core.models.not_a_model.CreateVcnDetails", + "oci.core.models.core_type_mapping", + "oci._vendor.models.FakeModel", + "subprocess.Popen", +]) +def test_unexported_model_names_are_rejected_without_imports(fqn): + _ = oci.core.models + with patch("importlib.import_module") as importer, pytest.raises(ValueError): + server._resolve_model_class_from_fqn(fqn) + importer.assert_not_called() + + +@pytest.mark.asyncio +@pytest.mark.parametrize("operation", ["not_an_operation", "__init__", "call_api"]) +async def test_invalid_operation_is_rejected_before_authentication_or_construction(monkeypatch, operation): + credentials = Mock(side_effect=AssertionError("loaded credentials")) + monkeypatch.setattr(server, "_get_config_and_signer", credentials) + with patch.object(oci.core.ComputeClient, "__init__") as constructor, \ + patch.object(server, "_get_client_class", wraps=server._get_client_class) as resolver: + async with Client(server.mcp) as client: + result = (await client.call_tool("invoke_oci_api", { + "client_fqn": "oci.core.ComputeClient", "operation": operation, + })).data + assert "not found or is not public" in result["error"] + assert resolver.call_count == 1 # The error path must not resolve the input again. + credentials.assert_not_called() + constructor.assert_not_called() + + +@pytest.mark.asyncio +@pytest.mark.parametrize("bad_hint", [ + {"__model_fqn": "subprocess.Popen"}, + {"__model": "NotAnOciModel"}, + {"__class": 42}, + {"__model": "CreateVcnDetails", "__class": "CreateSubnetDetails"}, +]) +async def test_all_model_hints_are_validated_before_any_constructor(monkeypatch, bad_hint): + credentials = Mock(side_effect=AssertionError("loaded credentials")) + monkeypatch.setattr(server, "_get_config_and_signer", credentials) + with patch.object(oci.core.ComputeClient, "__init__") as client_constructor, \ + patch.object(oci.core.models.CreateVcnDetails, "__init__") as model_constructor: + async with Client(server.mcp) as client: + result = (await client.call_tool("invoke_oci_api", { + "client_fqn": "oci.core.ComputeClient", "operation": "get_instance", + "params": { + "first": {"__model": "CreateVcnDetails"}, + "later": {"nested": [bad_hint]}, + }, + })).data + assert "model" in result["error"].lower() + credentials.assert_not_called() + client_constructor.assert_not_called() + model_constructor.assert_not_called() + + +def test_cross_service_model_hint_uses_its_own_nested_model_exports(): + models = oci.container_instances.models + result = server._construct_model_from_mapping({ + "__model_fqn": "oci.container_instances.models.CreateContainerInstanceDetails", + "__model": "CreateContainerInstanceDetails", + "shape_config": {"__model": "CreateContainerInstanceShapeConfigDetails", "ocpus": 2}, + }, oci.core.models, []) + assert isinstance(result, models.CreateContainerInstanceDetails) + assert isinstance(result.shape_config, models.CreateContainerInstanceShapeConfigDetails) + assert result.shape_config.ocpus == 2 + + +def test_sdk_polymorphic_model_conversion_is_preserved(): + result = server._construct_model_from_mapping({ + "__model": "LaunchInstanceDetails", + "source_details": {"source_type": "image", "image_id": "example-image"}, + }, oci.core.models, []) + assert isinstance(result.source_details, oci.core.models.InstanceSourceViaImageDetails) + assert result.source_details.image_id == "example-image" diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_server_extras.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_server_extras.py index a1d85a3a0..3608a8ad3 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_server_extras.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_server_extras.py @@ -25,6 +25,9 @@ mcp, ) +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import mock_sdk_services, sdk_service_loader +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import sdk_models + class TestImportClientAndModels: def test_import_client_requires_dotted_fqn(self): @@ -32,40 +35,18 @@ def test_import_client_requires_dotted_fqn(self): _import_client("InvalidFQNWithoutDot") def test_import_client_raises_when_attr_not_class(self): - with patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import: + with mock_sdk_services() as m_import: m_import.return_value = SimpleNamespace(Fake=123) # not a class with pytest.raises(ValueError): _import_client("oci.fake.Fake") - def test_import_models_module_from_client_fqn_returns_none_on_failure(self): - def import_side_effect(name): - if name == "oci.fake.models": - raise ImportError("no models") - return object() - - with patch( - "oracle.oci_cloud_mcp_server.server.import_module", - side_effect=import_side_effect, - ): - mod = _import_models_module_from_client_fqn("oci.fake.FakeClient") - assert mod is None - - def test_import_models_module_from_client_fqn_falls_back_to_parent_package(self): - sentinel = object() - - def import_side_effect(name): - if name == "oci.fake.compute_client.models": - raise ImportError("no client-local models") - if name == "oci.fake.models": - return sentinel - raise ImportError(name) + def test_import_models_module_rejects_unknown_service(self): + with pytest.raises(ValueError, match="Unknown OCI SDK service"): + _import_models_module_from_client_fqn("oci.not_a_service.FakeClient") - with patch( - "oracle.oci_cloud_mcp_server.server.import_module", - side_effect=import_side_effect, - ): - mod = _import_models_module_from_client_fqn("oci.fake.compute_client.FakeClient") - assert mod is sentinel + def test_client_aliases_use_the_same_service_models(self): + for fqn in ("oci.core.ComputeClient", "oci.core.compute_client.ComputeClient"): + assert _import_models_module_from_client_fqn(fqn) is oci.core.models def test_import_models_module_from_real_client_uses_service_models(self): mod = _import_models_module_from_client_fqn("oci.core.compute_client.ComputeClient") @@ -104,7 +85,7 @@ def get_weird(self, id): # noqa: ARG002 fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -137,7 +118,7 @@ class X: ... class TestListClientOperationsErrors: @pytest.mark.asyncio async def test_list_client_operations_raises_on_not_class(self): - with patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import: + with mock_sdk_services() as m_import: m_import.return_value = SimpleNamespace(NotAClient=42) async with Client(mcp) as client: with pytest.raises(ToolError): @@ -155,7 +136,7 @@ class InstanceDetails: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace( + fake_models = sdk_models( InstanceDetails=InstanceDetails, InstanceShapeConfigDetails=InstanceShapeConfigDetails, ) @@ -224,7 +205,7 @@ class MyModel: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping @@ -350,7 +331,7 @@ def __init__(self, config, signer): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -367,7 +348,7 @@ def __init__(self, config, **kwargs): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): signer = object() @@ -390,7 +371,7 @@ def __init__(self, config, signer): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -424,7 +405,7 @@ def __init__(self, config, signer): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -503,7 +484,7 @@ class MyModel: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) with patch("oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn") as m_models: m_models.return_value = fake_models out = _coerce_params_to_oci_models( @@ -520,7 +501,7 @@ class SourceDetails: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(SourceDetails=SourceDetails) + fake_models = sdk_models(SourceDetails=SourceDetails) with patch("oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn") as m_models: m_models.return_value = fake_models out = _coerce_params_to_oci_models("oci.fake.Fake", "op", {"source_details": {"foo": "bar"}}) @@ -555,21 +536,10 @@ def __repr__(self): class TestImportModelsAndResolve: - def test_import_models_success(self, monkeypatch): - # ensure success path returns the mocked models module - fake_models = SimpleNamespace() + def test_import_models_success(self): + from oracle.oci_cloud_mcp_server.server import _import_models_module_from_client_fqn - def fake_import(name): - assert name == "oci.fake.models" - return fake_models - - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", fake_import) - from oracle.oci_cloud_mcp_server.server import ( - _import_models_module_from_client_fqn, - ) - - mod = _import_models_module_from_client_fqn("oci.fake.Client") - assert mod is fake_models + assert _import_models_module_from_client_fqn("oci.core.ComputeClient") is oci.core.models def test_resolve_model_class_missing_returns_none(self): from oracle.oci_cloud_mcp_server.server import _resolve_model_class @@ -590,7 +560,7 @@ def get_plain(self, id): # noqa: ARG002 fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -614,8 +584,7 @@ class TestInvokeImportFailure: @pytest.mark.asyncio async def test_invoke_oci_api_import_error_surfaces_as_error_payload(self): with ( - patch( - "oracle.oci_cloud_mcp_server.server.import_module", + mock_sdk_services( side_effect=ImportError("boom"), ), patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, @@ -678,7 +647,7 @@ def _hidden(self): fake_module = SimpleNamespace(KlassClient=KlassClient) # first run with normal behavior - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) async with Client(mcp) as client: res = (await client.call_tool("list_client_operations", {"client_fqn": "oci.fake.KlassClient"})).data assert isinstance(res, dict) @@ -745,7 +714,7 @@ def get_thing(self, id): # noqa: ARG002 fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as m_import, + mock_sdk_services() as m_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as m_cfg, ): m_import.return_value = fake_module @@ -785,7 +754,7 @@ def test_invalid_fqn_raises(self): def test_not_class_raises_direct(self, monkeypatch): fake_module = SimpleNamespace(NotAClient=42) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) with pytest.raises(Exception): list_client_operations("oci.fake.NotAClient") @@ -799,7 +768,7 @@ def foo(self, a, b=1): # noqa: ARG002 return 1 fake_module = SimpleNamespace(KlassClient=KlassClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) async with Client(mcp) as client: res = (await client.call_tool("list_client_operations", {"client_fqn": "oci.fake.KlassClient"})).data ops = res["operations"] @@ -816,7 +785,7 @@ class MyModel: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) # inject a from_dict into oci.util that calls the constructor from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -835,7 +804,7 @@ class VcnDetails: def __init__(self, **kwargs): self._data = dict(kwargs) - fake_models = SimpleNamespace(VcnDetails=VcnDetails) + fake_models = sdk_models(VcnDetails=VcnDetails) from oracle.oci_cloud_mcp_server.server import oci as _oci @@ -887,8 +856,8 @@ def list_things(self, compartment_id): # noqa: ARG002 # Return a fake client whose response carries the request ID. monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -921,7 +890,7 @@ class SourceConfiguration: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(SourceConfiguration=SourceConfiguration) + fake_models = sdk_models(SourceConfiguration=SourceConfiguration) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: fake_models, @@ -939,7 +908,7 @@ def foo(self): # no docstring return 1 fake_module = SimpleNamespace(KlassClient=KlassClient) - monkeypatch.setattr("oracle.oci_cloud_mcp_server.server.import_module", lambda name: fake_module) + monkeypatch.setattr('oracle.oci_cloud_mcp_server.server._get_service_module', sdk_service_loader(lambda name: fake_module, monkeypatch)) async with Client(mcp) as client: res = (await client.call_tool("list_client_operations", {"client_fqn": "oci.fake.KlassClient"})).data ops = res["operations"] @@ -958,9 +927,12 @@ def update_vcn(update_vcn_details): # noqa: ARG001 class TestCoerceParamsBothKeysProvided: - def test_no_double_rename_when_dst_already_present(self): + def test_no_double_rename_when_dst_already_present(self, monkeypatch): + monkeypatch.setattr( + "oracle.oci_cloud_mcp_server.server._import_models_module_from_client_fqn", lambda fqn: None, + ) out = _coerce_params_to_oci_models( - "oci.fake.Fake", + "oci.core.ComputeClient", "create_vcn", {"vcn_details": {"x": 1}, "create_vcn_details": {"y": 2}}, ) @@ -1008,8 +980,8 @@ def create_vcn(self, create_vcn_details): # noqa: ARG001 # provide FakeClient monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) # basic config/signer monkeypatch.setattr( @@ -1074,8 +1046,8 @@ def get_thing(self, id): # noqa: ARG002 return {"ok": True} monkeypatch.setattr( - "oracle.oci_cloud_mcp_server.server.import_module", - lambda name: SimpleNamespace(FakeClient=FakeClient), + 'oracle.oci_cloud_mcp_server.server._get_service_module', + sdk_service_loader(lambda name: SimpleNamespace(FakeClient=FakeClient), monkeypatch), ) monkeypatch.setattr( "oracle.oci_cloud_mcp_server.server._get_config_and_signer", @@ -1109,7 +1081,7 @@ class MyModel: def __init__(self, **kwargs): self.kw = dict(kwargs) - fake_models = SimpleNamespace(MyModel=MyModel) + fake_models = sdk_models(MyModel=MyModel) from oracle.oci_cloud_mcp_server.server import _construct_model_from_mapping from oracle.oci_cloud_mcp_server.server import oci as _oci diff --git a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_tools.py b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_tools.py index ec728d83f..9c4f24b44 100644 --- a/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_tools.py +++ b/src/oci-cloud-mcp-server/oracle/oci_cloud_mcp_server/tests/test_tools.py @@ -13,6 +13,8 @@ from oracle.oci_cloud_mcp_server import __project__ from oracle.oci_cloud_mcp_server.server import mcp +from oracle.oci_cloud_mcp_server.tests.sdk_fixtures import mock_sdk_services + __version__ = importlib.metadata.version(__project__) user_agent_name = __project__.split("oracle.", 1)[1].split("-server", 1)[0] USER_AGENT = f"{user_agent_name}/{__version__}" @@ -35,7 +37,7 @@ def _hidden(self): fake_module = SimpleNamespace(FakeClient=FakeClient) - with patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import: + with mock_sdk_services() as mock_import: mock_import.return_value = fake_module async with Client(mcp) as client: @@ -71,7 +73,7 @@ def get_thing(self, id): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, ): mock_import.return_value = fake_module @@ -114,7 +116,7 @@ def list_things(self, compartment_id): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, ): mock_import.return_value = fake_module @@ -157,7 +159,7 @@ def get_zone_records(self, zone_name, page=None, limit=None): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, ): mock_import.return_value = fake_module @@ -200,7 +202,7 @@ def summarize_metrics(self, compartment_id): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, ): mock_import.return_value = fake_module @@ -243,7 +245,7 @@ def get_rr_set(self, zone_name_or_id, domain, rtype, page=None, limit=None): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, ): mock_import.return_value = fake_module @@ -290,7 +292,7 @@ def get_config(self, id): fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, patch( "oracle.oci_cloud_mcp_server.server.oci.pagination.list_call_get_all_results" @@ -341,7 +343,7 @@ def get_widget(self, widget_id, **kwargs): # noqa: ARG002 fake_module = SimpleNamespace(FakeClient=FakeClient) with ( - patch("oracle.oci_cloud_mcp_server.server.import_module") as mock_import, + mock_sdk_services() as mock_import, patch("oracle.oci_cloud_mcp_server.server._get_config_and_signer") as mock_cfg, patch( "oracle.oci_cloud_mcp_server.server.oci.pagination.list_call_get_all_results" diff --git a/src/oci-cloud-mcp-server/pyproject.toml b/src/oci-cloud-mcp-server/pyproject.toml index a1d528a5d..e5c2bdce7 100644 --- a/src/oci-cloud-mcp-server/pyproject.toml +++ b/src/oci-cloud-mcp-server/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "oracle.oci-cloud-mcp-server" -version = "2.3.0" +version = "2.3.1" description = "OCI Python SDK MCP server" readme = "README.md" requires-python = ">=3.13" diff --git a/src/oci-cloud-mcp-server/uv.lock b/src/oci-cloud-mcp-server/uv.lock index 9bd17a1a0..b6d4de4eb 100644 --- a/src/oci-cloud-mcp-server/uv.lock +++ b/src/oci-cloud-mcp-server/uv.lock @@ -1150,7 +1150,7 @@ dev = [ [[package]] name = "oracle-oci-cloud-mcp-server" -version = "2.3.0" +version = "2.3.1" source = { editable = "." } dependencies = [ { name = "fastmcp" },