diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2c7a29b..462f515 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,10 +3,23 @@ name: jAI Workflow CI on: push: branches: - - main + - main + paths-ignore: + - '.gitignore' + - '*.md' + - 'LICENSE' + - '.github/*.md' + - '.github/*.yml' pull_request: branches: - - main + - main + paths-ignore: + - '.gitignore' + - '*.md' + - 'LICENSE' + - '.github/*.md' + - '.github/*.yml' + workflow_dispatch: jobs: java_build: diff --git a/.github/workflows/javadocs.yaml b/.github/workflows/javadocs.yaml new file mode 100644 index 0000000..d873fb2 --- /dev/null +++ b/.github/workflows/javadocs.yaml @@ -0,0 +1,44 @@ +name: Build and publish Java Docs to GitHub Pages + +on: + release: + types: [created] + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + deploy: + runs-on: ubuntu-latest + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + steps: + - name: Checkout source code + uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + - name: Generate Javadoc + run: mvn -T4C compile javadoc:aggregate -DskipTests + + - name: Setup Pages + uses: actions/configure-pages@v3 + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + # Upload side folder + path: './target/site/apidocs' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index be31b7c..d92b876 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,10 +1,18 @@ name: jAI Workflow Release on: + push: + tags: + - v0.[0-9].[0-9]+ workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + jobs: release: + name: Build and deploy to Maven Central + if: github.repository == 'czelabueno/jai-workflow' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -20,10 +28,27 @@ jobs: server-password: OSSRH_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - - name: release - run: mvn -B -U -Prelease clean deploy -DskipTests + - name: Publish to Sonatype Maven Central + run: | + mvn versions:set -DnewVersion=${GITHUB_REF#refs/tags/v} + mvn -B -U --fail-at-end -Prelease clean deploy -DskipTests env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + create-github-release: + name: Create GitHub Release + needs: release + runs-on: ubuntu-latest + steps: + - name: Create GitHub Release + shell: bash + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.ref_name }} + run: | + gh release create "$tag" \ + --repo "${{ github.repository }}" \ + --title "$tag#v" \ + --generate-notes \ + --latest diff --git a/.github/workflows/snapshot.yaml b/.github/workflows/snapshot.yaml index 3d13fe8..6046af2 100644 --- a/.github/workflows/snapshot.yaml +++ b/.github/workflows/snapshot.yaml @@ -2,9 +2,13 @@ name: jAI Workflow Snapshot-release on: workflow_dispatch: + push: + branches: + - main jobs: snapshot-release: + if: github.repository == 'czelabueno/jai-workflow' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -15,40 +19,14 @@ jobs: java-version: '21' distribution: 'temurin' cache: maven - - name: Install gpg secret key - shell: bash - run: | - # Install gpg secret key - cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import - # Verify gpg secret key - gpg --list-secret-keys --keyid-format LONG - - name: Setup Maven settings - shell: bash - run: | - # Setup maven settings - echo " - - - ossrh - ${{ secrets.OSSRH_USERNAME }} - ${{ secrets.OSSRH_PASSWORD }} - - - - - ossrh - - true - - - gpg - ${{ secrets.GPG_PASSPHRASE }} - - - - " > ~/.m2/settings.xml - - name: Publish SNAPSHOT to Sonatype (Maven Central) + server-id: ossrh + server-username: OSSRH_USERNAME + server-password: OSSRH_PASSWORD + - name: Publish SNAPSHOT to Sonatype run: | mvn -B --fail-at-end \ -DskipTests -DskipITs \ clean deploy + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/README.md b/README.md index 095e1cd..44a5a2a 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ In **jAI Workflow**, the notion of state plays a pivotal role. Every execution o The simplest way to use jAI Workflow in your project is with the [LangChain4j](https://docs.langchain4j.dev) integration because enables you to define custom workflows using all the features that LangChain4j offers. This integration could provide a comprehensive toolset for building advanced AI applications: ```xml - com.github.czelabueno + io.github.czelabueno jai-workflow-langchain4j 0.2.0 @@ -140,7 +140,7 @@ The simplest way to use jAI Workflow in your project is with the [LangChain4j](h If you would want to use jAI workflow without LangChain4j or with other framework, add the following dependency to your `pom.xml` file: ```xml - com.github.czelabueno + io.github.czelabueno jai-workflow-core 0.2.0 diff --git a/jai-workflow-core/pom.xml b/jai-workflow-core/pom.xml index b7998b2..6a6e72e 100644 --- a/jai-workflow-core/pom.xml +++ b/jai-workflow-core/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.github.czelabueno + io.github.czelabueno jai-workflow-parent 0.2.0-SNAPSHOT ../pom.xml diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/DefaultStateWorkflow.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/DefaultStateWorkflow.java similarity index 95% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/DefaultStateWorkflow.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/DefaultStateWorkflow.java index 254131e..5dee7c1 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/DefaultStateWorkflow.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/DefaultStateWorkflow.java @@ -1,11 +1,11 @@ -package com.github.czelabueno.jai.workflow; - -import com.github.czelabueno.jai.workflow.node.Conditional; -import com.github.czelabueno.jai.workflow.node.Node; -import com.github.czelabueno.jai.workflow.transition.Transition; -import com.github.czelabueno.jai.workflow.graph.GraphImageGenerator; -import com.github.czelabueno.jai.workflow.graph.graphviz.GraphvizImageGenerator; -import com.github.czelabueno.jai.workflow.transition.TransitionState; +package io.github.czelabueno.jai.workflow; + +import io.github.czelabueno.jai.workflow.node.Conditional; +import io.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.transition.Transition; +import io.github.czelabueno.jai.workflow.graph.GraphImageGenerator; +import io.github.czelabueno.jai.workflow.graph.graphviz.GraphvizImageGenerator; +import io.github.czelabueno.jai.workflow.transition.TransitionState; import lombok.Builder; import lombok.NonNull; import lombok.Singular; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/StateWorkflow.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/StateWorkflow.java similarity index 92% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/StateWorkflow.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/StateWorkflow.java index 47013d0..11df743 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/StateWorkflow.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/StateWorkflow.java @@ -1,8 +1,8 @@ -package com.github.czelabueno.jai.workflow; +package io.github.czelabueno.jai.workflow; -import com.github.czelabueno.jai.workflow.node.Conditional; -import com.github.czelabueno.jai.workflow.node.Node; -import com.github.czelabueno.jai.workflow.transition.Transition; +import io.github.czelabueno.jai.workflow.node.Conditional; +import io.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.transition.Transition; import java.io.IOException; import java.util.List; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/WorkflowStateName.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/WorkflowStateName.java similarity index 74% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/WorkflowStateName.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/WorkflowStateName.java index 98b3cf0..84565d3 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/WorkflowStateName.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/WorkflowStateName.java @@ -1,6 +1,6 @@ -package com.github.czelabueno.jai.workflow; +package io.github.czelabueno.jai.workflow; -import com.github.czelabueno.jai.workflow.transition.TransitionState; +import io.github.czelabueno.jai.workflow.transition.TransitionState; /** * Enum representing the possible states in a workflow. diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java similarity index 91% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java index 3456e20..d3e2ec9 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/GraphImageGenerator.java @@ -1,6 +1,6 @@ -package com.github.czelabueno.jai.workflow.graph; +package io.github.czelabueno.jai.workflow.graph; -import com.github.czelabueno.jai.workflow.transition.Transition; +import io.github.czelabueno.jai.workflow.transition.Transition; import lombok.NonNull; import java.io.IOException; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java similarity index 95% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java index 0c0e0cb..13c688a 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGenerator.java @@ -1,9 +1,9 @@ -package com.github.czelabueno.jai.workflow.graph.graphviz; +package io.github.czelabueno.jai.workflow.graph.graphviz; -import com.github.czelabueno.jai.workflow.WorkflowStateName; -import com.github.czelabueno.jai.workflow.node.Node; -import com.github.czelabueno.jai.workflow.transition.Transition; -import com.github.czelabueno.jai.workflow.graph.GraphImageGenerator; +import io.github.czelabueno.jai.workflow.WorkflowStateName; +import io.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.transition.Transition; +import io.github.czelabueno.jai.workflow.graph.GraphImageGenerator; import guru.nidi.graphviz.engine.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Conditional.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Conditional.java similarity index 94% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Conditional.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Conditional.java index 90bc910..e0819bb 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Conditional.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Conditional.java @@ -1,6 +1,6 @@ -package com.github.czelabueno.jai.workflow.node; +package io.github.czelabueno.jai.workflow.node; -import com.github.czelabueno.jai.workflow.transition.TransitionState; +import io.github.czelabueno.jai.workflow.transition.TransitionState; import lombok.NonNull; import java.util.Objects; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Node.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Node.java similarity index 96% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Node.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Node.java index 1266229..ba0552b 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/node/Node.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/node/Node.java @@ -1,6 +1,6 @@ -package com.github.czelabueno.jai.workflow.node; +package io.github.czelabueno.jai.workflow.node; -import com.github.czelabueno.jai.workflow.transition.TransitionState; +import io.github.czelabueno.jai.workflow.transition.TransitionState; import lombok.Getter; import lombok.NonNull; diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/Transition.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/Transition.java similarity index 94% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/Transition.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/Transition.java index 2eab798..c78b82a 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/Transition.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/Transition.java @@ -1,7 +1,7 @@ -package com.github.czelabueno.jai.workflow.transition; +package io.github.czelabueno.jai.workflow.transition; -import com.github.czelabueno.jai.workflow.node.Node; -import com.github.czelabueno.jai.workflow.WorkflowStateName; +import io.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.WorkflowStateName; import lombok.NonNull; /** diff --git a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/TransitionState.java b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/TransitionState.java similarity index 79% rename from jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/TransitionState.java rename to jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/TransitionState.java index 6ebd35c..500dfcc 100644 --- a/jai-workflow-core/src/main/java/com/github/czelabueno/jai/workflow/transition/TransitionState.java +++ b/jai-workflow-core/src/main/java/io/github/czelabueno/jai/workflow/transition/TransitionState.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.transition; +package io.github.czelabueno.jai.workflow.transition; /** * Marker interface representing a state in a workflow transition. diff --git a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/StateWorkflowTest.java b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/StateWorkflowTest.java similarity index 97% rename from jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/StateWorkflowTest.java rename to jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/StateWorkflowTest.java index fc3fd0c..6e704f4 100644 --- a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/StateWorkflowTest.java +++ b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/StateWorkflowTest.java @@ -1,7 +1,7 @@ -package com.github.czelabueno.jai.workflow; +package io.github.czelabueno.jai.workflow; -import com.github.czelabueno.jai.workflow.node.Conditional; -import com.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.node.Conditional; +import io.github.czelabueno.jai.workflow.node.Node; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java similarity index 96% rename from jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java rename to jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java index b826fe7..0d293fc 100644 --- a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java +++ b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/graph/graphviz/GraphvizImageGeneratorTest.java @@ -1,7 +1,7 @@ -package com.github.czelabueno.jai.workflow.graph.graphviz; +package io.github.czelabueno.jai.workflow.graph.graphviz; -import com.github.czelabueno.jai.workflow.node.Node; -import com.github.czelabueno.jai.workflow.transition.Transition; +import io.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.transition.Transition; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/ConditionalTest.java b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/ConditionalTest.java similarity index 98% rename from jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/ConditionalTest.java rename to jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/ConditionalTest.java index 4f252d6..cdd2e2b 100644 --- a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/ConditionalTest.java +++ b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/ConditionalTest.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.node; +package io.github.czelabueno.jai.workflow.node; import org.junit.jupiter.api.Test; diff --git a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/NodeTest.java b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/NodeTest.java similarity index 98% rename from jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/NodeTest.java rename to jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/NodeTest.java index 6b2cba0..e7d0d13 100644 --- a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/node/NodeTest.java +++ b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/node/NodeTest.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.node; +package io.github.czelabueno.jai.workflow.node; import org.junit.jupiter.api.Test; diff --git a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/transition/TransitionTest.java b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/transition/TransitionTest.java similarity index 93% rename from jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/transition/TransitionTest.java rename to jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/transition/TransitionTest.java index ec53d21..95998f2 100644 --- a/jai-workflow-core/src/test/java/com/github/czelabueno/jai/workflow/transition/TransitionTest.java +++ b/jai-workflow-core/src/test/java/io/github/czelabueno/jai/workflow/transition/TransitionTest.java @@ -1,12 +1,9 @@ -package com.github.czelabueno.jai.workflow.transition; +package io.github.czelabueno.jai.workflow.transition; -import com.github.czelabueno.jai.workflow.WorkflowStateName; -import com.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.WorkflowStateName; +import io.github.czelabueno.jai.workflow.node.Node; import org.junit.jupiter.api.Test; -import java.util.Arrays; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/jai-workflow-langchain4j/pom.xml b/jai-workflow-langchain4j/pom.xml index 82f9375..0e138b6 100644 --- a/jai-workflow-langchain4j/pom.xml +++ b/jai-workflow-langchain4j/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.github.czelabueno + io.github.czelabueno jai-workflow-parent 0.2.0-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ - com.github.czelabueno + io.github.czelabueno jai-workflow-core ${project.version} diff --git a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java similarity index 93% rename from jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java rename to jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java index 514b7b5..0b4f19c 100644 --- a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java +++ b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/AbstractStatefulBean.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.langchain4j; +package io.github.czelabueno.jai.workflow.langchain4j; import lombok.Data; import reactor.core.publisher.Flux; diff --git a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java similarity index 97% rename from jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java rename to jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java index 57a856f..b3043f5 100644 --- a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java +++ b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/JAiWorkflow.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.langchain4j; +package io.github.czelabueno.jai.workflow.langchain4j; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.data.message.UserMessage; diff --git a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java similarity index 91% rename from jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java rename to jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java index dbce714..0bc8992 100644 --- a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java +++ b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/internal/DefaultJAiWorkflow.java @@ -1,11 +1,11 @@ -package com.github.czelabueno.jai.workflow.langchain4j.internal; +package io.github.czelabueno.jai.workflow.langchain4j.internal; -import com.github.czelabueno.jai.workflow.DefaultStateWorkflow; -import com.github.czelabueno.jai.workflow.StateWorkflow; -import com.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; -import com.github.czelabueno.jai.workflow.langchain4j.JAiWorkflow; -import com.github.czelabueno.jai.workflow.langchain4j.node.StreamingNode; -import com.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.DefaultStateWorkflow; +import io.github.czelabueno.jai.workflow.StateWorkflow; +import io.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; +import io.github.czelabueno.jai.workflow.langchain4j.JAiWorkflow; +import io.github.czelabueno.jai.workflow.langchain4j.node.StreamingNode; +import io.github.czelabueno.jai.workflow.node.Node; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.data.message.UserMessage; import lombok.Builder; diff --git a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java similarity index 97% rename from jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java rename to jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java index babf701..8c33252 100644 --- a/jai-workflow-langchain4j/src/main/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java +++ b/jai-workflow-langchain4j/src/main/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNode.java @@ -1,7 +1,7 @@ -package com.github.czelabueno.jai.workflow.langchain4j.node; +package io.github.czelabueno.jai.workflow.langchain4j.node; -import com.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; -import com.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; +import io.github.czelabueno.jai.workflow.node.Node; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.data.message.ChatMessage; import dev.langchain4j.data.message.UserMessage; @@ -12,7 +12,6 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Sinks; -import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.Function; diff --git a/jai-workflow-langchain4j/src/test/java/JAiWorkflowIT.java b/jai-workflow-langchain4j/src/test/java/JAiWorkflowIT.java index e8bf436..e2f52ee 100644 --- a/jai-workflow-langchain4j/src/test/java/JAiWorkflowIT.java +++ b/jai-workflow-langchain4j/src/test/java/JAiWorkflowIT.java @@ -1,8 +1,8 @@ -import com.github.czelabueno.jai.workflow.StateWorkflow; -import com.github.czelabueno.jai.workflow.WorkflowStateName; -import com.github.czelabueno.jai.workflow.langchain4j.internal.DefaultJAiWorkflow; -import com.github.czelabueno.jai.workflow.langchain4j.node.StreamingNode; -import com.github.czelabueno.jai.workflow.node.Node; +import io.github.czelabueno.jai.workflow.StateWorkflow; +import io.github.czelabueno.jai.workflow.WorkflowStateName; +import io.github.czelabueno.jai.workflow.langchain4j.internal.DefaultJAiWorkflow; +import io.github.czelabueno.jai.workflow.langchain4j.node.StreamingNode; +import io.github.czelabueno.jai.workflow.node.Node; import dev.langchain4j.model.chat.ChatLanguageModel; import dev.langchain4j.model.chat.StreamingChatLanguageModel; import dev.langchain4j.model.mistralai.MistralAiChatModel; @@ -12,14 +12,14 @@ import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; -import com.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock; -import com.github.czelabueno.jai.workflow.langchain4j.workflow.StatefulBeanMock; +import io.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock; +import io.github.czelabueno.jai.workflow.langchain4j.workflow.StatefulBeanMock; import java.util.Arrays; import java.util.List; -import static com.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock.generate; -import static com.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock.retrieve; +import static io.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock.generate; +import static io.github.czelabueno.jai.workflow.langchain4j.workflow.NodeFunctionsMock.retrieve; import static java.util.stream.Collectors.joining; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; diff --git a/jai-workflow-langchain4j/src/test/java/JAiWorkflowTest.java b/jai-workflow-langchain4j/src/test/java/JAiWorkflowTest.java index 53bc9d2..bb1471d 100644 --- a/jai-workflow-langchain4j/src/test/java/JAiWorkflowTest.java +++ b/jai-workflow-langchain4j/src/test/java/JAiWorkflowTest.java @@ -1,4 +1,4 @@ -import com.github.czelabueno.jai.workflow.langchain4j.JAiWorkflow; +import io.github.czelabueno.jai.workflow.langchain4j.JAiWorkflow; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.data.message.UserMessage; import org.junit.jupiter.api.BeforeEach; diff --git a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java similarity index 94% rename from jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java rename to jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java index 306af0c..02ba5c0 100644 --- a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java +++ b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/node/StreamingNodeTest.java @@ -1,7 +1,6 @@ -package com.github.czelabueno.jai.workflow.langchain4j.node; +package io.github.czelabueno.jai.workflow.langchain4j.node; -import com.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; -import com.github.czelabueno.jai.workflow.langchain4j.node.StreamingNode; +import io.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; import dev.langchain4j.data.message.AiMessage; import dev.langchain4j.data.message.ChatMessage; import dev.langchain4j.data.message.UserMessage; diff --git a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java similarity index 95% rename from jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java rename to jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java index 4e7372f..ce13a46 100644 --- a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java +++ b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/NodeFunctionsMock.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.langchain4j.workflow; +package io.github.czelabueno.jai.workflow.langchain4j.workflow; import dev.langchain4j.data.document.Document; import dev.langchain4j.data.document.loader.UrlDocumentLoader; @@ -11,7 +11,7 @@ import dev.langchain4j.model.input.Prompt; import dev.langchain4j.model.input.structured.StructuredPromptProcessor; import dev.langchain4j.rag.content.Content; -import com.github.czelabueno.jai.workflow.langchain4j.workflow.prompt.GenerateAnswerPrompt; +import io.github.czelabueno.jai.workflow.langchain4j.workflow.prompt.GenerateAnswerPrompt; import java.util.ArrayList; import java.util.List; diff --git a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java similarity index 61% rename from jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java rename to jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java index ec55ce4..5e9f9aa 100644 --- a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java +++ b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/StatefulBeanMock.java @@ -1,6 +1,6 @@ -package com.github.czelabueno.jai.workflow.langchain4j.workflow; +package io.github.czelabueno.jai.workflow.langchain4j.workflow; -import com.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; +import io.github.czelabueno.jai.workflow.langchain4j.AbstractStatefulBean; import lombok.Data; import java.util.List; diff --git a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java similarity index 90% rename from jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java rename to jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java index 7c412f9..bc58d26 100644 --- a/jai-workflow-langchain4j/src/test/java/com/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java +++ b/jai-workflow-langchain4j/src/test/java/io/github/czelabueno/jai/workflow/langchain4j/workflow/prompt/GenerateAnswerPrompt.java @@ -1,4 +1,4 @@ -package com.github.czelabueno.jai.workflow.langchain4j.workflow.prompt; +package io.github.czelabueno.jai.workflow.langchain4j.workflow.prompt; import dev.langchain4j.model.input.structured.StructuredPrompt; diff --git a/pom.xml b/pom.xml index fbb6e72..fb60aca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.czelabueno + io.github.czelabueno jai-workflow-parent 0.2.0-SNAPSHOT pom @@ -233,6 +233,13 @@ jar + + aggregate + + aggregate + + site + @@ -289,27 +296,6 @@ - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - org.sonatype.plugins @@ -322,6 +308,12 @@ false + + + org.codehaus.mojo + versions-maven-plugin + 2.18.0 +