horsies 0.1.0a4__py3-none-any.whl → 0.1.0a6__py3-none-any.whl

horsies/core/app.py

@@ -82,7 +82,9 @@ class Horsies:
                 f'horsies subprocess initialized with {config.queue_mode.name} mode (pid={os.getpid()})'
             )
         else:
-            self.logger.info(f'horsies initialized as {self._role} with {config.queue_mode.name} mode')
+            self.logger.info(
+                f'horsies initialized as {self._role} with {config.queue_mode.name} mode'
+            )
 
     def set_role(self, role: str) -> None:
         """Set the role and log it. Called by CLI after discovery."""
@@ -192,7 +194,7 @@ class Horsies:
             # Register task with this app, passing source for duplicate detection
             # Normalize path with realpath to handle symlinks and relative paths
             source_str = (
-                f"{os.path.realpath(fn_location.file)}:{fn_location.line}"
+                f'{os.path.realpath(fn_location.file)}:{fn_location.line}'
                 if fn_location
                 else None
             )
@@ -247,15 +249,19 @@ class Horsies:
                     if module_path.endswith('.py') or os.path.sep in module_path:
                         abs_path = os.path.realpath(module_path)
                         if not os.path.exists(abs_path):
-                            errors.append(_no_location(ConfigurationError(
-                                message=f'task module not found: {module_path}',
-                                code=ErrorCode.CLI_INVALID_ARGS,
-                                notes=[f'resolved path: {abs_path}'],
-                                help_text=(
-                                    'remove it from app.discover_tasks([...]) or fix the path; \n'
-                                    'if using globs, run app.expand_module_globs([...]) first'
-                                ),
-                            )))
+                            errors.append(
+                                _no_location(
+                                    ConfigurationError(
+                                        message=f'task module not found: {module_path}',
+                                        code=ErrorCode.CLI_INVALID_ARGS,
+                                        notes=[f'resolved path: {abs_path}'],
+                                        help_text=(
+                                            'remove it from app.discover_tasks([...]) or fix the path; \n'
+                                            'if using globs, run app.expand_module_globs([...]) first'
+                                        ),
+                                    )
+                                )
+                            )
                             continue
                         import_by_path(abs_path)
                     else:
@@ -265,16 +271,20 @@ class Horsies:
                 except HorsiesError as exc:
                     errors.append(exc)
                 except Exception as exc:
-                    errors.append(_no_location(ConfigurationError(
-                        message=f'failed to import module: {module_path}',
-                        code=ErrorCode.CLI_INVALID_ARGS,
-                        notes=[str(exc)],
-                        help_text=(
-                            'ensure the module is importable; '
-                            'for file paths include .py and a valid path, '
-                            'for dotted paths verify PYTHONPATH or run from the project root'
-                        ),
-                    )))
+                    errors.append(
+                        _no_location(
+                            ConfigurationError(
+                                message=f'failed to import module: {module_path}',
+                                code=ErrorCode.CLI_INVALID_ARGS,
+                                notes=[str(exc)],
+                                help_text=(
+                                    'ensure the module is importable; '
+                                    'for file paths include .py and a valid path, '
+                                    'for dotted paths verify PYTHONPATH or run from the project root'
+                                ),
+                            )
+                        )
+                    )
         finally:
             self.suppress_sends(prev_suppress)
         return errors
@@ -283,26 +293,32 @@ class Horsies:
         """Check broker connectivity via SELECT 1."""
         import asyncio
 
+        from sqlalchemy import text
+
+        HEALTH_CHECK_SQL = text("""SELECT 1""")
+
         errors: list[HorsiesError] = []
         try:
             broker = self.get_broker()
 
             async def _test_connection() -> None:
-                from sqlalchemy import text
-
                 async with broker.session_factory() as session:
-                    await session.execute(text('SELECT 1'))
+                    await session.execute(HEALTH_CHECK_SQL)
 
             asyncio.run(_test_connection())
         except HorsiesError as exc:
             errors.append(exc)
         except Exception as exc:
