Merge pull request #1 from muhrifqii/dev/update

Major Update

Author: muhrifqii

.editorconfig

@@ -0,0 +1,2 @@
+patreon: muhrifqii
+ko_fi: muhrifqii

.github/FUNDING.yml

@@ -0,0 +1,25 @@
+name: Validates
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 22
+          distribution: temurin
+          cache: gradle
+
+      - name: Compile
+        run: ./gradlew clean build --no-daemon

.github/workflows/validates.yml

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=22-graal

.sdkmanrc

@@ -0,0 +1,17 @@
+
+up: dev-env dev-run             ## Startup / Spinup Docker Compose
+down: docker-stop               ## Stop Docker
+destroy: docker-teardown clean  ## Teardown (removes volumes, tmp files, etc...)
+
+dev-env: ## Bootstrap Environment (with a Docker-Compose help).
+	docker-compose up -d --build db
+
+dev-run: dev-env
+	./gradlew bootRun
+
+docker-stop:
+	docker-compose down
+
+docker-teardown:
+	docker-compose down --remove-orphans -v
+

Makefile

@@ -1,10 +1,13 @@
-# LLM Ollama - Spring AI, WebFlux, R2DBC - SlakingSpringBed Sample
+# LLM Ollama - Spring AI, WebFlux, R2DBC
 
-The stack:
-- Ollama
-- Spring
-- Spring AI
+Sample project to showcase a java spring boot application with Generative AI powered using Spring AI
+
+## The Stack:
+- Java 22
+- GraalVM
 - Spring WebFlux
 - Spring Data R2DBC
-- Docker
-- Flyway
+- Docker/Podman
+- Flyway
+- [Ollama](https://ollama.com)
+

README.md

@@ -1,49 +1,18 @@
 plugins {
 	java
-	id("org.springframework.boot") version "3.2.1"
-	id("io.spring.dependency-management") version "1.1.4"
+  alias(libs.plugins.spring.boot) apply false
+  alias(libs.plugins.spring.dependencies) apply false
+  alias(libs.plugins.graalvm) apply false
 }
 
-group = "com.muhrifqii"
-version = "0.0.1-SNAPSHOT"
+allprojects {
+  repositories {
+    mavenCentral()
+    maven(url = "https://repo.spring.io/milestone")
+    maven(url = "https://repo.spring.io/snapshot")
+  }
 
-java {
-	sourceCompatibility = JavaVersion.VERSION_17
-}
-
-configurations {
-	compileOnly {
-		extendsFrom(configurations.annotationProcessor.get())
-	}
-}
-
-repositories {
-	mavenCentral()
-	maven(url = "https://repo.spring.io/milestone")
-	maven(url = "https://repo.spring.io/snapshot")
-}
-
-dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
-	implementation("org.springframework.boot:spring-boot-starter-webflux")
-	implementation("org.flywaydb:flyway-core")
-	implementation("org.springframework:spring-jdbc")
-
-	implementation("org.springframework.ai:spring-ai-ollama-spring-boot-starter:0.8.0-SNAPSHOT")
-
-	compileOnly("org.projectlombok:lombok")
-
-	runtimeOnly("org.postgresql:postgresql")
-	runtimeOnly("org.postgresql:r2dbc-postgresql")
-
-	annotationProcessor("org.projectlombok:lombok")
-
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
-	testImplementation("org.springframework.boot:spring-boot-testcontainers")
-	testImplementation("org.testcontainers:junit-jupiter")
-	testImplementation("io.projectreactor:reactor-test")
-}
-
-tasks.withType<Test> {
-	useJUnitPlatform()
+  tasks.withType<Test> {
+    useJUnitPlatform()
+  }
 }

build.gradle.kts

@@ -1,19 +1,24 @@
-version: "3.5"
+version: "3.7"
+
+volumes:
+  postgres_data:
 
-services:
 
-  postgres:
-    container_name: slaking-springbed-ai-postgres
-    image: postgres:13.13
+services:
+  db:
+    container_name: postgres_db
+    image: postgres:13.15
     restart: always
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=slakingspringbed
+      - POSTGRES_DB=gh_slaking_springai
     ports:
-      - "5432:5432"
+      - "5431:5432"
     volumes:
-      - postgres_data:/data/db
-
-volumes:
-  postgres_data:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-U", "postgres" ]
+      interval: 30s
+      timeout: 20s
+      retries: 5

docker-compose.yml

@@ -0,0 +1,3 @@
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8

gradle.properties

@@ -0,0 +1,7 @@
+plugins {
+  `kotlin-dsl`
+}
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_22
+}

gradle/build-logic/build.gradle.kts

@@ -0,0 +1,13 @@
+dependencyResolutionManagement {
+  repositories {
+    gradlePluginPortal()
+  }
+
+  versionCatalogs {
+    create("libs") {
+      from(files("../libs.versions.toml"))
+    }
+  }
+}
+
+rootProject.name = "build-logic"

gradle/build-logic/settings.gradle.kts

