Merge branch 'develop'

Author: yaojianpin

CHANGELOG.md

@@ -114,4 +114,30 @@
 - feat: modify Config to support getting custom config section
 - feat: add workflow.on events (manual, hook, chat)
 - feat: add acts-state package to support get or set state
-- feat: change the directory structure with acts, plugins, examples, benches, config
+- feat: change the directory structure with acts, plugins, examples, benches, config
+
+# 0.17.0
+- feat: reactoring env module to add register_var trait
+- feat: add "resects" user var to support get resects data from task context
+- feat: add step env module to support get step vars by step id
+- feat: change env var to $env
+- feat: rename proc env_local to env
+- feat: change event package params to Option<T>
+- feat: skip initialization of plugin when there is no related section
+- feat: add `acts.core.http` package plugin
+- feat: add `pid` prefix to the acts.app.state package
+- feat: support private vars (starts with `__`)
+- feat: use `acts.toml` instead of `acts.cfg`
+- feat: add `env.expose` in workflow to support set default outputs, the default outputs is `data`
+- feat: add `acts.app.shell` package plugin to support nushell, bash and powershell
+        support {{ }} refs the var in shell script
+- feat: add `os` var in expression
+- feat: use {{ }} for expression instead of ${ }
+- feat: use var name directly in script or expression instead of $("var")
+        use $get("var") instead of $("var")
+        use $set("var", value) instead of $("var", value)
+        use $inputs() instead of $act.inputs()
+        use $data() instead of $act.data()
+
+# 0.17.1
+- fix: fix examples/plugins build issue when exclude examples

Cargo.toml

@@ -5,11 +5,35 @@ members = [
     "store/sqlite",
     "store/postgres",
     "plugins/state",
+    "plugins/http",
     "examples/plugins/*",
+    "plugins/shell",
+]
+exclude = [
+    "examples/plugins/state",
+    "examples/plugins/http",
+    "examples/plugins/shell",
 ]
-exclude = ["examples/plugins/state"]
 resolver = "3"
 
+[workspace.package]
+authors = ["Yao <yaojianpin@sohu.com>"]
+description = "a fast, lightweight, extensiable workflow engine"
+keywords = ["workflow"]
+edition = "2024"
+license = "Apache-2.0"
+repository = "https://github.com/yaojianpin/acts.git"
+version = "0.17.1"
+
 [workspace.dependencies]
-tokio = { version = "1.44" }
+tokio = { version = "1.44", features = ["full"] }
 async-trait = { version = "0.1.88" }
+serde = "1.0.219"
+serde_json = "1.0.140"
+strum = { version = "0.27", features = ["derive"] }
+
+[profile.release]
+codegen-units = 1
+lto = true
+opt-level = "z"
+strip = true

README.md