-            errors.append(_no_location(ConfigurationError(
-                message='broker connectivity check failed',
-                code=ErrorCode.BROKER_INVALID_URL,
-                notes=[str(exc)],
-                help_text='check database_url in PostgresConfig',
-            )))
+            errors.append(
+                _no_location(
+                    ConfigurationError(
+                        message='broker connectivity check failed',
+                        code=ErrorCode.BROKER_INVALID_URL,
+                        notes=[str(exc)],
+                        help_text='check database_url in PostgresConfig',
+                    )
+                )
+            )
         return errors
 
     def list_tasks(self) -> list[str]:
@@ -508,26 +524,30 @@ class Horsies:
             if self.config.queue_mode == QueueMode.CUSTOM:
                 valid_queues = self.get_valid_queue_names()
                 if resolved_queue not in valid_queues:
-                    report.add(ConfigurationError(
-                        message='TaskNode queue not in app config',
-                        code=ErrorCode.TASK_INVALID_QUEUE,
+                    report.add(
+                        ConfigurationError(
+                            message='TaskNode queue not in app config',
+                            code=ErrorCode.TASK_INVALID_QUEUE,
+                            notes=[
+                                f"TaskNode '{task.name}' has queue '{resolved_queue}'",
+                                f'valid queues: {valid_queues}',
+                            ],
+                            help_text='use one of the configured queue names or add this queue to app config',
+                        )
+                    )
+                    queue_valid = False
+            elif resolved_queue != 'default':
+                report.add(
+                    ConfigurationError(
+                        message='TaskNode has non-default queue in DEFAULT mode',
+                        code=ErrorCode.CONFIG_INVALID_QUEUE_MODE,
                         notes=[
                             f"TaskNode '{task.name}' has queue '{resolved_queue}'",
-                            f'valid queues: {valid_queues}',
+                            "app is in DEFAULT mode (only 'default' queue allowed)",
                         ],
-                        help_text='use one of the configured queue names or add this queue to app config',
-                    ))
-                    queue_valid = False
-            elif resolved_queue != 'default':
-                report.add(ConfigurationError(
-                    message='TaskNode has non-default queue in DEFAULT mode',
-                    code=ErrorCode.CONFIG_INVALID_QUEUE_MODE,
-                    notes=[
-                        f"TaskNode '{task.name}' has queue '{resolved_queue}'",
-                        "app is in DEFAULT mode (only 'default' queue allowed)",
-                    ],
-                    help_text='either remove queue override or switch to QueueMode.CUSTOM',
-                ))
+                        help_text='either remove queue override or switch to QueueMode.CUSTOM',
+                    )
+                )
                 queue_valid = False
 
             if queue_valid:

horsies/core/banner.py

@@ -9,6 +9,33 @@ if TYPE_CHECKING:
     from horsies.core.app import Horsies
 
 
+# ---------------------------------------------------------------------------
+# ANSI color codes (matching Rust owo-colors output)
+# ---------------------------------------------------------------------------
+
+class Colors:
+    """ANSI escape codes for terminal colors."""
+
+    RESET = '\033[0m'
+    BOLD = '\033[1m'
+    DIMMED = '\033[2m'
+
+    # Standard colors
+    WHITE = '\033[37m'
+    BRIGHT_WHITE = '\033[97m'
+    CYAN = '\033[36m'
+    BRIGHT_CYAN = '\033[96m'
+    YELLOW = '\033[33m'
+    BRIGHT_YELLOW = '\033[93m'
+
+
+def _color(text: str, *codes: str) -> str:
+    """Apply ANSI color codes to text."""
+    if not codes:
+        return text
+    return ''.join(codes) + text + Colors.RESET
+
+
 # Braille art of galloping horse - converted from the golden horse image
 # Each braille character represents a 2x4 pixel block for higher resolution
 HORSE_BRAILLE = """
@@ -28,13 +55,13 @@ HORSE_BRAILLE = """
 ⠚⠒⠒⠒⡶⠚⠒⠒⠒⡰⠓⠒⠒⠒⢲⠓⠒⠒⠒⢻⠿⠀⠀⠚⢿⡷⠐⠒⠒⠚⡆⠒⠒⠒⠚⣖⠒⠒⠒⠚⢶⠒⠒⠒⠚⢶⠂⠐⠒⠛
 """
 
-# Figlet-style "horsies" text
+# Figlet-style "horsies" text with version and tagline
 LOGO_TEXT = r"""
     __                    _
    / /_  ____  __________(_)__  _____
