From 4e2ec313ffe72497b3ef83f26507f85780b0d91c Mon Sep 17 00:00:00 2001 From: Aaron Wanjala Date: Tue, 5 Nov 2024 02:55:00 -0600 Subject: [PATCH] REFACTOR: Shopping assistant to spring boot, pending alloy private service connect --- src/shoppingassistantservice/.gitattributes | 2 + src/shoppingassistantservice/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ src/shoppingassistantservice/Dockerfile | 48 +--- src/shoppingassistantservice/mvnw | 259 ++++++++++++++++++ src/shoppingassistantservice/mvnw.cmd | 149 ++++++++++ src/shoppingassistantservice/pom.xml | 98 +++++++ src/shoppingassistantservice/requirements.in | 6 - src/shoppingassistantservice/requirements.txt | 250 ----------------- .../shoppingassistantservice.py | 120 -------- .../ShoppingAssistantController.java | 126 +++++++++ .../core/ShoppingAssistantApplication.java | 15 + .../src/main/resources/application.properties | 1 + .../ShoppingAssistantApplicationTests.java | 13 + 14 files changed, 719 insertions(+), 420 deletions(-) create mode 100644 src/shoppingassistantservice/.gitattributes create mode 100644 src/shoppingassistantservice/.gitignore create mode 100644 src/shoppingassistantservice/.mvn/wrapper/maven-wrapper.properties create mode 100755 src/shoppingassistantservice/mvnw create mode 100644 src/shoppingassistantservice/mvnw.cmd create mode 100644 src/shoppingassistantservice/pom.xml delete mode 100644 src/shoppingassistantservice/requirements.in delete mode 100644 src/shoppingassistantservice/requirements.txt delete mode 100755 src/shoppingassistantservice/shoppingassistantservice.py create mode 100644 src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/controller/ShoppingAssistantController.java create mode 100644 src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/core/ShoppingAssistantApplication.java create mode 100644 src/shoppingassistantservice/src/main/resources/application.properties create mode 100644 src/shoppingassistantservice/src/test/java/com/example/demo/ShoppingAssistantApplicationTests.java diff --git a/src/shoppingassistantservice/.gitattributes b/src/shoppingassistantservice/.gitattributes new file mode 100644 index 00000000000..3b41682ac57 --- /dev/null +++ b/src/shoppingassistantservice/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/src/shoppingassistantservice/.gitignore b/src/shoppingassistantservice/.gitignore new file mode 100644 index 00000000000..549e00a2a96 --- /dev/null +++ b/src/shoppingassistantservice/.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/src/shoppingassistantservice/.mvn/wrapper/maven-wrapper.properties b/src/shoppingassistantservice/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000000..d58dfb70bab --- /dev/null +++ b/src/shoppingassistantservice/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 +# +# http://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.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/src/shoppingassistantservice/Dockerfile b/src/shoppingassistantservice/Dockerfile index 532c2f1b653..97a77cb3477 100644 --- a/src/shoppingassistantservice/Dockerfile +++ b/src/shoppingassistantservice/Dockerfile @@ -1,45 +1,5 @@ -# Copyright 2024 Google LLC -# -# 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. - -FROM python:3.12.6-slim@sha256:ad48727987b259854d52241fac3bc633574364867b8e20aec305e6e7f4028b26 AS base - -FROM base AS builder - -RUN apt-get -qq update \ - && apt-get install -y --no-install-recommends \ - wget g++ \ - && rm -rf /var/lib/apt/lists/* - -# get packages -COPY requirements.txt . -RUN pip install -r requirements.txt - -FROM base -# Enable unbuffered logging -ENV PYTHONUNBUFFERED=1 - -# get packages -WORKDIR /shoppingassistantservice - -# Grab packages from builder -COPY --from=builder /usr/local/lib/python3.12/ /usr/local/lib/python3.12/ - -# Add the application -COPY . . - -# set listen port -ENV PORT "8080" +FROM openjdk:21-jdk-alpine EXPOSE 8080 - -ENTRYPOINT ["python", "shoppingassistantservice.py"] +ARG JAR_FILE=target/demo-app-1.0.0.jar +ADD ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/src/shoppingassistantservice/mvnw b/src/shoppingassistantservice/mvnw new file mode 100755 index 00000000000..19529ddf8c6 --- /dev/null +++ b/src/shoppingassistantservice/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://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.2 +# +# 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 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${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_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/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/src/shoppingassistantservice/mvnw.cmd b/src/shoppingassistantservice/mvnw.cmd new file mode 100644 index 00000000000..249bdf38222 --- /dev/null +++ b/src/shoppingassistantservice/mvnw.cmd @@ -0,0 +1,149 @@ +<# : 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 http://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.2 +@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" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/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/src/shoppingassistantservice/pom.xml b/src/shoppingassistantservice/pom.xml new file mode 100644 index 00000000000..8e913128afb --- /dev/null +++ b/src/shoppingassistantservice/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.2 + + + com.example + demo + 0.0.1-SNAPSHOT + ShoppingAssistantApplication + ShoppingAssistant service for Online Boutique + + + + + + + + + + + + + + + 21 + + + + + dev.langchain4j + langchain4j-pgvector + 0.35.0 + + + + org.testcontainers + postgresql + 1.19.7 + + + + dev.langchain4j + langchain4j-spring-boot-starter + 0.35.0 + + + + dev.langchain4j + langchain4j-vertex-ai + 0.35.0 + + + + dev.langchain4j + langchain4j-vertex-ai-gemini + 0.35.0 + + + + dev.langchain4j + langchain4j + 0.35.0 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.platform + junit-platform-commons + 1.10.3 + compile + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/shoppingassistantservice/requirements.in b/src/shoppingassistantservice/requirements.in deleted file mode 100644 index cbf38339835..00000000000 --- a/src/shoppingassistantservice/requirements.in +++ /dev/null @@ -1,6 +0,0 @@ -flask==3.0.3 -langchain-google-genai==2.0.1 -langchain==0.3.4 -pillow==11.0.0 -langchain-google-alloydb-pg==0.8.0 -google-cloud-secret-manager==2.21.0 diff --git a/src/shoppingassistantservice/requirements.txt b/src/shoppingassistantservice/requirements.txt deleted file mode 100644 index cfa585e2d99..00000000000 --- a/src/shoppingassistantservice/requirements.txt +++ /dev/null @@ -1,250 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile --output-file=requirements.txt requirements.in -# -aiofiles==24.1.0 - # via google-cloud-alloydb-connector -aiohappyeyeballs==2.4.3 - # via aiohttp -aiohttp==3.10.10 - # via - # google-cloud-alloydb-connector - # langchain -aiosignal==1.3.1 - # via aiohttp -annotated-types==0.7.0 - # via pydantic -anyio==4.6.2.post1 - # via httpx -asyncpg==0.30.0 - # via google-cloud-alloydb-connector -attrs==24.2.0 - # via aiohttp -blinker==1.8.2 - # via flask -cachetools==5.5.0 - # via google-auth -certifi==2024.8.30 - # via - # httpcore - # httpx - # requests -cffi==1.17.1 - # via cryptography -charset-normalizer==3.4.0 - # via requests -click==8.1.7 - # via flask -cryptography==43.0.3 - # via google-cloud-alloydb-connector -flask==3.0.3 - # via -r requirements.in -frozenlist==1.5.0 - # via - # aiohttp - # aiosignal -google-ai-generativelanguage==0.6.10 - # via google-generativeai -google-api-core[grpc]==2.22.0 - # via - # google-ai-generativelanguage - # google-api-python-client - # google-cloud-core - # google-cloud-secret-manager - # google-cloud-storage - # google-generativeai -google-api-python-client==2.151.0 - # via google-generativeai -google-auth==2.35.0 - # via - # google-ai-generativelanguage - # google-api-core - # google-api-python-client - # google-auth-httplib2 - # google-cloud-alloydb-connector - # google-cloud-core - # google-cloud-secret-manager - # google-cloud-storage - # google-generativeai -google-auth-httplib2==0.2.0 - # via google-api-python-client -google-cloud-alloydb-connector[asyncpg]==1.4.0 - # via langchain-google-alloydb-pg -google-cloud-core==2.4.1 - # via google-cloud-storage -google-cloud-secret-manager==2.21.0 - # via -r requirements.in -google-cloud-storage==2.18.2 - # via langchain-google-alloydb-pg -google-crc32c==1.6.0 - # via - # google-cloud-storage - # google-resumable-media -google-generativeai==0.8.3 - # via langchain-google-genai -google-resumable-media==2.7.2 - # via google-cloud-storage -googleapis-common-protos[grpc]==1.65.0 - # via - # google-api-core - # grpc-google-iam-v1 - # grpcio-status -greenlet==3.1.1 - # via sqlalchemy -grpc-google-iam-v1==0.13.1 - # via google-cloud-secret-manager -grpcio==1.67.1 - # via - # google-api-core - # googleapis-common-protos - # grpc-google-iam-v1 - # grpcio-status -grpcio-status==1.67.1 - # via google-api-core -h11==0.14.0 - # via httpcore -httpcore==1.0.6 - # via httpx -httplib2==0.22.0 - # via - # google-api-python-client - # google-auth-httplib2 -httpx==0.27.2 - # via langsmith -idna==3.10 - # via - # anyio - # httpx - # requests - # yarl -itsdangerous==2.2.0 - # via flask -jinja2==3.1.4 - # via flask -jsonpatch==1.33 - # via langchain-core -jsonpointer==3.0.0 - # via jsonpatch -langchain==0.3.4 - # via -r requirements.in -langchain-core==0.3.15 - # via - # langchain - # langchain-google-alloydb-pg - # langchain-google-genai - # langchain-text-splitters -langchain-google-alloydb-pg==0.8.0 - # via -r requirements.in -langchain-google-genai==2.0.1 - # via -r requirements.in -langchain-text-splitters==0.3.2 - # via langchain -langsmith==0.1.139 - # via - # langchain - # langchain-core -markupsafe==3.0.2 - # via - # jinja2 - # werkzeug -multidict==6.1.0 - # via - # aiohttp - # yarl -numpy==1.26.4 - # via - # langchain - # langchain-google-alloydb-pg - # pgvector -orjson==3.10.11 - # via langsmith -packaging==24.1 - # via langchain-core -pgvector==0.3.6 - # via langchain-google-alloydb-pg -pillow==11.0.0 - # via -r requirements.in -propcache==0.2.0 - # via yarl -proto-plus==1.25.0 - # via - # google-ai-generativelanguage - # google-api-core - # google-cloud-secret-manager -protobuf==5.28.3 - # via - # google-ai-generativelanguage - # google-api-core - # google-cloud-alloydb-connector - # google-cloud-secret-manager - # google-generativeai - # googleapis-common-protos - # grpc-google-iam-v1 - # grpcio-status - # proto-plus -pyasn1==0.6.1 - # via - # pyasn1-modules - # rsa -pyasn1-modules==0.4.1 - # via google-auth -pycparser==2.22 - # via cffi -pydantic==2.9.2 - # via - # google-generativeai - # langchain - # langchain-core - # langchain-google-genai - # langsmith -pydantic-core==2.23.4 - # via pydantic -pyparsing==3.2.0 - # via httplib2 -pyyaml==6.0.2 - # via - # langchain - # langchain-core -requests==2.32.3 - # via - # google-api-core - # google-cloud-alloydb-connector - # google-cloud-storage - # langchain - # langsmith - # requests-toolbelt -requests-toolbelt==1.0.0 - # via langsmith -rsa==4.9 - # via google-auth -sniffio==1.3.1 - # via - # anyio - # httpx -sqlalchemy[asyncio]==2.0.36 - # via - # langchain - # langchain-google-alloydb-pg -tenacity==9.0.0 - # via - # langchain - # langchain-core -tqdm==4.66.6 - # via google-generativeai -typing-extensions==4.12.2 - # via - # google-generativeai - # langchain-core - # pydantic - # pydantic-core - # sqlalchemy -uritemplate==4.1.1 - # via google-api-python-client -urllib3==2.2.3 - # via requests -werkzeug==3.1.1 - # via flask -yarl==1.17.1 - # via aiohttp diff --git a/src/shoppingassistantservice/shoppingassistantservice.py b/src/shoppingassistantservice/shoppingassistantservice.py deleted file mode 100755 index 94fd8c2b486..00000000000 --- a/src/shoppingassistantservice/shoppingassistantservice.py +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/python -# -# Copyright 2024 Google LLC -# -# 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. - -import os - -from google.cloud import secretmanager_v1 -from urllib.parse import unquote -from langchain_core.messages import HumanMessage -from langchain_google_genai import ChatGoogleGenerativeAI, GoogleGenerativeAIEmbeddings -from flask import Flask, request - -from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore - -PROJECT_ID = os.environ["PROJECT_ID"] -REGION = os.environ["REGION"] -ALLOYDB_DATABASE_NAME = os.environ["ALLOYDB_DATABASE_NAME"] -ALLOYDB_TABLE_NAME = os.environ["ALLOYDB_TABLE_NAME"] -ALLOYDB_CLUSTER_NAME = os.environ["ALLOYDB_CLUSTER_NAME"] -ALLOYDB_INSTANCE_NAME = os.environ["ALLOYDB_INSTANCE_NAME"] -ALLOYDB_SECRET_NAME = os.environ["ALLOYDB_SECRET_NAME"] - -secret_manager_client = secretmanager_v1.SecretManagerServiceClient() -secret_name = secret_manager_client.secret_version_path(project=PROJECT_ID, secret=ALLOYDB_SECRET_NAME, secret_version="latest") -secret_request = secretmanager_v1.AccessSecretVersionRequest(name=secret_name) -secret_response = secret_manager_client.access_secret_version(request=secret_request) -PGPASSWORD = secret_response.payload.data.decode("UTF-8").strip() - -engine = AlloyDBEngine.from_instance( - project_id=PROJECT_ID, - region=REGION, - cluster=ALLOYDB_CLUSTER_NAME, - instance=ALLOYDB_INSTANCE_NAME, - database=ALLOYDB_DATABASE_NAME, - user="postgres", - password=PGPASSWORD -) - -# Create a synchronous connection to our vectorstore -vectorstore = AlloyDBVectorStore.create_sync( - engine=engine, - table_name=ALLOYDB_TABLE_NAME, - embedding_service=GoogleGenerativeAIEmbeddings(model="models/embedding-001"), - id_column="id", - content_column="description", - embedding_column="product_embedding", - metadata_columns=["id", "name", "categories"] -) - -def create_app(): - app = Flask(__name__) - - @app.route("/", methods=['POST']) - def talkToGemini(): - print("Beginning RAG call") - prompt = request.json['message'] - prompt = unquote(prompt) - - # Step 1 – Get a room description from Gemini-vision-pro - llm_vision = ChatGoogleGenerativeAI(model="gemini-1.5-flash") - message = HumanMessage( - content=[ - { - "type": "text", - "text": "You are a professional interior designer, give me a detailed decsription of the style of the room in this image", - }, - {"type": "image_url", "image_url": request.json['image']}, - ] - ) - response = llm_vision.invoke([message]) - print("Description step:") - print(response) - description_response = response.content - - # Step 2 – Similarity search with the description & user prompt - vector_search_prompt = f""" This is the user's request: {prompt} Find the most relevant items for that prompt, while matching style of the room described here: {description_response} """ - print(vector_search_prompt) - - docs = vectorstore.similarity_search(vector_search_prompt) - print(f"Vector search: {description_response}") - print(f"Retrieved documents: {len(docs)}") - #Prepare relevant documents for inclusion in final prompt - relevant_docs = "" - for doc in docs: - doc_details = doc.to_json() - print(f"Adding relevant document to prompt context: {doc_details}") - relevant_docs += str(doc_details) + ", " - - # Step 3 – Tie it all together by augmenting our call to Gemini-pro - llm = ChatGoogleGenerativeAI(model="gemini-1.5-flash") - design_prompt = ( - f" You are an interior designer that works for Online Boutique. You are tasked with providing recommendations to a customer on what they should add to a given room from our catalog. This is the description of the room: \n" - f"{description_response} Here are a list of products that are relevant to it: {relevant_docs} Specifically, this is what the customer has asked for, see if you can accommodate it: {prompt} Start by repeating a brief description of the room's design to the customer, then provide your recommendations. Do your best to pick the most relevant item out of the list of products provided, but if none of them seem relevant, then say that instead of inventing a new product. At the end of the response, add a list of the IDs of the relevant products in the following format for the top 3 results: [], [], [] ") - print("Final design prompt: ") - print(design_prompt) - design_response = llm.invoke( - design_prompt - ) - - data = {'content': design_response.content} - return data - - return app - -if __name__ == "__main__": - # Create an instance of flask server when called directly - app = create_app() - app.run(host='0.0.0.0', port=8080) diff --git a/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/controller/ShoppingAssistantController.java b/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/controller/ShoppingAssistantController.java new file mode 100644 index 00000000000..eb390bc02f6 --- /dev/null +++ b/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/controller/ShoppingAssistantController.java @@ -0,0 +1,126 @@ +package com.shoppingassistantservice.controller; + +import dev.langchain4j.data.segment.TextSegment; +import dev.langchain4j.data.embedding.Embedding; +import dev.langchain4j.model.embedding.EmbeddingModel; +import dev.langchain4j.model.vertexai.VertexAiEmbeddingModel; +import dev.langchain4j.model.vertexai.VertexAiGeminiChatModel; +import dev.langchain4j.service.AiServices; +import dev.langchain4j.service.UserMessage; +import dev.langchain4j.service.spring.AiService; +import dev.langchain4j.store.embedding.EmbeddingMatch; +import dev.langchain4j.store.embedding.EmbeddingSearchRequest; +import dev.langchain4j.store.embedding.EmbeddingSearchResult; +import dev.langchain4j.store.embedding.EmbeddingStore; +import dev.langchain4j.store.embedding.pgvector.PgVectorEmbeddingStore; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.PostConstruct; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +@AiService +interface ShoppingChatAssistant { + + @UserMessage("You are a professional interior designer, give me a detailed decsription of the style of the room in this image: {{image}}") + String getInteriorDesignResponse(String image); + + @UserMessage("You are an interior designer that works for Online Boutique. You are tasked with providing recommendations to a customer on what they should add to a given room from our catalog. This is the description of the room: {{description_response}} Here are a list of products that are relevant to it: {{relevant_docs}} Specifically, this is what the customer has asked for, see if you can accommodate it: {{prompt}} Start by repeating a brief description of the room's design to the customer, then provide your recommendations. Do your best to pick the most relevant item out of the list of products provided, but if none of them seem relevant, then say that instead of inventing a new product. At the end of the response, add a list of the IDs of the relevant products in the following format for the top 3 results: [], [], []") + String getDesignRecommendations(String prompt, String description, String relevantDocs); +} + +@RestController +class ShoppingAssistantController { + + Logger logger = LoggerFactory.getLogger(ShoppingAssistantController.class); + + @Autowired + private static Environment environment; + + static final String PROJECT_ID = environment.getProperty("PROJECT_ID"); + static final String REGION = environment.getProperty("REGION"); + static final String ALLOYDB_DATABASE_NAME = environment.getProperty("ALLOYDB_DATABASE_NAME"); + static final String ALLOYDB_TABLE_NAME = environment.getProperty("ALLOYDB_TABLE_NAME"); + static final String ALLOYDB_CLUSTER_NAME = environment.getProperty("ALLOYDB_CLUSTER_NAME"); + static final String ALLOYDB_INSTANCE_NAME = environment.getProperty("ALLOYDB_INSTANCE_NAME"); + static final String ALLOYDB_SECRET_NAME = environment.getProperty("ALLOYDB_SECRET_NAME"); + + private EmbeddingModel embeddingModel; + private EmbeddingStore pgVectorStore; + + + @PostConstruct + private void postConstruct() { + embeddingModel = VertexAiEmbeddingModel.builder() + .project(PROJECT_ID) + .location(REGION) + .endpoint(REGION+"-aiplatform.googleapis.com:443") + .publisher("google") + .modelName("textembedding-gecko@003") + .build(); + + pgVectorStore = PgVectorEmbeddingStore.builder() + .host("localhost") //TODO: https://cloud.google.com/alloydb/docs/configure-private-service-connect#connect-with-dns + .port(5432) + .database(ALLOYDB_DATABASE_NAME) + .user("user") + .password(ALLOYDB_SECRET_NAME) + .table(ALLOYDB_TABLE_NAME) + .build(); + } + + @PostMapping("/") + public String talkToGemini(@RequestBody Map body) { + String userSuppliedPrompt = body.get("prompt"); + logger.info("Beginning RAG call"); + + VertexAiGeminiChatModel geminiFlash = VertexAiGeminiChatModel + .builder() + .modelName("gemini-1.5-flash") + .build(); + + ShoppingChatAssistant interiorDesignerAssistant = AiServices.builder(ShoppingChatAssistant.class) + .chatLanguageModel(geminiFlash) + .build(); + + // Step 1 – Get a room description from Gemini-vision-pro + String descriptionResponse = interiorDesignerAssistant.getInteriorDesignResponse(body.get("image")); + logger.info("Description step:"); + logger.info(descriptionResponse); + + // Step 2 – Similarity search with the description & user prompt + String vectorSearchPrompt = "This is the user's request:" + userSuppliedPrompt + " Find the most relevant items for that prompt, while matching style of the room described here: " + descriptionResponse; + logger.info("Vector search:"); + logger.info(vectorSearchPrompt); + + //Retrieve the actual documents with a similarity search + EmbeddingSearchResult segmentEmbeddingSearchResult = pgVectorStore.search(EmbeddingSearchRequest.builder() + .queryEmbedding(embeddingModel.embed(vectorSearchPrompt).content()) + .build()); + + List> matches = segmentEmbeddingSearchResult.matches(); + String matchingResults = matches.stream() + .map(match -> { + String matchText = match.embedded().text(); + logger.info("Retrieved " + matchText); + return matchText; + }) + .collect(Collectors.joining(" , ")); + + // Step 3 – Tie it all together by augmenting our call to Gemini-pro + String polishedRecommendation = interiorDesignerAssistant.getDesignRecommendations(userSuppliedPrompt, descriptionResponse, matchingResults); + logger.info("Final design prompt: "); + logger.info(polishedRecommendation); + + return polishedRecommendation; + } + +} diff --git a/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/core/ShoppingAssistantApplication.java b/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/core/ShoppingAssistantApplication.java new file mode 100644 index 00000000000..8683d5354d3 --- /dev/null +++ b/src/shoppingassistantservice/src/main/java/com/shoppingassistantservice/core/ShoppingAssistantApplication.java @@ -0,0 +1,15 @@ +package com.shoppingassistantservice.core; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan("com.shoppingassistantservice.controller") +public class ShoppingAssistantApplication { + + public static void main(String[] args) { + SpringApplication.run(ShoppingAssistantApplication.class, args); + } + +} diff --git a/src/shoppingassistantservice/src/main/resources/application.properties b/src/shoppingassistantservice/src/main/resources/application.properties new file mode 100644 index 00000000000..2109a440d84 --- /dev/null +++ b/src/shoppingassistantservice/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/src/shoppingassistantservice/src/test/java/com/example/demo/ShoppingAssistantApplicationTests.java b/src/shoppingassistantservice/src/test/java/com/example/demo/ShoppingAssistantApplicationTests.java new file mode 100644 index 00000000000..7141c19c321 --- /dev/null +++ b/src/shoppingassistantservice/src/test/java/com/example/demo/ShoppingAssistantApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ShoppingAssistantApplicationTests { + + @Test + void contextLoads() { + } + +}