Merge branch 'feature/wallet-generate' into develop

Author: physcom

.github/workflows/build-branch.yml

@@ -12,6 +12,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+services:
+
 jobs:
 
   build:

build.gradle

@@ -21,6 +21,7 @@ configurations {
 
 repositories {
     mavenCentral()
+    jcenter()
 }
 
 dependencies {
@@ -32,14 +33,17 @@ dependencies {
 
     implementation 'javax.xml.bind:jaxb-api:2.1'
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.1'
 
 
     runtimeOnly("com.mysql:mysql-connector-j")
     runtimeOnly("org.postgresql:postgresql")
     implementation 'org.flywaydb:flyway-core:10.10.0'
     implementation "org.flywaydb:flyway-database-postgresql:10.10.0"
 
+    implementation 'org.springframework.data:spring-data-relational:3.2.3'
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation("org.springframework.boot:spring-boot-starter-validation")
@@ -62,6 +66,9 @@ dependencies {
 
     testImplementation 'org.testcontainers:postgresql:1.19.7'
 
+    implementation("org.springframework.boot:spring-boot-starter-webflux")
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+
 }
 
 tasks.named('test') {

gradle/wrapper/gradle-wrapper.properties

@@ -15,7 +15,7 @@
 #
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

prompt-reminder.json

@@ -0,0 +1,14 @@
+[
+  {
+    "remindAt": "2023-05-12T14:00:00Z",
+    "description": "alice@gmail.com and bob@gmail.com: Sync up at 2 PM to discuss progress"
+  },
+  {
+    "remindAt": "2023-05-12T15:00:00Z",
+    "description": "alice@gmail.com and bob@gmail.com: Final run-through for presentation"
+  },
+  {
+    "remindAt": null,
+    "description": "alice@gmail.com and bob@gmail.com: Finalize budget by Friday"
+  }
+]

src/main/kotlin/io/openfuture/openmessenger/OpenMessengerApplication.kt

@@ -1,10 +1,19 @@
 package io.openfuture.openmessenger
 
+import io.openfuture.openmessenger.service.AssistantService
+import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.domain.EntityScan
 
+@EntityScan("io.openfuture.openmessenger.repository.entity")
 @SpringBootApplication
-class OpenMessengerApplication
+class OpenMessengerApplication(val assistantService: AssistantService): CommandLineRunner {
+    override fun run(vararg args: String?) {
+//        val generateNotes = aiProcessor.generateNotes(AiRequest(33, false, LocalDateTime.now().minusDays(13), LocalDateTime.now()))
+//        print(generateNotes)
+    }
+}
 
 fun main(args: Array<String>) {
     SpringApplication.run(OpenMessengerApplication::class.java, *args)

src/main/kotlin/io/openfuture/openmessenger/assistant/gemini/GeminiService.kt

@@ -16,7 +16,21 @@ class GeminiService (
 ) {
 
     fun chat(input: String?): String? {
-        val jsonPayload = String.format("{\"contents\":[{\"role\": \"user\", \"parts\":[{\"text\": \"%s\"}]}]}", input)
+        val jsonPayload = """
+            {
+                "contents": [
+                    {
+                        "role": "user",
+                        "parts": [
+                            {
+                                "text": "$input"
+                            }
+                        ]
+                    }
+                ]
+            }
+        """.trimIndent()
+
         val headers = HttpHeaders()
         headers.contentType = MediaType.APPLICATION_JSON
         val requestEntity = HttpEntity(jsonPayload, headers)

src/main/kotlin/io/openfuture/openmessenger/assistant/model/BaseModel.kt

@@ -0,0 +1,14 @@
+package io.openfuture.openmessenger.assistant.model
+
+import java.time.LocalDateTime
+
+interface BaseModel {
+    val chatId: Int?
+    val groupChatId: Int?
+    val members: List<String>?
+    val recipient: String?
+    val generatedAt: LocalDateTime
+    val version: Int
+    val startTime: LocalDateTime
+    val endTime: LocalDateTime
+}

src/main/kotlin/io/openfuture/openmessenger/assistant/model/ConversationNotes.kt

@@ -0,0 +1,15 @@
+package io.openfuture.openmessenger.assistant.model
+
+import java.time.LocalDateTime
+
+data class ConversationNotes(
+    override val chatId: Int?,
+    override val groupChatId: Int?,
+    override val members: List<String>?,
+    override val recipient: String?,
+    override val generatedAt: LocalDateTime,
+    override val version: Int,
+    override val startTime: LocalDateTime,
+    override val endTime: LocalDateTime,
+    val notes: List<String>
+): BaseModel

src/main/kotlin/io/openfuture/openmessenger/assistant/model/Reminder.kt

@@ -0,0 +1,23 @@
+package io.openfuture.openmessenger.assistant.model
+
+import java.time.LocalDateTime
+
+data class Reminder(
+    override val chatId: Int?,
+    override val groupChatId: Int?,
+    override val members: List<String>?,
+    override val recipient: String?,
+    override val generatedAt: LocalDateTime,
+    override val version: Int,
+    override val startTime: LocalDateTime,
+    override val endTime: LocalDateTime,
+
+    val reminders: List<ReminderItem>
+): BaseModel
+
+data class ReminderItem(
+    val remindAt: String?,
+    val description: String?
+){
+
+}

src/main/kotlin/io/openfuture/openmessenger/assistant/model/Todos.kt

@@ -0,0 +1,23 @@
+package io.openfuture.openmessenger.assistant.model
+
+import java.time.LocalDateTime
+
+data class Todos(
+    override val chatId: Int?,
+    override val groupChatId: Int?,
+    override val members: List<String>?,
+    override val recipient: String?,
+    override val generatedAt: LocalDateTime,
+    override val version: Int,
+    override val startTime: LocalDateTime,
+    override val endTime: LocalDateTime,
+
+    val todos: List<Todo>
+): BaseModel
+
+data class Todo(
+    val executor: String?,
+    val description: String?,
+    val dueDate: String?,
+    val context: String?
+)