ralphx 0.3.5__py3-none-any.whl → 0.4.1__py3-none-any.whl

ralphx/__init__.py

@@ -1,6 +1,6 @@
 """RalphX - Generic agent loop orchestration system."""
 
-__version__ = "0.3.5"
+__version__ = "0.4.1"
 __author__ = "Jack"
 
 # Package metadata

ralphx/adapters/base.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from enum import Enum
 from pathlib import Path
-from typing import Any, AsyncIterator, Optional
+from typing import Any, AsyncIterator, Callable, Optional
 
 
 class AdapterEvent(str, Enum):
@@ -15,6 +15,8 @@ class AdapterEvent(str, Enum):
     TEXT = "text"           # Text output from model
     TOOL_USE = "tool_use"   # Model is using a tool
     TOOL_RESULT = "tool_result"  # Tool returned a result
+    THINKING = "thinking"   # Model's reasoning/thinking
+    USAGE = "usage"         # Token usage data
     ERROR = "error"         # Error occurred
     COMPLETE = "complete"   # Execution completed
 
@@ -37,6 +39,12 @@ class StreamEvent:
     # Tool result for TOOL_RESULT events
     tool_result: Optional[str] = None
 
+    # Thinking content for THINKING events
+    thinking: Optional[str] = None
+
+    # Token usage data for USAGE events
+    usage: Optional[dict] = None
+
     # Error details for ERROR events
     error_message: Optional[str] = None
     error_code: Optional[str] = None
@@ -100,6 +108,8 @@ class LLMAdapter(ABC):
         tools: Optional[list[str]] = None,
         timeout: int = 300,
         json_schema: Optional[dict] = None,
+        on_session_start: Optional[Callable[[str], None]] = None,
+        on_event: Optional[Callable[["StreamEvent"], None]] = None,
     ) -> ExecutionResult:
         """Execute a prompt and return the result.
 
@@ -110,6 +120,8 @@ class LLMAdapter(ABC):
             timeout: Timeout in seconds.
             json_schema: Optional JSON schema for structured output validation.
                         When provided, the result will include structured_output.
+            on_session_start: Optional callback fired when session ID is available.
+            on_event: Optional callback fired for each streaming event (for persistence).
 
         Returns:
             ExecutionResult with session info and output.
@@ -174,6 +186,10 @@ class LLMAdapter(ABC):
             Marker string to append to prompt.
         """
         now = datetime.utcnow().isoformat()
+        # Sanitize values to prevent HTML comment injection (e.g., --> in mode name)
+        safe_run_id = run_id.replace("--", "").replace('"', "")
+        safe_slug = project_slug.replace("--", "").replace('"', "")
+        safe_mode = mode.replace("--", "").replace('"', "")
         return f"""
 
-<!-- RALPHX_TRACKING run_id="{run_id}" project="{project_slug}" iteration={iteration} mode="{mode}" ts="{now}" -->"""
+<!-- RALPHX_TRACKING run_id="{safe_run_id}" project="{safe_slug}" iteration={iteration} mode="{safe_mode}" ts="{now}" -->"""