This commit is contained in:
@@ -42,10 +42,16 @@ class McpServerSpec:
|
||||
class ModelConfig:
|
||||
default: str
|
||||
roles: Mapping[str, str] = field(default_factory=dict)
|
||||
# Seconds one model request may take, for the roles whose replies are long. A
|
||||
# role not named here gets the runtime's default.
|
||||
timeouts: Mapping[str, float] = field(default_factory=dict)
|
||||
|
||||
def for_role(self, role: str) -> str:
|
||||
return self.roles.get(role, self.default)
|
||||
|
||||
def timeout_for(self, role: str) -> float | None:
|
||||
return self.timeouts.get(role)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderBundle:
|
||||
@@ -60,6 +66,9 @@ class ProviderBundle:
|
||||
role_mcp_servers: Mapping[str, tuple[str, ...]]
|
||||
role_skills: Mapping[str, tuple[str, ...]] = field(default_factory=dict)
|
||||
pillar_skills: Mapping[str, str] = field(default_factory=dict)
|
||||
# The Terraform providers generated code is written for, pinned so the schema
|
||||
# lookup, the patterns and validation agree: {name: {source, version}}.
|
||||
terraform_providers: Mapping[str, Mapping[str, str]] = field(default_factory=dict)
|
||||
|
||||
def mcp_servers_for_role(
|
||||
self, role: str, include_preview: bool = True
|
||||
@@ -108,10 +117,34 @@ def load_provider(name: str, root: Path | None = None) -> ProviderBundle:
|
||||
models = config.get("models") or {}
|
||||
if not isinstance(models.get("default"), str) or not models["default"]:
|
||||
raise fail("'models.default' is required")
|
||||
timeouts = {}
|
||||
for role, seconds in (models.get("timeout_seconds") or {}).items():
|
||||
if isinstance(seconds, bool) or not isinstance(seconds, (int, float)):
|
||||
raise fail(f"'models.timeout_seconds' for {role!r} must be a number")
|
||||
if seconds <= 0:
|
||||
raise fail(f"'models.timeout_seconds' for {role!r} must be positive")
|
||||
timeouts[str(role)] = float(seconds)
|
||||
model_config = ModelConfig(
|
||||
default=models["default"], roles=dict(models.get("roles") or {})
|
||||
default=models["default"],
|
||||
roles=dict(models.get("roles") or {}),
|
||||
timeouts=timeouts,
|
||||
)
|
||||
|
||||
terraform_providers = {}
|
||||
pins = (config.get("terraform") or {}).get("required_providers") or {}
|
||||
for provider, pin in pins.items():
|
||||
if not isinstance(pin, dict) or not all(
|
||||
isinstance(pin.get(key), str) and pin[key] for key in ("source", "version")
|
||||
):
|
||||
raise fail(
|
||||
f"terraform provider {provider!r} needs a 'source' and an exact "
|
||||
"'version', both strings"
|
||||
)
|
||||
terraform_providers[str(provider)] = {
|
||||
"source": pin["source"],
|
||||
"version": pin["version"],
|
||||
}
|
||||
|
||||
tools = {}
|
||||
for tier, tool_names in (config.get("tools") or {}).items():
|
||||
if tier not in TIERS:
|
||||
@@ -173,4 +206,5 @@ def load_provider(name: str, root: Path | None = None) -> ProviderBundle:
|
||||
role_mcp_servers=role_mcp_servers,
|
||||
role_skills=role_skills,
|
||||
pillar_skills=pillar_skills,
|
||||
terraform_providers=terraform_providers,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user