Unify solver and reorganize neural components

[tylerbessire]

Summary

• merge enhanced solver into a single solver.py with baseline fallbacks and stricter validation
• move guidance, episodic memory, and sketches into new arc_solver.neural package
• implement robust model save/load for neural guidance and update docs & tools

Testing

• pytest -q

---

https://chatgpt.com/codex/tasks/task_e_68c1e447be988322ac075ee0d45ab73e

Summary by CodeRabbit

• New Features
  • Class-based solver with enhanced and baseline modes, two-attempt solving, “best so far” fallback, and runtime stats.
  • More robust model load/save with safer IO and clearer errors.
  • New task feature extraction module.
• Refactor
  • Public API now imported from arc_solver.solver; neural components reorganized under arc_solver.neural.
  • Training, mining, memory-building, and benchmarking utilities moved to tools/.
• Documentation
  • Quick Start and API examples updated to new module paths; architecture docs aligned.
• Chores
  • Project structure and layout verification updated; tests directory surfaced.

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

Reorganizes neural components under arc_solver/neural, deletes arc_solver/enhanced_solver.py, and introduces a new class-based ARCSolver in arc_solver/solver.py with enhanced and baseline flows. Updates imports across tools, tests, and scripts. README and docs reflect new module paths and tools. Layout verification and public exports are adjusted.

Changes

Cohort / File(s)	Summary of Changes
Solver refactor and API relocation arc_solver/solver.py, arc_solver/enhanced_solver.py (removed), arc_submit.py, tools/benchmark.py	Replaces deleted enhanced_solver with class-based ARCSolver and module-level wrappers in solver.py; adds enhanced/baseline flows, validation, diversification, stats; updates imports in submit and benchmarking.
Neural package restructuring arc_solver/neural/__init__.py, arc_solver/neural/guidance.py, arc_solver/neural/episodic.py, arc_solver/neural/sketches.py, arc_solver/enhanced_search.py	Creates neural package initializer exporting components; updates import paths; implements concrete JSON load/save for SimpleClassifier; adjusts relative imports; updates enhanced_search to new neural paths.
Docs and README updates README.md, docs/architecture.md	Updates public import paths to arc_solver.solver and arc_solver.neural.*; reflects tools relocation; shows project structure updates including tests/.
Tools relocation and import updates tools/train_guidance.py, tools/mine_sketches.py, tools/build_memory.py, tools/benchmark.py	Points tooling to new neural modules and solver API; no logic changes.
Tests import updates tests/test_guidance.py, tests/test_memory.py	Switches imports to arc_solver.neural submodules; formatting-only changes otherwise.
Layout verification adjustments tools/verify_layout.py	Updates REQUIRED paths to expect neural-era files; removes older non-neural entries; ordering tweaked.
Public module visibility arc_solver/features (publicized)	New public module noted for task features; referenced by neural components.

Sequence Diagram(s)

sequenceDiagram
  autonumber
  actor User
  participant Solver as ARCSolver
  participant Enh as Enhanced Path
  participant Base as Baseline Path

  User->>Solver: solve_task(task)
  alt Enhancements enabled
    Solver->>Enh: synthesize_with_enhancements(task)
    Enh-->>Solver: program / plan
    Solver->>Enh: predict_two_enhanced(task)
    Enh-->>Solver: outputs
    Solver->>Solver: _validate_solution(outputs)
    alt Valid
      Solver-->>User: outputs
    else Invalid / Degenerate
      Solver->>Base: synthesize_baseline(task)
      Base-->>Solver: baseline program
      Solver->>Base: predict_two_baseline(task)
      Base-->>Solver: outputs (sanitized)
      Solver-->>User: outputs
    end
  else Enhancements disabled
    Solver->>Base: synthesize_baseline + predict_two_baseline
    Base-->>Solver: outputs
    Solver-->>User: outputs
  end

  note over Solver: solve_task_two_attempts(task)\n- If two answers identical, run _second_pass_diversified\n- Try alternate enhanced then baseline for diversity

Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Poem

I twitch my ears at modules new,
Neural burrows, pathways true.
The old warren sealed—solver reborn,
Two hops forward: enhance, then norm.
Tests nibble imports, tools align—
Carrots of stats now neatly fine.
Thump! The grid is mine.

---

📜 Recent review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2e2f8d8 and 425ceda.

📒 Files selected for processing (17)

• README.md (2 hunks)
• arc_solver/enhanced_search.py (1 hunks)
• arc_solver/enhanced_solver.py (0 hunks)
• arc_solver/neural/__init__.py (1 hunks)
• arc_solver/neural/episodic.py (1 hunks)
• arc_solver/neural/guidance.py (2 hunks)
• arc_solver/neural/sketches.py (1 hunks)
• arc_solver/solver.py (1 hunks)
• arc_submit.py (1 hunks)
• docs/architecture.md (2 hunks)
• tests/test_guidance.py (1 hunks)
• tests/test_memory.py (1 hunks)
• tools/benchmark.py (1 hunks)
• tools/build_memory.py (1 hunks)
• tools/mine_sketches.py (1 hunks)
• tools/train_guidance.py (1 hunks)
• tools/verify_layout.py (1 hunks)

✨ Finishing Touches

• 📝 Generate Docstrings

🧪 Generate unit tests

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch codex/merge-enhanced_solver-into-solver

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}