livekit-plugins-aws 1.0.0rc4__py3-none-any.whl → 1.0.0rc6__py3-none-any.whl

livekit/plugins/aws/llm.py

@@ -41,7 +41,7 @@ TEXT_MODEL = Literal["anthropic.claude-3-5-sonnet-20241022-v2:0"]
 class _LLMOptions:
     model: str | TEXT_MODEL
     temperature: NotGivenOr[float]
-    tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]]
+    tool_choice: NotGivenOr[ToolChoice]
     max_output_tokens: NotGivenOr[int]
     top_p: NotGivenOr[float]
     additional_request_fields: NotGivenOr[dict[str, Any]]
@@ -58,7 +58,7 @@ class LLM(llm.LLM):
         temperature: NotGivenOr[float] = NOT_GIVEN,
         max_output_tokens: NotGivenOr[int] = NOT_GIVEN,
         top_p: NotGivenOr[float] = NOT_GIVEN,
-        tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]] = NOT_GIVEN,
+        tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
         additional_request_fields: NotGivenOr[dict[str, Any]] = NOT_GIVEN,
     ) -> None:
         """
@@ -77,7 +77,7 @@ class LLM(llm.LLM):
             temperature (float, optional): Sampling temperature for response generation. Defaults to 0.8.
             max_output_tokens (int, optional): Maximum number of tokens to generate in the output. Defaults to None.
             top_p (float, optional): The nucleus sampling probability for response generation. Defaults to None.
-            tool_choice (ToolChoice or Literal["auto", "required", "none"], optional): Specifies whether to use tools during response generation. Defaults to "auto".
+            tool_choice (ToolChoice, optional): Specifies whether to use tools during response generation. Defaults to "auto".
             additional_request_fields (dict[str, Any], optional): Additional request fields to send to the AWS Bedrock Converse API. Defaults to None.
         """  # noqa: E501
         super().__init__()
@@ -106,7 +106,7 @@ class LLM(llm.LLM):
         tools: list[FunctionTool] | None = None,
         conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS,
         temperature: NotGivenOr[float] = NOT_GIVEN,
-        tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]] = NOT_GIVEN,
+        tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
     ) -> LLMStream:
         opts = {}
 
@@ -122,8 +122,8 @@ class LLM(llm.LLM):
             tool_config: dict[str, Any] = {"tools": to_fnc_ctx(tools)}
             tool_choice = tool_choice if is_given(tool_choice) else self._opts.tool_choice
             if is_given(tool_choice):
-                if isinstance(tool_choice, ToolChoice):
-                    tool_config["toolChoice"] = {"tool": {"name": tool_choice.name}}
+                if isinstance(tool_choice, dict) and tool_choice.get("type") == "function":
+                    tool_config["toolChoice"] = {"tool": {"name": tool_choice["function"]["name"]}}
                 elif tool_choice == "required":
                     tool_config["toolChoice"] = {"any": {}}
                 elif tool_choice == "auto":

livekit/plugins/aws/utils.py

@@ -53,7 +53,7 @@ def to_chat_ctx(chat_ctx: ChatContext, cache_key: Any) -> tuple[list[dict], dict
     for msg in chat_ctx.items:
         if msg.type == "message" and msg.role == "system":
             for content in msg.content:
-                if isinstance(content, str):
+                if content and isinstance(content, str):
                     system_message = {"text": content}
             continue
 
@@ -73,7 +73,7 @@ def to_chat_ctx(chat_ctx: ChatContext, cache_key: Any) -> tuple[list[dict], dict
 
         if msg.type == "message":
             for content in msg.content:
-                if isinstance(content, str):
+                if content and isinstance(content, str):
                     current_content.append({"text": content})
                 elif isinstance(content, ImageContent):
                     current_content.append(_build_image(content, cache_key))

livekit/plugins/aws/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.0.0.rc4'
+__version__ = '1.0.0.rc6'

{livekit_plugins_aws-1.0.0rc4.dist-info → livekit_plugins_aws-1.0.0rc6.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-aws
-Version: 1.0.0rc4
+Version: 1.0.0rc6
 Summary: LiveKit Agents Plugin for services from AWS
 Project-URL: Documentation, https://docs.livekit.io
 Project-URL: Website, https://livekit.io/
 Project-URL: Source, https://github.com/livekit/agents
-Author-email: LiveKit <support@livekit.io>
+Author-email: LiveKit <hello@livekit.io>
 License-Expression: Apache-2.0
 Keywords: audio,aws,livekit,realtime,video,webrtc
 Classifier: Intended Audience :: Developers
@@ -21,7 +21,7 @@ Requires-Python: >=3.9.0
 Requires-Dist: aiobotocore==2.19.0
 Requires-Dist: amazon-transcribe>=0.6.2
 Requires-Dist: boto3==1.36.3
-Requires-Dist: livekit-agents>=1.0.0.rc4
+Requires-Dist: livekit-agents>=1.0.0.rc6
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins AWS

{livekit_plugins_aws-1.0.0rc4.dist-info → livekit_plugins_aws-1.0.0rc6.dist-info}/RECORD

@@ -1,12 +1,12 @@
 livekit/plugins/aws/__init__.py,sha256=Ea-hK7QdutnwdZvvs9K2fiR8RWJqz2JcONxXnV1kXF0,977
-livekit/plugins/aws/llm.py,sha256=tL9XMIpIdjuqPeMkd4sHksZQgeTnA49no5pae06Lyfw,11455
+livekit/plugins/aws/llm.py,sha256=rIji8jLIyV-xfrDzDewqQiHIzV-oZAE9Cj6p6bba6Nw,11353
 livekit/plugins/aws/log.py,sha256=jFief0Xhv0n_F6sp6UFu9VKxs2bXNVGAfYGmEYfR_2Q,66
 livekit/plugins/aws/models.py,sha256=Nf8RFmDulW7h03dG2lERTog3mgDK0TbLvW0eGOncuEE,704
 livekit/plugins/aws/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 livekit/plugins/aws/stt.py,sha256=j2vEsoixFcsyTbCNhW5EWea5CEv3K-DzL9wmweebf3o,8030
 livekit/plugins/aws/tts.py,sha256=4EOI4VabvhjCcDyp_QoDhlXOdrMrKpnmNIDTeoJ8kcU,7601
-livekit/plugins/aws/utils.py,sha256=x2-7hf6SUUGG3YRE-VhDNWeagY_WOjDUkv5Z4Lcchqs,4987
-livekit/plugins/aws/version.py,sha256=j59nZMZZ8g3asKADdj9zt64g9i53Uq4ib4H0zY4FnPM,604
-livekit_plugins_aws-1.0.0rc4.dist-info/METADATA,sha256=xlEwumwzyoyokK9aW1pavRcsR1m-rt9b9gY59UlDu1M,1485
-livekit_plugins_aws-1.0.0rc4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-livekit_plugins_aws-1.0.0rc4.dist-info/RECORD,,
+livekit/plugins/aws/utils.py,sha256=FBUOsVNC0J2-_bfdRMbAtny72Tqji3UnC0RZdMND7jo,5011
+livekit/plugins/aws/version.py,sha256=PDOEKN5zsYLQdbfAm5Di6G1sFYANNA0LqJR8zZzeghg,604
+livekit_plugins_aws-1.0.0rc6.dist-info/METADATA,sha256=H7G8v1bskBEj88pLijagWXR_uG-LwkUKnLwLs0R8JU8,1483
+livekit_plugins_aws-1.0.0rc6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+livekit_plugins_aws-1.0.0rc6.dist-info/RECORD,,