@@ -59,16 +59,41 @@ use acts::{Engine, Vars, Workflow};
 async fn main() {
     let engine = Engine::new().start();
 
-    let text = include_str!("../../examples/simple/model.yml");
-    let workflow = Workflow::from_yml(text).unwrap();
+    // create yaml workflow model
+    let model = r#"
+    id: my_model
+    name: my model
+    outputs:
+        a:
+    steps:
+      - name: step 1
+        acts:
+          - uses: acts.transform.set
+            params:
+              a: 10
+      - name: step 2
+        acts:
+          - uses: acts.transform.code
+            params: |
+                return { a: a + 10 };
+    "#;
+    let workflow = Workflow::from_yml(model).unwrap();
 
     let executor = engine.executor();
     executor.model().deploy(&workflow).expect("fail to deploy workflow");
 
     let mut vars = Vars::new();
-    vars.insert("input".into(), 3.into());
+
+    // set the input value
+    vars.insert("a".into(), 0.into());
+
+    // set the pid or auto generate by engine
     vars.insert("pid".to_string(), "w1".into());
-    executor.proc().start(&workflow.id, &vars).expect("fail to start workflow");;
+
+    // start workflow by model id
+    executor.proc().start(&workflow.id, &vars).expect("fail to start workflow");
+
+    // create channel to receive messages
     let chan = engine.channel();
 
     chan.on_start(|e| {
@@ -123,22 +148,22 @@ steps:
     # workflow branches to run by condition
     branches:
       - name: branch 1
-        if: ${ $("value") > 100 }
+        if: value > 100
         steps:
           - name: step 3
             acts:
               - name: send a message
                 uses: acts.core.msg
 
       - name: branch 2
-        if: ${ $("value") <= 100 }
+        if: value <= 100
         steps:
           - name: step 4
             acts:
               - name: parallel send irq request
                 uses: acts.core.parallel
                 params:
-                  in: ${ ${list} }
+                  in: '{{ list }}'
                   acts:
                     - uses: acts.core.irq
   - name: final step
@@ -155,8 +180,12 @@ inputs:
   a: 100
 steps:
   - name: step1
-    run: |
-      $("output_key", "output value");
+    acts:
+      - uses: acts.transform.code
+        params: |
+          // get the a variable
+          let v = a + 100;
+          // do somthing else
 ```
 
 The inputs can also be set by starting the workflow.
@@ -187,8 +216,12 @@ outputs:
   output_key:
 steps:
   - name: step1
-    run: |
-      $("output_key", "output value");
+    acts:
+      - uses: acts.transform.set
+        params:
+          output_key: 100
+    outputs:
+      output_key:
 ```
 
 ### Setup
@@ -201,13 +234,15 @@ For more acts, please see the comments as follow:
 ```yml
 name: model name
 steps:
-  - uses: acts.core.set
-    params:
-      a: ['u1', 'u2']
-      v: 10
-  - uses: acts.core.msg
-    if: $("v") > 0
-    key: msg1
+  - name: step 1
+    acts:
+      - uses: acts.transform.set
+        params:
+          a: ['u1', 'u2']
+          v: 10
+      - uses: acts.core.msg
+        if: v > 0
+        key: msg1
 setup:
   # on step created
   - uses: acts.core.msg
@@ -385,7 +420,7 @@ steps:
     name: step 1
     branches:
       - id: b1
-        if: $("v") > 0
+        if: v > 0
         steps:
           - name: step a
           - name: step b
@@ -503,7 +538,6 @@ acts:
     - [x] parallel
     - [x] sequence
     - [x] subflow
-    - [ ] http
 
   - event
     - [x] manual
@@ -514,7 +548,6 @@ acts:
   - transform
     - [x] set
     - [x] code
-    - [ ] split
 
 - [ ] doc (doc/)
 
@@ -527,6 +560,8 @@ acts:
   - [ ] form (plugins/form)
   - [ ] ai (plugins/ai)
   - [x] state (plugins/state)
+  - [x] http (plugins/http)
+  - [x] shell (plugins/shell) support nushell, bash and powershell
   - [ ] pubsub (plugins/pubsub)
   - [ ] observability (plugins/obs)
   - [ ] database (plugins/database)

acts/Cargo.toml

@@ -8,30 +8,28 @@ license = "Apache-2.0"
 name = "acts"
 homepage = "https://docs.rs/acts"
 repository = "https://github.com/yaojianpin/acts.git"
-version = "0.16.1"
+version = "0.17.0"
 include = ["src/**/*", "../LICENSE", "../README.md", "!**/tests/**/*"]
 
 [dependencies]
-tokio = { features = ["full"], workspace = true }
+tokio = { features = ["full", "macros"], workspace = true }
 async-trait = { workspace = true }
 chrono = { version = "0.4" }
 globset = { version = "0.4", default-features = false }
-hocon = { version = "0.9.0", default-features = false, features = [
-    "serde-support",
-] }
 inventory = "0.3.20"
 jsonschema = { version = "0.30.0", default-features = false }
 moka = { version = "0.12", features = ["sync"] }
 nanoid = "0.4"
 regex = "1.10"
 rquickjs = { version = "0.9", features = ["full", "parallel"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+serde = { features = ["derive"], workspace = true }
+serde_json = { workspace = true }
 serde_repr = "0.1"
 serde_yaml = "0.9"
-strum = { version = "0.27", features = ["derive"] }
+strum = { features = ["derive"], workspace = true }
 thiserror = "2"
 tracing = "0.1"
+toml = "0.8.22"
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["async_tokio"] }
@@ -44,6 +42,50 @@ harness = false
 name = "workflow"
 path = "../benches/workflow.rs"
 
+[[example]]
+name = "simple"
+path = "../examples/simple/main.rs"
+
+[[example]]
+name = "model_build"
+path = "../examples/model_build/main.rs"
+
+[[example]]
+name = "actions"
+path = "../examples/actions/main.rs"
+
+[[example]]
+name = "approve"
+path = "../examples/approve/main.rs"
+
+[[example]]
+name = "catches"
+path = "../examples/catches/main.rs"
+
+[[example]]
+name = "event"
+path = "../examples/event/main.rs"
+
+[[example]]
+name = "message"
+path = "../examples/message/main.rs"
+
+[[example]]
+name = "package"
+path = "../examples/package/main.rs"
+
+[[example]]
+name = "subflow"
+path = "../examples/subflow/main.rs"
+
+[[example]]
+name = "timeout"
+path = "../examples/timeout/main.rs"
+
+[[example]]
+name = "user_var"
+path = "../examples/user_var/main.rs"
+
 [profile.release]
 codegen-units = 1
 lto = true

acts/src/builder.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
-use crate::ConfigData;
-use crate::{ActPlugin, Config, Engine, Result};
+use crate::config::ConfigData;
+use crate::{ActPlugin, Config, Engine, Result, config::ConfigLog};
 use std::path::Path;
 
 pub struct EngineBuilder {
@@ -18,10 +18,10 @@ impl EngineBuilder {
     pub fn new() -> Self {
         let mut config = Config::default();
         #[cfg(not(test))]
-        let file = Path::new("config/acts.cfg");
+        let file = Path::new("config/acts.toml");
 
         #[cfg(test)]
-        let file = Path::new("test/acts.cfg");
+        let file = Path::new("test/acts.toml");
 
         if file.exists() {
             config = Config::create(file);
@@ -37,7 +37,7 @@ impl EngineBuilder {
     pub fn set_config(mut self, data: &ConfigData) -> Self {
         self.config = Config {
             data: data.clone(),
-            table: hocon::Hocon::Null,
+            table: toml::Table::new(),
         };
         self
     }
@@ -47,28 +47,26 @@ impl EngineBuilder {
         self
     }
 
-    pub fn log_dir(mut self, log_dir: &str) -> Self {
-        self.config.data.log_dir = log_dir.to_string();
-        self
-    }
-
-    pub fn log_level(mut self, level: &str) -> Self {
-        self.config.data.log_level = level.to_string();
+    pub fn log(mut self, dir: &str, level: &str) -> Self {
+        self.config.data.log = Some(ConfigLog {
+            dir: dir.to_string(),
+            level: level.to_string(),
+        });
         self
     }
 
     pub fn cache_size(mut self, size: i64) -> Self {
-        self.config.data.cache_cap = size;
+        self.config.data.cache_cap = Some(size);
         self
     }
 
     pub fn tick_interval_secs(mut self, secs: i64) -> Self {
-        self.config.data.tick_interval_secs = secs;
+        self.config.data.tick_interval_secs = Some(secs);
         self
     }
 
     pub fn max_message_retry_times(mut self, retry_times: i32) -> Self {
-        self.config.data.max_message_retry_times = retry_times;
+        self.config.data.max_message_retry_times = Some(retry_times);
         self
     }