Skip to content

Commit

Permalink
fix: 移除milvus-client依赖 TencentBlueKing#2573
Browse files Browse the repository at this point in the history
* fix: 移除milvus-client依赖 TencentBlueKing#2573

* fix: 移除milvus-client依赖 TencentBlueKing#2573

* fix: 移除milvus-client依赖 TencentBlueKing#2573

* fix: 增加Milvus Http客户端 TencentBlueKing#2573

* fix: 支持检查Milvus Collection是否存在 TencentBlueKing#2573

* fix: 支持删除collection TencentBlueKing#2573

* fix: 支持Milvus插入与查询数据 TencentBlueKing#2573

* fix: 替换SDK MilvusClient TencentBlueKing#2573

* fix: 支持Milvus删除操作 TencentBlueKing#2573

* fix: 支持Milvus搜索操作 TencentBlueKing#2573

* fix: 修复Milvus创建Collection失败 TencentBlueKing#2573

* fix: 修复Milvus查询失败 TencentBlueKing#2573

* fix: 修复Milvus插入失败 TencentBlueKing#2573

* fix: 修复Milvus设置查询结果相似度阈值未生效 TencentBlueKing#2573

* fix: 修复Milvus设置查询结果相似度阈值未生效 TencentBlueKing#2573

* fix: 修复Milvus设置查询结果相似度阈值未生效 TencentBlueKing#2573
  • Loading branch information
cnlkl authored Sep 19, 2024
1 parent 22bac2d commit 3779d4f
Show file tree
Hide file tree
Showing 29 changed files with 948 additions and 356 deletions.
1 change: 0 additions & 1 deletion src/backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ allprojects {
dependency("commons-io:commons-io:${Versions.CommonsIO}")
dependency("com.squareup.okhttp3:okhttp:${Versions.OKhttp}")
dependency("com.google.guava:guava:${Versions.Guava}")
dependency("com.google.protobuf:protobuf-java:${Versions.ProtobufJava}")
dependency("com.google.protobuf:protobuf-java-util:${Versions.ProtobufJava}")
dependency("com.tencent.polaris:polaris-discovery-factory:${Versions.Polaris}")
dependency("org.apache.commons:commons-text:${Versions.CommonsText}")
Expand Down
3 changes: 1 addition & 2 deletions src/backend/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ object Versions {
const val Redline = "1.2.10"
const val SkyWalkingApmToolkit = "8.10.0"
const val Gson = "2.9.0"
const val ProtobufJava = "3.24.0"
const val ProtobufJava = "3.19.4"
const val Guava = "31.1-jre"
const val Shedlock = "4.12.0"
const val JGit = "5.11.0.202103091610-r"
Expand Down Expand Up @@ -70,5 +70,4 @@ object Versions {
const val JavaCpp = "1.5.9"
const val Notice = "1.0.0"
const val SpringCloudFunction = "3.2.11"
const val Milvus = "2.4.1"
}
11 changes: 0 additions & 11 deletions src/backend/job/biz-job/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@ dependencies {
implementation(project(":common:common-operate:operate-service"))
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
implementation("io.micrometer:micrometer-registry-prometheus")
implementation("io.milvus:milvus-sdk-java:${Versions.Milvus}") {
exclude(group = "org.slf4j")
exclude(group = "org.apache.logging.log4j")
exclude(group = "org.testcontainers")
exclude(group = "com.azure")
exclude(group = "com.amazonaws")
exclude(group = "io.minio")
exclude(group = "org.apache.hadoop")
exclude(group = "org.apache.parquet")
exclude(group = "com.squareup.okhttp3")
}
implementation("com.tencent.devops:devops-schedule-common")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ import com.tencent.bkrepo.job.batch.base.JobContext
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.AiProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.Document
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.EmbeddingModel
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.MilvusVectorStore
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.MilvusVectorStoreProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusVectorStore
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusVectorStoreProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.VectorStore
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusClient
import com.tencent.bkrepo.job.config.properties.ArtifactAccessLogEmbeddingJobProperties
import io.milvus.client.MilvusClient
import org.bson.types.ObjectId
import org.slf4j.LoggerFactory
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import com.tencent.bkrepo.common.artifact.cache.service.ArtifactPreloadPlanGener
import com.tencent.bkrepo.common.mongo.dao.util.sharding.MonthRangeShardingUtils
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.AiProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.EmbeddingModel
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.MilvusVectorStore
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.MilvusVectorStoreProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusVectorStore
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusVectorStoreProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.SearchRequest
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.VectorStore
import io.milvus.client.MilvusClient
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusClient
import org.slf4j.LoggerFactory
import java.time.LocalDateTime
import java.time.ZoneId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import com.tencent.bkrepo.common.artifact.cache.config.ArtifactPreloadProperties
import com.tencent.bkrepo.common.artifact.cache.service.ArtifactPreloadPlanGenerator
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.AiProperties
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.EmbeddingModel
import io.milvus.client.MilvusClient
import com.tencent.bkrepo.job.batch.task.cache.preload.ai.milvus.MilvusClient
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
Expand Down

This file was deleted.

Loading

0 comments on commit 3779d4f

Please sign in to comment.