Merge remote-tracking branch 'upstream/v2' into PR/fix-problem-3

Author: wangliang181230

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

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
-from typing import Dict
+from typing import Dict, Any
+
+from langchain_core.language_models import LanguageModelInput
+from langchain_core.messages import AIMessage
 
 from models_provider.base_model_provider import MaxKBBaseModel
 from models_provider.impl.base_chat_open_ai import BaseChatOpenAI
@@ -23,3 +26,38 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             streaming=True,
             **optional_params,
         )
+
+    def _get_request_payload(
+            self,
+            input_: LanguageModelInput,
+            *,
+            stop: list[str] | None = None,
+            **kwargs: Any,
+    ) -> dict:
+        # Collect reasoning_content from AIMessages with tool_calls before base conversion.
+        # When enable_thinking=true, Bailian API requires reasoning_content on any assistant
+        # message that contains tool_calls (defaults to "" when not present).
+        messages = self._convert_input(input_).to_messages()
+        reasoning_content_map = {}
+        for i, msg in enumerate(messages):
+            if (
+                    isinstance(msg, AIMessage)
+                    and (msg.tool_calls or msg.invalid_tool_calls)
+            ):
+                reasoning_content_map[i] = msg.additional_kwargs.get(
+                    "reasoning_content") or ""
+
+        payload = super()._get_request_payload(input_, stop=stop, **kwargs)
+
+        # Inject reasoning_content into assistant messages with tool_calls so that
+        # Bailian deepseek thinking mode does not reject the request with a 400 error.
+        if "messages" in payload and reasoning_content_map:
+            for i, message in enumerate(payload["messages"]):
+                if (
+                        i in reasoning_content_map
+                        and message.get("role") == "assistant"
+                        and message.get("tool_calls")
+                ):
+                    message["reasoning_content"] = reasoning_content_map[i]
+
+        return payload

pyproject.toml

@@ -22,18 +22,18 @@ dependencies = [
     "beautifulsoup4==4.13.4",
     "jieba==0.42.1",
     "langchain==1.2.15",
-    "langchain-core==1.2.29",
+    "langchain-core==1.2.30",
     "langchain-openai==1.1.13",
     "langchain-anthropic==1.4.0",
     "langchain-community==0.4.1",
     "langchain-deepseek==1.0.1",
-    "langchain-google-genai==4.2.1",
+    "langchain-google-genai==4.2.2",
     "langchain-mcp-adapters==0.2.2",
     "langchain-huggingface==1.2.1",
     "langchain-ollama==1.1.0",
-    "langchain-aws==1.4.3",
+    "langchain-aws==1.4.4",
     "langgraph==1.1.6",
-    "deepagents==0.5.2",
+    "deepagents==0.5.3",
     "torch==2.8.0",
     "numpy==1.26.4",
     "sentence-transformers==5.0.0",
@@ -55,7 +55,7 @@ dependencies = [
     "xlrd==2.0.2",
     "xlwt==1.3.0",
     "pymupdf==1.26.3",
-    "pypdf==6.10.1",
+    "pypdf==6.10.2",
     "pydub==0.25.1",
     "pysilk==0.0.1",
     "gunicorn==23.0.0",

ui/src/views/paragraph/index.vue

@@ -139,6 +139,7 @@
                                     {
                                       paragraph_id: item.id,
                                       new_position: setPosition(val, index),
+                                      target_index: setTargetIndex(val, index),
                                     },
                                     index,
                                   )
@@ -266,15 +267,22 @@ watch(
 
 function setPosition(val: string, index: number) {
   if (val === 'top') {
-    return 0
+    return 1
   } else if (val === 'bottom') {
-    return paginationConfig.total - 1
+    return paragraphDetail.value[paragraphDetail.value.length - 1]?.position ?? paginationConfig.total
   } else if (val === 'up') {
-    return index - 1
+    return paragraphDetail.value[index - 1]?.position ?? paragraphDetail.value[index].position
   } else if (val === 'down') {
-    return index + 1
+    return paragraphDetail.value[index + 1]?.position ?? paragraphDetail.value[index].position
   }
 }
+function setTargetIndex(val: string, index: number) {
+  if (val === 'top') return 0
+  if (val === 'bottom') return paragraphDetail.value.length - 1
+  if (val === 'up') return index - 1
+  if (val === 'down') return index + 1
+  return index
+}
 function dialogVisibleChange(val: boolean) {
   dialogVisible.value = val
 }
@@ -450,12 +458,13 @@ function onEnd(event?: any, params?: any, index?: number) {
     return
   }
   const p = cloneDeep(params)
-  if (p) {
-    p.new_position = p.new_position + 1 // 由于拖拽时会将当前段落位置作为新位置，所以需要加1
-  }
   const obj = p ?? {
     paragraph_id: paragraphDetail.value[event.newIndex].id, // 当前拖动的段落ID
-    new_position: event.newIndex + 1,
+    // 向下拖动时取前一个元素的position，向上拖动时取后一个元素的position
+    new_position:
+      event.newIndex > event.oldIndex
+        ? paragraphDetail.value[event.newIndex - 1]?.position ?? paragraphDetail.value.length
+        : paragraphDetail.value[event.newIndex + 1]?.position ?? paragraphDetail.value.length,
   }
   // console.log(paragraphDetail.value[event.newIndex], obj)
   loadSharedApi({ type: 'paragraph', systemType: apiType.value }).putAdjustPosition(
@@ -466,7 +475,7 @@ function onEnd(event?: any, params?: any, index?: number) {
   )
   if (params) {
     const movedItem = paragraphDetail.value.splice(index as number, 1)[0]
-    paragraphDetail.value.splice(params.new_position, 0, movedItem)
+    paragraphDetail.value.splice(params.target_index, 0, movedItem)
   }
 }