fix(factory.py): bedrock: merge consecutive tool + user messages (#6028)

* fix(factory.py): bedrock:  merge consecutive tool + user messages

Fixes https://github.com/BerriAI/litellm/issues/6007

* LiteLLM Minor Fixes & Improvements (10/02/2024)  (#6023)

* feat(together_ai/completion): handle together ai completion calls

* fix: handle list of int / list of list of int for text completion calls

* fix(utils.py): check if base model in bedrock converse model list

Fixes https://github.com/BerriAI/litellm/issues/6003

* test(test_optional_params.py): add unit tests for bedrock optional param mapping

Fixes https://github.com/BerriAI/litellm/issues/6003

* feat(utils.py): enable passing dummy tool call for anthropic/bedrock calls if tool_use blocks exist

Fixes https://github.com/BerriAI/litellm/issues/5388

* fixed an issue with tool use of claude models with anthropic and bedrock (#6013)

* fix(utils.py): handle empty schema for anthropic/bedrock

Fixes https://github.com/BerriAI/litellm/issues/6012

* fix: fix linting errors

* fix: fix linting errors

* fix: fix linting errors

* fix(proxy_cli.py): fix import route for app + health checks path (#6026)

* (testing): Enable testing us.anthropic.claude-3-haiku-20240307-v1:0. (#6018)

* fix(proxy_cli.py): fix import route for app + health checks gettsburg.wav

Fixes https://github.com/BerriAI/litellm/issues/5999

---------

Co-authored-by: David Manouchehri <david.manouchehri@ai.moda>

---------

Co-authored-by: Ved Patwardhan <54766411+vedpatwardhan@users.noreply.github.com>
Co-authored-by: David Manouchehri <david.manouchehri@ai.moda>

* fix(factory.py): correctly handle content in tool block

---------

Co-authored-by: Ved Patwardhan <54766411+vedpatwardhan@users.noreply.github.com>
Co-authored-by: David Manouchehri <david.manouchehri@ai.moda>

litellm/litellm_core_utils/litellm_logging.py

@@ -2646,10 +2646,6 @@ def get_standard_logging_object_payload(
             ),
         )
 
-        verbose_logger.debug(
-            "Standard Logging: created payload - payload: %s\n\n", payload
-        )
-
         return payload
     except Exception as e:
         verbose_logger.exception(

litellm/llms/prompt_templates/factory.py

@@ -2387,34 +2387,35 @@ def _bedrock_converse_messages_pt(
     while msg_i < len(messages):
         user_content: List[BedrockContentBlock] = []
         init_msg_i = msg_i
-        ## MERGE CONSECUTIVE USER CONTENT ##
-        while msg_i < len(messages) and messages[msg_i]["role"] == "user":
-            if isinstance(messages[msg_i]["content"], list):
-                _parts: List[BedrockContentBlock] = []
-                for element in messages[msg_i]["content"]:
-                    if isinstance(element, dict):
-                        if element["type"] == "text":
-                            _part = BedrockContentBlock(text=element["text"])
-                            _parts.append(_part)
-                        elif element["type"] == "image_url":
-                            image_url = element["image_url"]["url"]
-                            _part = _process_bedrock_converse_image_block(  # type: ignore
-                                image_url=image_url
-                            )
-                            _parts.append(BedrockContentBlock(image=_part))  # type: ignore
-                user_content.extend(_parts)
-            else:
-                _part = BedrockContentBlock(text=messages[msg_i]["content"])
-                user_content.append(_part)
-
+        valid_user_roles = ["user", "tool", "function"]
+        ## MERGE CONSECUTIVE USER + TOOL CONTENT ##
+        while msg_i < len(messages) and messages[msg_i]["role"] in valid_user_roles:
+            if messages[msg_i]["role"] == "user":
+                if isinstance(messages[msg_i]["content"], list):
+                    _parts: List[BedrockContentBlock] = []
+                    for element in messages[msg_i]["content"]:
+                        if isinstance(element, dict):
+                            if element["type"] == "text":
+                                _part = BedrockContentBlock(text=element["text"])
+                                _parts.append(_part)
+                            elif element["type"] == "image_url":
+                                image_url = element["image_url"]["url"]
+                                _part = _process_bedrock_converse_image_block(  # type: ignore
+                                    image_url=image_url
+                                )
+                                _parts.append(BedrockContentBlock(image=_part))  # type: ignore
+                    user_content.extend(_parts)
+                elif isinstance(messages[msg_i]["content"], str):
+                    _part = BedrockContentBlock(text=messages[msg_i]["content"])
+                    user_content.append(_part)
+            elif (
+                messages[msg_i]["role"] == "tool"
+                or messages[msg_i]["role"] == "function"
+            ):
+                tool_call_result = _convert_to_bedrock_tool_call_result(messages[msg_i])
+                user_content.append(tool_call_result)
             msg_i += 1
 
-        ## MERGE CONSECUTIVE TOOL CALL MESSAGES ##
-        while msg_i < len(messages) and messages[msg_i]["role"] == "tool":
-            tool_call_result = _convert_to_bedrock_tool_call_result(messages[msg_i])
-
-            user_content.append(tool_call_result)
-            msg_i += 1
         if user_content:
             contents.append(BedrockMessageBlock(role="user", content=user_content))
         assistant_content: List[BedrockContentBlock] = []

litellm/proxy/_new_secret_config.yaml

@@ -4,4 +4,4 @@ model_list:
       model: whisper-1
       api_key: os.environ/OPENAI_API_KEY
     model_info:
-      mode: audio_transcription
+      mode: audio_transcription