diff --git a/.github/workflows/chatbot-openai-springai.yml b/.github/workflows/chatbot-openai-springai.yml new file mode 100644 index 0000000..dc1ec0d --- /dev/null +++ b/.github/workflows/chatbot-openai-springai.yml @@ -0,0 +1,39 @@ +name: chatbot-openai-springai CI Build + +on: + push: + paths: + - "chatbot/chatbot-openai-springai/**" + branches: [main] + pull_request: + paths: + - "chatbot/chatbot-openai-springai/**" + types: + - opened + - synchronize + - reopened + +jobs: + build: + name: Run Unit & Integration Tests + runs-on: ubuntu-latest + defaults: + run: + working-directory: chatbot/chatbot-openai-springai + strategy: + matrix: + distribution: [ 'temurin' ] + java: [ '21' ] + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4.2.1 + with: + java-version: ${{ matrix.java }} + distribution: ${{ matrix.distribution }} + cache: 'maven' + - name: Build and analyze + run: ./mvnw clean verify \ No newline at end of file diff --git a/chatbot/chatbot-ollama-springai/src/test/java/com/example/chatbot/ChatbotOllamaApplicationTests.java b/chatbot/chatbot-ollama-springai/src/test/java/com/example/chatbot/ChatbotOllamaApplicationTests.java index 9de3c62..063f2f0 100644 --- a/chatbot/chatbot-ollama-springai/src/test/java/com/example/chatbot/ChatbotOllamaApplicationTests.java +++ b/chatbot/chatbot-ollama-springai/src/test/java/com/example/chatbot/ChatbotOllamaApplicationTests.java @@ -5,8 +5,6 @@ import com.example.chatbot.model.request.AIChatRequest; import com.example.chatbot.model.response.AIChatResponse; -import com.fasterxml.jackson.core.exc.StreamReadException; -import com.fasterxml.jackson.databind.DatabindException; import com.fasterxml.jackson.databind.ObjectMapper; import io.restassured.RestAssured; import io.restassured.http.ContentType; @@ -38,7 +36,7 @@ void setUp() { } @Test - void chat() throws StreamReadException, DatabindException, IOException { + void chat() throws IOException { Response response = given().contentType(ContentType.JSON) .body(new AIChatRequest( diff --git a/chatbot/chatbot-openai-springai/.gitignore b/chatbot/chatbot-openai-springai/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/chatbot/chatbot-openai-springai/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/chatbot/chatbot-openai-springai/.mvn/wrapper/maven-wrapper.properties b/chatbot/chatbot-openai-springai/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b457dbf --- /dev/null +++ b/chatbot/chatbot-openai-springai/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +wrapperVersion=3.3.1 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip diff --git a/chatbot/chatbot-openai-springai/ReadMe.md b/chatbot/chatbot-openai-springai/ReadMe.md new file mode 100644 index 0000000..8d0cba5 --- /dev/null +++ b/chatbot/chatbot-openai-springai/ReadMe.md @@ -0,0 +1,48 @@ +# chatbot-openapi-springai + + +## Sequence Diagram + +Before Vector Store + +```mermaid +sequenceDiagram +participant User +participant ChatbotController +participant ChatbotService +participant ChatModel +participant ChatMemory + + User->>ChatbotController: POST /api/ai/chat + ChatbotController->>ChatbotService: chat(message) + ChatbotService->>ChatModel: generateResponse(message) + ChatModel-->>ChatbotService: response + ChatbotService->>ChatMemory: saveInteraction(message, response) + ChatbotService-->>ChatbotController: response + ChatbotController-->>User: response + +``` + +After Vector Store + +```mermaid +sequenceDiagram + participant User + participant ChatbotController + participant ChatbotService + participant ChatService + participant ChatMemory + participant VectorStore + + User->>ChatbotController: POST /api/ai/chat + ChatbotController->>ChatbotService: chat(message) + ChatbotService->>ChatService: Process Chat Request + ChatService->>ChatMemory: Retrieve Memory + ChatService->>VectorStore: Retrieve Vectors + ChatMemory-->>ChatService: Return Memory Data + VectorStore-->>ChatService: Return Vector Data + ChatService-->>ChatbotService: Processed Response + ChatbotService-->>ChatbotController: response + ChatbotController-->>User: response + +``` \ No newline at end of file diff --git a/chatbot/chatbot-openai-springai/mvnw b/chatbot/chatbot-openai-springai/mvnw new file mode 100755 index 0000000..ba9212a --- /dev/null +++ b/chatbot/chatbot-openai-springai/mvnw @@ -0,0 +1,250 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.1 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl="${value-}" ;; + distributionSha256Sum) distributionSha256Sum="${value-}" ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/chatbot/chatbot-openai-springai/mvnw.cmd b/chatbot/chatbot-openai-springai/mvnw.cmd new file mode 100644 index 0000000..406932d --- /dev/null +++ b/chatbot/chatbot-openai-springai/mvnw.cmd @@ -0,0 +1,146 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/chatbot/chatbot-openai-springai/pom.xml b/chatbot/chatbot-openai-springai/pom.xml new file mode 100644 index 0000000..4a8232d --- /dev/null +++ b/chatbot/chatbot-openai-springai/pom.xml @@ -0,0 +1,144 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.0 + + + com.example.chatbot + chatbot-openai-springai + 0.0.1-SNAPSHOT + chatbot-openapi + Demo project for Chatbot using Ollama + + + 17 + 2.43.0 + 1.0.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.ai + spring-ai-openai-spring-boot-starter + + + org.springframework.ai + spring-ai-milvus-store-spring-boot-starter + + + org.apache.httpcomponents.client5 + httpclient5 + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.5.0 + + + + org.springframework.boot + spring-boot-starter-test + test + + + io.rest-assured + rest-assured + test + + + org.springframework.ai + spring-ai-spring-boot-testcontainers + test + + + org.testcontainers + junit-jupiter + test + + + org.testcontainers + milvus + test + + + + + + + org.springframework.ai + spring-ai-bom + ${spring-ai.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + com.diffplug.spotless + spotless-maven-plugin + ${spotless.version} + + + + 2.47.0 + + + + + + + + + compile + + check + + + + + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + + + + + \ No newline at end of file diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/ChatbotOpenaiApplication.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/ChatbotOpenaiApplication.java new file mode 100644 index 0000000..0848cf4 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/ChatbotOpenaiApplication.java @@ -0,0 +1,12 @@ +package com.example.chatbot; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ChatbotOpenaiApplication { + + public static void main(String[] args) { + SpringApplication.run(ChatbotOpenaiApplication.class, args); + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/ChatConfig.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/ChatConfig.java new file mode 100644 index 0000000..1fbe4af --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/ChatConfig.java @@ -0,0 +1,31 @@ +package com.example.chatbot.config; + +import org.springframework.ai.chat.client.ChatClient; +import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; +import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor; +import org.springframework.ai.chat.client.advisor.VectorStoreChatMemoryAdvisor; +import org.springframework.ai.chat.memory.ChatMemory; +import org.springframework.ai.chat.memory.InMemoryChatMemory; +import org.springframework.ai.vectorstore.SearchRequest; +import org.springframework.ai.vectorstore.VectorStore; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +public class ChatConfig { + + @Bean + ChatMemory chatMemory() { + return new InMemoryChatMemory(); + } + + @Bean + ChatClient chatClient(ChatClient.Builder chatClientBuilder, ChatMemory chatMemory, VectorStore vectorStore) { + return chatClientBuilder + .defaultAdvisors( + new MessageChatMemoryAdvisor(chatMemory), + new QuestionAnswerAdvisor(vectorStore, SearchRequest.defaults()), // RAG + new VectorStoreChatMemoryAdvisor(vectorStore)) + .build(); + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/CustomClientHttpResponse.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/CustomClientHttpResponse.java new file mode 100644 index 0000000..89d4f6c --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/CustomClientHttpResponse.java @@ -0,0 +1,47 @@ +package com.example.chatbot.config; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.MediaType; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +public class CustomClientHttpResponse implements ClientHttpResponse { + + private final ClientHttpResponse originalResponse; + private final HttpHeaders headers; + + public CustomClientHttpResponse(ClientHttpResponse originalResponse) { + this.originalResponse = originalResponse; + MultiValueMap modifiedHeaders = new LinkedMultiValueMap<>(originalResponse.getHeaders()); + modifiedHeaders.put(HttpHeaders.CONTENT_TYPE, Collections.singletonList(MediaType.APPLICATION_JSON_VALUE)); + this.headers = new HttpHeaders(modifiedHeaders); + } + + @Override + public HttpStatusCode getStatusCode() throws IOException { + return originalResponse.getStatusCode(); + } + + @Override + public String getStatusText() throws IOException { + return originalResponse.getStatusText(); + } + + @Override + public void close() {} + + @Override + public InputStream getBody() throws IOException { + return originalResponse.getBody(); + } + + @Override + public HttpHeaders getHeaders() { + return headers; + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/LoggingConfig.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/LoggingConfig.java new file mode 100644 index 0000000..c92e46f --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/LoggingConfig.java @@ -0,0 +1,60 @@ +package com.example.chatbot.config; + +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.web.client.RestClientCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpRequest; +import org.springframework.http.MediaType; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.util.StreamUtils; + +@Configuration(proxyBeanMethods = false) +@ConditionalOnProperty(value = "spring.ai.openai.api-key", havingValue = "demo") +public class LoggingConfig { + + private static final Logger LOGGER = LoggerFactory.getLogger(LoggingConfig.class); + + @Bean + RestClientCustomizer restClientCustomizer() { + return restClientBuilder -> restClientBuilder + .requestFactory(new BufferingClientHttpRequestFactory(new HttpComponentsClientHttpRequestFactory())) + .requestInterceptor((request, body, execution) -> { + logRequest(request, body); + ClientHttpResponse response = execution.execute(request, body); + logResponse(response); + return new CustomClientHttpResponse(response); + }) + .defaultHeaders(httpHeaders -> { + httpHeaders.setContentType(MediaType.APPLICATION_JSON); + httpHeaders.setAccept(List.of(MediaType.ALL)); + }); + } + + private void logResponse(ClientHttpResponse response) throws IOException { + LOGGER.info("============================response begin=========================================="); + LOGGER.info("Status code : {}", response.getStatusCode()); + LOGGER.info("Status text : {}", response.getStatusText()); + LOGGER.info("Headers : {}", response.getHeaders()); + LOGGER.info("Response body: {}", StreamUtils.copyToString(response.getBody(), Charset.defaultCharset())); + LOGGER.info("=======================response end================================================="); + } + + private void logRequest(HttpRequest request, byte[] body) { + + LOGGER.info("===========================request begin================================================"); + LOGGER.info("URI : {}", request.getURI()); + LOGGER.info("Method : {}", request.getMethod()); + LOGGER.info("Headers : {}", request.getHeaders()); + LOGGER.info("Request body: {}", new String(body, StandardCharsets.UTF_8)); + LOGGER.info("==========================request end================================================"); + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/SwaggerConfig.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/SwaggerConfig.java new file mode 100644 index 0000000..332c863 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/config/SwaggerConfig.java @@ -0,0 +1,10 @@ +package com.example.chatbot.config; + +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.info.Info; +import io.swagger.v3.oas.annotations.servers.Server; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +@OpenAPIDefinition(info = @Info(title = "chatbot-openai-springai", version = "v1.0.0"), servers = @Server(url = "/")) +public class SwaggerConfig {} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/controller/ChatbotController.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/controller/ChatbotController.java new file mode 100644 index 0000000..7231a0b --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/controller/ChatbotController.java @@ -0,0 +1,25 @@ +package com.example.chatbot.controller; + +import com.example.chatbot.model.request.AIChatRequest; +import com.example.chatbot.model.response.AIChatResponse; +import com.example.chatbot.service.ChatbotService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/ai") +class ChatbotController { + + private final ChatbotService chatbotService; + + ChatbotController(ChatbotService chatbotService) { + this.chatbotService = chatbotService; + } + + @PostMapping("/chat") + AIChatResponse chat(@RequestBody AIChatRequest request) { + return chatbotService.chat(request); + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/request/AIChatRequest.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/request/AIChatRequest.java new file mode 100644 index 0000000..1726c2a --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/request/AIChatRequest.java @@ -0,0 +1,3 @@ +package com.example.chatbot.model.request; + +public record AIChatRequest(String query, String conversationId) {} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/response/AIChatResponse.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/response/AIChatResponse.java new file mode 100644 index 0000000..06133c8 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/model/response/AIChatResponse.java @@ -0,0 +1,3 @@ +package com.example.chatbot.model.response; + +public record AIChatResponse(String answer, String conversationId) {} diff --git a/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/service/ChatbotService.java b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/service/ChatbotService.java new file mode 100644 index 0000000..af6e8a5 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/java/com/example/chatbot/service/ChatbotService.java @@ -0,0 +1,37 @@ +package com.example.chatbot.service; + +import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_CONVERSATION_ID_KEY; +import static org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor.CHAT_MEMORY_RETRIEVE_SIZE_KEY; + +import com.example.chatbot.model.request.AIChatRequest; +import com.example.chatbot.model.response.AIChatResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.ai.chat.client.ChatClient; +import org.springframework.ai.chat.model.ChatResponse; +import org.springframework.stereotype.Service; + +@Service +public class ChatbotService { + + private static final Logger LOGGER = LoggerFactory.getLogger(ChatbotService.class); + + private final ChatClient chatClient; + + public ChatbotService(ChatClient chatClient) { + this.chatClient = chatClient; + } + + public AIChatResponse chat(AIChatRequest request) { + + ChatResponse chatResponse = this.chatClient + .prompt() + .user(request.query()) + .advisors(a -> a.param(CHAT_MEMORY_CONVERSATION_ID_KEY, request.conversationId()) + .param(CHAT_MEMORY_RETRIEVE_SIZE_KEY, 100)) + .call() + .chatResponse(); + LOGGER.info("Response :{}", chatResponse.getResult()); + return new AIChatResponse(chatResponse.getResult().getOutput().getContent(), request.conversationId()); + } +} diff --git a/chatbot/chatbot-openai-springai/src/main/resources/application.properties b/chatbot/chatbot-openai-springai/src/main/resources/application.properties new file mode 100644 index 0000000..bab13b3 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/main/resources/application.properties @@ -0,0 +1,13 @@ +spring.application.name=chatbot-openai + +spring.threads.virtual.enabled=true +spring.mvc.problemdetails.enabled=true + +spring.ai.openai.api-key=demo +spring.ai.openai.base-url=http://langchain4j.dev/demo/openai +spring.ai.openai.chat.options.model=gpt-3.5-turbo +spring.ai.openai.chat.options.temperature=0.7 + +spring.ai.openai.embedding.enabled=true + +spring.testcontainers.beans.startup=parallel diff --git a/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/ChatbotOpenaiApplicationTests.java b/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/ChatbotOpenaiApplicationTests.java new file mode 100644 index 0000000..b75ae34 --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/ChatbotOpenaiApplicationTests.java @@ -0,0 +1,71 @@ +package com.example.chatbot; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.containsString; + +import com.example.chatbot.model.request.AIChatRequest; +import com.example.chatbot.model.response.AIChatResponse; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.response.Response; +import java.io.IOException; +import org.apache.http.HttpStatus; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; + +@SpringBootTest( + classes = {TestChatbotOpenaiApplication.class}, + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class ChatbotOpenaiApplicationTests { + + @Autowired + private ObjectMapper objectMapper; + + @LocalServerPort + private int localServerPort; + + @BeforeAll + void setUp() { + RestAssured.port = localServerPort; + } + + @Test + void chat() throws IOException { + + Response response = given().contentType(ContentType.JSON) + .body(new AIChatRequest( + "As a cricketer, how many centuries did Sachin Tendulkar scored adding up both One Day International (ODI) and Test centuries ?", + "junitId")) + .when() + .post("/api/ai/chat") + .then() + .statusCode(HttpStatus.SC_OK) + .contentType(ContentType.JSON) + .body("answer", containsString("100")) + .log() + .all(true) + .extract() + .response(); + + AIChatResponse aiChatResponse = objectMapper.readValue(response.asByteArray(), AIChatResponse.class); + + given().contentType(ContentType.JSON) + .body(new AIChatRequest( + "How many One Day International (ODI) centuries did he scored ?", + aiChatResponse.conversationId())) + .when() + .post("/api/ai/chat") + .then() + .statusCode(HttpStatus.SC_OK) + .contentType(ContentType.JSON) + .body("answer", containsString("49")) + .log() + .all(true); + } +} diff --git a/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/TestChatbotOpenaiApplication.java b/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/TestChatbotOpenaiApplication.java new file mode 100644 index 0000000..a3b04cc --- /dev/null +++ b/chatbot/chatbot-openai-springai/src/test/java/com/example/chatbot/TestChatbotOpenaiApplication.java @@ -0,0 +1,24 @@ +package com.example.chatbot; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; +import org.springframework.context.annotation.Bean; +import org.testcontainers.milvus.MilvusContainer; +import org.testcontainers.utility.DockerImageName; + +@TestConfiguration(proxyBeanMethods = false) +public class TestChatbotOpenaiApplication { + + @Bean + @ServiceConnection + MilvusContainer milvusContainer() { + return new MilvusContainer(DockerImageName.parse("milvusdb/milvus")); + } + + public static void main(String[] args) { + SpringApplication.from(ChatbotOpenaiApplication::main) + .with(TestChatbotOpenaiApplication.class) + .run(args); + } +} diff --git a/chatmodel-springai/pom.xml b/chatmodel-springai/pom.xml index 9a1b634..28f606d 100644 --- a/chatmodel-springai/pom.xml +++ b/chatmodel-springai/pom.xml @@ -84,7 +84,7 @@ - 2.40.0 + 2.47.0