Compare commits

...

3 Commits

Author SHA1 Message Date
fdacbf5e78 feat: sidecar config validation on deploy (#690)
Some checks failed
Architecture Lint / Linter Tests (pull_request) Successful in 8s
PR Checklist / pr-checklist (pull_request) Failing after 1m14s
Smoke Test / smoke (pull_request) Failing after 5s
Validate Config / YAML Lint (pull_request) Failing after 4s
Validate Config / Shell Script Lint (pull_request) Failing after 11s
Validate Config / Cron Syntax Check (pull_request) Successful in 3s
Validate Config / Deploy Script Dry Run (pull_request) Successful in 3s
Validate Config / JSON Validate (pull_request) Successful in 4s
Validate Config / Python Syntax & Import Check (pull_request) Failing after 21s
Validate Config / Playbook Schema Validation (pull_request) Successful in 6s
Architecture Lint / Lint Repository (pull_request) Has been cancelled
Validate Config / Python Test Suite (pull_request) Has been cancelled
2026-04-17 05:10:11 +00:00
60c3838c2b feat: config validator with schema checks (#690)
Some checks failed
Architecture Lint / Linter Tests (pull_request) Successful in 44s
PR Checklist / pr-checklist (pull_request) Failing after 4m2s
Smoke Test / smoke (pull_request) Failing after 9s
Validate Config / YAML Lint (pull_request) Failing after 30s
Validate Config / JSON Validate (pull_request) Successful in 29s
Validate Config / Shell Script Lint (pull_request) Failing after 1m8s
Validate Config / Cron Syntax Check (pull_request) Successful in 14s
Validate Config / Python Syntax & Import Check (pull_request) Failing after 1m52s
Validate Config / Deploy Script Dry Run (pull_request) Successful in 10s
Validate Config / Playbook Schema Validation (pull_request) Successful in 17s
Architecture Lint / Lint Repository (pull_request) Has been cancelled
Validate Config / Python Test Suite (pull_request) Has been cancelled
2026-04-15 03:35:41 +00:00
9251ffc4b5 test 2026-04-15 03:34:20 +00:00
2 changed files with 290 additions and 0 deletions

83
bin/validate_config.py Normal file
View File

@@ -0,0 +1,83 @@
#!/usr/bin/env python3
"""
Config Validator -- pre-deploy YAML validation for timmy-config sidecar.
Validates YAML syntax, required keys (model.default, model.provider,
toolsets), and provider names before deploy.sh writes to ~/.hermes/.
Usage:
python3 bin/validate_config.py [path/to/config.yaml]
python3 bin/validate_config.py --strict (fail on warnings too)
"""
import json, os, sys, yaml
from pathlib import Path
REQUIRED = {
"model": {"type": dict, "keys": {"default": str, "provider": str}},
"toolsets": {"type": list},
}
ALLOWED_PROVIDERS = [
"anthropic", "openai", "nous", "ollama", "openrouter", "openai-codex"
]
def validate(path):
errors = []
try:
with open(path) as f:
data = yaml.safe_load(f)
except Exception as e:
return [f"YAML parse error: {e}"]
if not isinstance(data, dict):
return [f"Expected mapping, got {type(data).__name__}"]
for key, spec in REQUIRED.items():
if key not in data:
errors.append(f"Required key missing: {key}")
continue
if spec["type"] == dict and not isinstance(data[key], dict):
errors.append(f"{key}: expected dict")
continue
if spec["type"] == list and not isinstance(data[key], list):
errors.append(f"{key}: expected list")
continue
if "keys" in spec:
for sub, sub_type in spec["keys"].items():
if sub not in data[key]:
errors.append(f"{key}.{sub}: required")
elif not isinstance(data[key][sub], sub_type):
errors.append(f"{key}.{sub}: expected {sub_type.__name__}")
provider = data.get("model", {}).get("provider")
if provider and provider not in ALLOWED_PROVIDERS:
errors.append(f"model.provider: unknown provider '{provider}'")
# Check JSON files
for jf in ["channel_directory.json"]:
jp = Path(path).parent / jf
if jp.exists():
try:
json.loads(jp.read_text())
except Exception as e:
errors.append(f"{jf}: invalid JSON: {e}")
return errors
def main():
strict = "--strict" in sys.argv
args = [a for a in sys.argv[1:] if not a.startswith("--")]
path = args[0] if args else str(Path(__file__).parent.parent / "config.yaml")
if not os.path.exists(path):
print(f"ERROR: {path} not found")
sys.exit(1)
errs = validate(path)
if errs:
for e in errs:
print(f"ERROR: {e}")
print(f"Validation FAILED: {len(errs)} issue(s)")
sys.exit(1)
print(f"OK: {path} is valid")
if __name__ == "__main__":
main()

View File

@@ -0,0 +1,207 @@
#!/usr/bin/env python3
"""
validate-sidecar-config.py — Pre-deploy validation for timmy-config sidecar.
Validates YAML syntax, required keys, value types before deploy.
Rejects bad config with clear errors.
Usage:
python3 scripts/validate-sidecar-config.py ~/.timmy/config.yaml
python3 scripts/validate-sidecar-config.py --all # Validate all config files
python3 scripts/validate-sidecar-config.py --schema # Print expected schema
"""
import argparse
import json
import os
import sys
from pathlib import Path
try:
import yaml
HAS_YAML = True
except ImportError:
HAS_YAML = False
# Expected schema: field -> type
REQUIRED_SCHEMA = {
"model": str,
"provider": str,
}
OPTIONAL_SCHEMA = {
"api_base": str,
"max_tokens": int,
"temperature": (int, float),
"system_prompt": str,
"tools": list,
"memory_enabled": bool,
"session_timeout": int,
"log_level": str,
}
CONFIG_DIRS = [
Path.home() / ".timmy",
Path.home() / ".hermes",
]
def validate_yaml_syntax(filepath: Path) -> list[str]:
"""Validate YAML can be parsed."""
errors = []
try:
content = filepath.read_text(errors="ignore")
if HAS_YAML:
yaml.safe_load(content)
else:
# Fallback: check for basic JSON-in-YAML
json.loads(content)
except (yaml.YAMLError if HAS_YAML else Exception, json.JSONDecodeError) as e:
errors.append(f"YAML syntax error: {e}")
except OSError as e:
errors.append(f"Cannot read file: {e}")
return errors
def validate_schema(filepath: Path) -> list[str]:
"""Validate config against expected schema."""
errors = []
try:
content = filepath.read_text(errors="ignore")
if HAS_YAML:
config = yaml.safe_load(content) or {}
else:
config = json.loads(content)
except Exception as e:
return [f"Cannot parse: {e}"]
if not isinstance(config, dict):
return ["Config must be a YAML/JSON object (dict)"]
# Check required keys
for key, expected_type in REQUIRED_SCHEMA.items():
if key not in config:
errors.append(f"Missing required key: '{key}' (expected {expected_type.__name__})")
elif not isinstance(config[key], expected_type):
errors.append(f"Wrong type for '{key}': expected {expected_type.__name__}, got {type(config[key]).__name__}")
# Check optional keys types
for key, expected_type in OPTIONAL_SCHEMA.items():
if key in config:
if isinstance(expected_type, tuple):
if not isinstance(config[key], expected_type):
type_names = " or ".join(t.__name__ for t in expected_type)
errors.append(f"Wrong type for '{key}': expected {type_names}, got {type(config[key]).__name__}")
else:
if not isinstance(config[key], expected_type):
errors.append(f"Wrong type for '{key}': expected {expected_type.__name__}, got {type(config[key]).__name__}")
# Check for common mistakes
if "model" in config and isinstance(config["model"], str):
if config["model"].startswith("http"):
errors.append("'model' looks like a URL — did you mean 'api_base'?")
if "api_base" in config and isinstance(config["api_base"], str):
if not config["api_base"].startswith("http"):
errors.append("'api_base' should start with http:// or https://")
return errors
def validate_file(filepath: Path) -> tuple[bool, list[str]]:
"""Full validation of a config file. Returns (valid, errors)."""
errors = []
errors.extend(validate_yaml_syntax(filepath))
if not errors:
errors.extend(validate_schema(filepath))
return len(errors) == 0, errors
def find_config_files() -> list[Path]:
"""Find config files in standard locations."""
configs = []
for d in CONFIG_DIRS:
if not d.exists():
continue
for f in d.rglob("*.yaml"):
if f.name in ("config.yaml", "settings.yaml", "env.yaml", "config.yml"):
configs.append(f)
for f in d.rglob("*.yml"):
if "config" in f.name.lower():
configs.append(f)
for f in d.rglob("*.json"):
if f.name in ("config.json", "settings.json"):
configs.append(f)
return sorted(set(configs))
def cmd_validate(filepath: str) -> bool:
path = Path(filepath)
if not path.exists():
print(f"ERROR: {path} not found")
return False
valid, errors = validate_file(path)
if valid:
print(f"OK: {path}")
else:
print(f"FAIL: {path}")
for e in errors:
print(f" - {e}")
return valid
def cmd_validate_all() -> bool:
configs = find_config_files()
if not configs:
print("No config files found in standard locations.")
return True
all_valid = True
for config in configs:
valid, errors = validate_file(config)
if valid:
print(f"OK: {config}")
else:
all_valid = False
print(f"FAIL: {config}")
for e in errors:
print(f" - {e}")
print(f"\n{'All configs valid.' if all_valid else 'Validation failures found.'}")
return all_valid
def cmd_schema():
print("Required keys:")
for key, typ in REQUIRED_SCHEMA.items():
print(f" {key}: {typ.__name__}")
print("\nOptional keys:")
for key, typ in OPTIONAL_SCHEMA.items():
if isinstance(typ, tuple):
print(f" {key}: {'|'.join(t.__name__ for t in typ)}")
else:
print(f" {key}: {typ.__name__}")
def main():
parser = argparse.ArgumentParser(description="Validate sidecar config files")
parser.add_argument("file", nargs="?", help="Config file to validate")
parser.add_argument("--all", action="store_true", help="Validate all config files")
parser.add_argument("--schema", action="store_true", help="Print expected schema")
args = parser.parse_args()
if args.schema:
cmd_schema()
elif args.all:
ok = cmd_validate_all()
sys.exit(0 if ok else 1)
elif args.file:
ok = cmd_validate(args.file)
sys.exit(0 if ok else 1)
else:
parser.print_help()
if __name__ == "__main__":
main()