From 47ec992056ea95aacf77c302a153104cffe2acf1 Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Mon, 6 Jan 2025 14:20:29 +0100 Subject: [PATCH 01/62] feat: add support for kotlin bindings --- .github/workflows/kotlin.yaml | 139 ++++++++++ bindings/kotlin/.gitignore | 3 + bindings/kotlin/Cargo.toml | 26 ++ bindings/kotlin/build.gradle.kts | 39 +++ .../kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + bindings/kotlin/gradlew | 252 ++++++++++++++++++ bindings/kotlin/gradlew.bat | 94 +++++++ bindings/kotlin/settings.gradle.kts | 1 + bindings/kotlin/src/config.rs | 14 + bindings/kotlin/src/custom_node.rs | 58 ++++ bindings/kotlin/src/decision.rs | 72 +++++ bindings/kotlin/src/engine.rs | 132 +++++++++ bindings/kotlin/src/error.rs | 54 ++++ bindings/kotlin/src/expression.rs | 92 +++++++ bindings/kotlin/src/lib.rs | 9 + bindings/kotlin/src/loader.rs | 43 +++ bindings/kotlin/src/types.rs | 103 +++++++ bindings/kotlin/uniffi-bindgen.rs | 3 + bindings/kotlin/uniffi.toml | 2 + 20 files changed, 1143 insertions(+) create mode 100644 .github/workflows/kotlin.yaml create mode 100644 bindings/kotlin/.gitignore create mode 100644 bindings/kotlin/Cargo.toml create mode 100644 bindings/kotlin/build.gradle.kts create mode 100644 bindings/kotlin/gradle/wrapper/gradle-wrapper.jar create mode 100644 bindings/kotlin/gradle/wrapper/gradle-wrapper.properties create mode 100755 bindings/kotlin/gradlew create mode 100644 bindings/kotlin/gradlew.bat create mode 100644 bindings/kotlin/settings.gradle.kts create mode 100644 bindings/kotlin/src/config.rs create mode 100644 bindings/kotlin/src/custom_node.rs create mode 100644 bindings/kotlin/src/decision.rs create mode 100644 bindings/kotlin/src/engine.rs create mode 100644 bindings/kotlin/src/error.rs create mode 100644 bindings/kotlin/src/expression.rs create mode 100644 bindings/kotlin/src/lib.rs create mode 100644 bindings/kotlin/src/loader.rs create mode 100644 bindings/kotlin/src/types.rs create mode 100644 bindings/kotlin/uniffi-bindgen.rs create mode 100644 bindings/kotlin/uniffi.toml diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml new file mode 100644 index 00000000..1bb19853 --- /dev/null +++ b/.github/workflows/kotlin.yaml @@ -0,0 +1,139 @@ +name: Kotlin +env: + WORKING_DIRECTORY: bindings/kotlin + +on: + push: + branches: + - master + tags-ignore: + - '**' + paths: + - 'bindings/kotlin/**' + - 'core/**' + - 'test-data/**' + - '.github/workflows/kotlin.yaml' + pull_request: + paths: + - 'bindings/kotlin/**' + - 'core/**' + - 'test-data/**' + - '.github/workflows/kotlin.yaml' + +jobs: + build: + if: "!contains(github.event.head_commit.message, 'skip ci')" + + strategy: + fail-fast: true + matrix: + settings: + - host: windows-latest + target: 'x86_64-pc-windows-msvc' + extension: "dll" + lib_dir: TODO + - host: macos-13 + target: 'x86_64-apple-darwin' + extension: "dylib" + lib_dir: TODO + - host: macos-14 + target: 'aarch64-apple-darwin' + extension: "dylib" + lib_dir: 'darwin-aarch64' + - host: ubuntu-latest + target: 'x86_64-unknown-linux-gnu' + extension: "so" + lib_dir: TODO + - host: ubuntu-latest + target: 'aarch64-unknown-linux-gnu' + extension: ".so" + lib_dir: TODO + + name: stable - ${{ matrix.settings.target }} - kotlin@17 + runs-on: ${{ matrix.settings.host }} + defaults: + run: + working-directory: ${{ env.WORKING_DIRECTORY }} + + steps: + - uses: actions/checkout@v3 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: ${{ matrix.settings.target }} + + - name: Cache cargo registry + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + .cargo-cache + key: ${{ matrix.settings.target }}-cargo-registry + + - name: Build + shell: bash + run: cargo build --lib --release --target ${{ matrix.settings.target }} + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.settings.lib_dir }} + path: ./../target/release/libzen_kotlin.${{ matrix.settings.extension }} + + release: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ env.WORKING_DIRECTORY }} + needs: [build] + + steps: + - uses: actions/checkout@v3 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: ${{ matrix.settings.target }} + + - name: Cache cargo registry + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + .cargo-cache + key: ${{ matrix.settings.target }}-cargo-registry + + - name: Validate Gradle wrapper jar + uses: gradle/wrapper-validation-action@v1 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Download all artifacts + uses: actions/download-artifact@v3 + with: + path: build/generated/main/resources + + - name: Generate Kotlin sources + run: | + cargo run \ + --bin uniffi-bindgen \ + --features "uniffi/cli" \ + -- generate \ + --library build/generated/resources/libs/libzen_kotlin.dylib \ + --language kotlin \ + --out-dir build/generated/main/kotlin + +# TODO +# - name: Setup Maven Repository credentials +# run: + + - name: Publish Maven Artifact + run: ./gradlew publish diff --git a/bindings/kotlin/.gitignore b/bindings/kotlin/.gitignore new file mode 100644 index 00000000..6eb8b6a7 --- /dev/null +++ b/bindings/kotlin/.gitignore @@ -0,0 +1,3 @@ +.idea +.gradle +build/ diff --git a/bindings/kotlin/Cargo.toml b/bindings/kotlin/Cargo.toml new file mode 100644 index 00000000..f2cbea1c --- /dev/null +++ b/bindings/kotlin/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "zen-kotlin" +version = "0.34.1" +edition = "2021" +license = "MIT" +publish = false + +[lib] +crate-type = ["cdylib"] + +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + +[dependencies] +uniffi = { version = "0.28.3", features = ["tokio"] } +serde_json = { workspace = true } +zen-engine = { path = "../../core/engine" } +zen-expression = { path = "../../core/expression" } +zen-tmpl = { path = "../../core/template" } +serde = { workspace = true, features = ["derive"] } +async-trait = "0.1.83" +tokio = "1.42.0" + +[build-dependencies] +uniffi = { version = "0.28.3", features = ["build"] } \ No newline at end of file diff --git a/bindings/kotlin/build.gradle.kts b/bindings/kotlin/build.gradle.kts new file mode 100644 index 00000000..f48a6cd7 --- /dev/null +++ b/bindings/kotlin/build.gradle.kts @@ -0,0 +1,39 @@ +plugins { + kotlin("jvm") version "2.1.0" + id("maven-publish") +} + +group = "io.gorules" +version = "0.36.1" + +dependencies { + implementation("net.java.dev.jna:jna:5.15.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") +} + +repositories { + mavenCentral() +} + +sourceSets { + main { + kotlin { + srcDirs("build/generated/main/kotlin") + } + resources { + srcDirs("build/generated/main/resources") + } + } +} + +publishing { + publications { + create("mavenJava") { + from(components["java"]) + artifact(tasks["kotlinSourcesJar"]) + } + } + repositories { + mavenLocal() + } +} \ No newline at end of file diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar b/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties b/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9355b415 --- /dev/null +++ b/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/bindings/kotlin/gradlew b/bindings/kotlin/gradlew new file mode 100755 index 00000000..f5feea6d --- /dev/null +++ b/bindings/kotlin/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/bindings/kotlin/gradlew.bat b/bindings/kotlin/gradlew.bat new file mode 100644 index 00000000..9b42019c --- /dev/null +++ b/bindings/kotlin/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/bindings/kotlin/settings.gradle.kts b/bindings/kotlin/settings.gradle.kts new file mode 100644 index 00000000..1c7c7abe --- /dev/null +++ b/bindings/kotlin/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "zen_kotlin" \ No newline at end of file diff --git a/bindings/kotlin/src/config.rs b/bindings/kotlin/src/config.rs new file mode 100644 index 00000000..e8095001 --- /dev/null +++ b/bindings/kotlin/src/config.rs @@ -0,0 +1,14 @@ +use std::sync::atomic::Ordering; +use zen_engine::ZEN_CONFIG; + +#[derive(uniffi::Record)] +pub struct ZenConfig { + pub nodes_in_context: Option +} + +#[uniffi::export] +pub fn override_config(config: ZenConfig) { + if let Some(val) = config.nodes_in_context { + ZEN_CONFIG.nodes_in_context.store(val, Ordering::Relaxed) + } +} \ No newline at end of file diff --git a/bindings/kotlin/src/custom_node.rs b/bindings/kotlin/src/custom_node.rs new file mode 100644 index 00000000..78b732b9 --- /dev/null +++ b/bindings/kotlin/src/custom_node.rs @@ -0,0 +1,58 @@ +use crate::error::ZenError; +use crate::types::{DecisionNode, JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; +use serde_json::Value; +use uniffi::deps::anyhow::anyhow; +use zen_engine::handler::custom_node_adapter::{CustomNodeAdapter, CustomNodeRequest}; +use zen_engine::handler::node::{NodeResponse, NodeResult}; +use zen_expression::Variable; +use crate::loader::ZenDecisionLoaderCallback; + +#[uniffi::export(callback_interface)] +#[async_trait::async_trait] +pub trait ZenCustomNodeCallback: Send + Sync { + async fn handle( + &self, + key: ZenEngineHandlerRequest, + ) -> Result; +} + +pub struct NoopCustomNodeCallback; + +#[async_trait::async_trait] +impl ZenCustomNodeCallback for NoopCustomNodeCallback { + async fn handle(&self, key: ZenEngineHandlerRequest) -> Result { + Err(ZenError::Zero) + } +} + +pub struct ZenCustomNodeCallbackWrapper(pub Box); + +impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { + async fn handle(&self, request: CustomNodeRequest) -> NodeResult { + let input = request + .input + .to_value() + .try_into() + .map_err(|err: ZenError| anyhow!(err))?; + + let node = DecisionNode::from(request.node); + + let result = self + .0 + .handle(ZenEngineHandlerRequest { input, node }) + .await + .map_err(|err| anyhow!(err.details()))?; + + let output: Value = result + .output + .try_into() + .map_err(|err: ZenError| anyhow!(err))?; + + let trace_data: Option = result.trace_data.and_then(|trace| trace.try_into().ok()); + + Ok(NodeResponse { + output: Variable::from(output), + trace_data, + }) + } +} diff --git a/bindings/kotlin/src/decision.rs b/bindings/kotlin/src/decision.rs new file mode 100644 index 00000000..fb6f9ad5 --- /dev/null +++ b/bindings/kotlin/src/decision.rs @@ -0,0 +1,72 @@ +use crate::custom_node::ZenCustomNodeCallbackWrapper; +use crate::engine::ZenEvaluateOptions; +use crate::error::ZenError; +use crate::loader::ZenDecisionLoaderCallbackWrapper; +use crate::types::{JsonBuffer, ZenEngineResponse}; +use serde_json::Value; +use std::sync::Arc; +use tokio::runtime::Handle; +use tokio::task; +use zen_engine::{Decision, DecisionGraphValidationError, EvaluationOptions}; + +#[derive(uniffi::Object)] +pub struct ZenDecision { + decision: Arc>, +} + +impl From> + for ZenDecision +{ + fn from( + value: Decision, + ) -> Self { + Self { + decision: Arc::new(value), + } + } +} + +#[uniffi::export(async_runtime = "tokio")] +impl ZenDecision { + pub async fn evaluate( + &self, + context: JsonBuffer, + options: Option, + ) -> Result { + let options = options.unwrap_or_default(); + let context: Value = context.try_into()?; + + let decision = self.decision.clone(); + let evaluation_options = EvaluationOptions { + max_depth: options.max_depth, + trace: options.trace, + }; + + // Use spawn_blocking to run the non-Send code synchronously + let response = task::spawn_blocking(move || { + // The blocking code that uses non-Send types + Handle::current().block_on(async move { + decision + .evaluate_with_opts(context.into(), evaluation_options) + .await + .map(|response| ZenEngineResponse::from(response)) + .map_err(|err| { + ZenError::EvaluationError( + serde_json::to_string(&err.as_ref()) + .unwrap_or_else(|_| err.to_string()), + ) + }) + }) + }) + .await + .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))??; + + Ok(response) + } + + pub fn validate(&self) -> Result<(), ZenError> { + self.decision.validate().map_err(|e| { + ZenError::ValidationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) + }) + } +} diff --git a/bindings/kotlin/src/engine.rs b/bindings/kotlin/src/engine.rs new file mode 100644 index 00000000..18a36c4d --- /dev/null +++ b/bindings/kotlin/src/engine.rs @@ -0,0 +1,132 @@ +use crate::custom_node::{NoopCustomNodeCallback, ZenCustomNodeCallback, ZenCustomNodeCallbackWrapper}; +use crate::decision::ZenDecision; +use crate::error::ZenError; +use crate::loader::{ + NoopDecisionLoader, ZenDecisionLoaderCallback, ZenDecisionLoaderCallbackWrapper, +}; +use crate::types::{ + JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse, ZenEngineResponse, +}; +use async_trait::async_trait; +use serde_json::Value; +use std::future::Future; +use std::sync::Arc; +use tokio::runtime::Handle; +use tokio::task; +use uniffi::deps::anyhow::anyhow; +use zen_engine::handler::custom_node_adapter::{ + CustomNodeAdapter, CustomNodeRequest, NoopCustomNode, +}; +use zen_engine::handler::node::NodeResult; +use zen_engine::loader::{DecisionLoader, NoopLoader}; +use zen_engine::model::DecisionContent; +use zen_engine::{DecisionEngine, EvaluationOptions}; +use zen_expression::parser::Node; + +#[derive(uniffi::Object)] +pub(crate) struct ZenEngine { + engine: Arc>, +} + +#[derive(uniffi::Record)] +pub struct ZenEvaluateOptions { + pub max_depth: Option, + pub trace: Option, +} + +impl Default for ZenEvaluateOptions { + fn default() -> Self { + Self { + max_depth: Some(5), + trace: Some(false), + } + } +} + +#[uniffi::export(async_runtime = "tokio")] +impl ZenEngine { + #[uniffi::constructor] + pub fn new( + loader: Option>, + custom_node: Option>, + ) -> Self { + Self { + engine: Arc::new(DecisionEngine::new( + Arc::new(ZenDecisionLoaderCallbackWrapper( + loader.unwrap_or_else(|| Box::new(NoopDecisionLoader)), + )), + Arc::new(ZenCustomNodeCallbackWrapper( + custom_node.unwrap_or_else(|| Box::new(NoopCustomNodeCallback)) + )), + )), + } + } + + pub async fn evaluate( + &self, + key: String, + context: JsonBuffer, + options: Option, + ) -> Result { + let options = options.unwrap_or_default(); + let context: Value = context.try_into()?; + + let engine = self.engine.clone(); + let evaluation_options = EvaluationOptions { + max_depth: options.max_depth, + trace: options.trace, + }; + + // Use spawn_blocking to run the non-Send code synchronously + let response = task::spawn_blocking(move || { + // The blocking code that uses non-Send types + Handle::current().block_on(async move { + engine + .evaluate_with_opts(key, context.into(), evaluation_options) + .await + .map(|response| ZenEngineResponse::from(response)) + .map_err(|err| { + ZenError::EvaluationError( + serde_json::to_string(&err.as_ref()) + .unwrap_or_else(|_| err.to_string()), + ) + }) + }) + }) + .await + .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))??; + + Ok(response) + } + + pub fn create_decision(&self, content: JsonBuffer) -> Result { + let decision = self.engine.create_decision(Arc::new( + serde_json::from_slice(&content.0).map_err(|_| ZenError::JsonDeserializationFailed)?, + )); + + Ok(ZenDecision::from(decision)) + } + + pub async fn get_decision(&self, key: String) -> Result { + let engine = self.engine.clone(); + + // Use spawn_blocking to run the non-Send code synchronously + let decision = task::spawn_blocking(move || { + // The blocking code that uses non-Send types + Handle::current().block_on(async move { + engine + .get_decision(&key) + .await + .map_err(|e| ZenError::LoaderInternalError { + key, + details: e.to_string(), + }) + .map(ZenDecision::from) + }) + }) + .await + .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))??; + + Ok(decision) + } +} diff --git a/bindings/kotlin/src/error.rs b/bindings/kotlin/src/error.rs new file mode 100644 index 00000000..8d19557d --- /dev/null +++ b/bindings/kotlin/src/error.rs @@ -0,0 +1,54 @@ +use serde_json::json; +use std::fmt::Formatter; + +#[allow(dead_code)] +#[derive(Debug, uniffi::Error)] +pub enum ZenError { + Zero, + + InvalidArgument, + StringNullError, + StringUtf8Error, + JsonSerializationFailed, + JsonDeserializationFailed, + ExecutionTaskSpawnError, + + IsolateError(String), + EvaluationError(String), + ValidationError(String), + + LoaderKeyNotFound { key: String }, + LoaderInternalError { key: String, details: String }, + + TemplateEngineError { template: String, details: String }, +} + +impl ZenError { + pub fn details(&self) -> String { + match &self { + ZenError::IsolateError(error) => error.to_string(), + ZenError::EvaluationError(error) => error.to_string(), + ZenError::ValidationError(error) => error.to_string(), + ZenError::LoaderKeyNotFound { key } => json!({ "key": key }).to_string(), + ZenError::LoaderInternalError { key, details } => { + json!({ "key": key, "details": details }).to_string() + } + ZenError::TemplateEngineError { template, details } => { + json!({ "template": template, "details": details }).to_string() + } + ZenError::Zero => String::from("Zero"), + ZenError::InvalidArgument => String::from("InvalidArgument"), + ZenError::StringNullError => String::from("StringNullError"), + ZenError::StringUtf8Error => String::from("StringUtf8Error"), + ZenError::JsonSerializationFailed => String::from("JsonSerializationFailed"), + ZenError::JsonDeserializationFailed => String::from("JsonDeserializationFailed"), + ZenError::ExecutionTaskSpawnError => String::from("ExecutionTaskSpawnError"), + } + } +} + +impl std::fmt::Display for ZenError { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + self.details().fmt(f) + } +} diff --git a/bindings/kotlin/src/expression.rs b/bindings/kotlin/src/expression.rs new file mode 100644 index 00000000..b38f5cd2 --- /dev/null +++ b/bindings/kotlin/src/expression.rs @@ -0,0 +1,92 @@ +use crate::error::ZenError; +use crate::types::JsonBuffer; +use serde_json::Value; +use tokio::task; +use uniffi::deps::anyhow::anyhow; + +#[uniffi::export()] +pub fn evaluate_expression_sync( + expression: String, + context: Option, +) -> Result { + let ctx: Value = context + .and_then(|v| v.try_into().ok()) + .unwrap_or(Value::Null); + + Ok( + zen_expression::evaluate_expression(expression.as_str(), ctx.into()) + .map_err(|e| { + ZenError::EvaluationError( + serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), + ) + })? + .to_value() + .try_into()?, + ) +} + +#[allow(dead_code)] +#[uniffi::export()] +pub fn evaluate_unary_expression_sync( + expression: String, + context: JsonBuffer, +) -> Result { + let ctx: Value = context.try_into()?; + + Ok( + zen_expression::evaluate_unary_expression(expression.as_str(), ctx.into()).map_err( + |e| { + ZenError::EvaluationError( + serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), + ) + }, + )?, + ) +} + +#[allow(dead_code)] +#[uniffi::export()] +pub fn render_template_sync(template: String, context: JsonBuffer) -> Result { + let ctx: Value = context.try_into()?; + + Ok(zen_tmpl::render(template.as_str(), ctx.into()) + .map_err(|e| ZenError::TemplateEngineError { + template, + details: serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), + })? + .to_value() + .try_into()?) +} + +#[allow(dead_code)] +#[uniffi::export(async_runtime = "tokio")] +pub async fn evaluate_expression( + expression: String, + context: Option, +) -> Result { + task::spawn_blocking(move || evaluate_expression_sync(expression, context)) + .await + .map_err(|e| ZenError::ExecutionTaskSpawnError)? +} + +#[allow(dead_code)] +#[uniffi::export(async_runtime = "tokio")] +pub async fn evaluate_unary_expression( + expression: String, + context: JsonBuffer, +) -> Result { + task::spawn_blocking(move || evaluate_unary_expression_sync(expression, context)) + .await + .map_err(|e| ZenError::ExecutionTaskSpawnError)? +} + +#[allow(dead_code)] +#[uniffi::export(async_runtime = "tokio")] +pub async fn render_template( + template: String, + context: JsonBuffer, +) -> Result { + task::spawn_blocking(move || render_template_sync(template, context)) + .await + .map_err(|e| ZenError::ExecutionTaskSpawnError)? +} diff --git a/bindings/kotlin/src/lib.rs b/bindings/kotlin/src/lib.rs new file mode 100644 index 00000000..9eb2e646 --- /dev/null +++ b/bindings/kotlin/src/lib.rs @@ -0,0 +1,9 @@ +uniffi::setup_scaffolding!(); +mod config; +mod custom_node; +mod decision; +mod engine; +mod error; +mod expression; +mod loader; +mod types; diff --git a/bindings/kotlin/src/loader.rs b/bindings/kotlin/src/loader.rs new file mode 100644 index 00000000..f82c3975 --- /dev/null +++ b/bindings/kotlin/src/loader.rs @@ -0,0 +1,43 @@ +use crate::error::ZenError; +use std::future::Future; +use std::sync::Arc; +use uniffi::deps::anyhow::anyhow; +use zen_engine::loader::{DecisionLoader, LoaderError, LoaderResponse}; +use zen_engine::model::DecisionContent; +use crate::types::JsonBuffer; + +#[uniffi::export(callback_interface)] +#[async_trait::async_trait] +pub trait ZenDecisionLoaderCallback: Send + Sync { + async fn load(&self, key: String) -> Result; +} + +pub struct NoopDecisionLoader; + +#[async_trait::async_trait] +impl ZenDecisionLoaderCallback for NoopDecisionLoader { + async fn load(&self, key: String) -> Result { + Err(ZenError::Zero) + } +} + +pub struct ZenDecisionLoaderCallbackWrapper(pub Box); + +impl DecisionLoader for ZenDecisionLoaderCallbackWrapper { + fn load<'a>(&'a self, key: &'a str) -> impl Future + 'a { + async move { + let maybe_raw = self.0.load(key.into()).await; + if maybe_raw.is_err() { + return Err(LoaderError::NotFound(key.to_string()).into()); + } + + let decision_content: DecisionContent = serde_json::from_slice(&maybe_raw.unwrap().0) + .map_err(|e| LoaderError::Internal { + key: key.to_string(), + source: anyhow!(e), + })?; + + Ok(Arc::new(decision_content)) + } + } +} diff --git a/bindings/kotlin/src/types.rs b/bindings/kotlin/src/types.rs new file mode 100644 index 00000000..9d6aacd5 --- /dev/null +++ b/bindings/kotlin/src/types.rs @@ -0,0 +1,103 @@ +use crate::error::ZenError; +use serde_json::Value; +use std::collections::HashMap; +use zen_engine::handler::custom_node_adapter::CustomDecisionNode; +use zen_engine::{DecisionGraphResponse, DecisionGraphTrace}; + +pub struct JsonBuffer(pub Vec); +uniffi::custom_newtype!(JsonBuffer, Vec); + +impl TryFrom for Value { + type Error = ZenError; + + fn try_from(value: JsonBuffer) -> Result { + serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) + } +} + +impl TryFrom for JsonBuffer { + type Error = ZenError; + + fn try_from(value: Value) -> Result { + serde_json::to_vec(&value) + .map(|v| JsonBuffer(v)) + .map_err(|_| ZenError::JsonSerializationFailed) + } +} + +#[derive(uniffi::Record)] +pub struct ZenEngineTrace { + pub id: String, + pub name: String, + pub input: JsonBuffer, + pub output: JsonBuffer, + pub performance: Option, + pub trace_data: Option, + pub order: u32, +} + +impl From for ZenEngineTrace { + fn from(value: DecisionGraphTrace) -> Self { + Self { + id: value.id, + name: value.name, + input: value.input.to_value().try_into().unwrap(), + output: value.output.to_value().try_into().unwrap(), + performance: value.performance, + trace_data: value.trace_data.map(|data| data.try_into().unwrap()), + order: value.order, + } + } +} + +#[derive(uniffi::Record)] +pub struct ZenEngineResponse { + pub performance: String, + pub result: JsonBuffer, + pub trace: Option>, +} + +impl From for ZenEngineResponse { + fn from(value: DecisionGraphResponse) -> Self { + Self { + performance: value.performance, + result: value.result.to_value().try_into().unwrap(), + trace: value.trace.map(|opt| { + opt.into_iter() + .map(|(key, value)| (key, ZenEngineTrace::from(value))) + .collect() + }), + } + } +} + +#[derive(uniffi::Record)] +pub struct ZenEngineHandlerResponse { + pub output: JsonBuffer, + pub trace_data: Option, +} + +#[derive(uniffi::Record)] +pub struct DecisionNode { + pub id: String, + pub name: String, + pub kind: String, + pub config: JsonBuffer, +} + +impl From for DecisionNode { + fn from(value: CustomDecisionNode) -> Self { + Self { + id: value.id, + name: value.name, + kind: value.kind, + config: JsonBuffer(serde_json::to_vec(&value.config).unwrap()), + } + } +} + +#[derive(uniffi::Record)] +pub struct ZenEngineHandlerRequest { + pub input: JsonBuffer, + pub node: DecisionNode, +} diff --git a/bindings/kotlin/uniffi-bindgen.rs b/bindings/kotlin/uniffi-bindgen.rs new file mode 100644 index 00000000..d96eac70 --- /dev/null +++ b/bindings/kotlin/uniffi-bindgen.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::uniffi_bindgen_main() +} \ No newline at end of file diff --git a/bindings/kotlin/uniffi.toml b/bindings/kotlin/uniffi.toml new file mode 100644 index 00000000..92c060a0 --- /dev/null +++ b/bindings/kotlin/uniffi.toml @@ -0,0 +1,2 @@ +[bindings.kotlin] +package_name = "io.gorules.zen_engine" \ No newline at end of file From 1603a9f7d546c409edf9c6cac14f6071b425c13d Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Mon, 6 Jan 2025 14:31:52 +0100 Subject: [PATCH 02/62] chore: build kotlin bindings version --- bindings/kotlin/Cargo.toml | 2 +- bindings/kotlin/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/kotlin/Cargo.toml b/bindings/kotlin/Cargo.toml index f2cbea1c..ad1a6741 100644 --- a/bindings/kotlin/Cargo.toml +++ b/bindings/kotlin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-kotlin" -version = "0.34.1" +version = "0.39.0" edition = "2021" license = "MIT" publish = false diff --git a/bindings/kotlin/build.gradle.kts b/bindings/kotlin/build.gradle.kts index f48a6cd7..fab6642d 100644 --- a/bindings/kotlin/build.gradle.kts +++ b/bindings/kotlin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "io.gorules" -version = "0.36.1" +version = "0.39.0" dependencies { implementation("net.java.dev.jna:jna:5.15.0") From e59b395968e3bed52030dbf94a111f1e243a2fa3 Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Mon, 6 Jan 2025 14:51:30 +0100 Subject: [PATCH 03/62] build: add proper lib dir for jna --- .github/workflows/kotlin.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 1bb19853..fff23024 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -31,11 +31,11 @@ jobs: - host: windows-latest target: 'x86_64-pc-windows-msvc' extension: "dll" - lib_dir: TODO + lib_dir: 'win32-x86-64' - host: macos-13 target: 'x86_64-apple-darwin' extension: "dylib" - lib_dir: TODO + lib_dir: 'darwin' - host: macos-14 target: 'aarch64-apple-darwin' extension: "dylib" @@ -43,11 +43,11 @@ jobs: - host: ubuntu-latest target: 'x86_64-unknown-linux-gnu' extension: "so" - lib_dir: TODO + lib_dir: 'linux-x86-64' - host: ubuntu-latest target: 'aarch64-unknown-linux-gnu' - extension: ".so" - lib_dir: TODO + extension: "so" + lib_dir: 'linux-aarch64' name: stable - ${{ matrix.settings.target }} - kotlin@17 runs-on: ${{ matrix.settings.host }} From d1617b5a4b3d7f221cf2986a2fff97dd8b2cd7c7 Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Fri, 31 Jan 2025 13:46:36 +0100 Subject: [PATCH 04/62] chore: rename kotlin directory to uniffi --- .github/workflows/kotlin.yaml | 6 +++--- bindings/{kotlin => uniffi}/.gitignore | 0 bindings/{kotlin => uniffi}/Cargo.toml | 0 bindings/{kotlin => uniffi}/build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 bindings/{kotlin => uniffi}/gradlew | 0 bindings/{kotlin => uniffi}/gradlew.bat | 0 bindings/{kotlin => uniffi}/settings.gradle.kts | 0 bindings/{kotlin => uniffi}/src/config.rs | 0 bindings/{kotlin => uniffi}/src/custom_node.rs | 0 bindings/{kotlin => uniffi}/src/decision.rs | 0 bindings/{kotlin => uniffi}/src/engine.rs | 0 bindings/{kotlin => uniffi}/src/error.rs | 0 bindings/{kotlin => uniffi}/src/expression.rs | 0 bindings/{kotlin => uniffi}/src/lib.rs | 0 bindings/{kotlin => uniffi}/src/loader.rs | 0 bindings/{kotlin => uniffi}/src/types.rs | 0 bindings/{kotlin => uniffi}/uniffi-bindgen.rs | 0 bindings/{kotlin => uniffi}/uniffi.toml | 0 20 files changed, 3 insertions(+), 3 deletions(-) rename bindings/{kotlin => uniffi}/.gitignore (100%) rename bindings/{kotlin => uniffi}/Cargo.toml (100%) rename bindings/{kotlin => uniffi}/build.gradle.kts (100%) rename bindings/{kotlin => uniffi}/gradle/wrapper/gradle-wrapper.jar (100%) rename bindings/{kotlin => uniffi}/gradle/wrapper/gradle-wrapper.properties (100%) rename bindings/{kotlin => uniffi}/gradlew (100%) rename bindings/{kotlin => uniffi}/gradlew.bat (100%) rename bindings/{kotlin => uniffi}/settings.gradle.kts (100%) rename bindings/{kotlin => uniffi}/src/config.rs (100%) rename bindings/{kotlin => uniffi}/src/custom_node.rs (100%) rename bindings/{kotlin => uniffi}/src/decision.rs (100%) rename bindings/{kotlin => uniffi}/src/engine.rs (100%) rename bindings/{kotlin => uniffi}/src/error.rs (100%) rename bindings/{kotlin => uniffi}/src/expression.rs (100%) rename bindings/{kotlin => uniffi}/src/lib.rs (100%) rename bindings/{kotlin => uniffi}/src/loader.rs (100%) rename bindings/{kotlin => uniffi}/src/types.rs (100%) rename bindings/{kotlin => uniffi}/uniffi-bindgen.rs (100%) rename bindings/{kotlin => uniffi}/uniffi.toml (100%) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index fff23024..1105b419 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -1,6 +1,6 @@ name: Kotlin env: - WORKING_DIRECTORY: bindings/kotlin + WORKING_DIRECTORY: bindings/uniffi on: push: @@ -9,13 +9,13 @@ on: tags-ignore: - '**' paths: - - 'bindings/kotlin/**' + - '../../bindings/uniffi/**' - 'core/**' - 'test-data/**' - '.github/workflows/kotlin.yaml' pull_request: paths: - - 'bindings/kotlin/**' + - '../../bindings/uniffi/**' - 'core/**' - 'test-data/**' - '.github/workflows/kotlin.yaml' diff --git a/bindings/kotlin/.gitignore b/bindings/uniffi/.gitignore similarity index 100% rename from bindings/kotlin/.gitignore rename to bindings/uniffi/.gitignore diff --git a/bindings/kotlin/Cargo.toml b/bindings/uniffi/Cargo.toml similarity index 100% rename from bindings/kotlin/Cargo.toml rename to bindings/uniffi/Cargo.toml diff --git a/bindings/kotlin/build.gradle.kts b/bindings/uniffi/build.gradle.kts similarity index 100% rename from bindings/kotlin/build.gradle.kts rename to bindings/uniffi/build.gradle.kts diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.jar b/bindings/uniffi/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from bindings/kotlin/gradle/wrapper/gradle-wrapper.jar rename to bindings/uniffi/gradle/wrapper/gradle-wrapper.jar diff --git a/bindings/kotlin/gradle/wrapper/gradle-wrapper.properties b/bindings/uniffi/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from bindings/kotlin/gradle/wrapper/gradle-wrapper.properties rename to bindings/uniffi/gradle/wrapper/gradle-wrapper.properties diff --git a/bindings/kotlin/gradlew b/bindings/uniffi/gradlew similarity index 100% rename from bindings/kotlin/gradlew rename to bindings/uniffi/gradlew diff --git a/bindings/kotlin/gradlew.bat b/bindings/uniffi/gradlew.bat similarity index 100% rename from bindings/kotlin/gradlew.bat rename to bindings/uniffi/gradlew.bat diff --git a/bindings/kotlin/settings.gradle.kts b/bindings/uniffi/settings.gradle.kts similarity index 100% rename from bindings/kotlin/settings.gradle.kts rename to bindings/uniffi/settings.gradle.kts diff --git a/bindings/kotlin/src/config.rs b/bindings/uniffi/src/config.rs similarity index 100% rename from bindings/kotlin/src/config.rs rename to bindings/uniffi/src/config.rs diff --git a/bindings/kotlin/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs similarity index 100% rename from bindings/kotlin/src/custom_node.rs rename to bindings/uniffi/src/custom_node.rs diff --git a/bindings/kotlin/src/decision.rs b/bindings/uniffi/src/decision.rs similarity index 100% rename from bindings/kotlin/src/decision.rs rename to bindings/uniffi/src/decision.rs diff --git a/bindings/kotlin/src/engine.rs b/bindings/uniffi/src/engine.rs similarity index 100% rename from bindings/kotlin/src/engine.rs rename to bindings/uniffi/src/engine.rs diff --git a/bindings/kotlin/src/error.rs b/bindings/uniffi/src/error.rs similarity index 100% rename from bindings/kotlin/src/error.rs rename to bindings/uniffi/src/error.rs diff --git a/bindings/kotlin/src/expression.rs b/bindings/uniffi/src/expression.rs similarity index 100% rename from bindings/kotlin/src/expression.rs rename to bindings/uniffi/src/expression.rs diff --git a/bindings/kotlin/src/lib.rs b/bindings/uniffi/src/lib.rs similarity index 100% rename from bindings/kotlin/src/lib.rs rename to bindings/uniffi/src/lib.rs diff --git a/bindings/kotlin/src/loader.rs b/bindings/uniffi/src/loader.rs similarity index 100% rename from bindings/kotlin/src/loader.rs rename to bindings/uniffi/src/loader.rs diff --git a/bindings/kotlin/src/types.rs b/bindings/uniffi/src/types.rs similarity index 100% rename from bindings/kotlin/src/types.rs rename to bindings/uniffi/src/types.rs diff --git a/bindings/kotlin/uniffi-bindgen.rs b/bindings/uniffi/uniffi-bindgen.rs similarity index 100% rename from bindings/kotlin/uniffi-bindgen.rs rename to bindings/uniffi/uniffi-bindgen.rs diff --git a/bindings/kotlin/uniffi.toml b/bindings/uniffi/uniffi.toml similarity index 100% rename from bindings/kotlin/uniffi.toml rename to bindings/uniffi/uniffi.toml From 3abcc55a0bbe72141ad8ab893c48c2d13d3d6a00 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:06:36 +0100 Subject: [PATCH 05/62] update kotlin files --- .github/workflows/kotlin.yaml | 12 +++++++----- bindings/uniffi/Cargo.toml | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 1105b419..6a91e570 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -3,6 +3,8 @@ env: WORKING_DIRECTORY: bindings/uniffi on: + # Temporary allow on workflow dispatch + workflow_dispatch: push: branches: - master @@ -89,7 +91,7 @@ jobs: defaults: run: working-directory: ${{ env.WORKING_DIRECTORY }} - needs: [build] + needs: [ build ] steps: - uses: actions/checkout@v3 @@ -127,13 +129,13 @@ jobs: --bin uniffi-bindgen \ --features "uniffi/cli" \ -- generate \ - --library build/generated/resources/libs/libzen_kotlin.dylib \ + --library build/generated/resources/libs/libzen_kotlin.so \ --language kotlin \ --out-dir build/generated/main/kotlin -# TODO -# - name: Setup Maven Repository credentials -# run: + # TODO + # - name: Setup Maven Repository credentials + # run: - name: Publish Maven Artifact run: ./gradlew publish diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index ad1a6741..e6e422e2 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -13,14 +13,14 @@ name = "uniffi-bindgen" path = "uniffi-bindgen.rs" [dependencies] -uniffi = { version = "0.28.3", features = ["tokio"] } +uniffi = { version = "0.29.0", features = ["tokio"] } serde_json = { workspace = true } zen-engine = { path = "../../core/engine" } zen-expression = { path = "../../core/expression" } zen-tmpl = { path = "../../core/template" } serde = { workspace = true, features = ["derive"] } -async-trait = "0.1.83" -tokio = "1.42.0" +async-trait = "0.1" +tokio = "1.43" [build-dependencies] -uniffi = { version = "0.28.3", features = ["build"] } \ No newline at end of file +uniffi = { version = "0.29.0", features = ["build"] } \ No newline at end of file From e28136f707d34ff3d8810e9ec3471accafc6a26c Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:17:08 +0100 Subject: [PATCH 06/62] update kotlin --- .github/workflows/kotlin.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 6a91e570..228d9740 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -81,7 +81,7 @@ jobs: run: cargo build --lib --release --target ${{ matrix.settings.target }} - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.settings.lib_dir }} path: ./../target/release/libzen_kotlin.${{ matrix.settings.extension }} @@ -119,7 +119,7 @@ jobs: uses: gradle/gradle-build-action@v2 - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: build/generated/main/resources From b96d0361bf8bc41b9d15bf3d1ee1f1e64e5c0dc8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:37:16 +0100 Subject: [PATCH 07/62] fix workflow --- .github/workflows/kotlin.yaml | 40 +++++++++++------------------------ 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 228d9740..d3e2d13f 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -60,25 +60,20 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - name: Setup Rust Toolchain + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true target: ${{ matrix.settings.target }} - - name: Cache cargo registry - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - .cargo-cache - key: ${{ matrix.settings.target }}-cargo-registry - - name: Build - shell: bash - run: cargo build --lib --release --target ${{ matrix.settings.target }} + uses: houseabsolute/actions-rust-cross@v1 + with: + target: ${{ matrix.settings.target }} + args: "--lib --release" + strip: true + + # shell: bash + # run: cargo build --lib --release --target ${{ matrix.settings.target }} - name: Upload artifact uses: actions/upload-artifact@v4 @@ -96,22 +91,11 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 + - name: Setup Rust Toolchain + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true target: ${{ matrix.settings.target }} - - name: Cache cargo registry - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - .cargo-cache - key: ${{ matrix.settings.target }}-cargo-registry - - name: Validate Gradle wrapper jar uses: gradle/wrapper-validation-action@v1 From 0e249b428da60c37297f65d955f5a6ef9d1c9d45 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:38:58 +0100 Subject: [PATCH 08/62] fix workflow --- .github/workflows/kotlin.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index d3e2d13f..8ffb440f 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -68,6 +68,7 @@ jobs: - name: Build uses: houseabsolute/actions-rust-cross@v1 with: + working-directory: bindings/uniffi target: ${{ matrix.settings.target }} args: "--lib --release" strip: true From a4995806e562147b9ee26c5df770969711090f7e Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:43:17 +0100 Subject: [PATCH 09/62] fix --- .github/workflows/kotlin.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 8ffb440f..986af0ab 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -71,7 +71,6 @@ jobs: working-directory: bindings/uniffi target: ${{ matrix.settings.target }} args: "--lib --release" - strip: true # shell: bash # run: cargo build --lib --release --target ${{ matrix.settings.target }} From e1c7fff77bc1b2e61b5461a0d5f6163f43d8c125 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:52:45 +0100 Subject: [PATCH 10/62] fix upload path --- .github/workflows/kotlin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 986af0ab..694a8f48 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -79,7 +79,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ matrix.settings.lib_dir }} - path: ./../target/release/libzen_kotlin.${{ matrix.settings.extension }} + path: target/release/libzen_kotlin.${{ matrix.settings.extension }} release: runs-on: ubuntu-latest From 8809f3baea7719ad0e0e3e06278e6e63b0c4d5cd Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 15:57:26 +0100 Subject: [PATCH 11/62] fix --- .github/workflows/kotlin.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 694a8f48..3eff1357 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -1,6 +1,6 @@ name: Kotlin env: - WORKING_DIRECTORY: bindings/uniffi + UNIFFI_DIRECTORY: bindings/uniffi on: # Temporary allow on workflow dispatch @@ -53,9 +53,6 @@ jobs: name: stable - ${{ matrix.settings.target }} - kotlin@17 runs-on: ${{ matrix.settings.host }} - defaults: - run: - working-directory: ${{ env.WORKING_DIRECTORY }} steps: - uses: actions/checkout@v3 @@ -68,9 +65,12 @@ jobs: - name: Build uses: houseabsolute/actions-rust-cross@v1 with: - working-directory: bindings/uniffi + working-directory: ${{ env.UNIFFI_DIRECTORY }} target: ${{ matrix.settings.target }} args: "--lib --release" + + - name: List release files + run: ls -lh target/release # shell: bash # run: cargo build --lib --release --target ${{ matrix.settings.target }} @@ -83,10 +83,10 @@ jobs: release: runs-on: ubuntu-latest + needs: [ build ] defaults: run: - working-directory: ${{ env.WORKING_DIRECTORY }} - needs: [ build ] + working-directory: ${{ env.UNIFFI_DIRECTORY }} steps: - uses: actions/checkout@v3 From c3ed322fb9ece93d46a0997811fa0d6f7c832c87 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 16:11:19 +0100 Subject: [PATCH 12/62] fix --- .../workflows/{kotlin.yaml => uniffi.yaml} | 20 +++++-------------- bindings/uniffi/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) rename .github/workflows/{kotlin.yaml => uniffi.yaml} (84%) diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/uniffi.yaml similarity index 84% rename from .github/workflows/kotlin.yaml rename to .github/workflows/uniffi.yaml index 3eff1357..c57a93a8 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/uniffi.yaml @@ -1,4 +1,4 @@ -name: Kotlin +name: UniFFI env: UNIFFI_DIRECTORY: bindings/uniffi @@ -14,13 +14,13 @@ on: - '../../bindings/uniffi/**' - 'core/**' - 'test-data/**' - - '.github/workflows/kotlin.yaml' + - '.github/workflows/uniffi.yaml' pull_request: paths: - '../../bindings/uniffi/**' - 'core/**' - 'test-data/**' - - '.github/workflows/kotlin.yaml' + - '.github/workflows/uniffi.yaml' jobs: build: @@ -69,17 +69,11 @@ jobs: target: ${{ matrix.settings.target }} args: "--lib --release" - - name: List release files - run: ls -lh target/release - - # shell: bash - # run: cargo build --lib --release --target ${{ matrix.settings.target }} - - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ${{ matrix.settings.lib_dir }} - path: target/release/libzen_kotlin.${{ matrix.settings.extension }} + path: target/${{ matrix.settings.target }}/release/libzen_uniffi.${{ matrix.settings.extension }} release: runs-on: ubuntu-latest @@ -113,13 +107,9 @@ jobs: --bin uniffi-bindgen \ --features "uniffi/cli" \ -- generate \ - --library build/generated/resources/libs/libzen_kotlin.so \ + --library build/generated/resources/libs/libzen_uniffi.so \ --language kotlin \ --out-dir build/generated/main/kotlin - # TODO - # - name: Setup Maven Repository credentials - # run: - - name: Publish Maven Artifact run: ./gradlew publish diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index e6e422e2..a2d64403 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "zen-kotlin" +name = "zen-uniffi" version = "0.39.0" edition = "2021" license = "MIT" From 159ecc19394f65527df5d33ed10741fed559e304 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 16:17:21 +0100 Subject: [PATCH 13/62] fix fmt --- .github/workflows/uniffi.yaml | 2 +- bindings/uniffi/src/config.rs | 4 ++-- bindings/uniffi/src/custom_node.rs | 8 +++++--- bindings/uniffi/src/decision.rs | 2 +- bindings/uniffi/src/engine.rs | 20 +++++--------------- bindings/uniffi/src/expression.rs | 1 - bindings/uniffi/src/loader.rs | 8 ++++---- bindings/uniffi/uniffi-bindgen.rs | 2 +- 8 files changed, 19 insertions(+), 28 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index c57a93a8..f0fd0859 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -51,7 +51,7 @@ jobs: extension: "so" lib_dir: 'linux-aarch64' - name: stable - ${{ matrix.settings.target }} - kotlin@17 + name: UniFFI - ${{ matrix.settings.target }} runs-on: ${{ matrix.settings.host }} steps: diff --git a/bindings/uniffi/src/config.rs b/bindings/uniffi/src/config.rs index e8095001..b87b251f 100644 --- a/bindings/uniffi/src/config.rs +++ b/bindings/uniffi/src/config.rs @@ -3,7 +3,7 @@ use zen_engine::ZEN_CONFIG; #[derive(uniffi::Record)] pub struct ZenConfig { - pub nodes_in_context: Option + pub nodes_in_context: Option, } #[uniffi::export] @@ -11,4 +11,4 @@ pub fn override_config(config: ZenConfig) { if let Some(val) = config.nodes_in_context { ZEN_CONFIG.nodes_in_context.store(val, Ordering::Relaxed) } -} \ No newline at end of file +} diff --git a/bindings/uniffi/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs index 78b732b9..1b28245c 100644 --- a/bindings/uniffi/src/custom_node.rs +++ b/bindings/uniffi/src/custom_node.rs @@ -1,11 +1,10 @@ use crate::error::ZenError; -use crate::types::{DecisionNode, JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; +use crate::types::{DecisionNode, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; use serde_json::Value; use uniffi::deps::anyhow::anyhow; use zen_engine::handler::custom_node_adapter::{CustomNodeAdapter, CustomNodeRequest}; use zen_engine::handler::node::{NodeResponse, NodeResult}; use zen_expression::Variable; -use crate::loader::ZenDecisionLoaderCallback; #[uniffi::export(callback_interface)] #[async_trait::async_trait] @@ -20,7 +19,10 @@ pub struct NoopCustomNodeCallback; #[async_trait::async_trait] impl ZenCustomNodeCallback for NoopCustomNodeCallback { - async fn handle(&self, key: ZenEngineHandlerRequest) -> Result { + async fn handle( + &self, + key: ZenEngineHandlerRequest, + ) -> Result { Err(ZenError::Zero) } } diff --git a/bindings/uniffi/src/decision.rs b/bindings/uniffi/src/decision.rs index fb6f9ad5..d76ab0d4 100644 --- a/bindings/uniffi/src/decision.rs +++ b/bindings/uniffi/src/decision.rs @@ -7,7 +7,7 @@ use serde_json::Value; use std::sync::Arc; use tokio::runtime::Handle; use tokio::task; -use zen_engine::{Decision, DecisionGraphValidationError, EvaluationOptions}; +use zen_engine::{Decision, EvaluationOptions}; #[derive(uniffi::Object)] pub struct ZenDecision { diff --git a/bindings/uniffi/src/engine.rs b/bindings/uniffi/src/engine.rs index 18a36c4d..d38075ad 100644 --- a/bindings/uniffi/src/engine.rs +++ b/bindings/uniffi/src/engine.rs @@ -1,27 +1,17 @@ -use crate::custom_node::{NoopCustomNodeCallback, ZenCustomNodeCallback, ZenCustomNodeCallbackWrapper}; +use crate::custom_node::{ + NoopCustomNodeCallback, ZenCustomNodeCallback, ZenCustomNodeCallbackWrapper, +}; use crate::decision::ZenDecision; use crate::error::ZenError; use crate::loader::{ NoopDecisionLoader, ZenDecisionLoaderCallback, ZenDecisionLoaderCallbackWrapper, }; -use crate::types::{ - JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse, ZenEngineResponse, -}; -use async_trait::async_trait; +use crate::types::{JsonBuffer, ZenEngineResponse}; use serde_json::Value; -use std::future::Future; use std::sync::Arc; use tokio::runtime::Handle; use tokio::task; -use uniffi::deps::anyhow::anyhow; -use zen_engine::handler::custom_node_adapter::{ - CustomNodeAdapter, CustomNodeRequest, NoopCustomNode, -}; -use zen_engine::handler::node::NodeResult; -use zen_engine::loader::{DecisionLoader, NoopLoader}; -use zen_engine::model::DecisionContent; use zen_engine::{DecisionEngine, EvaluationOptions}; -use zen_expression::parser::Node; #[derive(uniffi::Object)] pub(crate) struct ZenEngine { @@ -56,7 +46,7 @@ impl ZenEngine { loader.unwrap_or_else(|| Box::new(NoopDecisionLoader)), )), Arc::new(ZenCustomNodeCallbackWrapper( - custom_node.unwrap_or_else(|| Box::new(NoopCustomNodeCallback)) + custom_node.unwrap_or_else(|| Box::new(NoopCustomNodeCallback)), )), )), } diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index b38f5cd2..4ebb48f1 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -2,7 +2,6 @@ use crate::error::ZenError; use crate::types::JsonBuffer; use serde_json::Value; use tokio::task; -use uniffi::deps::anyhow::anyhow; #[uniffi::export()] pub fn evaluate_expression_sync( diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index f82c3975..d97b726a 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -1,10 +1,10 @@ use crate::error::ZenError; +use crate::types::JsonBuffer; use std::future::Future; use std::sync::Arc; use uniffi::deps::anyhow::anyhow; use zen_engine::loader::{DecisionLoader, LoaderError, LoaderResponse}; use zen_engine::model::DecisionContent; -use crate::types::JsonBuffer; #[uniffi::export(callback_interface)] #[async_trait::async_trait] @@ -33,9 +33,9 @@ impl DecisionLoader for ZenDecisionLoaderCallbackWrapper { let decision_content: DecisionContent = serde_json::from_slice(&maybe_raw.unwrap().0) .map_err(|e| LoaderError::Internal { - key: key.to_string(), - source: anyhow!(e), - })?; + key: key.to_string(), + source: anyhow!(e), + })?; Ok(Arc::new(decision_content)) } diff --git a/bindings/uniffi/uniffi-bindgen.rs b/bindings/uniffi/uniffi-bindgen.rs index d96eac70..f6cff6cf 100644 --- a/bindings/uniffi/uniffi-bindgen.rs +++ b/bindings/uniffi/uniffi-bindgen.rs @@ -1,3 +1,3 @@ fn main() { uniffi::uniffi_bindgen_main() -} \ No newline at end of file +} From a6afa107905435d0c0648fbba42d66a9bda89a78 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 16:37:14 +0100 Subject: [PATCH 14/62] fix --- .github/workflows/uniffi.yaml | 7 +++++-- bindings/uniffi/src/custom_node.rs | 2 +- bindings/uniffi/src/expression.rs | 6 +++--- bindings/uniffi/src/loader.rs | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index f0fd0859..0d11367c 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -101,13 +101,16 @@ jobs: with: path: build/generated/main/resources + - name: List resoruces + run: ls -lh build/generated/main/resources + - name: Generate Kotlin sources run: | cargo run \ --bin uniffi-bindgen \ --features "uniffi/cli" \ - -- generate \ - --library build/generated/resources/libs/libzen_uniffi.so \ + -- generate \ + --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ --language kotlin \ --out-dir build/generated/main/kotlin diff --git a/bindings/uniffi/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs index 1b28245c..f15a4330 100644 --- a/bindings/uniffi/src/custom_node.rs +++ b/bindings/uniffi/src/custom_node.rs @@ -21,7 +21,7 @@ pub struct NoopCustomNodeCallback; impl ZenCustomNodeCallback for NoopCustomNodeCallback { async fn handle( &self, - key: ZenEngineHandlerRequest, + _: ZenEngineHandlerRequest, ) -> Result { Err(ZenError::Zero) } diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index 4ebb48f1..24271155 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -65,7 +65,7 @@ pub async fn evaluate_expression( ) -> Result { task::spawn_blocking(move || evaluate_expression_sync(expression, context)) .await - .map_err(|e| ZenError::ExecutionTaskSpawnError)? + .map_err(|_| ZenError::ExecutionTaskSpawnError)? } #[allow(dead_code)] @@ -76,7 +76,7 @@ pub async fn evaluate_unary_expression( ) -> Result { task::spawn_blocking(move || evaluate_unary_expression_sync(expression, context)) .await - .map_err(|e| ZenError::ExecutionTaskSpawnError)? + .map_err(|_| ZenError::ExecutionTaskSpawnError)? } #[allow(dead_code)] @@ -87,5 +87,5 @@ pub async fn render_template( ) -> Result { task::spawn_blocking(move || render_template_sync(template, context)) .await - .map_err(|e| ZenError::ExecutionTaskSpawnError)? + .map_err(|_| ZenError::ExecutionTaskSpawnError)? } diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index d97b726a..6c3882fd 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -16,7 +16,7 @@ pub struct NoopDecisionLoader; #[async_trait::async_trait] impl ZenDecisionLoaderCallback for NoopDecisionLoader { - async fn load(&self, key: String) -> Result { + async fn load(&self, _: String) -> Result { Err(ZenError::Zero) } } From e6e3b757d7f5e1aac0ef7ce291386e7a5b001900 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 16:52:41 +0100 Subject: [PATCH 15/62] fix --- .github/workflows/uniffi.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 0d11367c..ce582496 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -32,23 +32,23 @@ jobs: settings: - host: windows-latest target: 'x86_64-pc-windows-msvc' - extension: "dll" + output: 'zen_uniffi.dll' lib_dir: 'win32-x86-64' - - host: macos-13 + - host: macos-latest target: 'x86_64-apple-darwin' - extension: "dylib" + output: 'libzen_uniffi.dylib' lib_dir: 'darwin' - - host: macos-14 + - host: macos-latest target: 'aarch64-apple-darwin' - extension: "dylib" + output: 'libzen_uniffi.dylib' lib_dir: 'darwin-aarch64' - host: ubuntu-latest target: 'x86_64-unknown-linux-gnu' - extension: "so" + output: 'libzen_uniffi.so' lib_dir: 'linux-x86-64' - host: ubuntu-latest target: 'aarch64-unknown-linux-gnu' - extension: "so" + output: 'libzen_uniffi.so' lib_dir: 'linux-aarch64' name: UniFFI - ${{ matrix.settings.target }} @@ -67,13 +67,14 @@ jobs: with: working-directory: ${{ env.UNIFFI_DIRECTORY }} target: ${{ matrix.settings.target }} - args: "--lib --release" + args: '--lib --release' - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ${{ matrix.settings.lib_dir }} - path: target/${{ matrix.settings.target }}/release/libzen_uniffi.${{ matrix.settings.extension }} + path: target/${{ matrix.settings.target }}/release/${{ matrix.settings.output }} + if-no-files-found: error release: runs-on: ubuntu-latest From ec1f5b4589735f8b687fbe41385f4c4991ed2100 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 16:59:51 +0100 Subject: [PATCH 16/62] fix --- .github/workflows/uniffi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index ce582496..a8a0461f 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -102,8 +102,8 @@ jobs: with: path: build/generated/main/resources - - name: List resoruces - run: ls -lh build/generated/main/resources + - name: List resources + run: ls -lh . - name: Generate Kotlin sources run: | From 41e89c45d9a77f9c3ab9d7e05f53883363a1ea5a Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 17:09:26 +0100 Subject: [PATCH 17/62] fix --- .github/workflows/uniffi.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index a8a0461f..9f351968 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -105,6 +105,12 @@ jobs: - name: List resources run: ls -lh . + - name: PWD + run: pwd + + - name: List resources + run: ls -lh ../../ + - name: Generate Kotlin sources run: | cargo run \ From aa0dda0e3eb10c70a56d193d09e07a539dad9254 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 20 Feb 2025 17:17:19 +0100 Subject: [PATCH 18/62] fix --- .github/workflows/uniffi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 9f351968..1a2d3c31 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -102,6 +102,9 @@ jobs: with: path: build/generated/main/resources + - name: Move artifacts + run: mv ../../build ./ + - name: List resources run: ls -lh . From 2e98f804ac446928464d75e5bb8e6c6b15942ee1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 21 Feb 2025 13:32:21 +0100 Subject: [PATCH 19/62] fix --- .github/workflows/uniffi.yaml | 14 +++------ bindings/uniffi/build.gradle.kts | 48 ++++++++++++++++++++++++++++- bindings/uniffi/settings.gradle.kts | 2 +- bindings/uniffi/uniffi.toml | 2 +- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 1a2d3c31..0a0da213 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -105,15 +105,6 @@ jobs: - name: Move artifacts run: mv ../../build ./ - - name: List resources - run: ls -lh . - - - name: PWD - run: pwd - - - name: List resources - run: ls -lh ../../ - - name: Generate Kotlin sources run: | cargo run \ @@ -125,4 +116,9 @@ jobs: --out-dir build/generated/main/kotlin - name: Publish Maven Artifact + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + MAVEN_GPG_SIGNING_KEY: ${{ secrets.MAVEN_GPG_SIGNING_KEY }} + MAVEN_GPG_SIGNING_PASSWORD: ${{ MAVEN_GPG_SIGNING_PASSWORD }} run: ./gradlew publish diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index fab6642d..4d529c30 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,10 +1,13 @@ +import java.util.* + plugins { kotlin("jvm") version "2.1.0" id("maven-publish") + id("signing") } group = "io.gorules" -version = "0.39.0" +version = "0.1.0" dependencies { implementation("net.java.dev.jna:jna:5.15.0") @@ -31,9 +34,52 @@ publishing { create("mavenJava") { from(components["java"]) artifact(tasks["kotlinSourcesJar"]) + + pom { + name = "GoRules ZEN Engine" + description = "GoRules ZEN Engine is a cross-platform, Open-Source Business Rules Engine (BRE)" + url = "https://gorules.io" + + licenses { + license { + name = "MIT License" + url = "https://github.com/gorules/zen/blob/master/LICENSE" + } + } + + developers { + developer { + id = "gorules" + name = "GoRules Team" + email = "hi@gorules.io" + } + } + + scm { + url = "https://github.com/gorules/zen" + } + } } } repositories { + maven { + url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } mavenLocal() } +} + +signing { + val signingKeyBase64 = System.getenv("MAVEN_GPG_SIGNING_KEY") + val signingPassword = System.getenv("MAVEN_GPG_SIGNING_PASSWORD") + + if (signingKeyBase64 != null && signingPassword != null) { + val signingKey = Base64.getDecoder().decode(signingKeyBase64).toString() + useInMemoryPgpKeys(signingKey, signingPassword) + sign(publishing.publications["mavenJava"]) + } } \ No newline at end of file diff --git a/bindings/uniffi/settings.gradle.kts b/bindings/uniffi/settings.gradle.kts index 1c7c7abe..874dd844 100644 --- a/bindings/uniffi/settings.gradle.kts +++ b/bindings/uniffi/settings.gradle.kts @@ -1 +1 @@ -rootProject.name = "zen_kotlin" \ No newline at end of file +rootProject.name = "zen-engine" \ No newline at end of file diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index 92c060a0..1c0ab740 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -1,2 +1,2 @@ [bindings.kotlin] -package_name = "io.gorules.zen_engine" \ No newline at end of file +package_name = "io.gorules.zen" \ No newline at end of file From 56751eaa16835db9562ccdf3b9557d27fa2d3d46 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 21 Feb 2025 13:37:07 +0100 Subject: [PATCH 20/62] fix --- .github/workflows/uniffi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 0a0da213..494adfc9 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -120,5 +120,5 @@ jobs: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} MAVEN_GPG_SIGNING_KEY: ${{ secrets.MAVEN_GPG_SIGNING_KEY }} - MAVEN_GPG_SIGNING_PASSWORD: ${{ MAVEN_GPG_SIGNING_PASSWORD }} + MAVEN_GPG_SIGNING_PASSWORD: ${{ secrets.MAVEN_GPG_SIGNING_PASSWORD }} run: ./gradlew publish From 780629f0ff16a50435443a1c88a79f2fd0c81177 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 21 Feb 2025 14:10:11 +0100 Subject: [PATCH 21/62] fix charset --- bindings/uniffi/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 4d529c30..41edd081 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -78,7 +78,7 @@ signing { val signingPassword = System.getenv("MAVEN_GPG_SIGNING_PASSWORD") if (signingKeyBase64 != null && signingPassword != null) { - val signingKey = Base64.getDecoder().decode(signingKeyBase64).toString() + val signingKey = Base64.getDecoder().decode(signingKeyBase64).toString(Charsets.UTF_8) useInMemoryPgpKeys(signingKey, signingPassword) sign(publishing.publications["mavenJava"]) } From 592ca02fb65aed33159fc149cde735f55b495462 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 21 Feb 2025 14:42:49 +0100 Subject: [PATCH 22/62] fix --- .github/workflows/uniffi.yaml | 10 ++++---- bindings/uniffi/build.gradle.kts | 40 ++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 494adfc9..6d400e17 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -117,8 +117,8 @@ jobs: - name: Publish Maven Artifact env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - MAVEN_GPG_SIGNING_KEY: ${{ secrets.MAVEN_GPG_SIGNING_KEY }} - MAVEN_GPG_SIGNING_PASSWORD: ${{ secrets.MAVEN_GPG_SIGNING_PASSWORD }} - run: ./gradlew publish + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} + GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} + run: ./gradlew publishToSonatype diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 41edd081..88c11330 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,14 +1,15 @@ import java.util.* +group = "io.gorules" +version = "0.1.0" + plugins { kotlin("jvm") version "2.1.0" id("maven-publish") id("signing") + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" } -group = "io.gorules" -version = "0.1.0" - dependencies { implementation("net.java.dev.jna:jna:5.15.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") @@ -62,24 +63,33 @@ publishing { } } repositories { - maven { - url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") - credentials { - username = System.getenv("MAVEN_USERNAME") - password = System.getenv("MAVEN_PASSWORD") - } - } mavenLocal() } } signing { - val signingKeyBase64 = System.getenv("MAVEN_GPG_SIGNING_KEY") - val signingPassword = System.getenv("MAVEN_GPG_SIGNING_PASSWORD") + val signingKeyBase64 = providers.environmentVariable("GPG_SIGNING_KEY") + val signingPassphrase = providers.environmentVariable("GPG_SIGNING_PASSPHRASE") - if (signingKeyBase64 != null && signingPassword != null) { - val signingKey = Base64.getDecoder().decode(signingKeyBase64).toString(Charsets.UTF_8) - useInMemoryPgpKeys(signingKey, signingPassword) + if (signingKeyBase64.isPresent && signingPassphrase.isPresent) { + val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) + useInMemoryPgpKeys(signingKey, signingPassphrase.get()) sign(publishing.publications["mavenJava"]) } +} + +nexusPublishing { + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + + val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") + val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") + if (remoteUsername.isPresent && remotePassword.isPresent) { + username.set(remoteUsername.get()) + password.set(remotePassword.get()) + } + } + } } \ No newline at end of file From 0c8ae15a22fcf4ddd0bd0ec48c0b89327e0d9c58 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 21 Feb 2025 14:51:14 +0100 Subject: [PATCH 23/62] fix --- bindings/uniffi/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 88c11330..6098e115 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -81,7 +81,7 @@ signing { nexusPublishing { repositories { sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local")) + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") From 96b70f971bcf9855fcbfe1722c8b6549265a53d6 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 01:36:37 +0100 Subject: [PATCH 24/62] fix --- .github/workflows/uniffi.yaml | 2 +- bindings/uniffi/build.gradle.kts | 50 ++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 6d400e17..2981903e 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -121,4 +121,4 @@ jobs: OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} - run: ./gradlew publishToSonatype + run: ./gradlew jreleaserFullRelease diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 6098e115..b9cac131 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jreleaser.model.Active import java.util.* group = "io.gorules" @@ -6,8 +7,7 @@ version = "0.1.0" plugins { kotlin("jvm") version "2.1.0" id("maven-publish") - id("signing") - id("io.github.gradle-nexus.publish-plugin") version "2.0.0" + id("org.jreleaser") version "1.16.0" } dependencies { @@ -67,28 +67,36 @@ publishing { } } -signing { - val signingKeyBase64 = providers.environmentVariable("GPG_SIGNING_KEY") - val signingPassphrase = providers.environmentVariable("GPG_SIGNING_PASSPHRASE") +jreleaser { + signing { + active = Active.ALWAYS + armored = true - if (signingKeyBase64.isPresent && signingPassphrase.isPresent) { - val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) - useInMemoryPgpKeys(signingKey, signingPassphrase.get()) - sign(publishing.publications["mavenJava"]) - } -} + val signingKeyBase64 = providers.environmentVariable("GPG_SIGNING_KEY") + val signingPassphrase = providers.environmentVariable("GPG_SIGNING_PASSPHRASE") -nexusPublishing { - repositories { - sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + if (signingKeyBase64.isPresent && signingPassphrase.isPresent) { + val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) + + secretKey.set(signingKey) + passphrase.set(signingPassphrase.get()) + } + } + deploy { + maven { + mavenCentral { + create("sonatype") { + active = Active.ALWAYS + url = "https://central.sonatype.com/api/v1/publisher" + stagingRepository("target/staging-deploy") - val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") - val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") - if (remoteUsername.isPresent && remotePassword.isPresent) { - username.set(remoteUsername.get()) - password.set(remotePassword.get()) + val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") + val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") + if (remoteUsername.isPresent && remotePassword.isPresent) { + username.set(remoteUsername.get()) + password.set(remotePassword.get()) + } + } } } } From 53bfe264a3880de362a18410879b7e5eea1c7669 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 16:19:09 +0100 Subject: [PATCH 25/62] fix --- .github/workflows/uniffi.yaml | 2 +- bindings/uniffi/build.gradle.kts | 55 +++++++++++++++----------------- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 2981903e..8b4963eb 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -121,4 +121,4 @@ jobs: OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} - run: ./gradlew jreleaserFullRelease + run: ./gradlew publishAllPublicationsToCentralPortal diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index b9cac131..909e12d5 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jreleaser.model.Active import java.util.* group = "io.gorules" @@ -7,7 +6,8 @@ version = "0.1.0" plugins { kotlin("jvm") version "2.1.0" id("maven-publish") - id("org.jreleaser") version "1.16.0" + id("signing") + id("com.gradleup.nmcp") version "0.0.9" } dependencies { @@ -54,6 +54,10 @@ publishing { name = "GoRules Team" email = "hi@gorules.io" } + organization { + name = "GoRules" + url = "https://gorules.io" + } } scm { @@ -67,37 +71,28 @@ publishing { } } -jreleaser { - signing { - active = Active.ALWAYS - armored = true - - val signingKeyBase64 = providers.environmentVariable("GPG_SIGNING_KEY") - val signingPassphrase = providers.environmentVariable("GPG_SIGNING_PASSPHRASE") +signing { + val signingKeyBase64 = providers.environmentVariable("GPG_SIGNING_KEY") + val signingPassphrase = providers.environmentVariable("GPG_SIGNING_PASSPHRASE") - if (signingKeyBase64.isPresent && signingPassphrase.isPresent) { - val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) + if (signingKeyBase64.isPresent and signingPassphrase.isPresent) { + val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) - secretKey.set(signingKey) - passphrase.set(signingPassphrase.get()) - } + useInMemoryPgpKeys(signingKey, signingPassphrase.get()) + sign(publishing.publications["mavenJava"]) } - deploy { - maven { - mavenCentral { - create("sonatype") { - active = Active.ALWAYS - url = "https://central.sonatype.com/api/v1/publisher" - stagingRepository("target/staging-deploy") - - val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") - val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") - if (remoteUsername.isPresent && remotePassword.isPresent) { - username.set(remoteUsername.get()) - password.set(remotePassword.get()) - } - } - } +} + +nmcp { + publish("mavenJava") { + publicationType = "USER_MANAGED" + + val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") + val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") + + if (remoteUsername.isPresent && remotePassword.isPresent) { + username.set(remoteUsername.get()) + password.set(remotePassword.get()) } } } \ No newline at end of file From 323e1bb07e1ad6aae7e1e40fc8d01732ce32c423 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 16:32:32 +0100 Subject: [PATCH 26/62] update env variables --- .github/workflows/uniffi.yaml | 4 ++-- bindings/uniffi/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 8b4963eb..398a4c8b 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -117,8 +117,8 @@ jobs: - name: Publish Maven Artifact env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} run: ./gradlew publishAllPublicationsToCentralPortal diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 909e12d5..fc64af92 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -87,8 +87,8 @@ nmcp { publish("mavenJava") { publicationType = "USER_MANAGED" - val remoteUsername = providers.environmentVariable("OSSRH_USERNAME") - val remotePassword = providers.environmentVariable("OSSRH_PASSWORD") + val remoteUsername = providers.environmentVariable("SONATYPE_USERNAME") + val remotePassword = providers.environmentVariable("SONATYPE_PASSWORD") if (remoteUsername.isPresent && remotePassword.isPresent) { username.set(remoteUsername.get()) From 8d84f547f39981802db491fdf3531bdd55b4e2e6 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 16:32:42 +0100 Subject: [PATCH 27/62] fix --- .github/workflows/uniffi.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 398a4c8b..d833eb08 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -76,9 +76,10 @@ jobs: path: target/${{ matrix.settings.target }}/release/${{ matrix.settings.output }} if-no-files-found: error - release: + release-kotlin: runs-on: ubuntu-latest needs: [ build ] + if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" defaults: run: working-directory: ${{ env.UNIFFI_DIRECTORY }} From 91f86d63d0941ae7049e699ce4eff9539671a9d4 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 16:53:11 +0100 Subject: [PATCH 28/62] add pipelines for release --- .github/workflows/uniffi-version-bump.yaml | 56 ++++++++++++++++++++++ .github/workflows/uniffi.yaml | 1 - bindings/uniffi/.bumpversion.cfg | 7 +++ bindings/uniffi/Cargo.toml | 4 +- bindings/uniffi/build.gradle.kts | 17 ++++++- 5 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/uniffi-version-bump.yaml create mode 100644 bindings/uniffi/.bumpversion.cfg diff --git a/.github/workflows/uniffi-version-bump.yaml b/.github/workflows/uniffi-version-bump.yaml new file mode 100644 index 00000000..ef62d63e --- /dev/null +++ b/.github/workflows/uniffi-version-bump.yaml @@ -0,0 +1,56 @@ +name: "Release: Uniffi" + +env: + WORKING_DIRECTORY: bindings/uniffi + +on: + workflow_dispatch: + inputs: + version: + description: 'Version' + required: true + default: 'patch' + type: choice + options: + - patch + - minor + - major + +permissions: + contents: write + +jobs: + publish: + name: Version + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ env.WORKING_DIRECTORY }} + steps: + - uses: actions/checkout@v3 + with: + persist-credentials: false + + - name: Set Git author + run: | + git config user.name "Bot" + git config user.email "bot@gorules.io" + + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: 'Install dependencies' + run: pip install --upgrade bump2version + + - name: Bumpversion + run: bumpversion ${{ github.event.inputs.version }} --allow-dirty --tag-name "uniffi-v{new_version}" + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Push changes + uses: ad-m/github-push-action@v0.6.0 + with: + github_token: ${{ secrets.PAT}} diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index d833eb08..e9a8af62 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -110,7 +110,6 @@ jobs: run: | cargo run \ --bin uniffi-bindgen \ - --features "uniffi/cli" \ -- generate \ --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ --language kotlin \ diff --git a/bindings/uniffi/.bumpversion.cfg b/bindings/uniffi/.bumpversion.cfg new file mode 100644 index 00000000..7766780d --- /dev/null +++ b/bindings/uniffi/.bumpversion.cfg @@ -0,0 +1,7 @@ +[bumpversion] +current_version = 0.1.0 +commit = True +tag = True +message = chore(release): publish uniffi + +[bumpversion:file:Cargo.toml] \ No newline at end of file diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index a2d64403..55cf27e8 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.39.0" +version = "0.1.0" edition = "2021" license = "MIT" publish = false @@ -13,7 +13,7 @@ name = "uniffi-bindgen" path = "uniffi-bindgen.rs" [dependencies] -uniffi = { version = "0.29.0", features = ["tokio"] } +uniffi = { version = "0.29.0", features = ["tokio", "cli"] } serde_json = { workspace = true } zen-engine = { path = "../../core/engine" } zen-expression = { path = "../../core/expression" } diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index fc64af92..9921ef43 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,7 +1,15 @@ +import org.tomlj.Toml import java.util.* group = "io.gorules" -version = "0.1.0" +version = loadCargoVersion() + +buildscript { + dependencies { + classpath("org.tomlj:tomlj:1.1.1") + } +} + plugins { kotlin("jvm") version "2.1.0" @@ -95,4 +103,11 @@ nmcp { password.set(remotePassword.get()) } } +} + +fun loadCargoVersion(): String { + val cargoFile = file("${projectDir}/Cargo.toml") + val result = Toml.parse(cargoFile.toPath()) + return result.getTable("package")?.getString("version") + ?: throw GradleException("Version not found in Cargo.toml") } \ No newline at end of file From 99637ce0d2bd90fe24dba159be72ee6020b016df Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 17:25:31 +0100 Subject: [PATCH 29/62] debug --- .github/workflows/uniffi.yaml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index e9a8af62..82206fca 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -79,7 +79,7 @@ jobs: release-kotlin: runs-on: ubuntu-latest needs: [ build ] - if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" + # if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" defaults: run: working-directory: ${{ env.UNIFFI_DIRECTORY }} @@ -115,10 +115,16 @@ jobs: --language kotlin \ --out-dir build/generated/main/kotlin - - name: Publish Maven Artifact - env: - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} - GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} - run: ./gradlew publishAllPublicationsToCentralPortal + - name: List current dir + run: ls -a . + + - name: Print dependency tree + run: tree build + +# - name: Publish Maven Artifact +# env: +# SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} +# SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} +# GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} +# GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} +# run: ./gradlew publishAllPublicationsToCentralPortal From 188934b3e93a851393ed1413367f1436f3bdf387 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 17:42:19 +0100 Subject: [PATCH 30/62] fix --- .github/workflows/uniffi.yaml | 3 +++ bindings/uniffi/build.gradle.kts | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 82206fca..a5525603 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -121,6 +121,9 @@ jobs: - name: Print dependency tree run: tree build + - name: Print outer folder + run: tree ../../build + # - name: Publish Maven Artifact # env: # SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 9921ef43..e2e7f74e 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -10,7 +10,6 @@ buildscript { } } - plugins { kotlin("jvm") version "2.1.0" id("maven-publish") From 9b3746d17db5a7fe843328fce083e46ad7a3f081 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 18:21:01 +0100 Subject: [PATCH 31/62] fix --- .github/workflows/uniffi.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index a5525603..8b36d4e1 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -107,13 +107,7 @@ jobs: run: mv ../../build ./ - name: Generate Kotlin sources - run: | - cargo run \ - --bin uniffi-bindgen \ - -- generate \ - --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ - --language kotlin \ - --out-dir build/generated/main/kotlin + run: cargo run --bin uniffi-bindgen -- generate --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so --language kotlin --out-dir build/generated/main/kotlin - name: List current dir run: ls -a . @@ -121,9 +115,6 @@ jobs: - name: Print dependency tree run: tree build - - name: Print outer folder - run: tree ../../build - # - name: Publish Maven Artifact # env: # SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} From 43ebff0a3d6181b95f6cb745211c9e3cd5a9e5e2 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 22 Feb 2025 18:48:12 +0100 Subject: [PATCH 32/62] fix --- .github/workflows/uniffi.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 8b36d4e1..dc5de1b3 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -106,8 +106,11 @@ jobs: - name: Move artifacts run: mv ../../build ./ + - name: List pwd + run: pwd + - name: Generate Kotlin sources - run: cargo run --bin uniffi-bindgen -- generate --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so --language kotlin --out-dir build/generated/main/kotlin + run: cargo run --bin uniffi-bindgen -- generate --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so --language kotlin --out-dir $(pwd)/build/generated/main/kotlin - name: List current dir run: ls -a . From 61cb44da2813fcb8866614e07d0312864ee4bce7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 13:01:07 +0100 Subject: [PATCH 33/62] fix --- .github/workflows/uniffi.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index dc5de1b3..e630ae23 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -110,7 +110,11 @@ jobs: run: pwd - name: Generate Kotlin sources - run: cargo run --bin uniffi-bindgen -- generate --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so --language kotlin --out-dir $(pwd)/build/generated/main/kotlin + run: | + cargo run --bin uniffi-bindgen -- generate \ + --library build/generated/main/resources/linux-aarch64/libzen_uniffi.so \ + --language kotlin \ + --out-dir build/generated/main/kotlin - name: List current dir run: ls -a . From 99ceca3812ada94c061c87583102dcad38e62dc3 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 13:13:19 +0100 Subject: [PATCH 34/62] fix --- .github/workflows/uniffi.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index e630ae23..7769cdf6 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -89,8 +89,6 @@ jobs: - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@stable - with: - target: ${{ matrix.settings.target }} - name: Validate Gradle wrapper jar uses: gradle/wrapper-validation-action@v1 @@ -106,19 +104,13 @@ jobs: - name: Move artifacts run: mv ../../build ./ - - name: List pwd - run: pwd - - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library build/generated/main/resources/linux-aarch64/libzen_uniffi.so \ + --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ --language kotlin \ --out-dir build/generated/main/kotlin - - name: List current dir - run: ls -a . - - name: Print dependency tree run: tree build From 0de1365d324dd21cb24e2662db09eb8243a46572 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 13:20:42 +0100 Subject: [PATCH 35/62] fix --- .github/workflows/uniffi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 7769cdf6..71728867 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -107,9 +107,9 @@ jobs: - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ + --library ./build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ --language kotlin \ - --out-dir build/generated/main/kotlin + --out-dir ./build/generated/main/kotlin - name: Print dependency tree run: tree build From 33a342525bfaac69cf7abbeeb8700de658d9ffc0 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 13:21:03 +0100 Subject: [PATCH 36/62] fix --- .github/workflows/uniffi.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 71728867..f7bde39b 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -30,18 +30,18 @@ jobs: fail-fast: true matrix: settings: - - host: windows-latest - target: 'x86_64-pc-windows-msvc' - output: 'zen_uniffi.dll' - lib_dir: 'win32-x86-64' - - host: macos-latest - target: 'x86_64-apple-darwin' - output: 'libzen_uniffi.dylib' - lib_dir: 'darwin' - - host: macos-latest - target: 'aarch64-apple-darwin' - output: 'libzen_uniffi.dylib' - lib_dir: 'darwin-aarch64' + # - host: windows-latest + # target: 'x86_64-pc-windows-msvc' + # output: 'zen_uniffi.dll' + # lib_dir: 'win32-x86-64' + # - host: macos-latest + # target: 'x86_64-apple-darwin' + # output: 'libzen_uniffi.dylib' + # lib_dir: 'darwin' + # - host: macos-latest + # target: 'aarch64-apple-darwin' + # output: 'libzen_uniffi.dylib' + # lib_dir: 'darwin-aarch64' - host: ubuntu-latest target: 'x86_64-unknown-linux-gnu' output: 'libzen_uniffi.so' From 0f80124467fbb60fbbd79d571afe35852783c622 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 13:26:27 +0100 Subject: [PATCH 37/62] fix --- .github/workflows/uniffi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index f7bde39b..93412ff9 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -107,9 +107,9 @@ jobs: - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library ./build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ + --library build/generated/main/resources/linux-x86-64/libzen_uniffiaaa.so \ --language kotlin \ - --out-dir ./build/generated/main/kotlin + --out-dir build/generated/main/kotlin - name: Print dependency tree run: tree build From f894a7f54f6abe7cbd858b6b885baf0bbd27d90a Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 23:35:52 +0100 Subject: [PATCH 38/62] fix --- .github/workflows/uniffi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 93412ff9..d947f7c0 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -37,7 +37,7 @@ jobs: # - host: macos-latest # target: 'x86_64-apple-darwin' # output: 'libzen_uniffi.dylib' - # lib_dir: 'darwin' + # lib_dir: 'darwin-x86-64' # - host: macos-latest # target: 'aarch64-apple-darwin' # output: 'libzen_uniffi.dylib' @@ -107,7 +107,7 @@ jobs: - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library build/generated/main/resources/linux-x86-64/libzen_uniffiaaa.so \ + --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ --language kotlin \ --out-dir build/generated/main/kotlin From 849ecf411baaacd9663192dbde34e822743dbf25 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 23:43:53 +0100 Subject: [PATCH 39/62] fix --- .github/workflows/uniffi.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index d947f7c0..12c50dd2 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -30,18 +30,18 @@ jobs: fail-fast: true matrix: settings: - # - host: windows-latest - # target: 'x86_64-pc-windows-msvc' - # output: 'zen_uniffi.dll' - # lib_dir: 'win32-x86-64' - # - host: macos-latest - # target: 'x86_64-apple-darwin' - # output: 'libzen_uniffi.dylib' - # lib_dir: 'darwin-x86-64' - # - host: macos-latest - # target: 'aarch64-apple-darwin' - # output: 'libzen_uniffi.dylib' - # lib_dir: 'darwin-aarch64' + - host: windows-latest + target: 'x86_64-pc-windows-msvc' + output: 'zen_uniffi.dll' + lib_dir: 'win32-x86-64' + - host: macos-latest + target: 'x86_64-apple-darwin' + output: 'libzen_uniffi.dylib' + lib_dir: 'darwin-x86-64' + - host: macos-latest + target: 'aarch64-apple-darwin' + output: 'libzen_uniffi.dylib' + lib_dir: 'darwin-aarch64' - host: ubuntu-latest target: 'x86_64-unknown-linux-gnu' output: 'libzen_uniffi.so' @@ -107,7 +107,7 @@ jobs: - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library build/generated/main/resources/linux-x86-64/libzen_uniffi.so \ + --library build/generated/main/resources/darwin-x86-64/libzen_uniffi.dylib \ --language kotlin \ --out-dir build/generated/main/kotlin From 51723f4cf0313c4f3ac2bda0bf217a935ee5630d Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 23 Feb 2025 23:50:27 +0100 Subject: [PATCH 40/62] fix build --- .github/workflows/uniffi.yaml | 16 +++++++--------- bindings/uniffi/.bumpversion.cfg | 2 +- bindings/uniffi/Cargo.toml | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 12c50dd2..d985f304 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -3,8 +3,6 @@ env: UNIFFI_DIRECTORY: bindings/uniffi on: - # Temporary allow on workflow dispatch - workflow_dispatch: push: branches: - master @@ -114,10 +112,10 @@ jobs: - name: Print dependency tree run: tree build -# - name: Publish Maven Artifact -# env: -# SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} -# SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} -# GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} -# GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} -# run: ./gradlew publishAllPublicationsToCentralPortal + - name: Publish Maven Artifact + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} + GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }} + run: ./gradlew publishAllPublicationsToCentralPortal diff --git a/bindings/uniffi/.bumpversion.cfg b/bindings/uniffi/.bumpversion.cfg index 7766780d..9fc08f29 100644 --- a/bindings/uniffi/.bumpversion.cfg +++ b/bindings/uniffi/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0 +current_version = 0.1.1 commit = True tag = True message = chore(release): publish uniffi diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 55cf27e8..65a07380 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.0" +version = "0.1.1" edition = "2021" license = "MIT" publish = false From 6db4d93f77214954fd4e438a12f885ba84c377df Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 24 Feb 2025 00:44:42 +0100 Subject: [PATCH 41/62] add javadoc --- .github/workflows/uniffi.yaml | 2 +- bindings/uniffi/build.gradle.kts | 12 ++++++++++++ bindings/uniffi/gradle.properties | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 bindings/uniffi/gradle.properties diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index d985f304..14d2f66d 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -109,7 +109,7 @@ jobs: --language kotlin \ --out-dir build/generated/main/kotlin - - name: Print dependency tree + - name: Print directory tree run: tree build - name: Publish Maven Artifact diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index e2e7f74e..6bdb0d76 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -14,6 +14,8 @@ plugins { kotlin("jvm") version "2.1.0" id("maven-publish") id("signing") + id("org.jetbrains.dokka") version "2.0.0" + id("org.jetbrains.dokka-javadoc") version "2.0.0" id("com.gradleup.nmcp") version "0.0.9" } @@ -37,11 +39,21 @@ sourceSets { } } +tasks { + val javadocJar by creating(Jar::class) { + dependsOn(dokkaGeneratePublicationJavadoc) + archiveClassifier.set("javadoc") + + from(dokkaGeneratePublicationJavadoc.get()) + } +} + publishing { publications { create("mavenJava") { from(components["java"]) artifact(tasks["kotlinSourcesJar"]) + artifact(tasks["javadocJar"]) pom { name = "GoRules ZEN Engine" diff --git a/bindings/uniffi/gradle.properties b/bindings/uniffi/gradle.properties new file mode 100644 index 00000000..66c172fb --- /dev/null +++ b/bindings/uniffi/gradle.properties @@ -0,0 +1,2 @@ +org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled +org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true \ No newline at end of file From f5b976232222f491c3af8ef18b039f8fc4d5006e Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 24 Feb 2025 02:03:29 +0100 Subject: [PATCH 42/62] improve bindings --- bindings/uniffi/.bumpversion.cfg | 2 +- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/src/custom_node.rs | 8 ++----- bindings/uniffi/src/expression.rs | 25 +++++++++------------ bindings/uniffi/src/loader.rs | 35 ++++++++++++++++++++---------- bindings/uniffi/src/types.rs | 19 ++++++++++++++++ 6 files changed, 56 insertions(+), 35 deletions(-) diff --git a/bindings/uniffi/.bumpversion.cfg b/bindings/uniffi/.bumpversion.cfg index 9fc08f29..56d18035 100644 --- a/bindings/uniffi/.bumpversion.cfg +++ b/bindings/uniffi/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.1 +current_version = 0.1.2 commit = True tag = True message = chore(release): publish uniffi diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 65a07380..5f9792e6 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.1" +version = "0.1.2" edition = "2021" license = "MIT" publish = false diff --git a/bindings/uniffi/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs index f15a4330..6f402e7c 100644 --- a/bindings/uniffi/src/custom_node.rs +++ b/bindings/uniffi/src/custom_node.rs @@ -33,7 +33,6 @@ impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { async fn handle(&self, request: CustomNodeRequest) -> NodeResult { let input = request .input - .to_value() .try_into() .map_err(|err: ZenError| anyhow!(err))?; @@ -45,16 +44,13 @@ impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { .await .map_err(|err| anyhow!(err.details()))?; - let output: Value = result + let output: Variable = result .output .try_into() .map_err(|err: ZenError| anyhow!(err))?; let trace_data: Option = result.trace_data.and_then(|trace| trace.try_into().ok()); - Ok(NodeResponse { - output: Variable::from(output), - trace_data, - }) + Ok(NodeResponse { output, trace_data }) } } diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index 24271155..f95c4ba0 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -1,25 +1,24 @@ use crate::error::ZenError; use crate::types::JsonBuffer; -use serde_json::Value; use tokio::task; +use zen_expression::Variable; #[uniffi::export()] pub fn evaluate_expression_sync( expression: String, context: Option, ) -> Result { - let ctx: Value = context + let ctx: Variable = context .and_then(|v| v.try_into().ok()) - .unwrap_or(Value::Null); + .unwrap_or(Variable::Null); Ok( - zen_expression::evaluate_expression(expression.as_str(), ctx.into()) + zen_expression::evaluate_expression(expression.as_str(), ctx) .map_err(|e| { ZenError::EvaluationError( serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), ) })? - .to_value() .try_into()?, ) } @@ -30,25 +29,21 @@ pub fn evaluate_unary_expression_sync( expression: String, context: JsonBuffer, ) -> Result { - let ctx: Value = context.try_into()?; + let ctx: Variable = context.try_into()?; Ok( - zen_expression::evaluate_unary_expression(expression.as_str(), ctx.into()).map_err( - |e| { - ZenError::EvaluationError( - serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), - ) - }, - )?, + zen_expression::evaluate_unary_expression(expression.as_str(), ctx).map_err(|e| { + ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) + })?, ) } #[allow(dead_code)] #[uniffi::export()] pub fn render_template_sync(template: String, context: JsonBuffer) -> Result { - let ctx: Value = context.try_into()?; + let ctx: Variable = context.try_into()?; - Ok(zen_tmpl::render(template.as_str(), ctx.into()) + Ok(zen_tmpl::render(template.as_str(), ctx) .map_err(|e| ZenError::TemplateEngineError { template, details: serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index 6c3882fd..f3e0a1c8 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -9,14 +9,14 @@ use zen_engine::model::DecisionContent; #[uniffi::export(callback_interface)] #[async_trait::async_trait] pub trait ZenDecisionLoaderCallback: Send + Sync { - async fn load(&self, key: String) -> Result; + async fn load(&self, key: String) -> Result, ZenError>; } pub struct NoopDecisionLoader; #[async_trait::async_trait] impl ZenDecisionLoaderCallback for NoopDecisionLoader { - async fn load(&self, _: String) -> Result { + async fn load(&self, _: String) -> Result, ZenError> { Err(ZenError::Zero) } } @@ -26,16 +26,27 @@ pub struct ZenDecisionLoaderCallbackWrapper(pub Box(&'a self, key: &'a str) -> impl Future + 'a { async move { - let maybe_raw = self.0.load(key.into()).await; - if maybe_raw.is_err() { - return Err(LoaderError::NotFound(key.to_string()).into()); - } - - let decision_content: DecisionContent = serde_json::from_slice(&maybe_raw.unwrap().0) - .map_err(|e| LoaderError::Internal { - key: key.to_string(), - source: anyhow!(e), - })?; + let maybe_json_buffer = match self.0.load(key.into()).await { + Ok(r) => r, + Err(error) => { + return Err(Box::new(LoaderError::Internal { + key: key.to_string(), + source: anyhow!(error), + })) + } + }; + + let Some(json_buffer) = maybe_json_buffer else { + return Err(Box::new(LoaderError::NotFound(key.to_string()))); + }; + + let decision_content: DecisionContent = + serde_json::from_slice(json_buffer.0.as_slice()).map_err(|e| { + LoaderError::Internal { + key: key.to_string(), + source: anyhow!(e), + } + })?; Ok(Arc::new(decision_content)) } diff --git a/bindings/uniffi/src/types.rs b/bindings/uniffi/src/types.rs index 9d6aacd5..098f587d 100644 --- a/bindings/uniffi/src/types.rs +++ b/bindings/uniffi/src/types.rs @@ -3,6 +3,7 @@ use serde_json::Value; use std::collections::HashMap; use zen_engine::handler::custom_node_adapter::CustomDecisionNode; use zen_engine::{DecisionGraphResponse, DecisionGraphTrace}; +use zen_expression::Variable; pub struct JsonBuffer(pub Vec); uniffi::custom_newtype!(JsonBuffer, Vec); @@ -15,6 +16,14 @@ impl TryFrom for Value { } } +impl TryFrom for Variable { + type Error = ZenError; + + fn try_from(value: JsonBuffer) -> Result { + serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) + } +} + impl TryFrom for JsonBuffer { type Error = ZenError; @@ -25,6 +34,16 @@ impl TryFrom for JsonBuffer { } } +impl TryFrom for JsonBuffer { + type Error = ZenError; + + fn try_from(var: Variable) -> Result { + serde_json::to_vec(&var) + .map(|v| JsonBuffer(v)) + .map_err(|_| ZenError::JsonSerializationFailed) + } +} + #[derive(uniffi::Record)] pub struct ZenEngineTrace { pub id: String, From 74206a8441f96162735789dd1a234da6b9f4c7a2 Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Fri, 11 Jul 2025 11:43:21 +0200 Subject: [PATCH 43/62] feat: separate artifact for java and kotlin source code --- .github/workflows/kotlin.yaml | 139 +++++++++++++++++++++++++++++++ bindings/uniffi/Cargo.toml | 7 +- bindings/uniffi/build.gradle.kts | 69 ++++++++++++--- bindings/uniffi/uniffi.toml | 4 +- 4 files changed, 205 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/kotlin.yaml diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml new file mode 100644 index 00000000..608e23cf --- /dev/null +++ b/.github/workflows/kotlin.yaml @@ -0,0 +1,139 @@ +name: Kotlin +env: + WORKING_DIRECTORY: bindings/uniffi + +on: + push: + branches: + - master + tags-ignore: + - '**' + paths: + - '../../bindings/uniffi/**' + - 'core/**' + - 'test-data/**' + - '.github/workflows/kotlin.yaml' + pull_request: + paths: + - '../../bindings/uniffi/**' + - 'core/**' + - 'test-data/**' + - '.github/workflows/kotlin.yaml' + +jobs: + build: + if: "!contains(github.event.head_commit.message, 'skip ci')" + + strategy: + fail-fast: true + matrix: + settings: + - host: windows-latest + target: 'x86_64-pc-windows-msvc' + extension: "dll" + lib_dir: 'win32-x86-64' + - host: macos-13 + target: 'x86_64-apple-darwin' + extension: "dylib" + lib_dir: 'darwin' + - host: macos-14 + target: 'aarch64-apple-darwin' + extension: "dylib" + lib_dir: 'darwin-aarch64' + - host: ubuntu-latest + target: 'x86_64-unknown-linux-gnu' + extension: "so" + lib_dir: 'linux-x86-64' + - host: ubuntu-latest + target: 'aarch64-unknown-linux-gnu' + extension: "so" + lib_dir: 'linux-aarch64' + + name: stable - ${{ matrix.settings.target }} - kotlin@17 + runs-on: ${{ matrix.settings.host }} + defaults: + run: + working-directory: ${{ env.WORKING_DIRECTORY }} + + steps: + - uses: actions/checkout@v3 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: ${{ matrix.settings.target }} + + - name: Cache cargo registry + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + .cargo-cache + key: ${{ matrix.settings.target }}-cargo-registry + + - name: Build + shell: bash + run: cargo build --lib --release --target ${{ matrix.settings.target }} + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.settings.lib_dir }} + path: ./../target/release/libzen_kotlin.${{ matrix.settings.extension }} + + release: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ${{ env.WORKING_DIRECTORY }} + needs: [build] + + steps: + - uses: actions/checkout@v3 + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: ${{ matrix.settings.target }} + + - name: Cache cargo registry + uses: actions/cache@v3 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + .cargo-cache + key: ${{ matrix.settings.target }}-cargo-registry + + - name: Validate Gradle wrapper jar + uses: gradle/wrapper-validation-action@v1 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Download all artifacts + uses: actions/download-artifact@v3 + with: + path: build/generated/main/resources + + - name: Generate Kotlin sources + run: | + cargo run \ + --bin uniffi-bindgen \ + --features "uniffi/cli" \ + -- generate \ + --library build/generated/resources/libs/libzen_uniffi.dylib \ + --language kotlin \ + --out-dir build/generated/kotlin + +# TODO +# - name: Setup Maven Repository credentials +# run: + + - name: Publish Maven Artifact + run: ./gradlew publish diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 5f9792e6..49d13cbe 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zen-uniffi" version = "0.1.2" -edition = "2021" +edition = "2024" license = "MIT" publish = false @@ -13,7 +13,7 @@ name = "uniffi-bindgen" path = "uniffi-bindgen.rs" [dependencies] -uniffi = { version = "0.29.0", features = ["tokio", "cli"] } +uniffi = { version = "0.29.2", features = ["tokio"] } serde_json = { workspace = true } zen-engine = { path = "../../core/engine" } zen-expression = { path = "../../core/expression" } @@ -23,4 +23,5 @@ async-trait = "0.1" tokio = "1.43" [build-dependencies] -uniffi = { version = "0.29.0", features = ["build"] } \ No newline at end of file +uniffi = { version = "0.29.2", features = ["build"] } +uniffi-bindgen-java = "0.2.1" \ No newline at end of file diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 6bdb0d76..30a3451f 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -19,27 +19,67 @@ plugins { id("com.gradleup.nmcp") version "0.0.9" } -dependencies { - implementation("net.java.dev.jna:jna:5.15.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") -} - repositories { mavenCentral() } sourceSets { - main { + val java by creating { + java { + srcDirs("build/generated/java") + } + resources { + srcDirs("build/generated/resources") + } + + compileClasspath += sourceSets["main"].compileClasspath + runtimeClasspath += sourceSets["main"].runtimeClasspath + } + + val kotlin by creating { kotlin { - srcDirs("build/generated/main/kotlin") + srcDirs("build/generated/kotlin") } resources { - srcDirs("build/generated/main/resources") + srcDirs("build/generated/resources") } + + compileClasspath += sourceSets["main"].compileClasspath + runtimeClasspath += sourceSets["main"].runtimeClasspath } } +dependencies { + implementation("net.java.dev.jna:jna:5.15.0") + "kotlinImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") +} + + tasks { + val generateJavaJar by creating(Jar::class) { + archiveBaseName.set("zen_engine") + from(sourceSets["java"].output) + dependsOn(sourceSets["java"].classesTaskName) + } + + val generateJavaSourcesJar by creating(Jar::class) { + archiveBaseName.set("zen_engine") + archiveClassifier.set("sources") + from(sourceSets["java"].allJava) + } + + val generateKotlinJar by creating(Jar::class) { + archiveBaseName.set("zen_engine_kotlin") + from(sourceSets["kotlin"].output) + dependsOn(sourceSets["kotlin"].classesTaskName) + } + + val generateKotlinSourcesJar by creating(Jar::class) { + archiveBaseName.set("zen_engine_kotlin") + archiveClassifier.set("sources") + from(sourceSets["kotlin"].kotlin) + } + val javadocJar by creating(Jar::class) { dependsOn(dokkaGeneratePublicationJavadoc) archiveClassifier.set("javadoc") @@ -51,8 +91,17 @@ tasks { publishing { publications { create("mavenJava") { - from(components["java"]) - artifact(tasks["kotlinSourcesJar"]) + groupId = "io.gorules" + artifactId = "zen-engine" + artifact(tasks["generateJavaJar"]) + artifact(tasks["generateJavaSourcesJar"]) + } + + create("mavenKotlin") { + groupId = "io.gorules" + artifactId = "zen-engine-kotlin" + artifact(tasks["generateKotlinJar"]) + artifact(tasks["generateKotlinSourcesJar"]) artifact(tasks["javadocJar"]) pom { diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index 1c0ab740..1162e1f2 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -1,2 +1,4 @@ [bindings.kotlin] -package_name = "io.gorules.zen" \ No newline at end of file +package_name = "io.gorules.zen.kotlin" +[bindings.java] +package_name = 'io.gorules.zen' \ No newline at end of file From a9faed93433c0419a7dd7c2eb3707d5c8b765c82 Mon Sep 17 00:00:00 2001 From: Lars Werkman Date: Mon, 14 Jul 2025 16:38:19 +0200 Subject: [PATCH 44/62] feat: add custom JsonBuffer type with fromString and toString abbilities --- bindings/uniffi/build.gradle.kts | 4 ++-- .../io/gorules/zen_engine/JsonBuffer.java | 20 +++++++++++++++++++ .../gorules/zen_engine/kotlin/JsonBuffer.kt | 11 ++++++++++ bindings/uniffi/uniffi.toml | 10 +++++++++- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java create mode 100644 bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 30a3451f..d789b840 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -26,7 +26,7 @@ repositories { sourceSets { val java by creating { java { - srcDirs("build/generated/java") + srcDirs("lib/java", "build/generated/java") } resources { srcDirs("build/generated/resources") @@ -38,7 +38,7 @@ sourceSets { val kotlin by creating { kotlin { - srcDirs("build/generated/kotlin") + srcDirs("lib/kotlin", "build/generated/kotlin") } resources { srcDirs("build/generated/resources") diff --git a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java new file mode 100644 index 00000000..b38b57ec --- /dev/null +++ b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java @@ -0,0 +1,20 @@ +package io.gorules.zen_engine; + +import org.jetbrains.annotations.NotNull; + +import java.nio.charset.StandardCharsets; + +public record JsonBuffer( + byte[] value +) { + + public JsonBuffer(String value) { + this(value.getBytes(StandardCharsets.UTF_8)); + } + + @NotNull + @Override + public String toString() { + return new String(value, StandardCharsets.UTF_8); + } +} \ No newline at end of file diff --git a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt new file mode 100644 index 00000000..d18ea520 --- /dev/null +++ b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt @@ -0,0 +1,11 @@ +package io.gorules.zen_engine.kotlin + +@JvmInline +value class JsonBuffer(val value: ByteArray) { + + constructor(value: String) : this(value = value.toByteArray(Charsets.UTF_8)) + + override fun toString(): String { + return value.toString(Charsets.UTF_8) + } +} \ No newline at end of file diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index 1162e1f2..081c3475 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -1,4 +1,12 @@ [bindings.kotlin] package_name = "io.gorules.zen.kotlin" +generate_immutable_records = true +[bindings.kotlin.custom_types.JsonBuffer] +into_custom = "JsonBuffer({})" +from_custom = "{}.value" [bindings.java] -package_name = 'io.gorules.zen' \ No newline at end of file +package_name = 'io.gorules.zen' +generate_immutable_records = true +[bindings.java.custom_types.JsonBuffer] +into_custom = "{}" +from_custom = "{}" \ No newline at end of file From 92377d49f42fff77f433ef31e47aca27e673f71f Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 16:47:25 +0200 Subject: [PATCH 45/62] fix workflows --- .github/workflows/kotlin.yaml | 139 ---------------------------------- .github/workflows/uniffi.yaml | 17 +++-- bindings/uniffi/Cargo.toml | 8 +- 3 files changed, 14 insertions(+), 150 deletions(-) delete mode 100644 .github/workflows/kotlin.yaml diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml deleted file mode 100644 index 608e23cf..00000000 --- a/.github/workflows/kotlin.yaml +++ /dev/null @@ -1,139 +0,0 @@ -name: Kotlin -env: - WORKING_DIRECTORY: bindings/uniffi - -on: - push: - branches: - - master - tags-ignore: - - '**' - paths: - - '../../bindings/uniffi/**' - - 'core/**' - - 'test-data/**' - - '.github/workflows/kotlin.yaml' - pull_request: - paths: - - '../../bindings/uniffi/**' - - 'core/**' - - 'test-data/**' - - '.github/workflows/kotlin.yaml' - -jobs: - build: - if: "!contains(github.event.head_commit.message, 'skip ci')" - - strategy: - fail-fast: true - matrix: - settings: - - host: windows-latest - target: 'x86_64-pc-windows-msvc' - extension: "dll" - lib_dir: 'win32-x86-64' - - host: macos-13 - target: 'x86_64-apple-darwin' - extension: "dylib" - lib_dir: 'darwin' - - host: macos-14 - target: 'aarch64-apple-darwin' - extension: "dylib" - lib_dir: 'darwin-aarch64' - - host: ubuntu-latest - target: 'x86_64-unknown-linux-gnu' - extension: "so" - lib_dir: 'linux-x86-64' - - host: ubuntu-latest - target: 'aarch64-unknown-linux-gnu' - extension: "so" - lib_dir: 'linux-aarch64' - - name: stable - ${{ matrix.settings.target }} - kotlin@17 - runs-on: ${{ matrix.settings.host }} - defaults: - run: - working-directory: ${{ env.WORKING_DIRECTORY }} - - steps: - - uses: actions/checkout@v3 - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: ${{ matrix.settings.target }} - - - name: Cache cargo registry - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - .cargo-cache - key: ${{ matrix.settings.target }}-cargo-registry - - - name: Build - shell: bash - run: cargo build --lib --release --target ${{ matrix.settings.target }} - - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.settings.lib_dir }} - path: ./../target/release/libzen_kotlin.${{ matrix.settings.extension }} - - release: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ${{ env.WORKING_DIRECTORY }} - needs: [build] - - steps: - - uses: actions/checkout@v3 - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - target: ${{ matrix.settings.target }} - - - name: Cache cargo registry - uses: actions/cache@v3 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - .cargo-cache - key: ${{ matrix.settings.target }}-cargo-registry - - - name: Validate Gradle wrapper jar - uses: gradle/wrapper-validation-action@v1 - - - name: Setup Gradle - uses: gradle/gradle-build-action@v2 - - - name: Download all artifacts - uses: actions/download-artifact@v3 - with: - path: build/generated/main/resources - - - name: Generate Kotlin sources - run: | - cargo run \ - --bin uniffi-bindgen \ - --features "uniffi/cli" \ - -- generate \ - --library build/generated/resources/libs/libzen_uniffi.dylib \ - --language kotlin \ - --out-dir build/generated/kotlin - -# TODO -# - name: Setup Maven Repository credentials -# run: - - - name: Publish Maven Artifact - run: ./gradlew publish diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 14d2f66d..2db30363 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -23,6 +23,8 @@ on: jobs: build: if: "!contains(github.event.head_commit.message, 'skip ci')" + env: + OUTPUT_NAME: zen_uniffi strategy: fail-fast: true @@ -30,23 +32,23 @@ jobs: settings: - host: windows-latest target: 'x86_64-pc-windows-msvc' - output: 'zen_uniffi.dll' + output: '{0}.dll' lib_dir: 'win32-x86-64' - host: macos-latest target: 'x86_64-apple-darwin' - output: 'libzen_uniffi.dylib' + output: 'lib{0}.dylib' lib_dir: 'darwin-x86-64' - host: macos-latest target: 'aarch64-apple-darwin' - output: 'libzen_uniffi.dylib' + output: 'lib{0}.dylib' lib_dir: 'darwin-aarch64' - host: ubuntu-latest target: 'x86_64-unknown-linux-gnu' - output: 'libzen_uniffi.so' + output: 'lib{0}.so' lib_dir: 'linux-x86-64' - host: ubuntu-latest target: 'aarch64-unknown-linux-gnu' - output: 'libzen_uniffi.so' + output: 'lib{0}.so' lib_dir: 'linux-aarch64' name: UniFFI - ${{ matrix.settings.target }} @@ -71,13 +73,14 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ matrix.settings.lib_dir }} - path: target/${{ matrix.settings.target }}/release/${{ matrix.settings.output }} + path: target/${{ matrix.settings.target }}/release/${{ format(matrix.settings.output, env.OUTPUT_NAME) }} if-no-files-found: error release-kotlin: runs-on: ubuntu-latest needs: [ build ] - # if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" + # TODO: Uncomment + #if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" defaults: run: working-directory: ${{ env.UNIFFI_DIRECTORY }} diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 49d13cbe..bd800645 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -13,15 +13,15 @@ name = "uniffi-bindgen" path = "uniffi-bindgen.rs" [dependencies] -uniffi = { version = "0.29.2", features = ["tokio"] } +uniffi = { version = "0.29", features = ["tokio", "cli"] } serde_json = { workspace = true } zen-engine = { path = "../../core/engine" } zen-expression = { path = "../../core/expression" } zen-tmpl = { path = "../../core/template" } serde = { workspace = true, features = ["derive"] } async-trait = "0.1" -tokio = "1.43" +tokio = "1.46" [build-dependencies] -uniffi = { version = "0.29.2", features = ["build"] } -uniffi-bindgen-java = "0.2.1" \ No newline at end of file +uniffi = { version = "0.29", features = ["build"] } +uniffi-bindgen-java = "0.2" \ No newline at end of file From 1eb23320531b158c3d02b99274d99f58910377e7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 17:54:40 +0200 Subject: [PATCH 46/62] fix pipeline --- .github/workflows/uniffi.yaml | 13 +++++-- bindings/uniffi/build.gradle.kts | 63 ++++++++++++++++++-------------- bindings/uniffi/src/loader.rs | 2 +- bindings/uniffi/uniffi.toml | 9 ++++- 4 files changed, 53 insertions(+), 34 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 2db30363..add7ef48 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -100,7 +100,7 @@ jobs: - name: Download all artifacts uses: actions/download-artifact@v4 with: - path: build/generated/main/resources + path: build/generated/resources - name: Move artifacts run: mv ../../build ./ @@ -108,9 +108,16 @@ jobs: - name: Generate Kotlin sources run: | cargo run --bin uniffi-bindgen -- generate \ - --library build/generated/main/resources/darwin-x86-64/libzen_uniffi.dylib \ + --library build/generated/resources/darwin-x86-64/libzen_uniffi.dylib \ --language kotlin \ - --out-dir build/generated/main/kotlin + --out-dir build/generated/kotlin + + - name: Generate Java sources + run: | + cargo run --bin uniffi-bindgen -- generate \ + --library build/generated/resources/darwin-x86-64/libzen_uniffi.dylib \ + --language java \ + --out-dir build/generated/java - name: Print directory tree run: tree build diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index d789b840..68670e7f 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -95,6 +95,9 @@ publishing { artifactId = "zen-engine" artifact(tasks["generateJavaJar"]) artifact(tasks["generateJavaSourcesJar"]) + artifact(tasks["javadocJar"]) + + configurePom() } create("mavenKotlin") { @@ -104,34 +107,7 @@ publishing { artifact(tasks["generateKotlinSourcesJar"]) artifact(tasks["javadocJar"]) - pom { - name = "GoRules ZEN Engine" - description = "GoRules ZEN Engine is a cross-platform, Open-Source Business Rules Engine (BRE)" - url = "https://gorules.io" - - licenses { - license { - name = "MIT License" - url = "https://github.com/gorules/zen/blob/master/LICENSE" - } - } - - developers { - developer { - id = "gorules" - name = "GoRules Team" - email = "hi@gorules.io" - } - organization { - name = "GoRules" - url = "https://gorules.io" - } - } - - scm { - url = "https://github.com/gorules/zen" - } - } + configurePom() } } repositories { @@ -170,4 +146,35 @@ fun loadCargoVersion(): String { val result = Toml.parse(cargoFile.toPath()) return result.getTable("package")?.getString("version") ?: throw GradleException("Version not found in Cargo.toml") +} + +fun MavenPublication.configurePom() { + pom { + name = "GoRules ZEN Engine" + description = "GoRules ZEN Engine is a cross-platform, Open-Source Business Rules Engine (BRE)" + url = "https://gorules.io" + + licenses { + license { + name = "MIT License" + url = "https://github.com/gorules/zen/blob/master/LICENSE" + } + } + + developers { + developer { + id = "gorules" + name = "GoRules Team" + email = "hi@gorules.io" + } + organization { + name = "GoRules" + url = "https://gorules.io" + } + } + + scm { + url = "https://github.com/gorules/zen" + } + } } \ No newline at end of file diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index f3e0a1c8..e21b2e07 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -32,7 +32,7 @@ impl DecisionLoader for ZenDecisionLoaderCallbackWrapper { return Err(Box::new(LoaderError::Internal { key: key.to_string(), source: anyhow!(error), - })) + })); } }; diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index 081c3475..b84a34c4 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -1,12 +1,17 @@ +# Kotlin [bindings.kotlin] -package_name = "io.gorules.zen.kotlin" +package_name = "io.gorules.zen_engine.kotlin" generate_immutable_records = true + [bindings.kotlin.custom_types.JsonBuffer] into_custom = "JsonBuffer({})" from_custom = "{}.value" + +# Java [bindings.java] -package_name = 'io.gorules.zen' +package_name = 'io.gorules.zen_engine' generate_immutable_records = true + [bindings.java.custom_types.JsonBuffer] into_custom = "{}" from_custom = "{}" \ No newline at end of file From 4947bc43ec7ab7c9338ca5edc2cf9b4f9246ae88 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 17:56:25 +0200 Subject: [PATCH 47/62] fix gradle --- .github/workflows/uniffi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index add7ef48..a377c06a 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -92,10 +92,10 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Validate Gradle wrapper jar - uses: gradle/wrapper-validation-action@v1 + uses: gradle/actions/wrapper-validation@v3 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Download all artifacts uses: actions/download-artifact@v4 From 030f03f86aeddeae4c657f8f0913e111007588e8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 18:08:12 +0200 Subject: [PATCH 48/62] fix: java bindings --- .github/workflows/uniffi.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index a377c06a..6074bf16 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -112,11 +112,13 @@ jobs: --language kotlin \ --out-dir build/generated/kotlin + - name: Install uniffi-bindgen-java + run: cargo install uniffi-bindgen-java + - name: Generate Java sources run: | - cargo run --bin uniffi-bindgen -- generate \ + uniffi-bindgen-java generate \ --library build/generated/resources/darwin-x86-64/libzen_uniffi.dylib \ - --language java \ --out-dir build/generated/java - name: Print directory tree From d09a0b8f6204149eee4f244971cd597ff3d8d2a7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 18:23:22 +0200 Subject: [PATCH 49/62] update java --- .github/workflows/uniffi.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 6074bf16..918e3d87 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -76,7 +76,7 @@ jobs: path: target/${{ matrix.settings.target }}/release/${{ format(matrix.settings.output, env.OUTPUT_NAME) }} if-no-files-found: error - release-kotlin: + release-java-kotlin: runs-on: ubuntu-latest needs: [ build ] # TODO: Uncomment @@ -87,6 +87,11 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' - name: Setup Rust Toolchain uses: dtolnay/rust-toolchain@stable From ac389444aedeacfb834c372a30a2697819a1c11f Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 18:39:47 +0200 Subject: [PATCH 50/62] include kotlin in publish; bump version --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/build.gradle.kts | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index bd800645..7a01eb17 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.2" +version = "0.1.3" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 68670e7f..4483a3f9 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -124,6 +124,7 @@ signing { useInMemoryPgpKeys(signingKey, signingPassphrase.get()) sign(publishing.publications["mavenJava"]) + sign(publishing.publications["mavenKotlin"]) } } @@ -139,6 +140,18 @@ nmcp { password.set(remotePassword.get()) } } + + publish("mavenKotlin") { + publicationType = "USER_MANAGED" + + val remoteUsername = providers.environmentVariable("SONATYPE_USERNAME") + val remotePassword = providers.environmentVariable("SONATYPE_PASSWORD") + + if (remoteUsername.isPresent && remotePassword.isPresent) { + username.set(remoteUsername.get()) + password.set(remotePassword.get()) + } + } } fun loadCargoVersion(): String { From a27f18b72d8de59798b2f5f02d75e9a255a38191 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 18:49:52 +0200 Subject: [PATCH 51/62] fix release --- bindings/uniffi/build.gradle.kts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 4483a3f9..85143893 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -86,6 +86,13 @@ tasks { from(dokkaGeneratePublicationJavadoc.get()) } + + val kotlindocJar by creating(Jar::class) { + dependsOn(dokkaGeneratePublicationJavadoc) + archiveClassifier.set("javadoc") + + from(dokkaGeneratePublicationJavadoc.get()) + } } publishing { @@ -105,7 +112,7 @@ publishing { artifactId = "zen-engine-kotlin" artifact(tasks["generateKotlinJar"]) artifact(tasks["generateKotlinSourcesJar"]) - artifact(tasks["javadocJar"]) + artifact(tasks["kotlindocJar"]) configurePom() } From fe10d86deb6b95ca00c424f3449c7fbeab8b6ff9 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 25 Jul 2025 20:16:11 +0200 Subject: [PATCH 52/62] fix --- bindings/uniffi/build.gradle.kts | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 85143893..a8877792 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,5 +1,9 @@ +import org.gradle.kotlin.dsl.dokkaSourceSets +import org.gradle.kotlin.dsl.invoke +import org.jetbrains.dokka.gradle.DokkaTask import org.tomlj.Toml import java.util.* +import kotlin.text.set group = "io.gorules" version = loadCargoVersion() @@ -49,6 +53,7 @@ sourceSets { } } + dependencies { implementation("net.java.dev.jna:jna:5.15.0") "kotlinImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") @@ -80,15 +85,28 @@ tasks { from(sourceSets["kotlin"].kotlin) } - val javadocJar by creating(Jar::class) { + val dokkaJavadocJava by creating(DokkaTask::class) { + outputDirectory.set(layout.buildDirectory.dir("dokka/java")) + dokkaSourceSets { named("java") } + + } + + val dokkaJavadocKotlin by creating(DokkaTask::class) { + outputDirectory.set(layout.buildDirectory.dir("dokka/kotlin")) + dokkaSourceSets { named("kotlin") } + } + + val javadocJarJava by creating(Jar::class) { dependsOn(dokkaGeneratePublicationJavadoc) + archiveBaseName.set("zen_engine") archiveClassifier.set("javadoc") from(dokkaGeneratePublicationJavadoc.get()) } - val kotlindocJar by creating(Jar::class) { + val javadocJarKotlin by creating(Jar::class) { dependsOn(dokkaGeneratePublicationJavadoc) + archiveBaseName.set("zen_engine_kotlin") archiveClassifier.set("javadoc") from(dokkaGeneratePublicationJavadoc.get()) @@ -102,7 +120,7 @@ publishing { artifactId = "zen-engine" artifact(tasks["generateJavaJar"]) artifact(tasks["generateJavaSourcesJar"]) - artifact(tasks["javadocJar"]) + artifact(tasks["javadocJarJava"]) configurePom() } @@ -112,7 +130,7 @@ publishing { artifactId = "zen-engine-kotlin" artifact(tasks["generateKotlinJar"]) artifact(tasks["generateKotlinSourcesJar"]) - artifact(tasks["kotlindocJar"]) + artifact(tasks["javadocJarKotlin"]) configurePom() } @@ -130,8 +148,7 @@ signing { val signingKey = Base64.getDecoder().decode(signingKeyBase64.get()).toString(Charsets.UTF_8) useInMemoryPgpKeys(signingKey, signingPassphrase.get()) - sign(publishing.publications["mavenJava"]) - sign(publishing.publications["mavenKotlin"]) + sign(publishing.publications["mavenJava"], publishing.publications["mavenKotlin"]) } } From da52566a3b2c815e84af18e9f8669ee67efadac2 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 02:59:23 +0200 Subject: [PATCH 53/62] fix publication --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/build.gradle.kts | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 7a01eb17..7a4323aa 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.3" +version = "0.1.4" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index a8877792..36edd473 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -1,9 +1,6 @@ -import org.gradle.kotlin.dsl.dokkaSourceSets -import org.gradle.kotlin.dsl.invoke import org.jetbrains.dokka.gradle.DokkaTask import org.tomlj.Toml import java.util.* -import kotlin.text.set group = "io.gorules" version = loadCargoVersion() @@ -153,19 +150,7 @@ signing { } nmcp { - publish("mavenJava") { - publicationType = "USER_MANAGED" - - val remoteUsername = providers.environmentVariable("SONATYPE_USERNAME") - val remotePassword = providers.environmentVariable("SONATYPE_PASSWORD") - - if (remoteUsername.isPresent && remotePassword.isPresent) { - username.set(remoteUsername.get()) - password.set(remotePassword.get()) - } - } - - publish("mavenKotlin") { + publishAllPublications { publicationType = "USER_MANAGED" val remoteUsername = providers.environmentVariable("SONATYPE_USERNAME") From 7e38e489f892e4faf02e4dce96cbe801eb308009 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 03:48:13 +0200 Subject: [PATCH 54/62] fix missing dep --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/build.gradle.kts | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 7a4323aa..e704c8a0 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.4" +version = "0.1.5" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 36edd473..f4b833b2 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -119,7 +119,7 @@ publishing { artifact(tasks["generateJavaSourcesJar"]) artifact(tasks["javadocJarJava"]) - configurePom() + configurePom(configurations["implementation"]) } create("mavenKotlin") { @@ -129,7 +129,7 @@ publishing { artifact(tasks["generateKotlinSourcesJar"]) artifact(tasks["javadocJarKotlin"]) - configurePom() + configurePom(configurations["implementation"]) } } repositories { @@ -170,7 +170,7 @@ fun loadCargoVersion(): String { ?: throw GradleException("Version not found in Cargo.toml") } -fun MavenPublication.configurePom() { +fun MavenPublication.configurePom(configuration: Configuration) { pom { name = "GoRules ZEN Engine" description = "GoRules ZEN Engine is a cross-platform, Open-Source Business Rules Engine (BRE)" @@ -198,5 +198,17 @@ fun MavenPublication.configurePom() { scm { url = "https://github.com/gorules/zen" } + + withXml { + val dependenciesNode = asNode().appendNode("dependencies") + + configuration.allDependencies.forEach { dep -> + val dependencyNode = dependenciesNode.appendNode("dependency") + dependencyNode.appendNode("groupId", dep.group) + dependencyNode.appendNode("artifactId", dep.name) + dependencyNode.appendNode("version", dep.version) + dependencyNode.appendNode("scope", "runtime") + } + } } } \ No newline at end of file From a36f5a1275f14637b97e9ba17b44a1934f9793bf Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 04:19:01 +0200 Subject: [PATCH 55/62] fix dep chain --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/build.gradle.kts | 44 +++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index e704c8a0..1d5a3967 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.5" +version = "0.1.6" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index f4b833b2..45de6658 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -52,8 +52,8 @@ sourceSets { dependencies { - implementation("net.java.dev.jna:jna:5.15.0") - "kotlinImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") + implementation("net.java.dev.jna:jna:5.17.0") + "kotlinImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") } @@ -119,7 +119,9 @@ publishing { artifact(tasks["generateJavaSourcesJar"]) artifact(tasks["javadocJarJava"]) - configurePom(configurations["implementation"]) + configurePom { + dependency("net.java.dev.jna:jna:5.17.0") + } } create("mavenKotlin") { @@ -129,7 +131,9 @@ publishing { artifact(tasks["generateKotlinSourcesJar"]) artifact(tasks["javadocJarKotlin"]) - configurePom(configurations["implementation"]) + configurePom { + dependency("net.java.dev.jna:jna:5.17.0") + } } } repositories { @@ -170,7 +174,10 @@ fun loadCargoVersion(): String { ?: throw GradleException("Version not found in Cargo.toml") } -fun MavenPublication.configurePom(configuration: Configuration) { +fun MavenPublication.configurePom(dependencyConfig: PomDependencyBuilder.() -> Unit) { + val depBuilder = PomDependencyBuilder() + depBuilder.dependencyConfig() + pom { name = "GoRules ZEN Engine" description = "GoRules ZEN Engine is a cross-platform, Open-Source Business Rules Engine (BRE)" @@ -201,14 +208,27 @@ fun MavenPublication.configurePom(configuration: Configuration) { withXml { val dependenciesNode = asNode().appendNode("dependencies") + depBuilder.addToXml(dependenciesNode) + } + } +} - configuration.allDependencies.forEach { dep -> - val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", dep.group) - dependencyNode.appendNode("artifactId", dep.name) - dependencyNode.appendNode("version", dep.version) - dependencyNode.appendNode("scope", "runtime") - } +class PomDependencyBuilder { + private val dependencies = mutableListOf>() + + fun dependency(notation: String) { + val parts = notation.split(":") + require(parts.size == 3) { "Dependency notation must be 'group:artifact:version'" } + dependencies.add(Triple(parts[0], parts[1], parts[2])) + } + + fun addToXml(dependenciesNode: groovy.util.Node) { + dependencies.forEach { (groupId, artifactId, version) -> + val dependencyNode = dependenciesNode.appendNode("dependency") + dependencyNode.appendNode("groupId", groupId) + dependencyNode.appendNode("artifactId", artifactId) + dependencyNode.appendNode("version", version) + dependencyNode.appendNode("scope", "runtime") } } } \ No newline at end of file From 49bc7114debc068011c662000da646665f6fb5f6 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 14:10:00 +0200 Subject: [PATCH 56/62] add expression compilation --- bindings/uniffi/src/expression.rs | 89 +++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 22 deletions(-) diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index f95c4ba0..faf4a07d 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -1,7 +1,8 @@ use crate::error::ZenError; use crate::types::JsonBuffer; use tokio::task; -use zen_expression::Variable; +use zen_expression::expression::{Standard, Unary}; +use zen_expression::{Expression, Variable}; #[uniffi::export()] pub fn evaluate_expression_sync( @@ -38,20 +39,6 @@ pub fn evaluate_unary_expression_sync( ) } -#[allow(dead_code)] -#[uniffi::export()] -pub fn render_template_sync(template: String, context: JsonBuffer) -> Result { - let ctx: Variable = context.try_into()?; - - Ok(zen_tmpl::render(template.as_str(), ctx) - .map_err(|e| ZenError::TemplateEngineError { - template, - details: serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), - })? - .to_value() - .try_into()?) -} - #[allow(dead_code)] #[uniffi::export(async_runtime = "tokio")] pub async fn evaluate_expression( @@ -75,12 +62,70 @@ pub async fn evaluate_unary_expression( } #[allow(dead_code)] +#[uniffi::export()] +pub fn compile_expression(expression: String) -> Result { + zen_expression::compile_expression(expression.as_str()) + .map_err(|err| ZenError::IsolateError(err.to_string())) + .map(|expression| ZenExpression { expression }) +} + +#[allow(dead_code)] +#[uniffi::export()] +pub fn compile_unary_expression(expression: String) -> Result { + zen_expression::compile_unary_expression(expression.as_str()) + .map_err(|err| ZenError::IsolateError(err.to_string())) + .map(|expression| ZenExpressionUnary { expression }) +} + +#[derive(uniffi::Object)] +pub(crate) struct ZenExpression { + expression: Expression, +} + #[uniffi::export(async_runtime = "tokio")] -pub async fn render_template( - template: String, - context: JsonBuffer, -) -> Result { - task::spawn_blocking(move || render_template_sync(template, context)) - .await - .map_err(|_| ZenError::ExecutionTaskSpawnError)? +impl ZenExpression { + pub async fn evaluate(&self, context: JsonBuffer) -> Result { + let expression = ZenExpression { + expression: self.expression.clone(), + }; + + task::spawn_blocking(move || expression.evaluate_sync(context)) + .await + .map_err(|_| ZenError::ExecutionTaskSpawnError)? + } + + pub fn evaluate_sync(&self, context: JsonBuffer) -> Result { + let ctx: Variable = context.try_into()?; + let res = self.expression.evaluate(ctx).map_err(|e| { + ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) + }); + + res?.try_into() + } +} + +#[derive(uniffi::Object)] +pub(crate) struct ZenExpressionUnary { + expression: Expression, +} + +#[uniffi::export(async_runtime = "tokio")] +impl ZenExpressionUnary { + pub async fn evaluate(&self, context: JsonBuffer) -> Result { + let expression = ZenExpressionUnary { + expression: self.expression.clone(), + }; + + task::spawn_blocking(move || expression.evaluate_sync(context)) + .await + .map_err(|_| ZenError::ExecutionTaskSpawnError)? + } + + pub fn evaluate_sync(&self, context: JsonBuffer) -> Result { + let ctx: Variable = context.try_into()?; + + self.expression.evaluate(ctx).map_err(|e| { + ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) + }) + } } From a63ce7bbee82b709498aae0c9bc46f12da9f6dd0 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 14:15:31 +0200 Subject: [PATCH 57/62] bump version --- bindings/uniffi/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 1d5a3967..abdbd957 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.6" +version = "0.1.7" edition = "2024" license = "MIT" publish = false From 1b9c03a0f534e7b68c62756ff36cfb6c198d539d Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 26 Jul 2025 15:38:18 +0200 Subject: [PATCH 58/62] improve performance --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/Makefile | 20 ++++ bindings/uniffi/build.gradle.kts | 4 +- .../io/gorules/zen_engine/JsonBuffer.java | 20 ---- .../gorules/zen_engine/kotlin/JsonBuffer.kt | 11 --- bindings/uniffi/src/custom_node.rs | 17 +--- bindings/uniffi/src/decision.rs | 4 +- bindings/uniffi/src/engine.rs | 9 +- bindings/uniffi/src/expression.rs | 65 ++++++------- bindings/uniffi/src/loader.rs | 14 ++- bindings/uniffi/src/types.rs | 95 ++++++++++++------- bindings/uniffi/uniffi.toml | 10 +- 12 files changed, 133 insertions(+), 138 deletions(-) create mode 100644 bindings/uniffi/Makefile delete mode 100644 bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java delete mode 100644 bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index abdbd957..6c84c772 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.7" +version = "0.1.8" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/Makefile b/bindings/uniffi/Makefile new file mode 100644 index 00000000..42daa61e --- /dev/null +++ b/bindings/uniffi/Makefile @@ -0,0 +1,20 @@ +# Just for local testing, at the moment it relies on .dylib (Mac), feel free to change below +build: + cargo build --lib --release + @mkdir -p build/generated/resources + cp -f ../../target/release/libzen_uniffi.dylib build/generated/resources/libzen_uniffi.dylib + +generate-java: + uniffi-bindgen-java generate \ + --library build/generated/resources/libzen_uniffi.dylib \ + --out-dir build/generated/java + +generate-kotlin: + cargo run --bin uniffi-bindgen generate \ + --library build/generated/resources/libzen_uniffi.dylib \ + --language kotlin \ + --out-dir build/generated/kotlin + +all: build generate-java generate-kotlin + +.PHONY: all build generate-java generate-kotlin \ No newline at end of file diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 45de6658..45307eb9 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -27,7 +27,7 @@ repositories { sourceSets { val java by creating { java { - srcDirs("lib/java", "build/generated/java") + srcDirs("build/generated/java") } resources { srcDirs("build/generated/resources") @@ -39,7 +39,7 @@ sourceSets { val kotlin by creating { kotlin { - srcDirs("lib/kotlin", "build/generated/kotlin") + srcDirs("build/generated/kotlin") } resources { srcDirs("build/generated/resources") diff --git a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java deleted file mode 100644 index b38b57ec..00000000 --- a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.gorules.zen_engine; - -import org.jetbrains.annotations.NotNull; - -import java.nio.charset.StandardCharsets; - -public record JsonBuffer( - byte[] value -) { - - public JsonBuffer(String value) { - this(value.getBytes(StandardCharsets.UTF_8)); - } - - @NotNull - @Override - public String toString() { - return new String(value, StandardCharsets.UTF_8); - } -} \ No newline at end of file diff --git a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt deleted file mode 100644 index d18ea520..00000000 --- a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt +++ /dev/null @@ -1,11 +0,0 @@ -package io.gorules.zen_engine.kotlin - -@JvmInline -value class JsonBuffer(val value: ByteArray) { - - constructor(value: String) : this(value = value.toByteArray(Charsets.UTF_8)) - - override fun toString(): String { - return value.toString(Charsets.UTF_8) - } -} \ No newline at end of file diff --git a/bindings/uniffi/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs index 6f402e7c..a24e2775 100644 --- a/bindings/uniffi/src/custom_node.rs +++ b/bindings/uniffi/src/custom_node.rs @@ -1,6 +1,7 @@ use crate::error::ZenError; -use crate::types::{DecisionNode, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; +use crate::types::{DecisionNode, JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; use serde_json::Value; +use std::sync::Arc; use uniffi::deps::anyhow::anyhow; use zen_engine::handler::custom_node_adapter::{CustomNodeAdapter, CustomNodeRequest}; use zen_engine::handler::node::{NodeResponse, NodeResult}; @@ -31,11 +32,7 @@ pub struct ZenCustomNodeCallbackWrapper(pub Box); impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { async fn handle(&self, request: CustomNodeRequest) -> NodeResult { - let input = request - .input - .try_into() - .map_err(|err: ZenError| anyhow!(err))?; - + let input = Arc::new(JsonBuffer(request.input.to_value())); let node = DecisionNode::from(request.node); let result = self @@ -44,12 +41,8 @@ impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { .await .map_err(|err| anyhow!(err.details()))?; - let output: Variable = result - .output - .try_into() - .map_err(|err: ZenError| anyhow!(err))?; - - let trace_data: Option = result.trace_data.and_then(|trace| trace.try_into().ok()); + let output: Variable = result.output.to_variable(); + let trace_data: Option = result.trace_data.map(|trace| trace.to_value()); Ok(NodeResponse { output, trace_data }) } diff --git a/bindings/uniffi/src/decision.rs b/bindings/uniffi/src/decision.rs index d76ab0d4..3a9339fe 100644 --- a/bindings/uniffi/src/decision.rs +++ b/bindings/uniffi/src/decision.rs @@ -30,11 +30,11 @@ impl From, options: Option, ) -> Result { let options = options.unwrap_or_default(); - let context: Value = context.try_into()?; + let context: Value = context.to_value(); let decision = self.decision.clone(); let evaluation_options = EvaluationOptions { diff --git a/bindings/uniffi/src/engine.rs b/bindings/uniffi/src/engine.rs index d38075ad..b8176b0c 100644 --- a/bindings/uniffi/src/engine.rs +++ b/bindings/uniffi/src/engine.rs @@ -55,11 +55,11 @@ impl ZenEngine { pub async fn evaluate( &self, key: String, - context: JsonBuffer, + context: Arc, options: Option, ) -> Result { let options = options.unwrap_or_default(); - let context: Value = context.try_into()?; + let context: Value = context.to_value(); let engine = self.engine.clone(); let evaluation_options = EvaluationOptions { @@ -89,9 +89,10 @@ impl ZenEngine { Ok(response) } - pub fn create_decision(&self, content: JsonBuffer) -> Result { + pub fn create_decision(&self, content: Arc) -> Result { let decision = self.engine.create_decision(Arc::new( - serde_json::from_slice(&content.0).map_err(|_| ZenError::JsonDeserializationFailed)?, + serde_json::from_value(content.to_value()) + .map_err(|_| ZenError::JsonDeserializationFailed)?, )); Ok(ZenDecision::from(decision)) diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index faf4a07d..455d9eb3 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -1,5 +1,6 @@ use crate::error::ZenError; use crate::types::JsonBuffer; +use std::sync::Arc; use tokio::task; use zen_expression::expression::{Standard, Unary}; use zen_expression::{Expression, Variable}; @@ -7,11 +8,9 @@ use zen_expression::{Expression, Variable}; #[uniffi::export()] pub fn evaluate_expression_sync( expression: String, - context: Option, + context: Option>, ) -> Result { - let ctx: Variable = context - .and_then(|v| v.try_into().ok()) - .unwrap_or(Variable::Null); + let ctx: Variable = context.map(|v| v.to_variable()).unwrap_or(Variable::Null); Ok( zen_expression::evaluate_expression(expression.as_str(), ctx) @@ -20,7 +19,7 @@ pub fn evaluate_expression_sync( serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), ) })? - .try_into()?, + .into(), ) } @@ -28,9 +27,9 @@ pub fn evaluate_expression_sync( #[uniffi::export()] pub fn evaluate_unary_expression_sync( expression: String, - context: JsonBuffer, + context: Arc, ) -> Result { - let ctx: Variable = context.try_into()?; + let ctx: Variable = context.to_variable(); Ok( zen_expression::evaluate_unary_expression(expression.as_str(), ctx).map_err(|e| { @@ -43,7 +42,7 @@ pub fn evaluate_unary_expression_sync( #[uniffi::export(async_runtime = "tokio")] pub async fn evaluate_expression( expression: String, - context: Option, + context: Option>, ) -> Result { task::spawn_blocking(move || evaluate_expression_sync(expression, context)) .await @@ -54,29 +53,13 @@ pub async fn evaluate_expression( #[uniffi::export(async_runtime = "tokio")] pub async fn evaluate_unary_expression( expression: String, - context: JsonBuffer, + context: Arc, ) -> Result { task::spawn_blocking(move || evaluate_unary_expression_sync(expression, context)) .await .map_err(|_| ZenError::ExecutionTaskSpawnError)? } -#[allow(dead_code)] -#[uniffi::export()] -pub fn compile_expression(expression: String) -> Result { - zen_expression::compile_expression(expression.as_str()) - .map_err(|err| ZenError::IsolateError(err.to_string())) - .map(|expression| ZenExpression { expression }) -} - -#[allow(dead_code)] -#[uniffi::export()] -pub fn compile_unary_expression(expression: String) -> Result { - zen_expression::compile_unary_expression(expression.as_str()) - .map_err(|err| ZenError::IsolateError(err.to_string())) - .map(|expression| ZenExpressionUnary { expression }) -} - #[derive(uniffi::Object)] pub(crate) struct ZenExpression { expression: Expression, @@ -84,8 +67,15 @@ pub(crate) struct ZenExpression { #[uniffi::export(async_runtime = "tokio")] impl ZenExpression { - pub async fn evaluate(&self, context: JsonBuffer) -> Result { - let expression = ZenExpression { + #[uniffi::constructor] + pub fn compile(expression: String) -> Result { + zen_expression::compile_expression(expression.as_str()) + .map_err(|err| ZenError::IsolateError(err.to_string())) + .map(|expression| Self { expression }) + } + + pub async fn evaluate(&self, context: Option>) -> Result { + let expression = Self { expression: self.expression.clone(), }; @@ -94,13 +84,13 @@ impl ZenExpression { .map_err(|_| ZenError::ExecutionTaskSpawnError)? } - pub fn evaluate_sync(&self, context: JsonBuffer) -> Result { - let ctx: Variable = context.try_into()?; + pub fn evaluate_sync(&self, context: Option>) -> Result { + let ctx: Variable = context.map(|b| b.to_variable()).unwrap_or(Variable::Null); let res = self.expression.evaluate(ctx).map_err(|e| { ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) }); - res?.try_into() + Ok(res?.into()) } } @@ -111,8 +101,15 @@ pub(crate) struct ZenExpressionUnary { #[uniffi::export(async_runtime = "tokio")] impl ZenExpressionUnary { - pub async fn evaluate(&self, context: JsonBuffer) -> Result { - let expression = ZenExpressionUnary { + #[uniffi::constructor] + pub fn compile(expression: String) -> Result { + zen_expression::compile_unary_expression(expression.as_str()) + .map_err(|err| ZenError::IsolateError(err.to_string())) + .map(|expression| Self { expression }) + } + + pub async fn evaluate(&self, context: Arc) -> Result { + let expression = Self { expression: self.expression.clone(), }; @@ -121,8 +118,8 @@ impl ZenExpressionUnary { .map_err(|_| ZenError::ExecutionTaskSpawnError)? } - pub fn evaluate_sync(&self, context: JsonBuffer) -> Result { - let ctx: Variable = context.try_into()?; + pub fn evaluate_sync(&self, context: Arc) -> Result { + let ctx: Variable = context.to_variable(); self.expression.evaluate(ctx).map_err(|e| { ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index e21b2e07..8aba473b 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -9,14 +9,14 @@ use zen_engine::model::DecisionContent; #[uniffi::export(callback_interface)] #[async_trait::async_trait] pub trait ZenDecisionLoaderCallback: Send + Sync { - async fn load(&self, key: String) -> Result, ZenError>; + async fn load(&self, key: String) -> Result>, ZenError>; } pub struct NoopDecisionLoader; #[async_trait::async_trait] impl ZenDecisionLoaderCallback for NoopDecisionLoader { - async fn load(&self, _: String) -> Result, ZenError> { + async fn load(&self, _: String) -> Result>, ZenError> { Err(ZenError::Zero) } } @@ -40,12 +40,10 @@ impl DecisionLoader for ZenDecisionLoaderCallbackWrapper { return Err(Box::new(LoaderError::NotFound(key.to_string()))); }; - let decision_content: DecisionContent = - serde_json::from_slice(json_buffer.0.as_slice()).map_err(|e| { - LoaderError::Internal { - key: key.to_string(), - source: anyhow!(e), - } + let decision_content: DecisionContent = serde_json::from_value(json_buffer.to_value()) + .map_err(|e| LoaderError::Internal { + key: key.to_string(), + source: anyhow!(e), })?; Ok(Arc::new(decision_content)) diff --git a/bindings/uniffi/src/types.rs b/bindings/uniffi/src/types.rs index 098f587d..1c749297 100644 --- a/bindings/uniffi/src/types.rs +++ b/bindings/uniffi/src/types.rs @@ -1,46 +1,71 @@ use crate::error::ZenError; use serde_json::Value; use std::collections::HashMap; +use std::ops::Deref; +use std::sync::Arc; use zen_engine::handler::custom_node_adapter::CustomDecisionNode; use zen_engine::{DecisionGraphResponse, DecisionGraphTrace}; use zen_expression::Variable; -pub struct JsonBuffer(pub Vec); -uniffi::custom_newtype!(JsonBuffer, Vec); +#[derive(uniffi::Object)] +pub struct JsonBuffer(pub(crate) Value); -impl TryFrom for Value { - type Error = ZenError; +impl From for Value { + fn from(value: JsonBuffer) -> Self { + value.0 + } +} - fn try_from(value: JsonBuffer) -> Result { - serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) +impl From for Variable { + fn from(value: JsonBuffer) -> Variable { + Variable::from(&value.0) } } -impl TryFrom for Variable { - type Error = ZenError; +impl From for JsonBuffer { + fn from(value: Value) -> Self { + JsonBuffer(value) + } +} - fn try_from(value: JsonBuffer) -> Result { - serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) +impl From for JsonBuffer { + fn from(var: Variable) -> Self { + JsonBuffer(var.to_value()) } } -impl TryFrom for JsonBuffer { - type Error = ZenError; +impl JsonBuffer { + pub fn to_value(&self) -> Value { + self.0.clone() + } - fn try_from(value: Value) -> Result { - serde_json::to_vec(&value) - .map(|v| JsonBuffer(v)) - .map_err(|_| ZenError::JsonSerializationFailed) + pub fn to_variable(&self) -> Variable { + Variable::from(&self.0) } } -impl TryFrom for JsonBuffer { - type Error = ZenError; +#[uniffi::export] +impl JsonBuffer { + #[uniffi::constructor] + pub fn from_bytes(bytes: Vec) -> Result { + serde_json::from_slice(&bytes) + .map(JsonBuffer) + .map_err(|_| ZenError::JsonDeserializationFailed) + } + + #[uniffi::constructor] + pub fn from_string(json_str: String) -> Result { + serde_json::from_str(&json_str) + .map(JsonBuffer) + .map_err(|_| ZenError::JsonDeserializationFailed) + } + + pub fn to_bytes(&self) -> Result, ZenError> { + serde_json::to_vec(&self.0).map_err(|_| ZenError::JsonSerializationFailed) + } - fn try_from(var: Variable) -> Result { - serde_json::to_vec(&var) - .map(|v| JsonBuffer(v)) - .map_err(|_| ZenError::JsonSerializationFailed) + pub fn to_json(&self) -> String { + serde_json::to_string(&self.0).unwrap_or_else(|_| String::from("Failed to serialize JSON")) } } @@ -48,10 +73,10 @@ impl TryFrom for JsonBuffer { pub struct ZenEngineTrace { pub id: String, pub name: String, - pub input: JsonBuffer, - pub output: JsonBuffer, + pub input: Arc, + pub output: Arc, pub performance: Option, - pub trace_data: Option, + pub trace_data: Option>, pub order: u32, } @@ -60,10 +85,10 @@ impl From for ZenEngineTrace { Self { id: value.id, name: value.name, - input: value.input.to_value().try_into().unwrap(), - output: value.output.to_value().try_into().unwrap(), + input: Arc::new(value.input.into()), + output: Arc::new(value.output.into()), performance: value.performance, - trace_data: value.trace_data.map(|data| data.try_into().unwrap()), + trace_data: value.trace_data.map(|data| Arc::new(data.into())), order: value.order, } } @@ -72,7 +97,7 @@ impl From for ZenEngineTrace { #[derive(uniffi::Record)] pub struct ZenEngineResponse { pub performance: String, - pub result: JsonBuffer, + pub result: Arc, pub trace: Option>, } @@ -80,7 +105,7 @@ impl From for ZenEngineResponse { fn from(value: DecisionGraphResponse) -> Self { Self { performance: value.performance, - result: value.result.to_value().try_into().unwrap(), + result: Arc::new(value.result.into()), trace: value.trace.map(|opt| { opt.into_iter() .map(|(key, value)| (key, ZenEngineTrace::from(value))) @@ -92,8 +117,8 @@ impl From for ZenEngineResponse { #[derive(uniffi::Record)] pub struct ZenEngineHandlerResponse { - pub output: JsonBuffer, - pub trace_data: Option, + pub output: Arc, + pub trace_data: Option>, } #[derive(uniffi::Record)] @@ -101,7 +126,7 @@ pub struct DecisionNode { pub id: String, pub name: String, pub kind: String, - pub config: JsonBuffer, + pub config: Arc, } impl From for DecisionNode { @@ -110,13 +135,13 @@ impl From for DecisionNode { id: value.id, name: value.name, kind: value.kind, - config: JsonBuffer(serde_json::to_vec(&value.config).unwrap()), + config: Arc::new(value.config.deref().clone().into()), } } } #[derive(uniffi::Record)] pub struct ZenEngineHandlerRequest { - pub input: JsonBuffer, + pub input: Arc, pub node: DecisionNode, } diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index b84a34c4..a3bf0f8a 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -3,15 +3,7 @@ package_name = "io.gorules.zen_engine.kotlin" generate_immutable_records = true -[bindings.kotlin.custom_types.JsonBuffer] -into_custom = "JsonBuffer({})" -from_custom = "{}.value" - # Java [bindings.java] package_name = 'io.gorules.zen_engine' -generate_immutable_records = true - -[bindings.java.custom_types.JsonBuffer] -into_custom = "{}" -from_custom = "{}" \ No newline at end of file +generate_immutable_records = true \ No newline at end of file From fe54801dfcf83e2ea2670a13c796977f003c5c74 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 28 Jul 2025 09:56:27 +0200 Subject: [PATCH 59/62] improve expression api --- bindings/uniffi/src/expression.rs | 59 +++++-------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index 455d9eb3..2b5ed53d 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -1,12 +1,11 @@ use crate::error::ZenError; use crate::types::JsonBuffer; use std::sync::Arc; -use tokio::task; use zen_expression::expression::{Standard, Unary}; use zen_expression::{Expression, Variable}; -#[uniffi::export()] -pub fn evaluate_expression_sync( +#[uniffi::export] +pub fn evaluate_expression( expression: String, context: Option>, ) -> Result { @@ -24,8 +23,8 @@ pub fn evaluate_expression_sync( } #[allow(dead_code)] -#[uniffi::export()] -pub fn evaluate_unary_expression_sync( +#[uniffi::export] +pub fn evaluate_unary_expression( expression: String, context: Arc, ) -> Result { @@ -38,34 +37,12 @@ pub fn evaluate_unary_expression_sync( ) } -#[allow(dead_code)] -#[uniffi::export(async_runtime = "tokio")] -pub async fn evaluate_expression( - expression: String, - context: Option>, -) -> Result { - task::spawn_blocking(move || evaluate_expression_sync(expression, context)) - .await - .map_err(|_| ZenError::ExecutionTaskSpawnError)? -} - -#[allow(dead_code)] -#[uniffi::export(async_runtime = "tokio")] -pub async fn evaluate_unary_expression( - expression: String, - context: Arc, -) -> Result { - task::spawn_blocking(move || evaluate_unary_expression_sync(expression, context)) - .await - .map_err(|_| ZenError::ExecutionTaskSpawnError)? -} - #[derive(uniffi::Object)] pub(crate) struct ZenExpression { expression: Expression, } -#[uniffi::export(async_runtime = "tokio")] +#[uniffi::export] impl ZenExpression { #[uniffi::constructor] pub fn compile(expression: String) -> Result { @@ -74,17 +51,7 @@ impl ZenExpression { .map(|expression| Self { expression }) } - pub async fn evaluate(&self, context: Option>) -> Result { - let expression = Self { - expression: self.expression.clone(), - }; - - task::spawn_blocking(move || expression.evaluate_sync(context)) - .await - .map_err(|_| ZenError::ExecutionTaskSpawnError)? - } - - pub fn evaluate_sync(&self, context: Option>) -> Result { + pub fn evaluate(&self, context: Option>) -> Result { let ctx: Variable = context.map(|b| b.to_variable()).unwrap_or(Variable::Null); let res = self.expression.evaluate(ctx).map_err(|e| { ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) @@ -99,7 +66,7 @@ pub(crate) struct ZenExpressionUnary { expression: Expression, } -#[uniffi::export(async_runtime = "tokio")] +#[uniffi::export] impl ZenExpressionUnary { #[uniffi::constructor] pub fn compile(expression: String) -> Result { @@ -108,17 +75,7 @@ impl ZenExpressionUnary { .map(|expression| Self { expression }) } - pub async fn evaluate(&self, context: Arc) -> Result { - let expression = Self { - expression: self.expression.clone(), - }; - - task::spawn_blocking(move || expression.evaluate_sync(context)) - .await - .map_err(|_| ZenError::ExecutionTaskSpawnError)? - } - - pub fn evaluate_sync(&self, context: Arc) -> Result { + pub fn evaluate(&self, context: Arc) -> Result { let ctx: Variable = context.to_variable(); self.expression.evaluate(ctx).map_err(|e| { From 6044d2240b8a11eead5bd6598b4d1262a0c0ccb2 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 31 Jul 2025 01:00:07 +0200 Subject: [PATCH 60/62] fix: restore interfaces --- bindings/uniffi/Cargo.toml | 2 +- bindings/uniffi/build.gradle.kts | 4 +- .../io/gorules/zen_engine/JsonBuffer.java | 20 +++ .../gorules/zen_engine/kotlin/JsonBuffer.kt | 11 ++ bindings/uniffi/src/custom_node.rs | 17 ++- bindings/uniffi/src/decision.rs | 8 +- bindings/uniffi/src/engine.rs | 13 +- bindings/uniffi/src/error.rs | 9 ++ bindings/uniffi/src/expression.rs | 52 +++---- bindings/uniffi/src/loader.rs | 14 +- bindings/uniffi/src/types.rs | 128 ++++++++---------- bindings/uniffi/uniffi.toml | 10 +- 12 files changed, 158 insertions(+), 130 deletions(-) create mode 100644 bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java create mode 100644 bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 6c84c772..1816b485 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.8" +version = "0.1.9" edition = "2024" license = "MIT" publish = false diff --git a/bindings/uniffi/build.gradle.kts b/bindings/uniffi/build.gradle.kts index 45307eb9..45de6658 100644 --- a/bindings/uniffi/build.gradle.kts +++ b/bindings/uniffi/build.gradle.kts @@ -27,7 +27,7 @@ repositories { sourceSets { val java by creating { java { - srcDirs("build/generated/java") + srcDirs("lib/java", "build/generated/java") } resources { srcDirs("build/generated/resources") @@ -39,7 +39,7 @@ sourceSets { val kotlin by creating { kotlin { - srcDirs("build/generated/kotlin") + srcDirs("lib/kotlin", "build/generated/kotlin") } resources { srcDirs("build/generated/resources") diff --git a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java new file mode 100644 index 00000000..b38b57ec --- /dev/null +++ b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java @@ -0,0 +1,20 @@ +package io.gorules.zen_engine; + +import org.jetbrains.annotations.NotNull; + +import java.nio.charset.StandardCharsets; + +public record JsonBuffer( + byte[] value +) { + + public JsonBuffer(String value) { + this(value.getBytes(StandardCharsets.UTF_8)); + } + + @NotNull + @Override + public String toString() { + return new String(value, StandardCharsets.UTF_8); + } +} \ No newline at end of file diff --git a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt new file mode 100644 index 00000000..d18ea520 --- /dev/null +++ b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt @@ -0,0 +1,11 @@ +package io.gorules.zen_engine.kotlin + +@JvmInline +value class JsonBuffer(val value: ByteArray) { + + constructor(value: String) : this(value = value.toByteArray(Charsets.UTF_8)) + + override fun toString(): String { + return value.toString(Charsets.UTF_8) + } +} \ No newline at end of file diff --git a/bindings/uniffi/src/custom_node.rs b/bindings/uniffi/src/custom_node.rs index a24e2775..6f402e7c 100644 --- a/bindings/uniffi/src/custom_node.rs +++ b/bindings/uniffi/src/custom_node.rs @@ -1,7 +1,6 @@ use crate::error::ZenError; -use crate::types::{DecisionNode, JsonBuffer, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; +use crate::types::{DecisionNode, ZenEngineHandlerRequest, ZenEngineHandlerResponse}; use serde_json::Value; -use std::sync::Arc; use uniffi::deps::anyhow::anyhow; use zen_engine::handler::custom_node_adapter::{CustomNodeAdapter, CustomNodeRequest}; use zen_engine::handler::node::{NodeResponse, NodeResult}; @@ -32,7 +31,11 @@ pub struct ZenCustomNodeCallbackWrapper(pub Box); impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { async fn handle(&self, request: CustomNodeRequest) -> NodeResult { - let input = Arc::new(JsonBuffer(request.input.to_value())); + let input = request + .input + .try_into() + .map_err(|err: ZenError| anyhow!(err))?; + let node = DecisionNode::from(request.node); let result = self @@ -41,8 +44,12 @@ impl CustomNodeAdapter for ZenCustomNodeCallbackWrapper { .await .map_err(|err| anyhow!(err.details()))?; - let output: Variable = result.output.to_variable(); - let trace_data: Option = result.trace_data.map(|trace| trace.to_value()); + let output: Variable = result + .output + .try_into() + .map_err(|err: ZenError| anyhow!(err))?; + + let trace_data: Option = result.trace_data.and_then(|trace| trace.try_into().ok()); Ok(NodeResponse { output, trace_data }) } diff --git a/bindings/uniffi/src/decision.rs b/bindings/uniffi/src/decision.rs index 3a9339fe..b94cb937 100644 --- a/bindings/uniffi/src/decision.rs +++ b/bindings/uniffi/src/decision.rs @@ -30,11 +30,11 @@ impl From, + context: JsonBuffer, options: Option, ) -> Result { let options = options.unwrap_or_default(); - let context: Value = context.to_value(); + let context: Value = context.try_into()?; let decision = self.decision.clone(); let evaluation_options = EvaluationOptions { @@ -49,7 +49,7 @@ impl ZenDecision { decision .evaluate_with_opts(context.into(), evaluation_options) .await - .map(|response| ZenEngineResponse::from(response)) + .map(|response| ZenEngineResponse::try_from(response)) .map_err(|err| { ZenError::EvaluationError( serde_json::to_string(&err.as_ref()) @@ -59,7 +59,7 @@ impl ZenDecision { }) }) .await - .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))??; + .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))???; Ok(response) } diff --git a/bindings/uniffi/src/engine.rs b/bindings/uniffi/src/engine.rs index b8176b0c..df796fed 100644 --- a/bindings/uniffi/src/engine.rs +++ b/bindings/uniffi/src/engine.rs @@ -55,11 +55,11 @@ impl ZenEngine { pub async fn evaluate( &self, key: String, - context: Arc, + context: JsonBuffer, options: Option, ) -> Result { let options = options.unwrap_or_default(); - let context: Value = context.to_value(); + let context: Value = context.try_into()?; let engine = self.engine.clone(); let evaluation_options = EvaluationOptions { @@ -74,7 +74,7 @@ impl ZenEngine { engine .evaluate_with_opts(key, context.into(), evaluation_options) .await - .map(|response| ZenEngineResponse::from(response)) + .map(|response| ZenEngineResponse::try_from(response)) .map_err(|err| { ZenError::EvaluationError( serde_json::to_string(&err.as_ref()) @@ -84,15 +84,14 @@ impl ZenEngine { }) }) .await - .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))??; + .map_err(|e| ZenError::EvaluationError(format!("Task failed: {:?}", e)))???; Ok(response) } - pub fn create_decision(&self, content: Arc) -> Result { + pub fn create_decision(&self, content: JsonBuffer) -> Result { let decision = self.engine.create_decision(Arc::new( - serde_json::from_value(content.to_value()) - .map_err(|_| ZenError::JsonDeserializationFailed)?, + serde_json::from_slice(&content.0).map_err(|_| ZenError::JsonDeserializationFailed)?, )); Ok(ZenDecision::from(decision)) diff --git a/bindings/uniffi/src/error.rs b/bindings/uniffi/src/error.rs index 8d19557d..3a9c28eb 100644 --- a/bindings/uniffi/src/error.rs +++ b/bindings/uniffi/src/error.rs @@ -1,5 +1,6 @@ use serde_json::json; use std::fmt::Formatter; +use zen_expression::IsolateError; #[allow(dead_code)] #[derive(Debug, uniffi::Error)] @@ -52,3 +53,11 @@ impl std::fmt::Display for ZenError { self.details().fmt(f) } } + +impl From for ZenError { + fn from(error: IsolateError) -> Self { + ZenError::EvaluationError( + serde_json::to_string(&error).unwrap_or_else(|_| error.to_string()), + ) + } +} diff --git a/bindings/uniffi/src/expression.rs b/bindings/uniffi/src/expression.rs index 2b5ed53d..76cf930a 100644 --- a/bindings/uniffi/src/expression.rs +++ b/bindings/uniffi/src/expression.rs @@ -1,40 +1,33 @@ use crate::error::ZenError; use crate::types::JsonBuffer; -use std::sync::Arc; use zen_expression::expression::{Standard, Unary}; use zen_expression::{Expression, Variable}; #[uniffi::export] pub fn evaluate_expression( expression: String, - context: Option>, + context: Option, ) -> Result { - let ctx: Variable = context.map(|v| v.to_variable()).unwrap_or(Variable::Null); + let ctx: Variable = context + .map(Variable::try_from) + .transpose()? + .unwrap_or(Variable::Null); - Ok( - zen_expression::evaluate_expression(expression.as_str(), ctx) - .map_err(|e| { - ZenError::EvaluationError( - serde_json::to_string(&e).unwrap_or_else(|_| e.to_string()), - ) - })? - .into(), - ) + zen_expression::evaluate_expression(expression.as_str(), ctx).map(JsonBuffer::try_from)? } #[allow(dead_code)] #[uniffi::export] pub fn evaluate_unary_expression( expression: String, - context: Arc, + context: JsonBuffer, ) -> Result { - let ctx: Variable = context.to_variable(); + let ctx: Variable = context.try_into()?; - Ok( - zen_expression::evaluate_unary_expression(expression.as_str(), ctx).map_err(|e| { - ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) - })?, - ) + Ok(zen_expression::evaluate_unary_expression( + expression.as_str(), + ctx, + )?) } #[derive(uniffi::Object)] @@ -51,13 +44,13 @@ impl ZenExpression { .map(|expression| Self { expression }) } - pub fn evaluate(&self, context: Option>) -> Result { - let ctx: Variable = context.map(|b| b.to_variable()).unwrap_or(Variable::Null); - let res = self.expression.evaluate(ctx).map_err(|e| { - ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) - }); + pub fn evaluate(&self, context: Option) -> Result { + let ctx: Variable = context + .map(Variable::try_from) + .transpose()? + .unwrap_or(Variable::Null); - Ok(res?.into()) + self.expression.evaluate(ctx).map(JsonBuffer::try_from)? } } @@ -75,11 +68,8 @@ impl ZenExpressionUnary { .map(|expression| Self { expression }) } - pub fn evaluate(&self, context: Arc) -> Result { - let ctx: Variable = context.to_variable(); - - self.expression.evaluate(ctx).map_err(|e| { - ZenError::EvaluationError(serde_json::to_string(&e).unwrap_or_else(|_| e.to_string())) - }) + pub fn evaluate(&self, context: JsonBuffer) -> Result { + let ctx: Variable = context.try_into()?; + Ok(self.expression.evaluate(ctx)?) } } diff --git a/bindings/uniffi/src/loader.rs b/bindings/uniffi/src/loader.rs index 8aba473b..e21b2e07 100644 --- a/bindings/uniffi/src/loader.rs +++ b/bindings/uniffi/src/loader.rs @@ -9,14 +9,14 @@ use zen_engine::model::DecisionContent; #[uniffi::export(callback_interface)] #[async_trait::async_trait] pub trait ZenDecisionLoaderCallback: Send + Sync { - async fn load(&self, key: String) -> Result>, ZenError>; + async fn load(&self, key: String) -> Result, ZenError>; } pub struct NoopDecisionLoader; #[async_trait::async_trait] impl ZenDecisionLoaderCallback for NoopDecisionLoader { - async fn load(&self, _: String) -> Result>, ZenError> { + async fn load(&self, _: String) -> Result, ZenError> { Err(ZenError::Zero) } } @@ -40,10 +40,12 @@ impl DecisionLoader for ZenDecisionLoaderCallbackWrapper { return Err(Box::new(LoaderError::NotFound(key.to_string()))); }; - let decision_content: DecisionContent = serde_json::from_value(json_buffer.to_value()) - .map_err(|e| LoaderError::Internal { - key: key.to_string(), - source: anyhow!(e), + let decision_content: DecisionContent = + serde_json::from_slice(json_buffer.0.as_slice()).map_err(|e| { + LoaderError::Internal { + key: key.to_string(), + source: anyhow!(e), + } })?; Ok(Arc::new(decision_content)) diff --git a/bindings/uniffi/src/types.rs b/bindings/uniffi/src/types.rs index 1c749297..ba2ccd21 100644 --- a/bindings/uniffi/src/types.rs +++ b/bindings/uniffi/src/types.rs @@ -1,71 +1,46 @@ use crate::error::ZenError; use serde_json::Value; use std::collections::HashMap; -use std::ops::Deref; -use std::sync::Arc; use zen_engine::handler::custom_node_adapter::CustomDecisionNode; use zen_engine::{DecisionGraphResponse, DecisionGraphTrace}; use zen_expression::Variable; -#[derive(uniffi::Object)] -pub struct JsonBuffer(pub(crate) Value); +pub struct JsonBuffer(pub Vec); +uniffi::custom_newtype!(JsonBuffer, Vec); -impl From for Value { - fn from(value: JsonBuffer) -> Self { - value.0 - } -} +impl TryFrom for Value { + type Error = ZenError; -impl From for Variable { - fn from(value: JsonBuffer) -> Variable { - Variable::from(&value.0) + fn try_from(value: JsonBuffer) -> Result { + serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) } } -impl From for JsonBuffer { - fn from(value: Value) -> Self { - JsonBuffer(value) - } -} +impl TryFrom for Variable { + type Error = ZenError; -impl From for JsonBuffer { - fn from(var: Variable) -> Self { - JsonBuffer(var.to_value()) + fn try_from(value: JsonBuffer) -> Result { + serde_json::from_slice(&value.0).map_err(|_| ZenError::JsonDeserializationFailed) } } -impl JsonBuffer { - pub fn to_value(&self) -> Value { - self.0.clone() - } +impl TryFrom for JsonBuffer { + type Error = ZenError; - pub fn to_variable(&self) -> Variable { - Variable::from(&self.0) + fn try_from(value: Value) -> Result { + serde_json::to_vec(&value) + .map(|v| JsonBuffer(v)) + .map_err(|_| ZenError::JsonSerializationFailed) } } -#[uniffi::export] -impl JsonBuffer { - #[uniffi::constructor] - pub fn from_bytes(bytes: Vec) -> Result { - serde_json::from_slice(&bytes) - .map(JsonBuffer) - .map_err(|_| ZenError::JsonDeserializationFailed) - } - - #[uniffi::constructor] - pub fn from_string(json_str: String) -> Result { - serde_json::from_str(&json_str) - .map(JsonBuffer) - .map_err(|_| ZenError::JsonDeserializationFailed) - } - - pub fn to_bytes(&self) -> Result, ZenError> { - serde_json::to_vec(&self.0).map_err(|_| ZenError::JsonSerializationFailed) - } +impl TryFrom for JsonBuffer { + type Error = ZenError; - pub fn to_json(&self) -> String { - serde_json::to_string(&self.0).unwrap_or_else(|_| String::from("Failed to serialize JSON")) + fn try_from(var: Variable) -> Result { + serde_json::to_vec(&var) + .map(|v| JsonBuffer(v)) + .map_err(|_| ZenError::JsonSerializationFailed) } } @@ -73,52 +48,59 @@ impl JsonBuffer { pub struct ZenEngineTrace { pub id: String, pub name: String, - pub input: Arc, - pub output: Arc, + pub input: JsonBuffer, + pub output: JsonBuffer, pub performance: Option, - pub trace_data: Option>, + pub trace_data: Option, pub order: u32, } -impl From for ZenEngineTrace { - fn from(value: DecisionGraphTrace) -> Self { - Self { +impl TryFrom for ZenEngineTrace { + type Error = ZenError; + + fn try_from(value: DecisionGraphTrace) -> Result { + Ok(Self { id: value.id, name: value.name, - input: Arc::new(value.input.into()), - output: Arc::new(value.output.into()), + input: JsonBuffer::try_from(value.input)?, + output: JsonBuffer::try_from(value.output)?, performance: value.performance, - trace_data: value.trace_data.map(|data| Arc::new(data.into())), + trace_data: value.trace_data.map(JsonBuffer::try_from).transpose()?, order: value.order, - } + }) } } #[derive(uniffi::Record)] pub struct ZenEngineResponse { pub performance: String, - pub result: Arc, + pub result: JsonBuffer, pub trace: Option>, } -impl From for ZenEngineResponse { - fn from(value: DecisionGraphResponse) -> Self { - Self { +impl TryFrom for ZenEngineResponse { + type Error = ZenError; + + fn try_from(value: DecisionGraphResponse) -> Result { + Ok(Self { performance: value.performance, - result: Arc::new(value.result.into()), - trace: value.trace.map(|opt| { - opt.into_iter() - .map(|(key, value)| (key, ZenEngineTrace::from(value))) - .collect() - }), - } + result: JsonBuffer::try_from(value.result)?, + trace: value + .trace + .map(|opt| { + opt.into_iter() + .map(|(key, value)| Ok((key, ZenEngineTrace::try_from(value)?))) + .collect::>() + }) + .transpose()?, + }) } } #[derive(uniffi::Record)] pub struct ZenEngineHandlerResponse { - pub output: Arc, - pub trace_data: Option>, + pub output: JsonBuffer, + pub trace_data: Option, } #[derive(uniffi::Record)] @@ -126,7 +108,7 @@ pub struct DecisionNode { pub id: String, pub name: String, pub kind: String, - pub config: Arc, + pub config: JsonBuffer, } impl From for DecisionNode { @@ -135,13 +117,13 @@ impl From for DecisionNode { id: value.id, name: value.name, kind: value.kind, - config: Arc::new(value.config.deref().clone().into()), + config: JsonBuffer(serde_json::to_vec(&value.config).unwrap()), } } } #[derive(uniffi::Record)] pub struct ZenEngineHandlerRequest { - pub input: Arc, + pub input: JsonBuffer, pub node: DecisionNode, } diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index a3bf0f8a..b84a34c4 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -3,7 +3,15 @@ package_name = "io.gorules.zen_engine.kotlin" generate_immutable_records = true +[bindings.kotlin.custom_types.JsonBuffer] +into_custom = "JsonBuffer({})" +from_custom = "{}.value" + # Java [bindings.java] package_name = 'io.gorules.zen_engine' -generate_immutable_records = true \ No newline at end of file +generate_immutable_records = true + +[bindings.java.custom_types.JsonBuffer] +into_custom = "{}" +from_custom = "{}" \ No newline at end of file From 7a5a843404d94b029e1e540fa64e74bb84a50680 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 31 Jul 2025 06:28:18 +0200 Subject: [PATCH 61/62] cleanup and add preliminary csharp support --- bindings/uniffi/Cargo.toml | 6 ++---- bindings/uniffi/Makefile | 9 +++++++-- .../lib/java/io/gorules/zen_engine/JsonBuffer.java | 5 +---- .../kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt | 8 +++----- bindings/uniffi/uniffi.toml | 11 ++++++++++- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/bindings/uniffi/Cargo.toml b/bindings/uniffi/Cargo.toml index 1816b485..b45005d0 100644 --- a/bindings/uniffi/Cargo.toml +++ b/bindings/uniffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zen-uniffi" -version = "0.1.9" +version = "0.1.10" edition = "2024" license = "MIT" publish = false @@ -17,11 +17,9 @@ uniffi = { version = "0.29", features = ["tokio", "cli"] } serde_json = { workspace = true } zen-engine = { path = "../../core/engine" } zen-expression = { path = "../../core/expression" } -zen-tmpl = { path = "../../core/template" } serde = { workspace = true, features = ["derive"] } async-trait = "0.1" tokio = "1.46" [build-dependencies] -uniffi = { version = "0.29", features = ["build"] } -uniffi-bindgen-java = "0.2" \ No newline at end of file +uniffi = { version = "0.29", features = ["build"] } \ No newline at end of file diff --git a/bindings/uniffi/Makefile b/bindings/uniffi/Makefile index 42daa61e..b44dbe8f 100644 --- a/bindings/uniffi/Makefile +++ b/bindings/uniffi/Makefile @@ -15,6 +15,11 @@ generate-kotlin: --language kotlin \ --out-dir build/generated/kotlin -all: build generate-java generate-kotlin +generate-csharp: + uniffi-bindgen-cs \ + --library build/generated/resources/libzen_uniffi.dylib \ + --out-dir build/generated/csharp + +all: build generate-java generate-kotlin generate-csharp -.PHONY: all build generate-java generate-kotlin \ No newline at end of file +.PHONY: all build generate-java generate-kotlin generate-csharp \ No newline at end of file diff --git a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java index b38b57ec..c4570c72 100644 --- a/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java +++ b/bindings/uniffi/lib/java/io/gorules/zen_engine/JsonBuffer.java @@ -4,10 +4,7 @@ import java.nio.charset.StandardCharsets; -public record JsonBuffer( - byte[] value -) { - +public record JsonBuffer(byte[] value) { public JsonBuffer(String value) { this(value.getBytes(StandardCharsets.UTF_8)); } diff --git a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt index d18ea520..2c2fa3e9 100644 --- a/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt +++ b/bindings/uniffi/lib/kotlin/io/gorules/zen_engine/kotlin/JsonBuffer.kt @@ -2,10 +2,8 @@ package io.gorules.zen_engine.kotlin @JvmInline value class JsonBuffer(val value: ByteArray) { + constructor(json: String) : this(json.toByteArray(Charsets.UTF_8)) - constructor(value: String) : this(value = value.toByteArray(Charsets.UTF_8)) - - override fun toString(): String { - return value.toString(Charsets.UTF_8) - } + override fun toString(): String = value.toString(Charsets.UTF_8) + fun toByteArray(): ByteArray = value } \ No newline at end of file diff --git a/bindings/uniffi/uniffi.toml b/bindings/uniffi/uniffi.toml index b84a34c4..ed2a9997 100644 --- a/bindings/uniffi/uniffi.toml +++ b/bindings/uniffi/uniffi.toml @@ -14,4 +14,13 @@ generate_immutable_records = true [bindings.java.custom_types.JsonBuffer] into_custom = "{}" -from_custom = "{}" \ No newline at end of file +from_custom = "{}" + +# C# +[bindings.csharp] +namespace = "GoRules.ZenEngine" +cdylib_name = "Libs/zen_uniffi" + +[bindings.csharp.custom_types.JsonBuffer] +into_custom = "new JsonBuffer({})" +from_custom = "{}.Value" \ No newline at end of file From 61f92ad409775a597487d5461a553b1414d22d4d Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 31 Jul 2025 11:21:01 +0200 Subject: [PATCH 62/62] prepare for release --- .github/workflows/uniffi.yaml | 3 +-- bindings/uniffi/.bumpversion.cfg | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml index 918e3d87..9e994745 100644 --- a/.github/workflows/uniffi.yaml +++ b/.github/workflows/uniffi.yaml @@ -79,8 +79,7 @@ jobs: release-java-kotlin: runs-on: ubuntu-latest needs: [ build ] - # TODO: Uncomment - #if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" + if: "startsWith(github.event.head_commit.message, 'chore(release): publish uniffi')" defaults: run: working-directory: ${{ env.UNIFFI_DIRECTORY }} diff --git a/bindings/uniffi/.bumpversion.cfg b/bindings/uniffi/.bumpversion.cfg index 56d18035..2eb98ac5 100644 --- a/bindings/uniffi/.bumpversion.cfg +++ b/bindings/uniffi/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.2 +current_version = 0.1.10 commit = True tag = True message = chore(release): publish uniffi