llama-index-llms-bedrock-converse 0.12.2__py3-none-any.whl → 0.12.4__py3-none-any.whl

llama_index/llms/bedrock_converse/base.py

@@ -1,5 +1,6 @@
 import warnings
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     Dict,
@@ -9,16 +10,21 @@ from typing import (
     Sequence,
     Tuple,
     Union,
-    TYPE_CHECKING,
 )
 
+from llama_index.core.base.llms.generic_utils import (
+    achat_to_completion_decorator,
+    astream_chat_to_completion_decorator,
+    chat_to_completion_decorator,
+    stream_chat_to_completion_decorator,
+)
 from llama_index.core.base.llms.types import (
     ChatMessage,
     ChatResponse,
-    ChatResponseGen,
     ChatResponseAsyncGen,
-    CompletionResponseAsyncGen,
+    ChatResponseGen,
     CompletionResponse,
+    CompletionResponseAsyncGen,
     CompletionResponseGen,
     LLMMetadata,
     MessageRole,
@@ -33,26 +39,20 @@ from llama_index.core.llms.callbacks import (
     llm_chat_callback,
     llm_completion_callback,
 )
-from llama_index.core.base.llms.generic_utils import (
-    achat_to_completion_decorator,
-    astream_chat_to_completion_decorator,
-    chat_to_completion_decorator,
-    stream_chat_to_completion_decorator,
-)
 from llama_index.core.llms.function_calling import FunctionCallingLLM, ToolSelection
 from llama_index.core.llms.utils import parse_partial_json
 from llama_index.core.types import BaseOutputParser, PydanticProgramMode
 from llama_index.llms.bedrock_converse.utils import (
+    ThinkingDict,
     bedrock_modelname_to_context_size,
     converse_with_retry,
     converse_with_retry_async,
     force_single_tool_call,
     is_bedrock_function_calling_model,
+    is_reasoning,
     join_two_dicts,
     messages_to_converse_messages,
     tools_to_converse_tools,
-    is_reasoning,
-    ThinkingDict,
 )
 
 if TYPE_CHECKING:
@@ -364,7 +364,9 @@ class BedrockConverse(FunctionCallingLLM):
         }
 
     def _get_content_and_tool_calls(
-        self, response: Optional[Dict[str, Any]] = None, content: Dict[str, Any] = None
+        self,
+        response: Optional[Dict[str, Any]] = None,
+        content: Optional[Dict[str, Any]] = None,
     ) -> Tuple[
         List[Union[TextBlock, ThinkingBlock, ToolCallBlock]], List[str], List[str]
     ]:
@@ -505,10 +507,13 @@ class BedrockConverse(FunctionCallingLLM):
                     content_delta = content_block_delta["delta"]
                     content = join_two_dicts(content, content_delta)
 
+                    thinking_delta_value = None
                     if "reasoningContent" in content_delta:
-                        thinking += content_delta.get("reasoningContent", {}).get(
+                        reasoning_text = content_delta.get("reasoningContent", {}).get(
                             "text", ""
                         )
+                        thinking += reasoning_text
+                        thinking_delta_value = reasoning_text
                         thinking_signature += content_delta.get(
                             "reasoningContent", {}
                         ).get("signature", "")
@@ -566,6 +571,14 @@ class BedrockConverse(FunctionCallingLLM):
                                 )
                             )
 
+                    response_additional_kwargs = self._get_response_token_counts(
+                        dict(chunk)
+                    )
+                    if thinking_delta_value is not None:
+                        response_additional_kwargs["thinking_delta"] = (
+                            thinking_delta_value
+                        )
+
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
@@ -579,7 +592,7 @@ class BedrockConverse(FunctionCallingLLM):
                         ),
                         delta=content_delta.get("text", ""),
                         raw=chunk,
-                        additional_kwargs=self._get_response_token_counts(dict(chunk)),
+                        additional_kwargs=response_additional_kwargs,
                     )
                 elif content_block_start := chunk.get("contentBlockStart"):
                     # New tool call starting
