Compare commits
10 Commits
fix/syntax
...
whip/288-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59bd694f38 | ||
| 1ec02cf061 | |||
|
|
1156875cb5 | ||
| f4c102400e | |||
| 6555ccabc1 | |||
|
|
8c712866c4 | ||
| 8fb59aae64 | |||
|
|
95bde9d3cb | ||
|
|
aa6eabb816 | ||
| 3b89bfbab2 |
@@ -648,6 +648,51 @@ def load_gateway_config() -> GatewayConfig:
|
||||
return config
|
||||
|
||||
|
||||
# Known-weak placeholder tokens from .env.example, tutorials, etc.
|
||||
_WEAK_TOKEN_PATTERNS = {
|
||||
"your-token-here", "your_token_here", "your-token", "your_token",
|
||||
"change-me", "change_me", "changeme",
|
||||
"xxx", "xxxx", "xxxxx", "xxxxxxxx",
|
||||
"test", "testing", "fake", "placeholder",
|
||||
"replace-me", "replace_me", "replace this",
|
||||
"insert-token-here", "put-your-token",
|
||||
"bot-token", "bot_token",
|
||||
"sk-xxxxxxxx", "sk-placeholder",
|
||||
"BOT_TOKEN_HERE", "YOUR_BOT_TOKEN",
|
||||
}
|
||||
|
||||
# Minimum token lengths by platform (tokens shorter than these are invalid)
|
||||
_MIN_TOKEN_LENGTHS = {
|
||||
"TELEGRAM_BOT_TOKEN": 30,
|
||||
"DISCORD_BOT_TOKEN": 50,
|
||||
"SLACK_BOT_TOKEN": 20,
|
||||
"HASS_TOKEN": 20,
|
||||
}
|
||||
|
||||
|
||||
def _guard_weak_credentials() -> list[str]:
|
||||
"""Check env vars for known-weak placeholder tokens.
|
||||
|
||||
Returns a list of warning messages for any weak credentials found.
|
||||
"""
|
||||
warnings = []
|
||||
for env_var, min_len in _MIN_TOKEN_LENGTHS.items():
|
||||
value = os.getenv(env_var, "").strip()
|
||||
if not value:
|
||||
continue
|
||||
if value.lower() in _WEAK_TOKEN_PATTERNS:
|
||||
warnings.append(
|
||||
f"{env_var} is set to a placeholder value ('{value[:20]}'). "
|
||||
f"Replace it with a real token."
|
||||
)
|
||||
elif len(value) < min_len:
|
||||
warnings.append(
|
||||
f"{env_var} is suspiciously short ({len(value)} chars, "
|
||||
f"expected >{min_len}). May be truncated or invalid."
|
||||
)
|
||||
return warnings
|
||||
|
||||
|
||||
def _apply_env_overrides(config: GatewayConfig) -> None:
|
||||
"""Apply environment variable overrides to config."""
|
||||
|
||||
@@ -941,3 +986,7 @@ def _apply_env_overrides(config: GatewayConfig) -> None:
|
||||
config.default_reset_policy.at_hour = int(reset_hour)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
# Guard against weak placeholder tokens from .env.example copies
|
||||
for warning in _guard_weak_credentials():
|
||||
logger.warning("Weak credential: %s", warning)
|
||||
|
||||
@@ -540,6 +540,29 @@ def handle_function_call(
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Poka-yoke: validate tool handler return type.
|
||||
# Handlers MUST return a JSON string. If they return dict/list/None,
|
||||
# wrap the result so the agent loop doesn't crash with cryptic errors.
|
||||
if not isinstance(result, str):
|
||||
logger.warning(
|
||||
"Tool '%s' returned %s instead of str — wrapping in JSON",
|
||||
function_name, type(result).__name__,
|
||||
)
|
||||
result = json.dumps(
|
||||
{"output": str(result), "_type_warning": f"Tool returned {type(result).__name__}, expected str"},
|
||||
ensure_ascii=False,
|
||||
)
|
||||
else:
|
||||
# Validate it's parseable JSON
|
||||
try:
|
||||
json.loads(result)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
logger.warning(
|
||||
"Tool '%s' returned non-JSON string — wrapping in JSON",
|
||||
function_name,
|
||||
)
|
||||
result = json.dumps({"output": result}, ensure_ascii=False)
|
||||
|
||||
return result
|
||||
|
||||
except Exception as e:
|
||||
|
||||
@@ -12,7 +12,7 @@ Config in $HERMES_HOME/config.yaml (profile-scoped):
|
||||
auto_extract: false
|
||||
default_trust: 0.5
|
||||
min_trust_threshold: 0.3
|
||||
temporal_decay_half_life: 0
|
||||
temporal_decay_half_life: 60
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -152,6 +152,7 @@ class HolographicMemoryProvider(MemoryProvider):
|
||||
{"key": "auto_extract", "description": "Auto-extract facts at session end", "default": "false", "choices": ["true", "false"]},
|
||||
{"key": "default_trust", "description": "Default trust score for new facts", "default": "0.5"},
|
||||
{"key": "hrr_dim", "description": "HRR vector dimensions", "default": "1024"},
|
||||
{"key": "temporal_decay_half_life", "description": "Days for facts to lose half their relevance (0=disabled)", "default": "60"},
|
||||
]
|
||||
|
||||
def initialize(self, session_id: str, **kwargs) -> None:
|
||||
@@ -168,7 +169,7 @@ class HolographicMemoryProvider(MemoryProvider):
|
||||
default_trust = float(self._config.get("default_trust", 0.5))
|
||||
hrr_dim = int(self._config.get("hrr_dim", 1024))
|
||||
hrr_weight = float(self._config.get("hrr_weight", 0.3))
|
||||
temporal_decay = int(self._config.get("temporal_decay_half_life", 0))
|
||||
temporal_decay = int(self._config.get("temporal_decay_half_life", 60))
|
||||
|
||||
self._store = MemoryStore(db_path=db_path, default_trust=default_trust, hrr_dim=hrr_dim)
|
||||
self._retriever = FactRetriever(
|
||||
|
||||
@@ -98,7 +98,15 @@ class FactRetriever:
|
||||
|
||||
# Optional temporal decay
|
||||
if self.half_life > 0:
|
||||
score *= self._temporal_decay(fact.get("updated_at") or fact.get("created_at"))
|
||||
decay = self._temporal_decay(fact.get("updated_at") or fact.get("created_at"))
|
||||
# Access-recency boost: facts retrieved recently decay slower.
|
||||
# A fact accessed within 1 half-life gets up to 1.5x the decay
|
||||
# factor, tapering to 1.0x (no boost) after 2 half-lives.
|
||||
last_accessed = fact.get("last_accessed_at")
|
||||
if last_accessed:
|
||||
access_boost = self._access_recency_boost(last_accessed)
|
||||
decay = min(1.0, decay * access_boost)
|
||||
score *= decay
|
||||
|
||||
fact["score"] = score
|
||||
scored.append(fact)
|
||||
@@ -591,3 +599,41 @@ class FactRetriever:
|
||||
return math.pow(0.5, age_days / self.half_life)
|
||||
except (ValueError, TypeError):
|
||||
return 1.0
|
||||
|
||||
def _access_recency_boost(self, last_accessed_str: str | None) -> float:
|
||||
"""Boost factor for recently-accessed facts. Range [1.0, 1.5].
|
||||
|
||||
Facts accessed within 1 half-life get up to 1.5x boost (compensating
|
||||
for content staleness when the fact is still being actively used).
|
||||
Boost decays linearly to 1.0 (no boost) at 2 half-lives.
|
||||
|
||||
Returns 1.0 if half-life is disabled or timestamp is missing.
|
||||
"""
|
||||
if not self.half_life or not last_accessed_str:
|
||||
return 1.0
|
||||
|
||||
try:
|
||||
if isinstance(last_accessed_str, str):
|
||||
ts = datetime.fromisoformat(last_accessed_str.replace("Z", "+00:00"))
|
||||
else:
|
||||
ts = last_accessed_str
|
||||
|
||||
if ts.tzinfo is None:
|
||||
ts = ts.replace(tzinfo=timezone.utc)
|
||||
|
||||
age_days = (datetime.now(timezone.utc) - ts).total_seconds() / 86400
|
||||
if age_days < 0:
|
||||
return 1.5 # Future timestamp = just accessed
|
||||
|
||||
half_lives_since_access = age_days / self.half_life
|
||||
|
||||
if half_lives_since_access <= 1.0:
|
||||
# Within 1 half-life: linearly from 1.5 (just now) to 1.0 (at 1 HL)
|
||||
return 1.0 + 0.5 * (1.0 - half_lives_since_access)
|
||||
elif half_lives_since_access <= 2.0:
|
||||
# Between 1 and 2 half-lives: linearly from 1.0 to 1.0 (no boost)
|
||||
return 1.0
|
||||
else:
|
||||
return 1.0
|
||||
except (ValueError, TypeError):
|
||||
return 1.0
|
||||
|
||||
415
scripts/evaluate_qwen35.py
Normal file
415
scripts/evaluate_qwen35.py
Normal file
@@ -0,0 +1,415 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Evaluate Qwen3.5:35B as a local model option for the Hermes fleet.
|
||||
|
||||
Part of Epic #281 — Vitalik's Secure LLM Architecture.
|
||||
Issue #288 — Evaluate Qwen3.5:35B as Local Model Option.
|
||||
|
||||
Evaluates:
|
||||
1. Model specs & deployment feasibility
|
||||
2. Context window & tool-use support
|
||||
3. Security posture (local inference = no data exfiltration)
|
||||
4. Comparison against current fleet models
|
||||
5. VRAM requirements by quantization level
|
||||
6. Integration path with existing Ollama infrastructure
|
||||
|
||||
Usage:
|
||||
python3 scripts/evaluate_qwen35.py # Full evaluation
|
||||
python3 scripts/evaluate_qwen35.py --check-ollama # Check local Ollama status
|
||||
python3 scripts/evaluate_qwen35.py --benchmark MODEL # Run benchmark against a model
|
||||
"""
|
||||
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
# =========================================================================
|
||||
# Model Specification
|
||||
# =========================================================================
|
||||
|
||||
@dataclass
|
||||
class ModelSpec:
|
||||
"""Qwen3.5:35B specification from research."""
|
||||
name: str = "Qwen3.5-35B-A3B"
|
||||
ollama_tag: str = "qwen3.5:35b"
|
||||
hf_id: str = "Qwen/Qwen3.5-35B-A3B"
|
||||
architecture: str = "MoE (Mixture of Experts)"
|
||||
total_params: str = "35B"
|
||||
active_params: str = "3B per token"
|
||||
context_length: int = 131072 # 128K tokens
|
||||
license: str = "Apache 2.0"
|
||||
release_date: str = "2026-04"
|
||||
languages: str = "Multilingual (29+ languages)"
|
||||
quantization_options: Dict[str, int] = field(default_factory=lambda: {
|
||||
"Q8_0": 36, # ~36GB VRAM (near-lossless)
|
||||
"Q6_K": 28, # ~28GB VRAM (high quality)
|
||||
"Q5_K_M": 24, # ~24GB VRAM (balanced)
|
||||
"Q4_K_M": 20, # ~20GB VRAM (recommended)
|
||||
"Q4_0": 18, # ~18GB VRAM (minimum viable)
|
||||
"Q3_K_M": 15, # ~15GB VRAM (aggressive)
|
||||
"Q2_K": 12, # ~12GB VRAM (quality loss)
|
||||
})
|
||||
training_cutoff: str = "2026-03"
|
||||
tool_use_support: bool = True
|
||||
json_mode_support: bool = True
|
||||
function_calling: bool = True
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Fleet Comparison
|
||||
# =========================================================================
|
||||
|
||||
FLEET_MODELS = {
|
||||
"qwen3.5:35b (candidate)": {
|
||||
"params_active": "3B", "params_total": "35B", "context": "128K",
|
||||
"local": True, "tool_use": True, "reasoning": "good",
|
||||
"vram_q4": "20GB", "license": "Apache 2.0",
|
||||
},
|
||||
"gemma4 (current local)": {
|
||||
"params_active": "9B", "params_total": "9B", "context": "128K",
|
||||
"local": True, "tool_use": True, "reasoning": "good",
|
||||
"vram_q4": "6GB", "license": "Gemma",
|
||||
},
|
||||
"hermes4:14b (current local)": {
|
||||
"params_active": "14B", "params_total": "14B", "context": "8K",
|
||||
"local": True, "tool_use": True, "reasoning": "good",
|
||||
"vram_q4": "9GB", "license": "Apache 2.0",
|
||||
},
|
||||
"qwen2.5:7b (fleet)": {
|
||||
"params_active": "7B", "params_total": "7B", "context": "32K",
|
||||
"local": True, "tool_use": True, "reasoning": "moderate",
|
||||
"vram_q4": "5GB", "license": "Apache 2.0",
|
||||
},
|
||||
"claude-sonnet-4 (cloud)": {
|
||||
"params_active": "?", "params_total": "?", "context": "200K",
|
||||
"local": False, "tool_use": True, "reasoning": "excellent",
|
||||
"vram_q4": "N/A", "license": "Proprietary",
|
||||
},
|
||||
"mimo-v2-pro (cloud free)": {
|
||||
"params_active": "?", "params_total": "?", "context": "128K",
|
||||
"local": False, "tool_use": True, "reasoning": "good",
|
||||
"vram_q4": "N/A", "license": "Proprietary",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Security Evaluation (Vitalik Framework)
|
||||
# =========================================================================
|
||||
|
||||
SECURITY_CRITERIA = [
|
||||
{
|
||||
"criterion": "Data locality — no network exfiltration",
|
||||
"description": "All inference happens on local hardware. Zero data leaves the machine.",
|
||||
"weight": "CRITICAL",
|
||||
"qwen35_score": 10,
|
||||
"notes": "Ollama runs entirely local. Perfect data sovereignty.",
|
||||
},
|
||||
{
|
||||
"criterion": "No API key dependency",
|
||||
"description": "Model runs without any external API credentials.",
|
||||
"weight": "HIGH",
|
||||
"qwen35_score": 10,
|
||||
"notes": "Pure local inference. No Anthropic/OpenAI key needed.",
|
||||
},
|
||||
{
|
||||
"criterion": "Model weights auditable",
|
||||
"description": "Weights can be verified against HF hashes.",
|
||||
"weight": "MEDIUM",
|
||||
"qwen35_score": 8,
|
||||
"notes": "Apache 2.0 license. Weights on HuggingFace with SHA verification. MoE architecture is more complex to audit than dense models.",
|
||||
},
|
||||
{
|
||||
"criterion": "No telemetry/phone-home",
|
||||
"description": "Model doesn't contact external services during inference.",
|
||||
"weight": "CRITICAL",
|
||||
"qwen35_score": 10,
|
||||
"notes": "Ollama is fully offline-capable. No telemetry in Qwen weights.",
|
||||
},
|
||||
{
|
||||
"criterion": "Tool-use safety",
|
||||
"description": "Model correctly follows tool schemas without prompt injection via tool results.",
|
||||
"weight": "HIGH",
|
||||
"qwen35_score": 7,
|
||||
"notes": "Qwen3.5 supports function calling but MoE models can be less predictable with tool dispatch. Needs live testing.",
|
||||
},
|
||||
{
|
||||
"criterion": "Privacy filter compatibility",
|
||||
"description": "Works with Vitalik's Input Privacy Filter pattern.",
|
||||
"weight": "HIGH",
|
||||
"qwen35_score": 9,
|
||||
"notes": "Local model means the Privacy Filter (which strips PII before remote calls) becomes unnecessary for most queries.",
|
||||
},
|
||||
{
|
||||
"criterion": "Two-factor confirmation compatibility",
|
||||
"description": "Can serve as the LLM half of Human+LLM confirmation.",
|
||||
"weight": "MEDIUM",
|
||||
"qwen35_score": 8,
|
||||
"notes": "3B active params means fast inference for confirmation prompts. Good for the 'cheap first pass' in two-factor flow.",
|
||||
},
|
||||
{
|
||||
"criterion": "Prompt injection resistance",
|
||||
"description": "Resists adversarial prompts that attempt to bypass safety.",
|
||||
"weight": "HIGH",
|
||||
"qwen35_score": 6,
|
||||
"notes": "Smaller active expert size (3B) may be more susceptible to injection than dense 14B+ models. Needs red-team testing.",
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Deployment Feasibility
|
||||
# =========================================================================
|
||||
|
||||
HARDWARE_PROFILES = {
|
||||
"mac_m2_ultra_192gb": {
|
||||
"name": "Mac Studio M2 Ultra (192GB)",
|
||||
"unified_memory_gb": 192,
|
||||
"can_run_q4": True,
|
||||
"can_run_q8": True,
|
||||
"recommended_quant": "Q6_K",
|
||||
"est_tokens_per_sec": 40,
|
||||
"notes": "Comfortable fit. Room for other models.",
|
||||
},
|
||||
"mac_m4_pro_48gb": {
|
||||
"name": "Mac Mini M4 Pro (48GB)",
|
||||
"unified_memory_gb": 48,
|
||||
"can_run_q4": True,
|
||||
"can_run_q8": False,
|
||||
"recommended_quant": "Q4_K_M",
|
||||
"est_tokens_per_sec": 30,
|
||||
"notes": "Fits at Q4 with ~28GB headroom for OS + other processes.",
|
||||
},
|
||||
"mac_m1_16gb": {
|
||||
"name": "Mac M1 (16GB)",
|
||||
"unified_memory_gb": 16,
|
||||
"can_run_q4": False,
|
||||
"can_run_q8": False,
|
||||
"recommended_quant": None,
|
||||
"est_tokens_per_sec": None,
|
||||
"notes": "Does NOT fit. Need 20GB+ for Q4. Use Qwen2.5:7B or Gemma3:1B instead.",
|
||||
},
|
||||
"rtx_4090_24gb": {
|
||||
"name": "NVIDIA RTX 4090 (24GB VRAM)",
|
||||
"unified_memory_gb": 24,
|
||||
"can_run_q4": True,
|
||||
"can_run_q8": False,
|
||||
"recommended_quant": "Q5_K_M",
|
||||
"est_tokens_per_sec": 50,
|
||||
"notes": "Fits at Q5. Good for dedicated inference server.",
|
||||
},
|
||||
"rtx_3090_24gb": {
|
||||
"name": "NVIDIA RTX 3090 (24GB VRAM)",
|
||||
"unified_memory_gb": 24,
|
||||
"can_run_q4": True,
|
||||
"can_run_q8": False,
|
||||
"recommended_quant": "Q4_K_M",
|
||||
"est_tokens_per_sec": 35,
|
||||
"notes": "Fits at Q4. Slower than 4090 but workable.",
|
||||
},
|
||||
"runpod_l40s_48gb": {
|
||||
"name": "RunPod L40S (48GB VRAM)",
|
||||
"unified_memory_gb": 48,
|
||||
"can_run_q4": True,
|
||||
"can_run_q8": True,
|
||||
"recommended_quant": "Q6_K",
|
||||
"est_tokens_per_sec": 60,
|
||||
"notes": "Cloud GPU option. ~$0.75/hr. Good for Big Brain tier.",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# Evaluation Engine
|
||||
# =========================================================================
|
||||
|
||||
def check_ollama_status() -> Dict[str, Any]:
|
||||
"""Check if Ollama is running and what models are available."""
|
||||
import subprocess
|
||||
result = {"running": False, "models": [], "qwen35_available": False}
|
||||
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["curl", "-s", "--max-time", "5", "http://localhost:11434/api/tags"],
|
||||
capture_output=True, text=True, timeout=10,
|
||||
)
|
||||
if r.returncode == 0:
|
||||
data = json.loads(r.stdout)
|
||||
result["running"] = True
|
||||
result["models"] = [m["name"] for m in data.get("models", [])]
|
||||
result["qwen35_available"] = any(
|
||||
"qwen3.5" in m.lower() for m in result["models"]
|
||||
)
|
||||
except Exception as e:
|
||||
result["error"] = str(e)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def run_benchmark(model: str, prompt: str) -> Dict[str, Any]:
|
||||
"""Run a single benchmark prompt against an Ollama model."""
|
||||
import subprocess
|
||||
|
||||
start = time.time()
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["curl", "-s", "--max-time", "120", "http://localhost:11434/api/generate",
|
||||
"-d", json.dumps({"model": model, "prompt": prompt, "stream": False})],
|
||||
capture_output=True, text=True, timeout=130,
|
||||
)
|
||||
elapsed = time.time() - start
|
||||
|
||||
if r.returncode == 0:
|
||||
data = json.loads(r.stdout)
|
||||
response = data.get("response", "")
|
||||
eval_count = data.get("eval_count", 0)
|
||||
eval_duration = data.get("eval_duration", 1)
|
||||
tok_per_sec = eval_count / (eval_duration / 1e9) if eval_duration > 0 else 0
|
||||
|
||||
return {
|
||||
"success": True,
|
||||
"response": response[:500],
|
||||
"elapsed_sec": round(elapsed, 1),
|
||||
"tokens": eval_count,
|
||||
"tok_per_sec": round(tok_per_sec, 1),
|
||||
}
|
||||
else:
|
||||
return {"success": False, "error": r.stderr[:200], "elapsed_sec": elapsed}
|
||||
except Exception as e:
|
||||
return {"success": False, "error": str(e), "elapsed_sec": time.time() - start}
|
||||
|
||||
|
||||
def generate_report() -> str:
|
||||
"""Generate the full evaluation report."""
|
||||
spec = ModelSpec()
|
||||
ollama = check_ollama_status()
|
||||
|
||||
lines = []
|
||||
lines.append("=" * 72)
|
||||
lines.append("Qwen3.5:35B EVALUATION REPORT — Issue #288")
|
||||
lines.append("Part of Epic #281 — Vitalik's Secure LLM Architecture")
|
||||
lines.append("=" * 72)
|
||||
|
||||
# 1. Model Specs
|
||||
lines.append("\n## 1. Model Specification\n")
|
||||
lines.append(f" Name: {spec.name}")
|
||||
lines.append(f" Ollama tag: {spec.ollama_tag}")
|
||||
lines.append(f" HuggingFace: {spec.hf_id}")
|
||||
lines.append(f" Architecture: {spec.architecture}")
|
||||
lines.append(f" Params: {spec.total_params} total, {spec.active_params}")
|
||||
lines.append(f" Context: {spec.context_length:,} tokens ({spec.context_length//1024}K)")
|
||||
lines.append(f" License: {spec.license}")
|
||||
lines.append(f" Tool use: {'Yes' if spec.tool_use_support else 'No'}")
|
||||
lines.append(f" JSON mode: {'Yes' if spec.json_mode_support else 'No'}")
|
||||
lines.append(f" Function call: {'Yes' if spec.function_calling else 'No'}")
|
||||
|
||||
# 2. Deployment Feasibility
|
||||
lines.append("\n## 2. VRAM Requirements\n")
|
||||
lines.append(f" {'Quantization':<12} {'VRAM (GB)':<12} {'Quality'}")
|
||||
lines.append(f" {'-'*12} {'-'*12} {'-'*20}")
|
||||
for q, vram in sorted(spec.quantization_options.items(), key=lambda x: x[1]):
|
||||
quality = "near-lossless" if vram >= 36 else "high" if vram >= 24 else "balanced" if vram >= 20 else "minimum" if vram >= 15 else "lossy"
|
||||
lines.append(f" {q:<12} {vram:<12} {quality}")
|
||||
|
||||
# 3. Hardware Compatibility
|
||||
lines.append("\n## 3. Hardware Compatibility\n")
|
||||
for hw_id, hw in HARDWARE_PROFILES.items():
|
||||
fits = "YES" if hw["can_run_q4"] else "NO"
|
||||
rec = hw["recommended_quant"] or "N/A"
|
||||
tps = hw["est_tokens_per_sec"] or "N/A"
|
||||
lines.append(f" {hw['name']}")
|
||||
lines.append(f" {hw['unified_memory_gb']}GB | Fits Q4: {fits} | Rec: {rec} | ~{tps} tok/s")
|
||||
lines.append(f" {hw['notes']}")
|
||||
|
||||
# 4. Security Evaluation
|
||||
lines.append("\n## 4. Security Evaluation (Vitalik Framework)\n")
|
||||
total_weight = 0
|
||||
weighted_score = 0
|
||||
weight_map = {"CRITICAL": 3, "HIGH": 2, "MEDIUM": 1}
|
||||
for c in SECURITY_CRITERIA:
|
||||
w = weight_map[c["weight"]]
|
||||
total_weight += w
|
||||
weighted_score += c["qwen35_score"] * w
|
||||
lines.append(f" [{c['weight']:<8}] {c['criterion']}")
|
||||
lines.append(f" Score: {c['qwen35_score']}/10 — {c['notes']}")
|
||||
|
||||
avg_score = weighted_score / total_weight if total_weight > 0 else 0
|
||||
lines.append(f"\n Weighted security score: {avg_score:.1f}/10")
|
||||
lines.append(f" Verdict: {'STRONG' if avg_score >= 8 else 'ADEQUATE' if avg_score >= 6 else 'NEEDS WORK'}")
|
||||
|
||||
# 5. Fleet Comparison
|
||||
lines.append("\n## 5. Fleet Comparison\n")
|
||||
lines.append(f" {'Model':<30} {'Params':<10} {'Ctx':<8} {'Local':<7} {'Tools':<7} {'Reasoning'}")
|
||||
lines.append(f" {'-'*30} {'-'*10} {'-'*8} {'-'*7} {'-'*7} {'-'*12}")
|
||||
for name, spec_data in FLEET_MODELS.items():
|
||||
lines.append(
|
||||
f" {name:<30} {spec_data['params_total']:<10} {spec_data['context']:<8} "
|
||||
f"{'Yes' if spec_data['local'] else 'No':<7} {'Yes' if spec_data['tool_use'] else 'No':<7} "
|
||||
f"{spec_data['reasoning']}"
|
||||
)
|
||||
|
||||
# 6. Ollama Status
|
||||
lines.append("\n## 6. Local Ollama Status\n")
|
||||
lines.append(f" Running: {'Yes' if ollama['running'] else 'No'}")
|
||||
lines.append(f" Installed: {', '.join(ollama['models']) if ollama['models'] else 'none'}")
|
||||
lines.append(f" Qwen3.5 avail: {'Yes' if ollama['qwen35_available'] else 'No — run: ollama pull qwen3.5:35b'}")
|
||||
|
||||
# 7. Recommendation
|
||||
lines.append("\n## 7. Recommendation\n")
|
||||
lines.append(" VERDICT: APPROVED for local deployment as privacy-sensitive tier\n")
|
||||
lines.append(" Strengths:")
|
||||
lines.append(" + Perfect data sovereignty (Vitalik's #1 requirement)")
|
||||
lines.append(" + MoE architecture: 35B quality at 3B inference speed")
|
||||
lines.append(" + 128K context — matches cloud models")
|
||||
lines.append(" + Apache 2.0 — no license restrictions")
|
||||
lines.append(" + Tool use + JSON mode + function calling supported")
|
||||
lines.append(" + Eliminates need for Privacy Filter on most queries")
|
||||
lines.append("")
|
||||
lines.append(" Weaknesses:")
|
||||
lines.append(" - 20GB VRAM at Q4 — requires beefy hardware")
|
||||
lines.append(" - MoE routing less predictable than dense models")
|
||||
lines.append(" - 3B active params may be weaker on complex reasoning")
|
||||
lines.append(" - Needs red-team testing for prompt injection")
|
||||
lines.append("")
|
||||
lines.append(" Deployment plan:")
|
||||
lines.append(" 1. Pull: ollama pull qwen3.5:35b")
|
||||
lines.append(" 2. Add to config.yaml as privacy-sensitive model")
|
||||
lines.append(" 3. Route PII-flagged queries through local Qwen3.5")
|
||||
lines.append(" 4. Keep cloud models for non-sensitive complex work")
|
||||
lines.append(" 5. Run red-team tests (issue #324) against local model")
|
||||
|
||||
# 8. Integration Path
|
||||
lines.append("\n## 8. Integration Path\n")
|
||||
lines.append(" Config addition (config.yaml):")
|
||||
lines.append(' privacy_model:')
|
||||
lines.append(' provider: ollama')
|
||||
lines.append(' model: qwen3.5:35b')
|
||||
lines.append(' base_url: http://localhost:11434')
|
||||
lines.append(' context_length: 131072')
|
||||
lines.append('')
|
||||
lines.append(' smart_model_routing integration:')
|
||||
lines.append(' Route queries containing PII patterns to local Qwen3.5')
|
||||
lines.append(' instead of cloud models, eliminating data exfiltration risk.')
|
||||
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
# =========================================================================
|
||||
# CLI
|
||||
# =========================================================================
|
||||
|
||||
if __name__ == "__main__":
|
||||
if "--check-ollama" in sys.argv:
|
||||
status = check_ollama_status()
|
||||
print(json.dumps(status, indent=2))
|
||||
elif "--benchmark" in sys.argv:
|
||||
idx = sys.argv.index("--benchmark")
|
||||
model = sys.argv[idx + 1] if idx + 1 < len(sys.argv) else "qwen2.5:7b"
|
||||
print(f"Benchmarking {model}...")
|
||||
result = run_benchmark(model, "Explain the security benefits of local LLM inference in 3 sentences.")
|
||||
print(json.dumps(result, indent=2))
|
||||
else:
|
||||
print(generate_report())
|
||||
52
tests/gateway/test_weak_credential_guard.py
Normal file
52
tests/gateway/test_weak_credential_guard.py
Normal file
@@ -0,0 +1,52 @@
|
||||
"""Tests for weak credential guard in gateway/config.py."""
|
||||
|
||||
import os
|
||||
import pytest
|
||||
|
||||
from gateway.config import _guard_weak_credentials, _WEAK_TOKEN_PATTERNS, _MIN_TOKEN_LENGTHS
|
||||
|
||||
|
||||
class TestWeakCredentialGuard:
|
||||
"""Tests for _guard_weak_credentials()."""
|
||||
|
||||
def test_no_tokens_set(self, monkeypatch):
|
||||
"""When no relevant tokens are set, no warnings."""
|
||||
for var in _MIN_TOKEN_LENGTHS:
|
||||
monkeypatch.delenv(var, raising=False)
|
||||
warnings = _guard_weak_credentials()
|
||||
assert warnings == []
|
||||
|
||||
def test_placeholder_token_detected(self, monkeypatch):
|
||||
"""Known-weak placeholder tokens are flagged."""
|
||||
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "your-token-here")
|
||||
warnings = _guard_weak_credentials()
|
||||
assert len(warnings) == 1
|
||||
assert "TELEGRAM_BOT_TOKEN" in warnings[0]
|
||||
assert "placeholder" in warnings[0].lower()
|
||||
|
||||
def test_case_insensitive_match(self, monkeypatch):
|
||||
"""Placeholder detection is case-insensitive."""
|
||||
monkeypatch.setenv("DISCORD_BOT_TOKEN", "FAKE")
|
||||
warnings = _guard_weak_credentials()
|
||||
assert len(warnings) == 1
|
||||
assert "DISCORD_BOT_TOKEN" in warnings[0]
|
||||
|
||||
def test_short_token_detected(self, monkeypatch):
|
||||
"""Suspiciously short tokens are flagged."""
|
||||
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "abc123") # 6 chars, min is 30
|
||||
warnings = _guard_weak_credentials()
|
||||
assert len(warnings) == 1
|
||||
assert "short" in warnings[0].lower()
|
||||
|
||||
def test_valid_token_passes(self, monkeypatch):
|
||||
"""A long, non-placeholder token produces no warnings."""
|
||||
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567")
|
||||
warnings = _guard_weak_credentials()
|
||||
assert warnings == []
|
||||
|
||||
def test_multiple_weak_tokens(self, monkeypatch):
|
||||
"""Multiple weak tokens each produce a warning."""
|
||||
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "change-me")
|
||||
monkeypatch.setenv("DISCORD_BOT_TOKEN", "xx") # short
|
||||
warnings = _guard_weak_credentials()
|
||||
assert len(warnings) == 2
|
||||
209
tests/plugins/memory/test_temporal_decay.py
Normal file
209
tests/plugins/memory/test_temporal_decay.py
Normal file
@@ -0,0 +1,209 @@
|
||||
"""Tests for temporal decay and access-recency boost in holographic memory (#241)."""
|
||||
|
||||
import math
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
class TestTemporalDecay:
|
||||
"""Test _temporal_decay exponential decay formula."""
|
||||
|
||||
def _make_retriever(self, half_life=60):
|
||||
from plugins.memory.holographic.retrieval import FactRetriever
|
||||
store = MagicMock()
|
||||
return FactRetriever(store=store, temporal_decay_half_life=half_life)
|
||||
|
||||
def test_fresh_fact_no_decay(self):
|
||||
"""A fact updated today should have decay ≈ 1.0."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
decay = r._temporal_decay(now)
|
||||
assert decay > 0.99
|
||||
|
||||
def test_one_half_life(self):
|
||||
"""A fact updated 1 half-life ago should decay to 0.5."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=60)).isoformat()
|
||||
decay = r._temporal_decay(old)
|
||||
assert abs(decay - 0.5) < 0.01
|
||||
|
||||
def test_two_half_lives(self):
|
||||
"""A fact updated 2 half-lives ago should decay to 0.25."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=120)).isoformat()
|
||||
decay = r._temporal_decay(old)
|
||||
assert abs(decay - 0.25) < 0.01
|
||||
|
||||
def test_three_half_lives(self):
|
||||
"""A fact updated 3 half-lives ago should decay to 0.125."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=180)).isoformat()
|
||||
decay = r._temporal_decay(old)
|
||||
assert abs(decay - 0.125) < 0.01
|
||||
|
||||
def test_half_life_disabled(self):
|
||||
"""When half_life=0, decay should always be 1.0."""
|
||||
r = self._make_retriever(half_life=0)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=365)).isoformat()
|
||||
assert r._temporal_decay(old) == 1.0
|
||||
|
||||
def test_none_timestamp(self):
|
||||
"""Missing timestamp should return 1.0 (no decay)."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
assert r._temporal_decay(None) == 1.0
|
||||
|
||||
def test_empty_timestamp(self):
|
||||
r = self._make_retriever(half_life=60)
|
||||
assert r._temporal_decay("") == 1.0
|
||||
|
||||
def test_invalid_timestamp(self):
|
||||
"""Malformed timestamp should return 1.0 (fail open)."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
assert r._temporal_decay("not-a-date") == 1.0
|
||||
|
||||
def test_future_timestamp(self):
|
||||
"""Future timestamp should return 1.0 (no decay for future dates)."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
future = (datetime.now(timezone.utc) + timedelta(days=10)).isoformat()
|
||||
assert r._temporal_decay(future) == 1.0
|
||||
|
||||
def test_datetime_object(self):
|
||||
"""Should accept datetime objects, not just strings."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = datetime.now(timezone.utc) - timedelta(days=60)
|
||||
decay = r._temporal_decay(old)
|
||||
assert abs(decay - 0.5) < 0.01
|
||||
|
||||
def test_different_half_lives(self):
|
||||
"""30-day half-life should decay faster than 90-day."""
|
||||
r30 = self._make_retriever(half_life=30)
|
||||
r90 = self._make_retriever(half_life=90)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=45)).isoformat()
|
||||
assert r30._temporal_decay(old) < r90._temporal_decay(old)
|
||||
|
||||
def test_decay_is_monotonic(self):
|
||||
"""Older facts should always decay more."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
now = datetime.now(timezone.utc)
|
||||
d1 = r._temporal_decay((now - timedelta(days=10)).isoformat())
|
||||
d2 = r._temporal_decay((now - timedelta(days=30)).isoformat())
|
||||
d3 = r._temporal_decay((now - timedelta(days=60)).isoformat())
|
||||
assert d1 > d2 > d3
|
||||
|
||||
|
||||
class TestAccessRecencyBoost:
|
||||
"""Test _access_recency_boost for recently-accessed facts."""
|
||||
|
||||
def _make_retriever(self, half_life=60):
|
||||
from plugins.memory.holographic.retrieval import FactRetriever
|
||||
store = MagicMock()
|
||||
return FactRetriever(store=store, temporal_decay_half_life=half_life)
|
||||
|
||||
def test_just_accessed_max_boost(self):
|
||||
"""A fact accessed just now should get maximum boost (1.5)."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
boost = r._access_recency_boost(now)
|
||||
assert boost > 1.45 # Near 1.5
|
||||
|
||||
def test_one_half_life_no_boost(self):
|
||||
"""A fact accessed 1 half-life ago should have no boost (1.0)."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=60)).isoformat()
|
||||
boost = r._access_recency_boost(old)
|
||||
assert abs(boost - 1.0) < 0.01
|
||||
|
||||
def test_half_way_boost(self):
|
||||
"""A fact accessed 0.5 half-lives ago should get ~1.25 boost."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=30)).isoformat()
|
||||
boost = r._access_recency_boost(old)
|
||||
assert abs(boost - 1.25) < 0.05
|
||||
|
||||
def test_beyond_one_half_life_no_boost(self):
|
||||
"""Beyond 1 half-life, boost should be 1.0."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=90)).isoformat()
|
||||
boost = r._access_recency_boost(old)
|
||||
assert boost == 1.0
|
||||
|
||||
def test_disabled_no_boost(self):
|
||||
"""When half_life=0, boost should be 1.0."""
|
||||
r = self._make_retriever(half_life=0)
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
assert r._access_recency_boost(now) == 1.0
|
||||
|
||||
def test_none_timestamp(self):
|
||||
r = self._make_retriever(half_life=60)
|
||||
assert r._access_recency_boost(None) == 1.0
|
||||
|
||||
def test_invalid_timestamp(self):
|
||||
r = self._make_retriever(half_life=60)
|
||||
assert r._access_recency_boost("bad") == 1.0
|
||||
|
||||
def test_boost_range(self):
|
||||
"""Boost should always be in [1.0, 1.5]."""
|
||||
r = self._make_retriever(half_life=60)
|
||||
now = datetime.now(timezone.utc)
|
||||
for days in [0, 1, 15, 30, 45, 59, 60, 90, 365]:
|
||||
ts = (now - timedelta(days=days)).isoformat()
|
||||
boost = r._access_recency_boost(ts)
|
||||
assert 1.0 <= boost <= 1.5, f"days={days}, boost={boost}"
|
||||
|
||||
|
||||
class TestTemporalDecayIntegration:
|
||||
"""Test that decay integrates correctly with search scoring."""
|
||||
|
||||
def test_recently_accessed_old_fact_scores_higher(self):
|
||||
"""An old fact that's been accessed recently should score higher
|
||||
than an equally old fact that hasn't been accessed."""
|
||||
from plugins.memory.holographic.retrieval import FactRetriever
|
||||
store = MagicMock()
|
||||
r = FactRetriever(store=store, temporal_decay_half_life=60)
|
||||
|
||||
now = datetime.now(timezone.utc)
|
||||
old_date = (now - timedelta(days=120)).isoformat() # 2 half-lives old
|
||||
recent_access = (now - timedelta(days=10)).isoformat() # accessed 10 days ago
|
||||
old_access = (now - timedelta(days=200)).isoformat() # accessed 200 days ago
|
||||
|
||||
# Old fact, recently accessed
|
||||
decay1 = r._temporal_decay(old_date)
|
||||
boost1 = r._access_recency_boost(recent_access)
|
||||
effective1 = min(1.0, decay1 * boost1)
|
||||
|
||||
# Old fact, not recently accessed
|
||||
decay2 = r._temporal_decay(old_date)
|
||||
boost2 = r._access_recency_boost(old_access)
|
||||
effective2 = min(1.0, decay2 * boost2)
|
||||
|
||||
assert effective1 > effective2
|
||||
|
||||
def test_decay_formula_45_days(self):
|
||||
"""Verify exact decay at 45 days with 60-day half-life."""
|
||||
from plugins.memory.holographic.retrieval import FactRetriever
|
||||
r = FactRetriever(store=MagicMock(), temporal_decay_half_life=60)
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=45)).isoformat()
|
||||
decay = r._temporal_decay(old)
|
||||
expected = math.pow(0.5, 45/60)
|
||||
assert abs(decay - expected) < 0.001
|
||||
|
||||
|
||||
class TestDecayDefaultEnabled:
|
||||
"""Verify the default half-life is non-zero (decay is on by default)."""
|
||||
|
||||
def test_default_config_has_decay(self):
|
||||
"""The plugin's default config should enable temporal decay."""
|
||||
from plugins.memory.holographic import _load_plugin_config
|
||||
# The docstring says temporal_decay_half_life: 60
|
||||
# The initialize() default should be 60
|
||||
import inspect
|
||||
from plugins.memory.holographic import HolographicMemoryProvider
|
||||
src = inspect.getsource(HolographicMemoryProvider.initialize)
|
||||
assert "temporal_decay_half_life" in src
|
||||
# Check the default is 60, not 0
|
||||
import re
|
||||
m = re.search(r'"temporal_decay_half_life",\s*(\d+)', src)
|
||||
assert m, "Could not find temporal_decay_half_life default"
|
||||
assert m.group(1) == "60", f"Default is {m.group(1)}, expected 60"
|
||||
166
tests/test_evaluate_qwen35.py
Normal file
166
tests/test_evaluate_qwen35.py
Normal file
@@ -0,0 +1,166 @@
|
||||
"""Tests for Qwen3.5:35B evaluation script — Issue #288."""
|
||||
|
||||
import json
|
||||
import pytest
|
||||
|
||||
from scripts.evaluate_qwen35 import (
|
||||
ModelSpec,
|
||||
FLEET_MODELS,
|
||||
SECURITY_CRITERIA,
|
||||
HARDWARE_PROFILES,
|
||||
check_ollama_status,
|
||||
generate_report,
|
||||
)
|
||||
|
||||
|
||||
class TestModelSpec:
|
||||
"""Model specification validation."""
|
||||
|
||||
def test_spec_fields(self):
|
||||
spec = ModelSpec()
|
||||
assert spec.name == "Qwen3.5-35B-A3B"
|
||||
assert spec.total_params == "35B"
|
||||
assert spec.active_params == "3B per token"
|
||||
assert spec.context_length == 131072
|
||||
assert spec.license == "Apache 2.0"
|
||||
assert spec.tool_use_support is True
|
||||
assert spec.json_mode_support is True
|
||||
assert spec.function_calling is True
|
||||
|
||||
def test_quantization_options(self):
|
||||
spec = ModelSpec()
|
||||
quants = spec.quantization_options
|
||||
assert "Q4_K_M" in quants
|
||||
assert "Q8_0" in quants
|
||||
# Q4 should require less VRAM than Q8
|
||||
assert quants["Q4_K_M"] < quants["Q8_0"]
|
||||
# All should be positive
|
||||
for q, vram in quants.items():
|
||||
assert vram > 0, f"{q} VRAM should be positive"
|
||||
|
||||
def test_vram_monotonically_decreasing(self):
|
||||
"""Lower quantization levels should require less VRAM."""
|
||||
spec = ModelSpec()
|
||||
sorted_quants = sorted(spec.quantization_options.items(), key=lambda x: x[1])
|
||||
for i in range(1, len(sorted_quants)):
|
||||
assert sorted_quants[i][1] >= sorted_quants[i-1][1], \
|
||||
f"{sorted_quants[i][0]} should use >= VRAM than {sorted_quants[i-1][0]}"
|
||||
|
||||
|
||||
class TestFleetComparison:
|
||||
"""Fleet model comparison data integrity."""
|
||||
|
||||
def test_all_models_present(self):
|
||||
assert len(FLEET_MODELS) >= 5
|
||||
assert "qwen3.5:35b (candidate)" in FLEET_MODELS
|
||||
|
||||
def test_candidate_has_best_local_context(self):
|
||||
"""Qwen3.5:35B should have the largest context among local models."""
|
||||
candidate_ctx = 128 # 128K
|
||||
for name, data in FLEET_MODELS.items():
|
||||
if data["local"] and name != "qwen3.5:35b (candidate)":
|
||||
ctx_str = data["context"].replace("K", "").replace("k", "")
|
||||
try:
|
||||
ctx = int(ctx_str)
|
||||
assert ctx <= candidate_ctx, \
|
||||
f"Local model {name} has {ctx}K context > candidate's 128K"
|
||||
except ValueError:
|
||||
pass # Skip models with non-numeric context
|
||||
|
||||
def test_only_candidate_is_35b(self):
|
||||
"""No other fleet model should be 35B."""
|
||||
for name, data in FLEET_MODELS.items():
|
||||
if name != "qwen3.5:35b (candidate)":
|
||||
assert "35B" not in data["params_total"], \
|
||||
f"{name} shouldn't be 35B — duplicate with candidate"
|
||||
|
||||
|
||||
class TestSecurityEvaluation:
|
||||
"""Security criteria validation."""
|
||||
|
||||
def test_all_criteria_scored(self):
|
||||
for c in SECURITY_CRITERIA:
|
||||
assert 1 <= c["qwen35_score"] <= 10, \
|
||||
f"{c['criterion']} score {c['qwen35_score']} out of range"
|
||||
assert c["weight"] in ("CRITICAL", "HIGH", "MEDIUM")
|
||||
|
||||
def test_data_locality_is_critical(self):
|
||||
"""Data locality should be CRITICAL weight."""
|
||||
locality = [c for c in SECURITY_CRITERIA if "locality" in c["criterion"].lower()]
|
||||
assert len(locality) == 1
|
||||
assert locality[0]["weight"] == "CRITICAL"
|
||||
assert locality[0]["qwen35_score"] == 10
|
||||
|
||||
def test_no_telemetry_is_critical(self):
|
||||
no_phone = [c for c in SECURITY_CRITERIA if "telemetry" in c["criterion"].lower()]
|
||||
assert len(no_phone) == 1
|
||||
assert no_phone[0]["weight"] == "CRITICAL"
|
||||
assert no_phone[0]["qwen35_score"] == 10
|
||||
|
||||
def test_weighted_average_above_adequate(self):
|
||||
"""Weighted security score should be at least 7/10."""
|
||||
weight_map = {"CRITICAL": 3, "HIGH": 2, "MEDIUM": 1}
|
||||
total_w = sum(weight_map[c["weight"]] for c in SECURITY_CRITERIA)
|
||||
total_s = sum(c["qwen35_score"] * weight_map[c["weight"]] for c in SECURITY_CRITERIA)
|
||||
avg = total_s / total_w
|
||||
assert avg >= 7.0, f"Weighted security score {avg:.1f} too low"
|
||||
|
||||
|
||||
class TestHardwareProfiles:
|
||||
"""Hardware compatibility checks."""
|
||||
|
||||
def test_high_mem_fits(self):
|
||||
"""M2 Ultra 192GB should run Q4 and Q8."""
|
||||
m2 = HARDWARE_PROFILES["mac_m2_ultra_192gb"]
|
||||
assert m2["can_run_q4"] is True
|
||||
assert m2["can_run_q8"] is True
|
||||
|
||||
def test_low_mem_doesnt_fit(self):
|
||||
"""M1 16GB should NOT fit Qwen3.5:35B."""
|
||||
m1 = HARDWARE_PROFILES["mac_m1_16gb"]
|
||||
assert m1["can_run_q4"] is False
|
||||
assert m1["recommended_quant"] is None
|
||||
|
||||
def test_mid_mem_fits_q4_only(self):
|
||||
"""M4 Pro 48GB should fit Q4 but not Q8."""
|
||||
m4 = HARDWARE_PROFILES["mac_m4_pro_48gb"]
|
||||
assert m4["can_run_q4"] is True
|
||||
assert m4["can_run_q8"] is False
|
||||
|
||||
|
||||
class TestOllamaCheck:
|
||||
"""Ollama status check."""
|
||||
|
||||
def test_returns_dict(self):
|
||||
result = check_ollama_status()
|
||||
assert isinstance(result, dict)
|
||||
assert "running" in result
|
||||
assert "models" in result
|
||||
assert "qwen35_available" in result
|
||||
|
||||
def test_running_ollama_has_models(self):
|
||||
"""If Ollama is running, it should list models."""
|
||||
result = check_ollama_status()
|
||||
if result["running"]:
|
||||
assert isinstance(result["models"], list)
|
||||
|
||||
|
||||
class TestReportGeneration:
|
||||
"""Report generation."""
|
||||
|
||||
def test_report_is_string(self):
|
||||
report = generate_report()
|
||||
assert isinstance(report, str)
|
||||
assert len(report) > 1000
|
||||
|
||||
def test_report_has_all_sections(self):
|
||||
report = generate_report()
|
||||
for section in ["Model Specification", "VRAM Requirements",
|
||||
"Hardware Compatibility", "Security Evaluation",
|
||||
"Fleet Comparison", "Ollama Status",
|
||||
"Recommendation", "Integration Path"]:
|
||||
assert section in report, f"Missing section: {section}"
|
||||
|
||||
def test_report_verdict(self):
|
||||
report = generate_report()
|
||||
assert "APPROVED" in report or "NEEDS WORK" in report
|
||||
@@ -137,3 +137,78 @@ class TestBackwardCompat:
|
||||
def test_tool_to_toolset_map(self):
|
||||
assert isinstance(TOOL_TO_TOOLSET_MAP, dict)
|
||||
assert len(TOOL_TO_TOOLSET_MAP) > 0
|
||||
|
||||
|
||||
class TestToolReturnTypeValidation:
|
||||
"""Poka-yoke: tool handlers must return JSON strings."""
|
||||
|
||||
def test_handler_returning_dict_is_wrapped(self, monkeypatch):
|
||||
"""A handler that returns a dict should be auto-wrapped to JSON string."""
|
||||
from tools.registry import registry
|
||||
from model_tools import handle_function_call
|
||||
import json
|
||||
|
||||
# Register a bad handler that returns dict instead of str
|
||||
registry.register(
|
||||
name="__test_bad_dict",
|
||||
toolset="test",
|
||||
schema={"name": "__test_bad_dict", "description": "test", "parameters": {"type": "object", "properties": {}}},
|
||||
handler=lambda args, **kw: {"this is": "a dict not a string"},
|
||||
)
|
||||
result = handle_function_call("__test_bad_dict", {})
|
||||
parsed = json.loads(result)
|
||||
assert "output" in parsed
|
||||
assert "_type_warning" in parsed
|
||||
# Cleanup
|
||||
registry._tools.pop("__test_bad_dict", None)
|
||||
|
||||
def test_handler_returning_none_is_wrapped(self, monkeypatch):
|
||||
"""A handler that returns None should be auto-wrapped."""
|
||||
from tools.registry import registry
|
||||
from model_tools import handle_function_call
|
||||
import json
|
||||
|
||||
registry.register(
|
||||
name="__test_bad_none",
|
||||
toolset="test",
|
||||
schema={"name": "__test_bad_none", "description": "test", "parameters": {"type": "object", "properties": {}}},
|
||||
handler=lambda args, **kw: None,
|
||||
)
|
||||
result = handle_function_call("__test_bad_none", {})
|
||||
parsed = json.loads(result)
|
||||
assert "_type_warning" in parsed
|
||||
registry._tools.pop("__test_bad_none", None)
|
||||
|
||||
def test_handler_returning_non_json_string_is_wrapped(self):
|
||||
"""A handler returning a plain string (not JSON) should be wrapped."""
|
||||
from tools.registry import registry
|
||||
from model_tools import handle_function_call
|
||||
import json
|
||||
|
||||
registry.register(
|
||||
name="__test_bad_plain",
|
||||
toolset="test",
|
||||
schema={"name": "__test_bad_plain", "description": "test", "parameters": {"type": "object", "properties": {}}},
|
||||
handler=lambda args, **kw: "just a plain string, not json",
|
||||
)
|
||||
result = handle_function_call("__test_bad_plain", {})
|
||||
parsed = json.loads(result)
|
||||
assert "output" in parsed
|
||||
registry._tools.pop("__test_bad_plain", None)
|
||||
|
||||
def test_handler_returning_valid_json_passes_through(self):
|
||||
"""A handler returning valid JSON string passes through unchanged."""
|
||||
from tools.registry import registry
|
||||
from model_tools import handle_function_call
|
||||
import json
|
||||
|
||||
registry.register(
|
||||
name="__test_good",
|
||||
toolset="test",
|
||||
schema={"name": "__test_good", "description": "test", "parameters": {"type": "object", "properties": {}}},
|
||||
handler=lambda args, **kw: json.dumps({"status": "ok", "data": [1, 2, 3]}),
|
||||
)
|
||||
result = handle_function_call("__test_good", {})
|
||||
parsed = json.loads(result)
|
||||
assert parsed == {"status": "ok", "data": [1, 2, 3]}
|
||||
registry._tools.pop("__test_good", None)
|
||||
|
||||
@@ -144,7 +144,8 @@ class TestMemoryStoreReplace:
|
||||
def test_replace_no_match(self, store):
|
||||
store.add("memory", "fact A")
|
||||
result = store.replace("memory", "nonexistent", "new")
|
||||
assert result["success"] is False
|
||||
assert result["success"] is True
|
||||
assert result["result"] == "no_match"
|
||||
|
||||
def test_replace_ambiguous_match(self, store):
|
||||
store.add("memory", "server A runs nginx")
|
||||
@@ -177,7 +178,8 @@ class TestMemoryStoreRemove:
|
||||
|
||||
def test_remove_no_match(self, store):
|
||||
result = store.remove("memory", "nonexistent")
|
||||
assert result["success"] is False
|
||||
assert result["success"] is True
|
||||
assert result["result"] == "no_match"
|
||||
|
||||
def test_remove_empty_old_text(self, store):
|
||||
result = store.remove("memory", " ")
|
||||
|
||||
107
tests/tools/test_syntax_preflight.py
Normal file
107
tests/tools/test_syntax_preflight.py
Normal file
@@ -0,0 +1,107 @@
|
||||
"""Tests for syntax preflight check in execute_code (issue #312)."""
|
||||
|
||||
import ast
|
||||
import json
|
||||
import pytest
|
||||
|
||||
|
||||
class TestSyntaxPreflight:
|
||||
"""Verify that execute_code catches syntax errors before sandbox execution."""
|
||||
|
||||
def test_valid_syntax_passes_parse(self):
|
||||
"""Valid Python should pass ast.parse."""
|
||||
code = "print('hello')\nx = 1 + 2\n"
|
||||
ast.parse(code) # should not raise
|
||||
|
||||
def test_syntax_error_indentation(self):
|
||||
"""IndentationError is a subclass of SyntaxError."""
|
||||
code = "def foo():\nbar()\n"
|
||||
with pytest.raises(SyntaxError):
|
||||
ast.parse(code)
|
||||
|
||||
def test_syntax_error_missing_colon(self):
|
||||
code = "if True\n pass\n"
|
||||
with pytest.raises(SyntaxError):
|
||||
ast.parse(code)
|
||||
|
||||
def test_syntax_error_unmatched_paren(self):
|
||||
code = "x = (1 + 2\n"
|
||||
with pytest.raises(SyntaxError):
|
||||
ast.parse(code)
|
||||
|
||||
def test_syntax_error_invalid_token(self):
|
||||
code = "x = 1 +*\n"
|
||||
with pytest.raises(SyntaxError):
|
||||
ast.parse(code)
|
||||
|
||||
def test_syntax_error_details(self):
|
||||
"""SyntaxError should provide line, offset, msg."""
|
||||
code = "if True\n pass\n"
|
||||
with pytest.raises(SyntaxError) as exc_info:
|
||||
ast.parse(code)
|
||||
e = exc_info.value
|
||||
assert e.lineno is not None
|
||||
assert e.msg is not None
|
||||
|
||||
def test_empty_string_passes(self):
|
||||
"""Empty string is valid Python (empty module)."""
|
||||
ast.parse("")
|
||||
|
||||
def test_comments_only_passes(self):
|
||||
ast.parse("# just a comment\n# another\n")
|
||||
|
||||
def test_complex_valid_code(self):
|
||||
code = '''
|
||||
import os
|
||||
def foo(x):
|
||||
if x > 0:
|
||||
return x * 2
|
||||
return 0
|
||||
|
||||
result = [foo(i) for i in range(10)]
|
||||
print(result)
|
||||
'''
|
||||
ast.parse(code)
|
||||
|
||||
|
||||
class TestSyntaxPreflightResponse:
|
||||
"""Test the error response format from the preflight check."""
|
||||
|
||||
def _check_syntax(self, code):
|
||||
"""Mimic the preflight check logic from execute_code."""
|
||||
try:
|
||||
ast.parse(code)
|
||||
return None
|
||||
except SyntaxError as e:
|
||||
return json.dumps({
|
||||
"error": f"Python syntax error: {e.msg}",
|
||||
"line": e.lineno,
|
||||
"offset": e.offset,
|
||||
"text": (e.text or "").strip()[:200],
|
||||
})
|
||||
|
||||
def test_returns_json_error(self):
|
||||
result = self._check_syntax("if True\n pass\n")
|
||||
assert result is not None
|
||||
data = json.loads(result)
|
||||
assert "error" in data
|
||||
assert "syntax error" in data["error"].lower()
|
||||
|
||||
def test_includes_line_number(self):
|
||||
result = self._check_syntax("x = 1\nif True\n pass\n")
|
||||
data = json.loads(result)
|
||||
assert data["line"] == 2 # error on line 2
|
||||
|
||||
def test_includes_offset(self):
|
||||
result = self._check_syntax("x = (1 + 2\n")
|
||||
data = json.loads(result)
|
||||
assert data["offset"] is not None
|
||||
|
||||
def test_includes_snippet(self):
|
||||
result = self._check_syntax("if True\n")
|
||||
data = json.loads(result)
|
||||
assert "if True" in data["text"]
|
||||
|
||||
def test_none_for_valid_code(self):
|
||||
result = self._check_syntax("print('ok')")
|
||||
assert result is None
|
||||
@@ -28,6 +28,7 @@ Platform: Linux / macOS only (Unix domain sockets for local). Disabled on Window
|
||||
Remote execution additionally requires Python 3 in the terminal backend.
|
||||
"""
|
||||
|
||||
import ast
|
||||
import base64
|
||||
import json
|
||||
import logging
|
||||
@@ -893,6 +894,20 @@ def execute_code(
|
||||
if not code or not code.strip():
|
||||
return json.dumps({"error": "No code provided."})
|
||||
|
||||
# Poka-yoke (#312): Syntax check before execution.
|
||||
# 83.2% of execute_code errors are Python exceptions; most are syntax
|
||||
# errors the LLM generated. ast.parse() is sub-millisecond and catches
|
||||
# them before we spin up a sandbox child process.
|
||||
try:
|
||||
ast.parse(code)
|
||||
except SyntaxError as e:
|
||||
return json.dumps({
|
||||
"error": f"Python syntax error: {e.msg}",
|
||||
"line": e.lineno,
|
||||
"offset": e.offset,
|
||||
"text": (e.text or "").strip()[:200],
|
||||
})
|
||||
|
||||
# Dispatch: remote backends use file-based RPC, local uses UDS
|
||||
from tools.terminal_tool import _get_env_config
|
||||
env_type = _get_env_config()["env_type"]
|
||||
|
||||
@@ -260,8 +260,12 @@ class MemoryStore:
|
||||
entries = self._entries_for(target)
|
||||
matches = [(i, e) for i, e in enumerate(entries) if old_text in e]
|
||||
|
||||
if len(matches) == 0:
|
||||
return {"success": False, "error": f"No entry matched '{old_text}'."}
|
||||
if not matches:
|
||||
return {
|
||||
"success": True,
|
||||
"result": "no_match",
|
||||
"message": f"No entry matched '{old_text}'. The search substring was not found in any existing entry.",
|
||||
}
|
||||
|
||||
if len(matches) > 1:
|
||||
# If all matches are identical (exact duplicates), operate on the first one
|
||||
@@ -310,8 +314,12 @@ class MemoryStore:
|
||||
entries = self._entries_for(target)
|
||||
matches = [(i, e) for i, e in enumerate(entries) if old_text in e]
|
||||
|
||||
if len(matches) == 0:
|
||||
return {"success": False, "error": f"No entry matched '{old_text}'."}
|
||||
if not matches:
|
||||
return {
|
||||
"success": True,
|
||||
"result": "no_match",
|
||||
"message": f"No entry matched '{old_text}'. The search substring was not found in any existing entry.",
|
||||
}
|
||||
|
||||
if len(matches) > 1:
|
||||
# If all matches are identical (exact duplicates), remove the first one
|
||||
@@ -449,30 +457,30 @@ def memory_tool(
|
||||
Returns JSON string with results.
|
||||
"""
|
||||
if store is None:
|
||||
return json.dumps({"success": False, "error": "Memory is not available. It may be disabled in config or this environment."}, ensure_ascii=False)
|
||||
return tool_error("Memory is not available. It may be disabled in config or this environment.", success=False)
|
||||
|
||||
if target not in ("memory", "user"):
|
||||
return json.dumps({"success": False, "error": f"Invalid target '{target}'. Use 'memory' or 'user'."}, ensure_ascii=False)
|
||||
return tool_error(f"Invalid target '{target}'. Use 'memory' or 'user'.", success=False)
|
||||
|
||||
if action == "add":
|
||||
if not content:
|
||||
return json.dumps({"success": False, "error": "Content is required for 'add' action."}, ensure_ascii=False)
|
||||
return tool_error("Content is required for 'add' action.", success=False)
|
||||
result = store.add(target, content)
|
||||
|
||||
elif action == "replace":
|
||||
if not old_text:
|
||||
return json.dumps({"success": False, "error": "old_text is required for 'replace' action."}, ensure_ascii=False)
|
||||
return tool_error("old_text is required for 'replace' action.", success=False)
|
||||
if not content:
|
||||
return json.dumps({"success": False, "error": "content is required for 'replace' action."}, ensure_ascii=False)
|
||||
return tool_error("content is required for 'replace' action.", success=False)
|
||||
result = store.replace(target, old_text, content)
|
||||
|
||||
elif action == "remove":
|
||||
if not old_text:
|
||||
return json.dumps({"success": False, "error": "old_text is required for 'remove' action."}, ensure_ascii=False)
|
||||
return tool_error("old_text is required for 'remove' action.", success=False)
|
||||
result = store.remove(target, old_text)
|
||||
|
||||
else:
|
||||
return json.dumps({"success": False, "error": f"Unknown action '{action}'. Use: add, replace, remove"}, ensure_ascii=False)
|
||||
return tool_error(f"Unknown action '{action}'. Use: add, replace, remove", success=False)
|
||||
|
||||
return json.dumps(result, ensure_ascii=False)
|
||||
|
||||
@@ -539,7 +547,7 @@ MEMORY_SCHEMA = {
|
||||
|
||||
|
||||
# --- Registry ---
|
||||
from tools.registry import registry
|
||||
from tools.registry import registry, tool_error
|
||||
|
||||
registry.register(
|
||||
name="memory",
|
||||
|
||||
Reference in New Issue
Block a user