Merge remote-tracking branch 'upstream/main'

Author: eilamt

configs/default_config.yaml

@@ -78,10 +78,15 @@ prompt:
   # Feature extraction and program labeling thresholds
   # These control how the LLM perceives and categorizes programs
   suggest_simplification_after_chars: 500     # Suggest simplifying if program exceeds this many characters
-  include_changes_under_chars: 100           # Include change descriptions in features if under this length  
+  include_changes_under_chars: 100           # Include change descriptions in features if under this length
   concise_implementation_max_lines: 10        # Label as "concise" if program has this many lines or fewer
   comprehensive_implementation_min_lines: 50  # Label as "comprehensive" if program has this many lines or more
 
+  # Diff summary formatting for "Previous Attempts" section
+  # Controls how SEARCH/REPLACE blocks are displayed in prompts
+  diff_summary_max_line_len: 100              # Truncate lines longer than this (with "...")
+  diff_summary_max_lines: 30                  # Max lines per SEARCH/REPLACE block
+
   # Note: meta-prompting features are not yet implemented
 
 # Database configuration

openevolve/config.py

@@ -281,6 +281,10 @@ class PromptConfig:
         50  # Label as "comprehensive" if program has this many lines or more
     )
 
+    # Diff summary formatting for "Previous Attempts" section
+    diff_summary_max_line_len: int = 100  # Truncate lines longer than this
+    diff_summary_max_lines: int = 30  # Max lines per SEARCH/REPLACE block
+
     # Backward compatibility - deprecated
     code_length_threshold: Optional[int] = (
         None  # Deprecated: use suggest_simplification_after_chars
@@ -340,7 +344,9 @@ class DatabaseConfig:
     artifact_size_threshold: int = 32 * 1024  # 32KB threshold
     cleanup_old_artifacts: bool = True
     artifact_retention_days: int = 30
-    max_snapshot_artifacts: Optional[int] = 100  # Max artifacts in worker snapshots (None=unlimited)
+    max_snapshot_artifacts: Optional[int] = (
+        100  # Max artifacts in worker snapshots (None=unlimited)
+    )
 
     novelty_llm: Optional["LLMInterface"] = None
     embedding_model: Optional[str] = None
@@ -427,9 +433,18 @@ class Config:
     @classmethod
     def from_yaml(cls, path: Union[str, Path]) -> "Config":
         """Load configuration from a YAML file"""
-        with open(path, "r") as f:
+        config_path = Path(path).resolve()
+        with open(config_path, "r") as f:
             config_dict = yaml.safe_load(f)
-        return cls.from_dict(config_dict)
+        config = cls.from_dict(config_dict)
+
+        # Resolve template_dir relative to config file location
+        if config.prompt.template_dir:
+            template_path = Path(config.prompt.template_dir)
+            if not template_path.is_absolute():
+                config.prompt.template_dir = str((config_path.parent / template_path).resolve())
+
+        return config
 
     @classmethod
     def from_dict(cls, config_dict: Dict[str, Any]) -> "Config":

openevolve/iteration.py

@@ -1,12 +1,12 @@
 import asyncio
-import os
-import uuid
 import logging
+import os
 import time
+import uuid
 from dataclasses import dataclass
 
-from openevolve.database import Program, ProgramDatabase
 from openevolve.config import Config
+from openevolve.database import Program, ProgramDatabase
 from openevolve.evaluator import Evaluator
 from openevolve.llm.ensemble import LLMEnsemble
 from openevolve.prompt.sampler import PromptSampler
@@ -63,8 +63,7 @@ async def run_iteration_with_shared_db(
         # Build prompt
         if config.prompt.programs_as_changes_description:
             parent_changes_desc = (
-                parent.changes_description
-                or config.prompt.initial_changes_description
+                parent.changes_description or config.prompt.initial_changes_description
             )
             child_changes_desc = parent_changes_desc
         else:
@@ -115,20 +114,34 @@ async def run_iteration_with_shared_db(
                     return None
 
                 child_code, _ = apply_diff_blocks(parent.code, code_blocks)
-                child_changes_desc, desc_applied = apply_diff_blocks(parent_changes_desc, desc_blocks)
+                child_changes_desc, desc_applied = apply_diff_blocks(
+                    parent_changes_desc, desc_blocks
+                )
 
                 # Must update the previous changes description
-                if desc_applied == 0 or not child_changes_desc.strip() or child_changes_desc.strip() == parent_changes_desc.strip():
+                if (
+                    desc_applied == 0
+                    or not child_changes_desc.strip()
+                    or child_changes_desc.strip() == parent_changes_desc.strip()
+                ):
                     logger.warning(
                         f"Iteration {iteration+1}: changes_description was not updated or empty, program is discarded"
                     )
                     return None
 
-                changes_summary = format_diff_summary(code_blocks)
+                changes_summary = format_diff_summary(
+                    code_blocks,
+                    max_line_len=config.prompt.diff_summary_max_line_len,
+                    max_lines=config.prompt.diff_summary_max_lines,
+                )
             else:
                 # All diffs applied only to code
                 child_code = apply_diff(parent.code, llm_response, config.diff_pattern)
-                changes_summary = format_diff_summary(diff_blocks)
+                changes_summary = format_diff_summary(
+                    diff_blocks,
+                    max_line_len=config.prompt.diff_summary_max_line_len,
+                    max_lines=config.prompt.diff_summary_max_lines,
+                )
         else:
             # Parse full rewrite
             new_code = parse_full_rewrite(llm_response, config.language)

openevolve/process_parallel.py

@@ -33,6 +33,7 @@ class SerializableResult:
     artifacts: Optional[Dict[str, Any]] = None
     iteration: int = 0
     error: Optional[str] = None
+    target_island: Optional[int] = None  # Island where child should be placed
 
 
 def _worker_init(config_dict: dict, evaluation_file: str, parent_env: dict = None) -> None:
@@ -170,8 +171,7 @@ def _run_iteration_worker(
         # Build prompt
         if _worker_config.prompt.programs_as_changes_description:
             parent_changes_desc = (
-                parent.changes_description
-                or _worker_config.prompt.initial_changes_description
+                parent.changes_description or _worker_config.prompt.initial_changes_description
             )
             child_changes_desc = parent_changes_desc
         else:
@@ -223,7 +223,9 @@ def _run_iteration_worker(
 
             diff_blocks = extract_diffs(llm_response, _worker_config.diff_pattern)
             if not diff_blocks:
-                return SerializableResult(error="No valid diffs found in response", iteration=iteration)
+                return SerializableResult(
+                    error="No valid diffs found in response", iteration=iteration
+                )
 
             if _worker_config.prompt.programs_as_changes_description:
                 try:
@@ -236,20 +238,34 @@ def _run_iteration_worker(
                     return SerializableResult(error=str(e), iteration=iteration)
 
                 child_code, _ = apply_diff_blocks(parent.code, code_blocks)
-                child_changes_desc, desc_applied = apply_diff_blocks(parent_changes_desc, desc_blocks)
+                child_changes_desc, desc_applied = apply_diff_blocks(
+                    parent_changes_desc, desc_blocks
+                )
 
                 # Must update the previous changes description
-                if desc_applied == 0 or not child_changes_desc.strip() or child_changes_desc.strip() == parent_changes_desc.strip():
+                if (
+                    desc_applied == 0
+                    or not child_changes_desc.strip()
+                    or child_changes_desc.strip() == parent_changes_desc.strip()
+                ):
                     return SerializableResult(
                         error="changes_description was not updated or empty, program is discarded",
                         iteration=iteration,
                     )
 
-                changes_summary = format_diff_summary(code_blocks)
+                changes_summary = format_diff_summary(
+                    code_blocks,
+                    max_line_len=_worker_config.prompt.diff_summary_max_line_len,
+                    max_lines=_worker_config.prompt.diff_summary_max_lines,
+                )
             else:
                 # All diffs applied only to code
                 child_code = apply_diff(parent.code, llm_response, _worker_config.diff_pattern)
-                changes_summary = format_diff_summary(diff_blocks)
+                changes_summary = format_diff_summary(
+                    diff_blocks,
+                    max_line_len=_worker_config.prompt.diff_summary_max_line_len,
+                    max_lines=_worker_config.prompt.diff_summary_max_lines,
+                )
         else:
             from openevolve.utils.code_utils import parse_full_rewrite
 
@@ -297,6 +313,9 @@ def _run_iteration_worker(
 
         iteration_time = time.time() - iteration_start
 
+        # Get target island from snapshot (where child should be placed)
+        target_island = db_snapshot.get("sampling_island")
+
         return SerializableResult(
             child_program_dict=child_program.to_dict(),
             parent_id=parent.id,
@@ -305,6 +324,7 @@ def _run_iteration_worker(
             llm_response=llm_response,
             artifacts=artifacts,
             iteration=iteration,
+            target_island=target_island,
         )
 
     except Exception as e:
@@ -539,9 +559,14 @@ async def run_evolution(
                     # Reconstruct program from dict
                     child_program = Program(**result.child_program_dict)
 
-                    # Add to database (will auto-inherit parent's island)
-                    # No need to specify target_island - database will handle parent island inheritance
-                    self.database.add(child_program, iteration=completed_iteration)
+                    # Add to database with explicit target_island to ensure proper island placement
+                    # This fixes issue #391: children should go to the target island, not inherit
+                    # from the parent (which may be from a different island due to fallback sampling)
+                    self.database.add(
+                        child_program,
+                        iteration=completed_iteration,
+                        target_island=result.target_island,
+                    )
 
                     # Store artifacts
                     if result.artifacts:
@@ -588,10 +613,8 @@ async def run_evolution(
 
                     # Island management
                     # get current program island id
-                    island_id = child_program.metadata.get(
-                        "island", self.database.current_island
-                    )
-                    #use this to increment island generation
+                    island_id = child_program.metadata.get("island", self.database.current_island)
+                    # use this to increment island generation
                     self.database.increment_island_generation(island_idx=island_id)
 
                     # Check migration
@@ -709,7 +732,7 @@ async def run_evolution(
                                         f"(best score: {best_score:.4f})"
                                     )
                                     break
-                                
+
                             else:
                                 # Event-based early stopping
                                 if current_score == self.config.convergence_threshold:

openevolve/prompt/templates.py

@@ -4,9 +4,12 @@
 
 import os
 import json
+import logging
 from pathlib import Path
 from typing import Dict, List, Optional, Union, Any
 
+logger = logging.getLogger(__name__)
+
 # Base system message template for evolution
 BASE_SYSTEM_TEMPLATE = """You are an expert software developer tasked with iteratively improving a codebase.
 Your job is to analyze the current program and suggest improvements based on feedback from previous attempts.
@@ -185,8 +188,13 @@ def __init__(self, custom_template_dir: Optional[str] = None):
         self._load_from_directory(self.default_dir)
 
         # 2. Override with custom templates (if provided)
-        if self.custom_dir and self.custom_dir.exists():
-            self._load_from_directory(self.custom_dir)
+        if self.custom_dir:
+            if self.custom_dir.exists():
+                self._load_from_directory(self.custom_dir)
+            else:
+                logger.warning(
+                    f"Custom template directory does not exist, using default prompt."
+                )
 
     def _load_from_directory(self, directory: Path) -> None:
         """Load all templates and fragments from a directory"""

openevolve/utils/code_utils.py

@@ -120,12 +120,32 @@ def parse_full_rewrite(llm_response: str, language: str = "python") -> Optional[
     return llm_response
 
 
-def format_diff_summary(diff_blocks: List[Tuple[str, str]]) -> str:
+def _format_block_lines(lines: List[str], max_line_len: int = 100, max_lines: int = 30) -> str:
+    """Format a block of lines for diff summary: show all lines (truncated per line, optional cap)."""
+    truncated = []
+    for line in lines[:max_lines]:
+        s = line.rstrip()
+        if len(s) > max_line_len:
+            s = s[: max_line_len - 3] + "..."
+        truncated.append("  " + s)
+    if len(lines) > max_lines:
+        truncated.append(f"  ... ({len(lines) - max_lines} more lines)")
+    return "\n".join(truncated) if truncated else "  (empty)"
+
+
+def format_diff_summary(
+    diff_blocks: List[Tuple[str, str]],
+    max_line_len: int = 100,
+    max_lines: int = 30,
+) -> str:
     """
-    Create a human-readable summary of the diff
+    Create a human-readable summary of the diff.
+    For multi-line blocks, shows the full search and replace content (all lines).
 
     Args:
         diff_blocks: List of (search_text, replace_text) tuples
+        max_line_len: Maximum characters per line before truncation (default: 100)
+        max_lines: Maximum lines per SEARCH/REPLACE block (default: 30)
 
     Returns:
         Summary string
@@ -136,17 +156,12 @@ def format_diff_summary(diff_blocks: List[Tuple[str, str]]) -> str:
         search_lines = search_text.strip().split("\n")
         replace_lines = replace_text.strip().split("\n")
 
-        # Create a short summary
         if len(search_lines) == 1 and len(replace_lines) == 1:
             summary.append(f"Change {i+1}: '{search_lines[0]}' to '{replace_lines[0]}'")
         else:
-            search_summary = (
-                f"{len(search_lines)} lines" if len(search_lines) > 1 else search_lines[0]
-            )
-            replace_summary = (
-                f"{len(replace_lines)} lines" if len(replace_lines) > 1 else replace_lines[0]
-            )
-            summary.append(f"Change {i+1}: Replace {search_summary} with {replace_summary}")
+            search_block = _format_block_lines(search_lines, max_line_len, max_lines)
+            replace_block = _format_block_lines(replace_lines, max_line_len, max_lines)
+            summary.append(f"Change {i+1}: Replace:\n{search_block}\nwith:\n{replace_block}")
 
     return "\n".join(summary)