Replace host, port, and database properties by url in VectorStore con…

…figuration (#535) * Replace host, port, and database properties by url * Add invoke method
xebia-functional · Nov 13, 2023 · ea1be66 · ea1be66
1 parent e498b5a
commit ea1be66
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/...gresql/src/main/kotlin/com/xebia/functional/xef/store/migrations/PsqlVectorStoreConfig.kt b/...gresql/src/main/kotlin/com/xebia/functional/xef/store/migrations/PsqlVectorStoreConfig.kt
@@ -7,7 +7,7 @@ import org.flywaydb.core.api.configuration.FluentConfiguration
 import org.flywaydb.core.api.output.MigrateResult
 
 class PsqlVectorStoreConfig(
-  val uri: String,
+  val url: String,
   val driver: String,
   val user: String,
   val password: String,
@@ -18,7 +18,7 @@ class PsqlVectorStoreConfig(
     withContext(Dispatchers.IO) {
       val migration: FluentConfiguration = Flyway.configure()
         .dataSource(
-          uri,
+          url,
           user,
           password
         )

diff --git a/server/src/main/kotlin/com/xebia/functional/xef/server/db/psql/PSQLVectorStoreConfig.kt b/server/src/main/kotlin/com/xebia/functional/xef/server/db/psql/PSQLVectorStoreConfig.kt
@@ -16,39 +16,41 @@ import org.slf4j.Logger
 
 @Serializable
 class PSQLVectorStoreConfig(
-  val host: String,
-  val port: Int,
-  val database: String,
+  val url: String,
   val driver: String,
   val user: String,
   val password: String,
   val collectionName: String,
   val vectorSize: Int
 ) : VectorStoreConfig {
 
-  fun getUrl(): String = "jdbc:postgresql://$host:$port/$database"
-
   override suspend fun getVectorStoreService(logger: Logger): PostgresVectorStoreService {
-    val vectorStoreHikariDataSource =
-      RepositoryService.getHikariDataSource(getUrl(), user, password)
+    val vectorStoreHikariDataSource = RepositoryService.getHikariDataSource(url, user, password)
     return PostgresVectorStoreService(toPGVectorStoreConfig(), logger, vectorStoreHikariDataSource)
   }
 
   private fun toPGVectorStoreConfig() =
     PostgreSQLXef.PGVectorStoreConfig(
-      dbConfig =
-        PostgreSQLXef.DBConfig(
-          host = host,
-          port = port,
-          database = database,
-          user = user,
-          password = password
-        ),
+      dbConfig = PostgreSQLXef.DBConfig(url = url, user = user, password = password),
       collectionName = collectionName,
       vectorSize = vectorSize
     )
 
   companion object {
+    operator fun invoke(
+      host: String,
+      port: Int,
+      database: String,
+      driver: String,
+      user: String,
+      password: String,
+      collectionName: String,
+      vectorSize: Int
+    ): PSQLVectorStoreConfig {
+      val url = "jdbc:postgresql://${host}:${port}/${database}"
+      return PSQLVectorStoreConfig(url, driver, user, password, collectionName, vectorSize)
+    }
+
     @OptIn(ExperimentalSerializationApi::class)
     suspend fun load(configNamespace: String, config: Config?): PSQLVectorStoreConfig =
       withContext(Dispatchers.IO) {
@@ -61,9 +63,7 @@ class PSQLVectorStoreConfig(
 
     private fun PSQLVectorStoreConfig.toPSQLConfig(): PsqlVectorStoreConfig =
       PsqlVectorStoreConfig(
-        host = this.host,
-        port = this.port,
-        database = this.database,
+        url = this.url,
         driver = this.driver,
         user = this.user,
         password = this.password,

diff --git a/...er/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt b/...er/src/main/kotlin/com/xebia/functional/xef/server/services/PostgresVectorStoreService.kt
@@ -14,13 +14,7 @@ import kotlinx.uuid.generateUUID
 import org.slf4j.Logger
 
 object PostgreSQLXef {
-  data class DBConfig(
-    val host: String,
-    val port: Int,
-    val database: String,
-    val user: String,
-    val password: String
-  )
+  data class DBConfig(val url: String, val user: String, val password: String)
 
   data class PGVectorStoreConfig(
     val dbConfig: DBConfig,