livekit-plugins-anthropic 1.0.0rc3__py3-none-any.whl → 1.0.0rc5__py3-none-any.whl

livekit/plugins/anthropic/llm.py

@@ -44,7 +44,7 @@ class _LLMOptions:
     user: NotGivenOr[str]
     temperature: NotGivenOr[float]
     parallel_tool_calls: NotGivenOr[bool]
-    tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]]
+    tool_choice: NotGivenOr[ToolChoice]
     caching: NotGivenOr[Literal["ephemeral"]]
     top_k: NotGivenOr[int]
     max_tokens: NotGivenOr[int]
@@ -64,7 +64,7 @@ class LLM(llm.LLM):
         max_tokens: NotGivenOr[int] = NOT_GIVEN,
         temperature: NotGivenOr[float] = NOT_GIVEN,
         parallel_tool_calls: NotGivenOr[bool] = NOT_GIVEN,
-        tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]] = NOT_GIVEN,
+        tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
         caching: NotGivenOr[Literal["ephemeral"]] = NOT_GIVEN,
     ) -> None:
         """
@@ -74,14 +74,14 @@ class LLM(llm.LLM):
         the ``ANTHROPIC_API_KEY`` environmental variable.
 
         model (str | ChatModels): The model to use. Defaults to "claude-3-5-sonnet-20241022".
-        api_key (str | None): The Anthropic API key. Defaults to the ANTHROPIC_API_KEY environment variable.
-        base_url (str | None): The base URL for the Anthropic API. Defaults to None.
-        user (str | None): The user for the Anthropic API. Defaults to None.
+        api_key (str, optional): The Anthropic API key. Defaults to the ANTHROPIC_API_KEY environment variable.
+        base_url (str, optional): The base URL for the Anthropic API. Defaults to None.
+        user (str, optional): The user for the Anthropic API. Defaults to None.
         client (anthropic.AsyncClient | None): The Anthropic client to use. Defaults to None.
-        temperature (float | None): The temperature for the Anthropic API. Defaults to None.
-        parallel_tool_calls (bool | None): Whether to parallelize tool calls. Defaults to None.
-        tool_choice (Union[ToolChoice, Literal["auto", "required", "none"]] | None): The tool choice for the Anthropic API. Defaults to "auto".
-        caching (Literal["ephemeral"] | None): If set to "ephemeral", caching will be enabled for the system prompt, tools, and chat history.
+        temperature (float, optional): The temperature for the Anthropic API. Defaults to None.
+        parallel_tool_calls (bool, optional): Whether to parallelize tool calls. Defaults to None.
+        tool_choice (ToolChoice, optional): The tool choice for the Anthropic API. Defaults to "auto".
+        caching (Literal["ephemeral"], optional): If set to "ephemeral", caching will be enabled for the system prompt, tools, and chat history.
         """  # noqa: E501
 
         super().__init__()
@@ -121,7 +121,7 @@ class LLM(llm.LLM):
         tools: list[FunctionTool] | None = None,
         conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS,
         parallel_tool_calls: NotGivenOr[bool] = NOT_GIVEN,
-        tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]] = NOT_GIVEN,
+        tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
         extra_kwargs: NotGivenOr[dict[str, Any]] = NOT_GIVEN,
     ) -> LLMStream:
         extra = {}
@@ -145,12 +145,11 @@ class LLM(llm.LLM):
             tool_choice = tool_choice if is_given(tool_choice) else self._opts.tool_choice
             if is_given(tool_choice):
                 anthropic_tool_choice: dict[str, Any] | None = {"type": "auto"}
-                if isinstance(tool_choice, ToolChoice):
-                    if tool_choice.type == "function":
-                        anthropic_tool_choice = {
-                            "type": "tool",
-                            "name": tool_choice.name,
-                        }
+                if isinstance(tool_choice, dict) and tool_choice.get("type") == "function":
+                    anthropic_tool_choice = {
+                        "type": "tool",
+                        "name": tool_choice["function"]["name"],
+                    }
                 elif isinstance(tool_choice, str):
                     if tool_choice == "required":
                         anthropic_tool_choice = {"type": "any"}

livekit/plugins/anthropic/utils.py

