fix: Always handle the extra response outside of stream, such as the exceptions from bedrock (#1526)

2025-03-12 16:29:32 +08:00
parent de6e3657f1
commit f9ab6934d2
12 changed files with 5 additions and 20 deletions
--- a/lua/avante/providers/azure.lua
+++ b/lua/avante/providers/azure.lua
@@ -16,7 +16,6 @@ M.api_key_name = "AZURE_OPENAI_API_KEY"
 M.parse_messages = O.parse_messages
 M.parse_response = O.parse_response
 M.parse_response_without_stream = O.parse_response_without_stream
-M.is_disable_stream = O.is_disable_stream
 M.is_o_series_model = O.is_o_series_model
 M.role_map = O.role_map

--- a/lua/avante/providers/bedrock/claude.lua
+++ b/lua/avante/providers/bedrock/claude.lua
@@ -17,7 +17,6 @@ M.role_map = {
  assistant = "assistant",
 }

-M.is_disable_stream = Claude.is_disable_stream
 M.parse_messages = Claude.parse_messages
 M.parse_response = Claude.parse_response

--- a/lua/avante/providers/claude.lua
+++ b/lua/avante/providers/claude.lua
@@ -36,8 +36,6 @@ M.role_map = {
  assistant = "assistant",
 }

-function M:is_disable_stream() return false end
-
 function M:parse_messages(opts)
  ---@type AvanteClaudeMessage[]
  local messages = {}
--- a/lua/avante/providers/cohere.lua
+++ b/lua/avante/providers/cohere.lua
@@ -47,8 +47,6 @@ M.role_map = {
  assistant = "assistant",
 }

-function M:is_disable_stream() return false end
-
 function M:parse_messages(opts)
  local messages = {
    { role = "system", content = opts.system_prompt },
--- a/lua/avante/providers/copilot.lua
+++ b/lua/avante/providers/copilot.lua
@@ -209,8 +209,6 @@ M.role_map = {
  assistant = "assistant",
 }

-function M:is_disable_stream() return false end
-
 M.parse_messages = OpenAI.parse_messages

 M.parse_response = OpenAI.parse_response
--- a/lua/avante/providers/gemini.lua
+++ b/lua/avante/providers/gemini.lua
@@ -12,8 +12,6 @@ M.role_map = {
 }
 -- M.tokenizer_id = "google/gemma-2b"

-function M:is_disable_stream() return false end
-
 function M:parse_messages(opts)
  local contents = {}
  local prev_role = nil
--- a/lua/avante/providers/ollama.lua
+++ b/lua/avante/providers/ollama.lua
@@ -14,8 +14,6 @@ M.role_map = {
 M.parse_messages = P.openai.parse_messages
 M.is_o_series_model = P.openai.is_o_series_model

-function M:is_disable_stream() return false end
-
 function M:parse_stream_data(ctx, data, handler_opts)
  local ok, json_data = pcall(vim.json.decode, data)
  if not ok or not json_data then
--- a/lua/avante/providers/openai.lua
+++ b/lua/avante/providers/openai.lua
@@ -13,8 +13,6 @@ M.role_map = {
  assistant = "assistant",
 }

-function M:is_disable_stream() return false end
-
 ---@param tool AvanteLLMTool
 ---@return AvanteOpenAITool
 function M.transform_tool(tool)
--- a/lua/avante/providers/vertex.lua
+++ b/lua/avante/providers/vertex.lua
@@ -11,7 +11,6 @@ M.role_map = {
  assistant = "model",
 }

-M.is_disable_stream = Gemini.is_disable_stream
 M.parse_messages = Gemini.parse_messages
 M.parse_response = Gemini.parse_response

--- a/lua/avante/providers/vertex_claude.lua
+++ b/lua/avante/providers/vertex_claude.lua
@@ -9,7 +9,6 @@ M.role_map = {
  assistant = "assistant",
 }

-M.is_disable_stream = P.claude.is_disable_stream
 M.parse_messages = P.claude.parse_messages
 M.parse_response = P.claude.parse_response
 M.parse_api_key = Vertex.parse_api_key