@@ -777,10 +790,13 @@ class BedrockConverse(FunctionCallingLLM):
                     content_delta = content_block_delta["delta"]
                     content = join_two_dicts(content, content_delta)
 
+                    thinking_delta_value = None
                     if "reasoningContent" in content_delta:
-                        thinking += content_delta.get("reasoningContent", {}).get(
+                        reasoning_text = content_delta.get("reasoningContent", {}).get(
                             "text", ""
                         )
+                        thinking += reasoning_text
+                        thinking_delta_value = reasoning_text
                         thinking_signature += content_delta.get(
                             "reasoningContent", {}
                         ).get("signature", "")
@@ -838,6 +854,14 @@ class BedrockConverse(FunctionCallingLLM):
                                 )
                             )
 
+                    response_additional_kwargs = self._get_response_token_counts(
+                        dict(chunk)
+                    )
+                    if thinking_delta_value is not None:
+                        response_additional_kwargs["thinking_delta"] = (
+                            thinking_delta_value
+                        )
+
                     yield ChatResponse(
                         message=ChatMessage(
                             role=role,
@@ -851,7 +875,7 @@ class BedrockConverse(FunctionCallingLLM):
                         ),
                         delta=content_delta.get("text", ""),
                         raw=chunk,
-                        additional_kwargs=self._get_response_token_counts(dict(chunk)),
+                        additional_kwargs=response_additional_kwargs,
                     )
                 elif content_block_start := chunk.get("contentBlockStart"):
                     # New tool call starting

{llama_index_llms_bedrock_converse-0.12.2.dist-info → llama_index_llms_bedrock_converse-0.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llama-index-llms-bedrock-converse
-Version: 0.12.2
+Version: 0.12.4
 Summary: llama-index llms bedrock converse integration
 Author-email: Your Name <you@example.com>
 License-Expression: MIT

llama_index_llms_bedrock_converse-0.12.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+llama_index/llms/bedrock_converse/__init__.py,sha256=xE3ZHLXqFr7TTTgQlYH9bLLPRZAV3dJyiz_iUFXBfak,98
+llama_index/llms/bedrock_converse/base.py,sha256=uQ2pD0SwSqbjLdDB9A5O0REky5y6LL3E3UWNIHvKVu8,46074
+llama_index/llms/bedrock_converse/utils.py,sha256=dP24P7SU9l6NiRC4jbBRjnsPoSwEBXDBMzqwSAgSMX0,30001
+llama_index_llms_bedrock_converse-0.12.4.dist-info/METADATA,sha256=WdzTa6FZPw6XiDWs1K97YuvU5kz2352AwZLD9kyteKY,7834
+llama_index_llms_bedrock_converse-0.12.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+llama_index_llms_bedrock_converse-0.12.4.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
+llama_index_llms_bedrock_converse-0.12.4.dist-info/RECORD,,

llama_index_llms_bedrock_converse-0.12.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-llama_index/llms/bedrock_converse/__init__.py,sha256=xE3ZHLXqFr7TTTgQlYH9bLLPRZAV3dJyiz_iUFXBfak,98
-llama_index/llms/bedrock_converse/base.py,sha256=rs6Vz6Yg6lM8zaZQ26enXsn0jwVgTDm5x4S1LY4CEiI,45059
-llama_index/llms/bedrock_converse/utils.py,sha256=dP24P7SU9l6NiRC4jbBRjnsPoSwEBXDBMzqwSAgSMX0,30001
-llama_index_llms_bedrock_converse-0.12.2.dist-info/METADATA,sha256=7qLGNTYt8TRDG_4488bJoCVZ4hpMPIvvSHGxsjtQBSQ,7834
-llama_index_llms_bedrock_converse-0.12.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-llama_index_llms_bedrock_converse-0.12.2.dist-info/licenses/LICENSE,sha256=JPQLUZD9rKvCTdu192Nk0V5PAwklIg6jANii3UmTyMs,1065
-llama_index_llms_bedrock_converse-0.12.2.dist-info/RECORD,,