-  / __ \/ __ \/ ___/ ___/ / _ \/ ___/
- / / / / /_/ / /  (__  ) /  __(__  )
-/_/ /_/\____/_/  /____/_/\___/____/
+  / __ \/ __ \/ ___/ ___/ / _ \/ ___/      {version}
+ / / / / /_/ / /  (__  ) /  __(__  )       distributed task queue
+/_/ /_/\____/_/  /____/_/\___/____/        and workflow engine
 """
 
 # Full banner combining horse and logo
@@ -51,26 +78,66 @@ BANNER = (
 
 
 def get_version() -> str:
-    """Get horsies version."""
+    """Get horsies version from package metadata."""
     try:
-        import horsies
-
-        version = getattr(horsies, "__version__", None)
-        return str(version) if version else "0.1.0"
-    except ImportError:
-        return "0.1.0"
+        from importlib.metadata import version
+        return version('horsies')
+    except Exception:
+        return 'dev'
 
 
 def format_banner(version: str | None = None) -> str:
     """Format the banner string with version."""
     if version is None:
         version = get_version()
-    return BANNER.format(version=f"v{version}")
+    return BANNER.format(version=f'v{version}')
+
+
+# ---------------------------------------------------------------------------
+# Formatting helpers (matching Rust banner.rs)
+# ---------------------------------------------------------------------------
+
+def _format_ms(ms: int) -> str:
+    """Format milliseconds into a human-readable string."""
+    if ms >= 60_000:
+        mins = ms // 60_000
+        remainder_s = (ms % 60_000) // 1_000
+        if remainder_s > 0:
+            return f'{mins}m{remainder_s}s'
+        return f'{mins}m'
+    elif ms >= 1_000:
+        secs = ms // 1_000
+        remainder_ms = ms % 1_000
+        if remainder_ms > 0:
+            return f'{secs}.{remainder_ms // 100}s'
+        return f'{secs}s'
+    return f'{ms}ms'
+
+
+def _format_bool(val: bool) -> str:
+    """Format a boolean for display."""
+    return 'yes' if val else 'no'
+
+
+def _write_section_header(lines: list[str], name: str) -> None:
+    """Write a colored [section] header line."""
+    header = _color(name, Colors.BRIGHT_CYAN, Colors.BOLD)
+    lines.append(f'[{header}]')
+
+
+def _write_kv(lines: list[str], key: str, value: str) -> None:
+    """Write a colored '.> key: value' line with consistent alignment."""
+    prefix = _color('.>', Colors.DIMMED)
+    # Pad key before coloring to maintain alignment
+    padded_key = f'{key}:'.ljust(22)
+    colored_key = _color(padded_key, Colors.WHITE, Colors.BOLD)
+    colored_value = _color(value, Colors.BRIGHT_WHITE)
+    lines.append(f'  {prefix} {colored_key} {colored_value}')
 
 
 def print_banner(
-    app: "Horsies",
-    role: str = "worker",
+    app: 'Horsies',
+    role: str = 'worker',
     show_tasks: bool = True,
     file: TextIO | None = None,
 ) -> None:
@@ -91,49 +158,86 @@ def print_banner(
     # Build the banner
     lines: list[str] = []
 
-    # ASCII art header
-    banner = format_banner(version)
-    lines.append(banner)
+    # ASCII art header - cyan colored
+    colored_horse = _color(HORSE_BRAILLE, Colors.CYAN)
+    lines.append(colored_horse)
+
+    # Logo with version - bright yellow bold
+    logo = LOGO_TEXT.replace('{version}', f'v{version}')
+    colored_logo = _color(logo, Colors.BRIGHT_YELLOW, Colors.BOLD)
+    lines.append(colored_logo)
 
-    # Configuration section
-    lines.append("[config]")
-    lines.append(f"  .> app:         {app.__class__.__name__}")
-    lines.append(f"  .> role:        {role}")
-    lines.append(f"  .> queue_mode:  {app.config.queue_mode.name}")
+    # [config] section
+    _write_section_header(lines, 'config')
+    _write_kv(lines, 'app', app.__class__.__name__)
+    _write_kv(lines, 'role', role)
+    _write_kv(lines, 'queue_mode', app.config.queue_mode.name.lower())
 
     # Queue info
-    if app.config.queue_mode.name == "CUSTOM" and app.config.custom_queues:
-        queues_str = ", ".join(q.name for q in app.config.custom_queues)
-        lines.append(f"  .> queues:      {queues_str}")
+    if app.config.queue_mode.name == 'CUSTOM' and app.config.custom_queues:
+        queues_str = ', '.join(q.name for q in app.config.custom_queues)
     else:
-        lines.append(f"  .> queues:      default")
+        queues_str = 'default'
+    _write_kv(lines, 'queues', queues_str)
 
-    # Broker info
+    # Broker info (mask password)
     broker_url = app.config.broker.database_url
-    # Mask password in URL
-    if "@" in broker_url:
-        pre, post = broker_url.split("@", 1)
-        if ":" in pre:
-            scheme_user = pre.rsplit(":", 1)[0]
-            broker_url = f"{scheme_user}:****@{post}"
-    lines.append(f"  .> broker:      {broker_url}")
+    if '@' in broker_url:
+        pre, post = broker_url.split('@', 1)
+        if ':' in pre:
+            scheme_user = pre.rsplit(':', 1)[0]
+            broker_url = f'{scheme_user}:****@{post}'
+    _write_kv(lines, 'broker', broker_url)
 
-    # Concurrency info (if available)
-    if hasattr(app.config, "cluster_wide_cap") and app.config.cluster_wide_cap:
-        lines.append(f"  .> cap:         {app.config.cluster_wide_cap} (cluster-wide)")
+    # Cluster-wide cap
+    if hasattr(app.config, 'cluster_wide_cap') and app.config.cluster_wide_cap:
+        _write_kv(lines, 'cluster_cap', f'{app.config.cluster_wide_cap} (cluster-wide)')
 
-    lines.append("")
+    # Prefetch buffer
+    if hasattr(app.config, 'prefetch_buffer') and app.config.prefetch_buffer > 0:
+        _write_kv(lines, 'prefetch', str(app.config.prefetch_buffer))
 
-    # Tasks section
+    lines.append('')
+
+    # [recovery] section
+    if hasattr(app.config, 'recovery') and app.config.recovery:
+        recovery = app.config.recovery
+        _write_section_header(lines, 'recovery')
+        _write_kv(
+            lines,
+            'requeue_stale_claimed',
+            _format_bool(recovery.auto_requeue_stale_claimed),
+        )
+        _write_kv(
+            lines,
+            'fail_stale_running',
+            _format_bool(recovery.auto_fail_stale_running),
+        )
+        _write_kv(
+            lines,
+            'check_interval',
+            _format_ms(recovery.check_interval_ms),
+        )
+        _write_kv(
+            lines,
+            'heartbeat_interval',
+            _format_ms(recovery.runner_heartbeat_interval_ms),
+        )
+        lines.append('')
+
+    # [tasks] section
     if show_tasks:
         task_names = app.list_tasks()
-        lines.append(f"[tasks] ({len(task_names)} registered)")
+        tasks_header = _color('tasks', Colors.BRIGHT_CYAN, Colors.BOLD)
+        lines.append(f'[{tasks_header}] ({len(task_names)} registered)')
         for task_name in sorted(task_names):
-            lines.append(f"  . {task_name}")
-        lines.append("")
+            bullet = _color('.', Colors.DIMMED)
+            name = _color(task_name, Colors.WHITE)
+            lines.append(f'  {bullet} {name}')
+        lines.append('')
 
     # Print everything
-    output = "\n".join(lines)
+    output = '\n'.join(lines)
     print(output, file=file)
 
 
@@ -141,4 +245,14 @@ def print_simple_banner(file: TextIO | None = None) -> None:
     """Print just the ASCII art banner without config."""
     if file is None:
         file = sys.stdout
-    print(format_banner(), file=file)
+
+    version = get_version()
+
+    # Horse art - cyan
+    colored_horse = _color(HORSE_BRAILLE, Colors.CYAN)
+    print(colored_horse, file=file)
+
+    # Logo with version - bright yellow bold
+    logo = LOGO_TEXT.replace('{version}', f'v{version}')
+    colored_logo = _color(logo, Colors.BRIGHT_YELLOW, Colors.BOLD)
+    print(colored_logo, file=file)