@@ -0,0 +1,35 @@
+# https://docs.spring.io/spring-boot/appendix/dependency-versions/coordinates.html
+[versions]
+spring-boot = "3.3.3"
+spring-ai = "1.0.0-SNAPSHOT"
+lombok = "1.18.34"
+reactor-core = "3.6.9"
+graalvm = "0.10.2"
+flyway = "10.12.0"
+
+[libraries]
+lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
+
+spring-boot-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-boot" }
+spring-boot-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "spring-boot" }
+spring-boot-r2dbc = { module = "org.springframework.boot:spring-boot-starter-data-r2dbc", version.ref = "spring-boot" }
+spring-boot-devtools = { module = "org.springframework.boot:spring-boot-devtools", version.ref = "spring-boot" }
+spring-boot-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
+
+spring-ai-bom = { group = "org.springframework.ai", name = "spring-ai-bom", version.ref = "spring-ai" }
+spring-ai-ollama = { group = "org.springframework.ai", name = "spring-ai-ollama-spring-boot-starter" }
+
+reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "reactor-core" }
+reactor-test = { module = "io.projectreactor:reactor-test", version.ref = "reactor-core" }
+
+flyway-core = { module = "org.flywaydb:flyway-core", version.ref = "flyway" }
+flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version.ref = "flyway" }
+postgresql = { module = "org.postgresql:postgresql", version = "42.7.3" }
+postgresql-r2dbc = { module = "org.postgresql:r2dbc-postgresql", version = "1.0.5.RELEASE" }
+
+[plugins]
+spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }
+spring-dependencies = { id = "io.spring.dependency-management", version = "1.1.6" }
+graalvm = { id = "org.graalvm.buildtools.native", version.ref = "graalvm" }
+
+[bundles]

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1 @@
+Domain layer contract module

gradlew

@@ -0,0 +1,26 @@
+plugins {
+  java
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_22
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(22))
+  }
+}
+
+configurations {
+	compileOnly {
+		extendsFrom(configurations.annotationProcessor.get())
+	}
+}
+
+dependencies {
+  implementation(libs.reactor.core)
+  compileOnly(libs.lombok)
+  annotationProcessor(libs.lombok)
+}
+
+tasks.test {
+  useJUnitPlatform()
+}

llm/api/README.md

@@ -0,0 +1,4 @@
+package com.muhrifqii.llm.api.datamodels;
+
+public record ErrorResponse(String message) {
+}

llm/api/build.gradle.kts

@@ -0,0 +1,25 @@
+package com.muhrifqii.llm.api.datamodels;
+
+import lombok.experimental.StandardException;
+
+@StandardException
+public abstract sealed class HandledError
+        extends RuntimeException
+        permits HandledError.NotFoundError, HandledError.InvalidArgsError {
+
+    @StandardException
+    public static final class NotFoundError extends HandledError {
+    }
+
+    @StandardException
+    public static final class InvalidArgsError extends HandledError {
+    }
+
+    public static HandledError notFound(String message) {
+        return new NotFoundError(message);
+    }
+
+    public static HandledError invalidArgs(String message) {
+        return new InvalidArgsError(message);
+    }
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/ErrorResponse.java

@@ -0,0 +1,8 @@
+package com.muhrifqii.llm.api.datamodels.conversations;
+
+import lombok.Builder;
+
+@Builder
+public record Conversation(
+        String id, String name, String description, String createdAt, String updatedAt) {
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/HandledError.java

@@ -0,0 +1,4 @@
+package com.muhrifqii.llm.api.datamodels.conversations;
+
+public record ConversationRequest(String message) {
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/Conversation.java

@@ -0,0 +1,11 @@
+package com.muhrifqii.llm.api.datamodels.conversations;
+
+import lombok.Builder;
+
+@Builder
+public record Message(
+        String id,
+        String conversationId,
+        String content,
+        String createdAt) {
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/ConversationRequest.java

@@ -0,0 +1,6 @@
+package com.muhrifqii.llm.api.datamodels.conversations;
+
+public record UserMessage(
+        String content,
+        UserMultimodalityMedia media) {
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/Message.java

@@ -0,0 +1,9 @@
+package com.muhrifqii.llm.api.datamodels.conversations;
+
+import lombok.NonNull;
+
+/**
+ * Wrapper for multimodality media
+ */
+public record UserMultimodalityMedia(@NonNull String mimeType, byte[] content) {
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/UserMessage.java

@@ -0,0 +1,4 @@
+/**
+ * Conversation related data models
+ */
+package com.muhrifqii.llm.api.datamodels.conversations;

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/UserMultimodalityMedia.java

@@ -0,0 +1,5 @@
+/**
+ * Provides data models that used between domain layer and data layer (Clean
+ * Architecture Pattern).
+ */
+package com.muhrifqii.llm.api.datamodels;

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/conversations/package-info.java

@@ -0,0 +1,14 @@
+package com.muhrifqii.llm.api.usecases;
+
+import com.muhrifqii.llm.api.datamodels.conversations.Message;
+import com.muhrifqii.llm.api.datamodels.conversations.UserMessage;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface PromptModelUsecase {
+
+    Mono<Message> chat(String conversationID, UserMessage message);
+
+    Flux<Message> streamChat(String conversationID, UserMessage message);
+}

llm/api/src/main/java/com/muhrifqii/llm/api/datamodels/package-info.java

@@ -0,0 +1,8 @@
+package com.muhrifqii.llm.api.usecases;
+
+import reactor.core.publisher.Flux;
+
+public interface SemanticSearchUsecase<T> {
+
+    Flux<T> search(String query);
+}

llm/api/src/main/java/com/muhrifqii/llm/api/usecases/PromptModelUsecase.java

@@ -0,0 +1,7 @@
+package com.muhrifqii.llm.api.usecases;
+
+import reactor.core.publisher.Mono;
+
+public interface SummarizerUsecase {
+    Mono<String> makeTitle(String text);
+}

llm/api/src/main/java/com/muhrifqii/llm/api/usecases/SemanticSearchUsecase.java

@@ -0,0 +1,5 @@
+/**
+ * Provides contracts for the the domain layer (Clean
+ * Architecture Pattern).
+ */
+package com.muhrifqii.llm.api.usecases;