Merge branch 'fix/tidb-metadata-filter' into deploy/dev

2025-03-19 19:16:58 +08:00 · 2025-03-19 19:16:58 +08:00 · bc9a687f66
commit bc9a687f66
parent 46c6a91194 2ff931d82a
13 changed files with 27 additions and 18 deletions
--- a/README.md
+++ b/README.md
@ -204,6 +204,7 @@ If you'd like to configure a highly-available setup, there are community-contrib

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Using Terraform for Deployment
--- a/README_AR.md
+++ b/README_AR.md
@ -187,6 +187,7 @@ docker compose up -d

 - [رسم بياني Helm من قبل @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [رسم بياني Helm من قبل @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [رسم بياني Helm من قبل @magicsong](https://github.com/magicsong/ai-charts)
 - [ملف YAML من قبل @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### استخدام Terraform للتوزيع
--- a/README_BN.md
+++ b/README_BN.md
@ -203,6 +203,7 @@ GitHub-এ ডিফাইকে স্টার দিয়ে রাখুন

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### টেরাফর্ম ব্যবহার করে ডিপ্লয়
--- a/README_CN.md
+++ b/README_CN.md
@ -205,6 +205,7 @@ docker compose up -d

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML 文件 by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### 使用 Terraform 部署
--- a/README_DE.md
+++ b/README_DE.md
@ -205,6 +205,7 @@ Falls Sie eine hochverfügbare Konfiguration einrichten möchten, gibt es von de

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Terraform für die Bereitstellung verwenden
--- a/README_ES.md
+++ b/README_ES.md
@ -77,9 +77,7 @@ Dify es una plataforma de desarrollo de aplicaciones de LLM de código abierto.
  Amplias capacidades de RAG que cubren todo, desde la ingestión de documentos hasta la recuperación, con soporte listo para usar para la extracción de texto de PDF, PPT y otros formatos de documento comunes.

 **5. Capacidades de agente**: 
-  Puedes definir agent
-
-es basados en LLM Function Calling o ReAct, y agregar herramientas preconstruidas o personalizadas para el agente. Dify proporciona más de 50 herramientas integradas para agentes de IA, como Búsqueda de Google, DALL·E, Difusión Estable y WolframAlpha.
+  Puedes definir agentes basados en LLM Function Calling o ReAct, y agregar herramientas preconstruidas o personalizadas para el agente. Dify proporciona más de 50 herramientas integradas para agentes de IA, como Búsqueda de Google, DALL·E, Difusión Estable y WolframAlpha.

 **6. LLMOps**: 
  Supervisa y analiza registros de aplicaciones y rendimiento a lo largo del tiempo. Podrías mejorar continuamente prompts, conjuntos de datos y modelos basados en datos de producción y anotaciones.
@ -207,6 +205,7 @@ Si desea configurar una configuración de alta disponibilidad, la comunidad prop

 - [Gráfico Helm por @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Gráfico Helm por @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Gráfico Helm por @magicsong](https://github.com/magicsong/ai-charts)
 - [Ficheros YAML por @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Uso de Terraform para el despliegue
--- a/README_FR.md
+++ b/README_FR.md
@ -203,6 +203,7 @@ Si vous souhaitez configurer une configuration haute disponibilité, la communau

 - [Helm Chart par @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart par @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart par @magicsong](https://github.com/magicsong/ai-charts)
 - [Fichier YAML par @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Utilisation de Terraform pour le déploiement
--- a/README_JA.md
+++ b/README_JA.md
@ -204,6 +204,7 @@ docker compose up -d

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Terraformを使用したデプロイ
--- a/README_KL.md
+++ b/README_KL.md
@ -203,6 +203,7 @@ If you'd like to configure a highly-available setup, there are community-contrib

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Terraform atorlugu pilersitsineq
--- a/README_KR.md
+++ b/README_KR.md
@ -197,6 +197,7 @@ Dify를 Kubernetes에 배포하고 프리미엄 스케일링 설정을 구성했

 - [Helm Chart by @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart by @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
+- [Helm Chart by @magicsong](https://github.com/magicsong/ai-charts)
 - [YAML file by @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Terraform을 사용한 배포
--- a/README_PT.md
+++ b/README_PT.md
@ -203,7 +203,8 @@ Se deseja configurar uma instalação de alta disponibilidade, há [Helm Charts]

 - [Helm Chart de @LeoQuote](https://github.com/douban/charts/tree/master/charts/dify)
 - [Helm Chart de @BorisPolonsky](https://github.com/BorisPolonsky/dify-helm)
- [Arquivo YAML de @Winson-030](https://github.com/Winson-030/dify-kubernetes)
+- [Helm Chart de @magicsong](https://github.com/magicsong/ai-charts)
+- [Arquivo YAML por @Winson-030](https://github.com/Winson-030/dify-kubernetes)

 #### Usando o Terraform para Implantação

--- a/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py
+++ b/api/core/rag/datasource/vdb/tidb_on_qdrant/tidb_on_qdrant_vector.py
@ -328,16 +328,13 @@ class TidbOnQdrantVector(BaseVector):
        )
        document_ids_filter = kwargs.get("document_ids_filter")
        if document_ids_filter:
-            should_conditions = []
-            for document_id_filter in document_ids_filter:
-                should_conditions.append(
+            if filter.must:
+                filter.must.append(
                    models.FieldCondition(
                        key="metadata.document_id",
-                        match=models.MatchValue(value=document_id_filter),
+                        match=models.MatchAny(any=document_ids_filter),
                    )
                )
-            if should_conditions:
-                filter.should = should_conditions  # type: ignore
        results = self._client.search(
            collection_name=self._collection_name,
            query_vector=query_vector,
@ -382,16 +379,13 @@ class TidbOnQdrantVector(BaseVector):
        )
        document_ids_filter = kwargs.get("document_ids_filter")
        if document_ids_filter:
-            should_conditions = []
-            for document_id_filter in document_ids_filter:
-                should_conditions.append(
+            if scroll_filter.must:
+                scroll_filter.must.append(
                    models.FieldCondition(
                        key="metadata.document_id",
-                        match=models.MatchValue(value=document_id_filter),
+                        match=models.MatchAny(any=document_ids_filter),
                    )
                )
-            if should_conditions:
-                scroll_filter.should = should_conditions  # type: ignore
        response = self._client.scroll(
            collection_name=self._collection_name,
            scroll_filter=scroll_filter,
--- a/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
+++ b/api/core/rag/datasource/vdb/weaviate/weaviate_vector.py
@ -189,7 +189,10 @@ class WeaviateVector(BaseVector):
        vector = {"vector": query_vector}
        document_ids_filter = kwargs.get("document_ids_filter")
        if document_ids_filter:
-            where_filter = {"operator": "ContainsAny", "path": ["document_id"], "valueTextArray": document_ids_filter}
+            operands = []
+            for document_id_filter in document_ids_filter:
+                operands.append({"path": ["document_id"], "operator": "Equal", "valueText": document_id_filter})
+            where_filter = {"operator": "Or", "operands": operands}
            query_obj = query_obj.with_where(where_filter)
        result = (
            query_obj.with_near_vector(vector)
@ -237,7 +240,10 @@ class WeaviateVector(BaseVector):
        query_obj = self._client.query.get(collection_name, properties)
        document_ids_filter = kwargs.get("document_ids_filter")
        if document_ids_filter:
-            where_filter = {"operator": "ContainsAny", "path": ["document_id"], "valueTextArray": document_ids_filter}
+            operands = []
+            for document_id_filter in document_ids_filter:
+                operands.append({"path": ["document_id"], "operator": "Equal", "valueText": document_id_filter})
+            where_filter = {"operator": "Or", "operands": operands}
            query_obj = query_obj.with_where(where_filter)
        query_obj = query_obj.with_additional(["vector"])
        properties = ["text"]