Merge branch 'v2' into virtualized-tree@v2

Author: wangdan-fit2cloud

apps/application/flow/compare/not_contain_compare.py

@@ -20,7 +20,7 @@ def support(self, node_id, fields: List[str], source_value, compare, target_valu
     def compare(self, source_value, compare, target_value):
         if isinstance(source_value, str):
             return str(target_value) not in source_value
-        elif isinstance(self, list):
+        elif isinstance(source_value, list):
             return not any([str(item) == str(target_value) for item in source_value])
         else:
             return str(target_value) not in str(source_value)

apps/application/flow/step_node/tool_lib_node/impl/base_tool_lib_node.py

@@ -110,7 +110,8 @@ def convert_value(name: str, value, _type, is_required, source, node):
         if _type == 'int':
             return int(value)
         if _type == 'boolean':
-            value = 0 if ['0', '[]'].__contains__(value) else value
+            if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                return False
             return bool(value)
         if _type == 'float':
             return float(value)

apps/application/flow/step_node/tool_node/impl/base_tool_node.py

@@ -85,7 +85,8 @@ def convert_value(name: str, value, _type, is_required, source, node):
         if _type == 'int':
             return int(value)
         if _type == 'boolean':
-            value = 0 if ['0', '[]'].__contains__(value) else value
+            if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                return False
             return bool(value)
         if _type == 'float':
             return float(value)

apps/application/flow/tools.py

@@ -303,7 +303,7 @@ def generate_tool_message_complete(icon, name, input_content, output_content):
             "output": output_content
         }
     }
-    return f'<tool_calls_render>{json.dumps(content)}</tool_calls_render>'
+    return f'<tool_calls_render>{json.dumps(content, ensure_ascii=False)}</tool_calls_render>'
 
 
 # 全局单例事件循环

apps/application/long_term_memory/__init__.py

@@ -1,6 +1,6 @@
 import re
 import uuid_utils.compat as uuid
-from django.db.models import QuerySet
+from django.db.models import Count, QuerySet
 from langchain_core.messages import HumanMessage
 
 from application.models import Chat, ChatRecord, Application, ApplicationLongTermMemory
@@ -228,8 +228,10 @@ def _execute_scheduled_extract(workspace_id, application_id):
     chat_user_ids = list(
         QuerySet(Chat).filter(application_id=application_id)
         .exclude(chat_user_id__isnull=True)
+        .values('chat_user_id')
+        .annotate(count=Count('chat_user_id'))
+        .filter(count__gt=1)
         .values_list('chat_user_id', flat=True)
-        .distinct()
     )
     for chat_user_id in chat_user_ids:
         config = _get_long_term_config(application, chat_user_id)

apps/knowledge/views/paragraph.py

