Skip to content

Llm chat bot #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: spring-bot-master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-mvn-modules
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v2
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-mvn-modules
with:
Expand Down
31 changes: 15 additions & 16 deletions .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ name: CVE Scanning for Maven
on:
pull_request:
paths:
- 'pom.xml'
- '.github/workflows/cve-scanning.yml'
- "pom.xml"
- ".github/workflows/cve-scanning.yml"
push:
paths:
- 'pom.xml'
- '.github/workflows/cve-scanning.yml'
- "pom.xml"
- ".github/workflows/cve-scanning.yml"
schedule:
# Run every day at 5am and 5pm
- cron: '0 5,17 * * *'

- cron: "0 5,17 * * *"

jobs:
depchecktest:
depchecktest:
runs-on: ubuntu-latest
name: depcheck_test
steps:
Expand All @@ -24,28 +23,28 @@ jobs:
- name: Setup JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
java-version: "17"
distribution: "temurin"
- name: Build with Maven
run: mvn install
run: mvn install
- name: Depcheck
uses: dependency-check/Dependency-Check_Action@1b5d19fd4a32ff0ff982e8c9d8e27dbf7ac8a46c
id: Depcheck
env:
JAVA_HOME: /opt/jdk
with:
project: 'spring-bot'
format: 'HTML'
path: '.'
out: 'reports' # this is the default, no need to specify unless you wish to override it
project: "spring-bot"
format: "HTML"
path: "."
out: "reports" # this is the default, no need to specify unless you wish to override it
args: >
--suppression ./.github/workflows/allow-list.xml
--failOnCVSS 5
--enableRetired

- name: Upload Test results
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Depcheck report
path: ${{ github.workspace }}/reports
82 changes: 41 additions & 41 deletions .github/workflows/license-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@ name: License Scanning for Maven

on:
schedule:
- cron: '0 8,18 * * 1-5'
- cron: "0 8,18 * * 1-5"
push:
paths:
- 'maven/pom.xml'
- '.github/workflows/license-check.yml'
- '.github/workflows/acceptable-licenses.txt'
- "maven/pom.xml"
- ".github/workflows/license-check.yml"
- ".github/workflows/acceptable-licenses.txt"

jobs:
scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache Maven dependencies
uses: actions/cache@v2
env:
cache-name: cache-mvn-modules
with:
path: ~/.m2
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'adopt'
- name: Install XQ
run: pip install xq
- name: Download deps and plugins
run: mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
- name: Build
run: mvn install -DskipTests
- name: License XML report
run: |
mvn org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses
- name: Validate XML report
run: |
ALLOW_LICENSES=`cat .github/workflows/acceptable-licenses.txt | sed "s|<name>|name='|" | sed "s|</name>|' |" | tr -s '\n' '~' | sed 's/\~/or /g' `
xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" target/generated-resources/aggregate-licenses.xml > target/license-issues.xml
LINES_FOUND=`cat target/license-issues.xml | grep "<result>" | wc -l`
if [ $LINES_FOUND -gt 0 ]; then cat target/license-issues.xml ; exit -1; fi
- name: Upload license XML Issues
uses: actions/upload-artifact@v3
with:
name: license-xml-report
path: 'target/license-issues.xml'
- uses: actions/checkout@v3
- name: Cache Maven dependencies
uses: actions/cache@v3
env:
cache-name: cache-mvn-modules
with:
path: ~/.m2
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: "adopt"
- name: Install XQ
run: pip install xq
- name: Download deps and plugins
run: mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies
- name: Build
run: mvn install -DskipTests
- name: License XML report
run: |
mvn org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses
- name: Validate XML report
run: |
ALLOW_LICENSES=`cat .github/workflows/acceptable-licenses.txt | sed "s|<name>|name='|" | sed "s|</name>|' |" | tr -s '\n' '~' | sed 's/\~/or /g' `
xq "//dependency[count(licenses/license[${ALLOW_LICENSES}])=0]" target/generated-resources/aggregate-licenses.xml > target/license-issues.xml
LINES_FOUND=`cat target/license-issues.xml | grep "<result>" | wc -l`
if [ $LINES_FOUND -gt 0 ]; then cat target/license-issues.xml ; exit -1; fi
- name: Upload license XML Issues
uses: actions/upload-artifact@v4
with:
name: license-xml-report
path: "target/license-issues.xml"
10 changes: 5 additions & 5 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: [push, pull_request]
jobs:
semgrep:
name: run-semgrep
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: returntocorp/semgrep
steps:
- uses: actions/checkout@v3
- run: semgrep scan --error --config auto
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
- uses: actions/checkout@v3
- run: semgrep scan --error --config auto
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
6 changes: 3 additions & 3 deletions demos/claim-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions demos/custom-help-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -29,13 +29,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions demos/demo-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand All @@ -28,13 +28,13 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<scope>compile</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions demos/todo-bot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -23,12 +23,12 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
14 changes: 7 additions & 7 deletions libs/chat-workflow-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand Down Expand Up @@ -56,32 +56,32 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow-testing</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>symphony-bdk-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>teams-chat-workflow-spring-boot-starter</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entities</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions libs/chat-workflow-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>chat-workflow</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions libs/chat-workflow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>org.finos.springbot</groupId>
<artifactId>entity-json</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ X renderDropdown(
X textField(Variable variable, boolean editable);

X checkBox(Variable variable, boolean editable);

X collection(Type t, Variable collection, Variable item, X in, boolean editable);

X button(String text, String id);
Expand Down
2 changes: 1 addition & 1 deletion libs/entity-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.finos.springbot</groupId>
<artifactId>spring-bot</artifactId>
<version>10.0.2-SNAPSHOT</version>
<version>10.0.2</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
Loading