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

livekit/plugins/google/beta/realtime/api_proto.py

@@ -5,13 +5,13 @@ from typing import Literal, Union
 
 from google.genai import types
 
-from ..._utils import _build_gemini_ctx, _build_tools
+# from ..._utils import _build_gemini_ctx, _build_tools
 
 LiveAPIModels = Literal["gemini-2.0-flash-exp"]
 
 Voice = Literal["Puck", "Charon", "Kore", "Fenrir", "Aoede"]
 
-__all__ = ["_build_tools", "ClientEvents", "_build_gemini_ctx"]
+# __all__ = ["_build_tools", "ClientEvents", "_build_gemini_ctx"]
 
 ClientEvents = Union[
     types.ContentListUnion,

livekit/plugins/google/beta/realtime/realtime_api.py

@@ -27,7 +27,6 @@ from google.genai.types import (
 )
 from livekit import rtc
 from livekit.agents import llm, utils
-from livekit.agents.llm.function_context import _create_ai_function_info
 from livekit.agents.utils import images
 
 from ...log import logger
@@ -35,9 +34,10 @@ from .api_proto import (
     ClientEvents,
     LiveAPIModels,
     Voice,
-    _build_gemini_ctx,
-    _build_tools,
 )
+
+# temporary placeholders
+from .temp import _build_gemini_ctx, _build_tools, _create_ai_function_info
 from .transcriber import ModelTranscriber, TranscriberSession, TranscriptionContent
 
 EventTypes = Literal[

livekit/plugins/google/beta/realtime/temp.py

@@ -0,0 +1,10 @@
+def _build_tools():
+    pass
+
+
+def _create_ai_function_info():
+    pass
+
+
+def _build_gemini_ctx():
+    pass

livekit/plugins/google/llm.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 import json
 import os
 from dataclasses import dataclass
-from typing import Any, Literal, cast
+from typing import Any, cast
 
 from google import genai
 from google.auth._default_async import default_async
@@ -43,7 +43,7 @@ from .utils import to_chat_ctx, to_fnc_ctx
 class _LLMOptions:
     model: ChatModels | str
     temperature: NotGivenOr[float]
-    tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]]
+    tool_choice: NotGivenOr[ToolChoice]
     vertexai: NotGivenOr[bool]
     project: NotGivenOr[str]
     location: NotGivenOr[str]
@@ -69,7 +69,7 @@ class LLM(llm.LLM):
         top_k: NotGivenOr[float] = NOT_GIVEN,
         presence_penalty: NotGivenOr[float] = NOT_GIVEN,
         frequency_penalty: NotGivenOr[float] = NOT_GIVEN,
-        tool_choice: NotGivenOr[ToolChoice | Literal["auto", "required", "none"]] = NOT_GIVEN,
+        tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
     ) -> None:
         """
         Create a new instance of Google GenAI LLM.
@@ -93,7 +93,7 @@ class LLM(llm.LLM):
             top_k (int, optional): The top-k sampling value for response generation. Defaults to None.
             presence_penalty (float, optional): Penalizes the model for generating previously mentioned concepts. Defaults to None.
             frequency_penalty (float, optional): Penalizes the model for repeating words. 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".
         """  # noqa: E501
         super().__init__()
         gcp_project = project if is_given(project) else os.environ.get("GOOGLE_CLOUD_PROJECT")
@@ -147,7 +147,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 = {}
@@ -158,7 +158,7 @@ class LLM(llm.LLM):
         tool_choice = tool_choice if is_given(tool_choice) else self._opts.tool_choice
         if is_given(tool_choice):
             gemini_tool_choice: types.ToolConfig