@@ -36,7 +36,7 @@ def to_chat_ctx(
     for i, msg in enumerate(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 = anthropic.types.TextBlockParam(
                         text=content,
                         type="text",
@@ -64,7 +64,7 @@ def to_chat_ctx(
 
         if msg.type == "message":
             for c in msg.content:
-                if isinstance(c, str):
+                if c and isinstance(c, str):
                     content.append(
                         anthropic.types.TextBlockParam(
                             text=c, type="text", cache_control=cache_ctrl
@@ -114,6 +114,12 @@ def _to_image_content(
     cache_ctrl: anthropic.types.CacheControlEphemeralParam | None,
 ) -> anthropic.types.ImageBlockParam:
     img = llm.utils.serialize_image(image)
+    if img.external_url:
+        return {
+            "type": "image",
+            "source": {"type": "url", "url": img.external_url},
+            "cache_control": cache_ctrl,
+        }
     if cache_key not in image._cache:
         image._cache[cache_key] = img.data_bytes
     b64_data = base64.b64encode(image._cache[cache_key]).decode("utf-8")
@@ -121,8 +127,8 @@ def _to_image_content(
         "type": "image",
         "source": {
             "type": "base64",
-            "data": f"data:{img.media_type};base64,{b64_data}",
-            "media_type": img.media_type,
+            "data": f"data:{img.mime_type};base64,{b64_data}",
+            "media_type": img.mime_type,
         },
         "cache_control": cache_ctrl,
     }

livekit/plugins/anthropic/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_anthropic-1.0.0rc3.dist-info → livekit_plugins_anthropic-1.0.0rc5.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-anthropic
-Version: 1.0.0rc3
+Version: 1.0.0rc5
 Summary: Agent Framework plugin for services from Anthropic
 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,livekit,realtime,video,webrtc
 Classifier: Intended Audience :: Developers
@@ -19,7 +19,7 @@ Classifier: Topic :: Multimedia :: Video
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: >=3.9.0
 Requires-Dist: anthropic>=0.34
-Requires-Dist: livekit-agents>=1.0.0.rc3
+Requires-Dist: livekit-agents>=1.0.0.rc5
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins Anthropic

livekit_plugins_anthropic-1.0.0rc5.dist-info/RECORD

@@ -0,0 +1,10 @@
+livekit/plugins/anthropic/__init__.py,sha256=1WCyNEaR6qBsX54qJQM0SeY-QHIucww16PLXcSnMqRo,1175
+livekit/plugins/anthropic/llm.py,sha256=0O0ed5GZsTrEy_tWgrVadbA9IaEZfBm-oKjicT69l34,12885
+livekit/plugins/anthropic/log.py,sha256=fG1pYSY88AnT738gZrmzF9FO4l4BdGENj3VKHMQB3Yo,72
+livekit/plugins/anthropic/models.py,sha256=wyTr2nl6SL4ylN6s4mHJcqtmgV2mjJysZo89FknWdhI,213
+livekit/plugins/anthropic/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+livekit/plugins/anthropic/utils.py,sha256=Nfl9dGCZGDEJAHj_f-TmePr8bKJrc8IwM6Houjev4DE,5158
+livekit/plugins/anthropic/version.py,sha256=G8-S67mIdz56XcVImzUB7osx6o_lG2oShZz-PjWeOeo,604
+livekit_plugins_anthropic-1.0.0rc5.dist-info/METADATA,sha256=r60nMSf-kbpQGphqIZvfu5wFWJMxAarij8wqeBMjjbM,1278
+livekit_plugins_anthropic-1.0.0rc5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+livekit_plugins_anthropic-1.0.0rc5.dist-info/RECORD,,

livekit_plugins_anthropic-1.0.0rc3.dist-info/RECORD

@@ -1,10 +0,0 @@
-livekit/plugins/anthropic/__init__.py,sha256=1WCyNEaR6qBsX54qJQM0SeY-QHIucww16PLXcSnMqRo,1175
-livekit/plugins/anthropic/llm.py,sha256=Gj9oGm16kdeEHw1I4GB7EGSBLpgkzhv36f55Msby5o0,13042
-livekit/plugins/anthropic/log.py,sha256=fG1pYSY88AnT738gZrmzF9FO4l4BdGENj3VKHMQB3Yo,72
-livekit/plugins/anthropic/models.py,sha256=wyTr2nl6SL4ylN6s4mHJcqtmgV2mjJysZo89FknWdhI,213
-livekit/plugins/anthropic/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-livekit/plugins/anthropic/utils.py,sha256=SgF7No3XxiF62zt_ija9scqqOUkuB51Yxpe9X2QTuf8,4956
-livekit/plugins/anthropic/version.py,sha256=wYcaYw0AmH9qt8_atfIwl-Qo0WMWL73z2vqRF8LOjms,604
-livekit_plugins_anthropic-1.0.0rc3.dist-info/METADATA,sha256=lADiAACTnZZ5pKVe9FF8wbIqmZ7EcJ-F4sYbrnYx2Kg,1280
-livekit_plugins_anthropic-1.0.0rc3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-livekit_plugins_anthropic-1.0.0rc3.dist-info/RECORD,,