...

Cargo.lock

@@ -192,13 +192,14 @@ dependencies = [
 [[package]]
 name = "baobab_actor"
 version = "0.1.0"
-source = "git+https://git.ourworld.tf/herocode/baobab.git#04a1af242362e5158e40bb405c593af74f77d047"
 dependencies = [
+ "anyhow",
  "anyhow",
  "async-trait",
  "chrono",
  "clap",
  "crossterm",
+ "crossterm",
  "env_logger",
  "hero_job",
  "hero_supervisor",
@@ -207,6 +208,7 @@ dependencies = [
  "heromodels_core",
  "log",
  "ratatui",
+ "ratatui",
  "redis",
  "rhai",
  "serde",
@@ -342,8 +344,10 @@ dependencies = [
 [[package]]
 name = "clap"
 version = "4.5.43"
+version = "4.5.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
+checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -352,8 +356,10 @@ dependencies = [
 [[package]]
 name = "clap_builder"
 version = "4.5.43"
+version = "4.5.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
+checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
 dependencies = [
  "anstream",
  "anstyle",
@@ -940,8 +946,10 @@ dependencies = [
 [[package]]
 name = "h2"
 version = "0.4.12"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -982,7 +990,6 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 [[package]]
 name = "hero_job"
 version = "0.1.0"
-source = "git+https://git.ourworld.tf/herocode/baobab.git#04a1af242362e5158e40bb405c593af74f77d047"
 dependencies = [
  "chrono",
  "log",
@@ -997,7 +1004,7 @@ dependencies = [
 [[package]]
 name = "hero_logger"
 version = "0.1.0"
-source = "git+https://git.ourworld.tf/herocode/baobab.git?branch=logger#d7a7eae19ec22c8f5250a5ee1cea6affe7810d4f"
+source = "git+https://git.ourworld.tf/herocode/baobab.git?branch=logger#0da7b9363c2956e6f17ac78232152c549f1d5e68"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1014,7 +1021,6 @@ dependencies = [
 [[package]]
 name = "hero_supervisor"
 version = "0.1.0"
-source = "git+https://git.ourworld.tf/herocode/baobab.git#04a1af242362e5158e40bb405c593af74f77d047"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1193,6 +1199,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "h2 0.4.12",
+ "h2 0.4.12",
  "http 1.3.1",
  "http-body 1.0.1",
  "httparse",
@@ -2463,7 +2470,12 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "1.6.0"
+<<<<<<< HEAD
 source = "git+https://github.com/paradigmxyz/reth#c23e53377922d8a842df55ededa6700e2b938d64"
+=======
+source = "git+https://github.com/paradigmxyz/reth#59e4a5556fa54f1c210e45412b6a91f2351bea19"
+source = "git+https://github.com/paradigmxyz/reth#59e4a5556fa54f1c210e45412b6a91f2351bea19"
+>>>>>>> 473b9ca753b9e350a8824e527789d53928b867d4
 dependencies = [
  "bytes",
  "futures",

Cargo.toml

@@ -40,8 +40,11 @@ chrono = { version = "0.4", features = ["serde"] }
 toml = "0.8"
 thiserror = "1.0"
 async-trait = "0.1"
-hero_job = { git = "https://git.ourworld.tf/herocode/baobab.git"}
+# hero_job = { git = "https://git.ourworld.tf/herocode/baobab.git"}
-baobab_actor = { git = "https://git.ourworld.tf/herocode/baobab.git"}
+# baobab_actor = { git = "https://git.ourworld.tf/herocode/baobab.git"}
+# TODO: uncomment above; only work with local paths whilst developig
+hero_job = { path = "/home/maxime/baobab/core/job"}
+baobab_actor = { path = "/home/maxime/baobab/core/actor"}
 heromodels = { git = "https://git.ourworld.tf/herocode/db.git" }
 heromodels_core = { git = "https://git.ourworld.tf/herocode/db.git" }
 heromodels-derive = { git = "https://git.ourworld.tf/herocode/db.git" }

README.md

@@ -39,12 +39,41 @@ let handle = spawn_osis_actor(
 - **Actor Type**: `"OSIS"`
 - **Processing Model**: Sequential, blocking
 - **Script Engine**: Rhai with OSIS-specific DSL extensions
+## Canonical Redis queues and verification
 
-## Binaries
+The project uses canonical dispatch queues per script type. For OSIS, the work queue is:
+- hero:q:work:type:osis
 
-- `actor.rs`: The actor binary, runs actor. `cargo run --bin actor_osis`
+Consumer behavior:
-- `terminal_ui.rs`: The TUI binary, runs actor with TUI. `cargo run --bin actor_osis_tui`
+- The in-repo actor derives ScriptType=OSIS from its actor_id containing "osis" and BLPOPs hero:q:work:type:osis.
+- This repo’s OSIS actor has been updated so its actor_id is "osis", ensuring it consumes the canonical queue.
 
-## Examples
+Quick verification (redis-cli):
+- List work queues:
+  - KEYS hero:q:work:type:*
+- Check OSIS queue length:
+  - LLEN hero:q:work:type:osis
+- Inspect a specific job (replace {job_id} with the printed id):
+  - HGET hero:job:{job_id} status
+  - HGET hero:job:{job_id} output
 
-The `examples` directory contains example scripts that can be used to test the actor. The examples are stored in the `examples/scripts` directory.
+Run options:
+- Option A: Run the example which spawns the OSIS actor and dispatches jobs to the canonical queue.
+  1) Start Redis (if not already): redis-server
+  2) In this repo:
+     - cargo run --example actor
+  3) Observe the console: job IDs will be printed as they are created and dispatched.
+  4) In a separate terminal, verify with redis-cli:
+     - LLEN hero:q:work:type:osis (will briefly increment, then return to 0 as the actor consumes)
+     - HGET hero:job:{job_id} status (should transition to started then finished)
+     - HGET hero:job:{job_id} output (should contain the script result)
+
+- Option B: Run the standalone actor binary and dispatch from another process that pushes to the canonical type queue.
+  1) Start the actor:
+     - cargo run --bin actor_osis
+  2) From any producer, LPUSH hero:q:work:type:osis {job_id} after persisting the job hash hero:job:{job_id}.
+  3) Use the same redis-cli checks above to confirm consumption and completion.
+
+Notes:
+- Hash-only result model is the default. The job result is written to hero:job:{job_id}.output and status=finished.
+- Reply queues (hero:q:reply:{job_id}) are optional and not required for OSIS to function.

examples/actor.rs

@@ -110,9 +110,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Job::update_status(&mut redis_conn, &job.id, JobStatus::Dispatched).await?;
         println!("Stored job in Redis with key: {} and status: Dispatched", job_key);
         
-        // Add the job to the OSIS queue for processing
+        // Add the job to the canonical type queue for processing
-        // Note: The supervisor uses "actor_queue:" prefix, so the correct queue is:
+        // Canonical dispatch queue per type: hero:q:work:type:{script_type}
-        let queue_key = "hero:job:actor_queue:osis";
+        let queue_key = "hero:q:work:type:osis";
         let _: () = redis_conn.lpush(&queue_key, &job.id).await?;
         println!("Dispatched job {} to OSIS queue: {}", job.id, queue_key);
         

examples/scripts/test_logging.rhai

@@ -0,0 +1,13 @@
+// test_logging.rhai - Simple test script for logging verification
+
+print("=== LOGGING TEST SCRIPT ===");
+print("This is a simple test to verify Rhai logging is working");
+print("Line 1: Hello from Rhai!");
+print("Line 2: Testing print statements");
+print("Line 3: Numbers work too: " + 42);
+print("Line 4: Boolean values: " + true);
+print("Line 5: String concatenation: " + "works" + " " + "perfectly");
+print("=== END OF TEST ===");
+
+// Return a simple value
+"Logging test completed successfully"

src/lib.rs

@@ -264,8 +264,8 @@ impl Actor for OSISActor {
     }
 
     fn actor_id(&self) -> &str {
-        // Use actor_queue:osis to match supervisor's dispatch queue naming
+        // Actor ID contains "osis" so the runtime derives ScriptType=OSIS and consumes the canonical type queue.
-        "actor_queue:osis"
+        "osis"
     }
 
     fn redis_url(&self) -> &str {