@@ -64,7 +64,6 @@ def get(self, request: Request, workspace_id: str, knowledge_id: str, document_i
     @log(
         menu='Paragraph', operate='Create Paragraph',
         get_operation_object=lambda r, keywords: get_knowledge_document_operation_object(
-            get_knowledge_operation_object(keywords.get('knowledge_id')),
             get_knowledge_operation_object(keywords.get('knowledge_id')),
             get_document_operation_object(keywords.get('document_id'))
         ),

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/embedding.py

@@ -6,6 +6,7 @@
     @date：2024/10/16 16:34
     @desc:
 """
+from http import HTTPStatus
 from typing import Dict, List
 
 from openai import OpenAI
@@ -16,11 +17,15 @@
 class AliyunBaiLianEmbedding(MaxKBBaseModel):
     model_name: str
     optional_params: dict
+    api_base: str
+    api_key: str
 
     def __init__(self, api_key, model_name: str, api_base: str, optional_params: dict):
         self.client = OpenAI(api_key=api_key, base_url=api_base).embeddings
         self.model_name = model_name
         self.optional_params = optional_params
+        self.api_key = api_key
+        self.api_base = api_base
 
     def is_cache_model(self):
         return False
@@ -42,6 +47,24 @@ def embed_query(self, text: str):
     def embed_documents(
             self, texts: List[str], chunk_size: int | None = None
     ) -> List[List[float]]:
+        # 处理多模态的向量化
+        if any(k in self.model_name for k in ("vl-embedding", "embedding-vision", "multimodal")):
+            import dashscope
+            dashscope.api_key = self.api_key
+            dashscope.base_http_api_url = self.api_base
+            multimodal_input = [{"text": text} for text in texts]
+            resp = dashscope.MultiModalEmbedding.call(
+                model="tongyi-embedding-vision-plus",
+                input=multimodal_input,  # type: ignore
+                **self.optional_params
+            )
+
+            if resp.status_code == HTTPStatus.OK:
+                embeddings_data = resp.output.get('embeddings', [])
+                return [item.get('embedding', []) for item in embeddings_data]
+            else:
+                raise Exception(f'MultiModalEmbedding call failed: status={resp.status_code}, message={resp.message}')
+
         if len(self.optional_params) > 0:
             res = self.client.create(
                 input=texts, model=self.model_name, encoding_format="float",

apps/models_provider/impl/minimax_model_provider/icon/minimax_icon_svg

@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-  <rect width="100%" height="100%" rx="4" fill="#1A1A2E"/>
-  <text x="12" y="16" text-anchor="middle" font-family="Arial, sans-serif" font-weight="bold" font-size="10" fill="#E94560">M</text>
-</svg>
+<svg t="1776929669814" class="icon" viewBox="0 0 1169 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4810" width="100%" height="100%"><path d="M474.173841 470.682521V847.403039c-25.441562 127.572805-194.68465 94.674371-195.416638 2.192962-0.802986-116.24 0-231.750012 0-347.113027V368.697276c0-16.740712-3.654937-29.973484-18.275685-40.428305-28.512509-21.346633-62.725921 3.728936-63.456908 34.507407-1.608972 41.305289-0.804986 81.733594-1.608973 122.453893 0 32.167446 0 63.384909 0.730988 95.478357C175.164986 722.025196 3.947932 698.5576 0 581.512614V483.5493c0-32.021449 62.725921-39.551319 59.655973 8.406855-2.046965 23.759591-0.731987 48.25117-1.535973 71.791765-0.729987 42.036277 63.530907 70.32879 78.663646 1.607972 0.730987-56.658025 0.730987-113.31605 0.730988-170.486067 0-71.644767 20.32365-129.984763 96.282343-135.39467 32.898434-2.92395 54.757058 10.819814 75.738697 34.579405 8.042862 8.407855 27.049535 35.092396 27.781522 64.115897 0 26.75754 0.729987 53.368082 0.729987 80.418616 0 53.367082-0.729987 107.028158-0.729987 160.39724 0 34.579405 0.729987 68.792816 0.729987 102.568235 0 42.841263 0 86.267516-0.729987 129.180778-0.730987 55.78104 67.111845 54.977054 78.005658-0.876985 0-65.796868 0.729987-130.78875 0.729987-196.585618 0-162.078211-0.729987-324.157422-0.729987-486.163634 0-16.814711-2.33996-63.456908 6.579886-80.417617C469.274925-48.744541 613.003452 1.625592 614.319429 97.176948c2.777952 195.781631 0 393.756225 0.730988 589.975848 0 68.062829-55.269049 53.44208-58.338996 26.830538 0-204.188487 0-409.180959 0.729987-613.07745-2.703953-51.175119-78.589648-44.229239-82.976572-7.529871-1.461975 42.109275-0.729987 84.950538-1.461975 126.987815v250.025698h0.730987l0.511992 0.292995z" fill="#D4367A" p-id="4811"></path><path d="M696.347018 467.684573v276.638239-652.848766c24.709575-128.44779 193.880664-95.038365 194.611651-2.484957 0.803986 115.437014 0 231.677014 0.803986 347.040028 0 44.303238 0 88.752473-0.730987 133.055711 0 17.545698 4.312926 29.900486 19.007673 41.159292 27.780522 20.835641 61.921935-3.654937 63.456908-34.945399 1.535974-40.501303 0.731987-81.002606 0.731987-122.527892v-94.893367c21.200635-141.315568 191.906698-117.847972 195.488637-0.803986V711.645375c0 32.166447-61.994933 39.769316-59.216981-8.334857 1.680971-24.490579 0-304.930753 0.876985-329.49433 1.461975-41.305289-63.602906-70.402789-78.663647-0.876985v169.609081c0 72.66875-20.396649 130.057762-97.013331 136.271656-72.228757 1.680971-101.253258-48.25117-103.593217-98.695302V237.250538c0-43.645249 0-86.266516 0.731987-129.107779 0.729987-55.78004-67.112845-55.78004-78.663646 0.804986v767.626792c0 16.667713 2.33996 63.383909-5.921898 80.417616-47.300186 115.363015-191.7607 64.918883-193.076678-30.559474v-90.871437c3.582938-61.190947 55.269049-46.643197 57.609009-20.762642V922.631744c2.777952 51.321117 78.663646 45.107224 82.245585 7.602869 1.534974-42.109275 1.534974-84.146552 1.534973-127.059813V467.757571h-0.219996v-0.072998z" fill="#ED6D48" p-id="4812"></path></svg>

apps/tools/serializers/tool.py

@@ -536,7 +536,8 @@ def convert_value(name: str, value: str, _type: str, is_required: bool):
                 if _type == 'int':
                     return int(value)
                 if _type == 'boolean':
-                    value = 0 if ['0', '[]'].__contains__(value) else value
+                    if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+                        return False
                     return bool(value)
                 if _type == 'float':
                     return float(value)

apps/trigger/handler/impl/task/tool_task/base_tool_task.py

@@ -50,7 +50,8 @@ def _convert_value(_type, value):
     if _type == 'int':
         return int(value)
     if _type == 'boolean':
-        value = 0 if ['0', '[]'].__contains__(value) else value
+        if isinstance(value, str) and value.lower() in ('false', '0', '[]', ''):
+            return False
         return bool(value)
     if _type == 'float':
         return float(value)