livekit-plugins-aws 1.0.0rc3__tar.gz → 1.0.0rc5__tar.gz

{livekit_plugins_aws-1.0.0rc3 → livekit_plugins_aws-1.0.0rc5}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-aws
-Version: 1.0.0rc3
+Version: 1.0.0rc5
 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.rc3
+Requires-Dist: livekit-agents>=1.0.0.rc5
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins AWS

{livekit_plugins_aws-1.0.0rc3 → livekit_plugins_aws-1.0.0rc5}/livekit/plugins/aws/llm.py

@@ -35,14 +35,13 @@ from .log import logger
 from .utils import get_aws_credentials, to_chat_ctx, to_fnc_ctx
 
 TEXT_MODEL = Literal["anthropic.claude-3-5-sonnet-20241022-v2:0"]
-DEFAULT_REGION = "us-east-1"
 
 
 @dataclass
 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]]
@@ -59,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:
         """
@@ -78,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__()
@@ -107,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 = {}
 
@@ -123,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":
@@ -228,12 +227,24 @@ class LLMStream(llm.LLMStream):
             self._tool_call_id = tool_use["toolUseId"]
             self._fnc_name = tool_use["name"]
             self._fnc_raw_arguments = ""
+
         elif "contentBlockDelta" in chunk:
             delta = chunk["contentBlockDelta"]["delta"]
             if "toolUse" in delta:
                 self._fnc_raw_arguments += delta["toolUse"]["input"]
             elif "text" in delta:
                 self._text += delta["text"]
+
+        elif "metadata" in chunk:
+            metadata = chunk["metadata"]
+            return llm.ChatChunk(
+                request_id=request_id,
+                usage=llm.CompletionUsage(
+                    completion_tokens=metadata["usage"]["outputTokens"],
+                    prompt_tokens=metadata["usage"]["inputTokens"],
+                    total_tokens=metadata["usage"]["totalTokens"],
+                ),
+            )
         elif "contentBlockStop" in chunk:
             if self._text:
                 chat_chunk = llm.ChatChunk(

{livekit_plugins_aws-1.0.0rc3 → livekit_plugins_aws-1.0.0rc5}/livekit/plugins/aws/utils.py

@@ -13,6 +13,8 @@ from livekit.agents.utils import is_given
 
 __all__ = ["to_fnc_ctx", "to_chat_ctx", "get_aws_credentials"]
 
+DEFAULT_REGION = "us-east-1"
+
 
 def get_aws_credentials(
     api_key: NotGivenOr[str],
@@ -21,9 +23,7 @@ def get_aws_credentials(
 ):
     aws_region = region if is_given(region) else os.environ.get("AWS_DEFAULT_REGION")
     if not aws_region:
-        raise ValueError(
-            "AWS_DEFAULT_REGION must be set via argument or the AWS_DEFAULT_REGION environment variable."  # noqa: E501
-        )
+        aws_region = DEFAULT_REGION
 
     if is_given(api_key) and is_given(api_secret):
         session = boto3.Session(
@@ -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))
@@ -127,6 +127,8 @@ def _build_tool_spec(fnc: FunctionTool) -> dict:
 
 def _build_image(image: ImageContent, cache_key: Any) -> dict:
     img = utils.serialize_image(image)
+    if img.external_url:
+        raise ValueError("external_url is not supported by AWS Bedrock.")
     if cache_key not in image._cache:
         image._cache[cache_key] = img.data_bytes
     return {

{livekit_plugins_aws-1.0.0rc3 → livekit_plugins_aws-1.0.0rc5}/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.rc3'
+__version__ = '1.0.0.rc5'

{livekit_plugins_aws-1.0.0rc3 → livekit_plugins_aws-1.0.0rc5}/pyproject.toml

@@ -9,7 +9,7 @@ description = "LiveKit Agents Plugin for services from AWS"
 readme = "README.md"
 license = "Apache-2.0"
 requires-python = ">=3.9.0"
-authors = [{ name = "LiveKit", email = "support@livekit.io" }]
+authors = [{ name = "LiveKit", email = "hello@livekit.io" }]
 keywords = ["webrtc", "realtime", "audio", "video", "livekit", "aws"]
 classifiers = [
     "Intended Audience :: Developers",
@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-    "livekit-agents>=1.0.0.rc3",
+    "livekit-agents>=1.0.0.rc5",
     "aiobotocore==2.19.0",
     "boto3==1.36.3",
     "amazon-transcribe>=0.6.2",