-            if isinstance(tool_choice, ToolChoice):
+            if isinstance(tool_choice, dict) and tool_choice.get("type") == "function":
                 gemini_tool_choice = types.ToolConfig(
                     function_calling_config=types.FunctionCallingConfig(
                         mode="ANY",

livekit/plugins/google/utils.py

@@ -9,6 +9,8 @@ from google.genai import types
 from livekit.agents import llm
 from livekit.agents.llm import FunctionTool
 
+from .log import logger
+
 __all__ = ["to_chat_ctx", "to_fnc_ctx"]
 
 
@@ -28,7 +30,7 @@ def to_chat_ctx(
         if msg.type == "message" and msg.role == "system":
             sys_parts = []
             for content in msg.content:
-                if isinstance(content, str):
+                if content and isinstance(content, str):
                     sys_parts.append(types.Part(text=content))
             system_instruction = types.Content(parts=sys_parts)
             continue
@@ -49,9 +51,9 @@ def to_chat_ctx(
 
         if msg.type == "message":
             for content in msg.content:
-                if isinstance(content, str):
+                if content and isinstance(content, str):
                     parts.append(types.Part(text=content))
-                elif isinstance(content, dict):
+                elif content and isinstance(content, dict):
                     parts.append(types.Part(text=json.dumps(content)))
                 elif isinstance(content, llm.ImageContent):
                     parts.append(_to_image_part(content, cache_key))
@@ -81,9 +83,16 @@ def to_chat_ctx(
 
 def _to_image_part(image: llm.ImageContent, cache_key: Any) -> types.Part:
     img = llm.utils.serialize_image(image)
+    if img.external_url:
+        if img.mime_type:
+            mime_type = img.mime_type
+        else:
+            logger.debug("No media type provided for image, defaulting to image/jpeg.")
+            mime_type = "image/jpeg"
+        return types.Part.from_uri(file_uri=img.external_url, mime_type=mime_type)
     if cache_key not in image._cache:
         image._cache[cache_key] = img.data_bytes
-    return types.Part.from_bytes(data=image._cache[cache_key], mime_type=img.media_type)
+    return types.Part.from_bytes(data=image._cache[cache_key], mime_type=img.mime_type)
 
 
 def _build_gemini_fnc(function_tool: FunctionTool) -> types.FunctionDeclaration:

livekit/plugins/google/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_google-1.0.0rc3.dist-info → livekit_plugins_google-1.0.0rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-google
-Version: 1.0.0rc3
+Version: 1.0.0rc5
 Summary: Agent Framework plugin for services from Google Cloud
 Project-URL: Documentation, https://docs.livekit.io
 Project-URL: Website, https://livekit.io/
@@ -22,7 +22,7 @@ Requires-Dist: google-auth<3,>=2
 Requires-Dist: google-cloud-speech<3,>=2
 Requires-Dist: google-cloud-texttospeech<3,>=2
 Requires-Dist: google-genai==1.5.0
-Requires-Dist: livekit-agents>=1.0.0.rc3
+Requires-Dist: livekit-agents>=1.0.0.rc5
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins Google

{livekit_plugins_google-1.0.0rc3.dist-info → livekit_plugins_google-1.0.0rc5.dist-info}/RECORD

@@ -1,17 +1,18 @@
 livekit/plugins/google/__init__.py,sha256=e_kSlFNmKhyyeliz7f4WOKc_Y0-y39QjO5nCWuguhss,1171
-livekit/plugins/google/llm.py,sha256=oAi4EUitki2EUWIMEcnSVO4AB6EmZzi3vNiDG2mdVvU,14377
+livekit/plugins/google/llm.py,sha256=1yy6DaPxcO5EUN3JORpZ-q5ygdPWWmq6P3x73EbAqK4,14251
 livekit/plugins/google/log.py,sha256=GI3YWN5YzrafnUccljzPRS_ZALkMNk1i21IRnTl2vNA,69
 livekit/plugins/google/models.py,sha256=SGjAumdDK97NNLwMFcqZdKR68f1NoGB2Rk1UP2-imG0,1457
 livekit/plugins/google/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 livekit/plugins/google/stt.py,sha256=fT5JtDM8ck2iMAzRvFKVeyT1oPt_R-bDkqiLa-ysikc,22539
 livekit/plugins/google/tts.py,sha256=mYm9n4zDzmNEAF3bSOb4-603CJrrdv9YJhrfbp5_k5A,7455
-livekit/plugins/google/utils.py,sha256=SfuQLJSXSV708VMn5_TVB93ginUCX2izqT9r2seraSQ,8040
-livekit/plugins/google/version.py,sha256=wYcaYw0AmH9qt8_atfIwl-Qo0WMWL73z2vqRF8LOjms,604
+livekit/plugins/google/utils.py,sha256=Ezh8eX6ld_11achNzUQqT4Owe1mKgOfBTl5IInt4Fm4,8411
+livekit/plugins/google/version.py,sha256=G8-S67mIdz56XcVImzUB7osx6o_lG2oShZz-PjWeOeo,604
 livekit/plugins/google/beta/__init__.py,sha256=AxRYc7NGG62Tv1MmcZVCDHNvlhbC86hM-_yP01Qb28k,47
 livekit/plugins/google/beta/realtime/__init__.py,sha256=_fW2NMN22F-hnQ4xAJ_g5lPbR7CvM_xXzSWlUQY-E-U,188
-livekit/plugins/google/beta/realtime/api_proto.py,sha256=zrAR9aZ3wFpEiIoSi_8xiP6i8k5diPSl-r298imUyf4,684
-livekit/plugins/google/beta/realtime/realtime_api.py,sha256=b7shOYZ86b38zxZCJkgzLQQeWESYo3VUZU1-7rNDAmw,22588
+livekit/plugins/google/beta/realtime/api_proto.py,sha256=VO6QqOGOrxzsaOLBqnwNd8c-BId0PjwKicdrPTJisy0,688
+livekit/plugins/google/beta/realtime/realtime_api.py,sha256=ERM6WvcTtrfIyKpukzoSYrkhd3eYxIY-I09mKWp8vLk,22576
+livekit/plugins/google/beta/realtime/temp.py,sha256=an_YueuS_tUw3_QC6xWkkcw5JrJOBQFv2pJh6atpNcc,108
 livekit/plugins/google/beta/realtime/transcriber.py,sha256=DD7q894xc25GeeuKDar6-GwH-MxStEwhwBiX-KZ-Jo4,9559
-livekit_plugins_google-1.0.0rc3.dist-info/METADATA,sha256=rUCv5Xc0YzqUtGPrtI8VOXjJWc0b618Teri1xqE4iZM,3496
-livekit_plugins_google-1.0.0rc3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-livekit_plugins_google-1.0.0rc3.dist-info/RECORD,,
+livekit_plugins_google-1.0.0rc5.dist-info/METADATA,sha256=xBEeCvL5uEOhATjWMS0nneUDQDUeGn8Lk8DqbzOz8k4,3496
+livekit_plugins_google-1.0.0rc5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+livekit_plugins_google-1.0.0rc5.dist-info/RECORD,,