livekit-plugins-google 1.0.0rc6__py3-none-any.whl → 1.0.0rc8__py3-none-any.whl

livekit/plugins/google/llm.py

@@ -25,7 +25,7 @@ from google.auth._default_async import default_async
 from google.genai import types
 from google.genai.errors import APIError, ClientError, ServerError
 from livekit.agents import APIConnectionError, APIStatusError, llm, utils
-from livekit.agents.llm import FunctionTool, ToolChoice
+from livekit.agents.llm import FunctionTool, ToolChoice, utils as llm_utils
 from livekit.agents.types import (
     DEFAULT_API_CONNECT_OPTIONS,
     NOT_GIVEN,
@@ -36,7 +36,7 @@ from livekit.agents.utils import is_given
 
 from .log import logger
 from .models import ChatModels
-from .utils import to_chat_ctx, to_fnc_ctx
+from .utils import to_chat_ctx, to_fnc_ctx, to_response_format
 
 
 @dataclass
@@ -148,6 +148,9 @@ class LLM(llm.LLM):
         conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS,
         parallel_tool_calls: NotGivenOr[bool] = NOT_GIVEN,
         tool_choice: NotGivenOr[ToolChoice] = NOT_GIVEN,
+        response_format: NotGivenOr[
+            types.SchemaUnion | type[llm_utils.ResponseFormatT]
+        ] = NOT_GIVEN,
         extra_kwargs: NotGivenOr[dict[str, Any]] = NOT_GIVEN,
     ) -> LLMStream:
         extra = {}
@@ -189,6 +192,10 @@ class LLM(llm.LLM):
                 )
                 extra["tool_config"] = gemini_tool_choice
 
+        if is_given(response_format):
+            extra["response_schema"] = to_response_format(response_format)
+            extra["response_mime_type"] = "application/json"
+
         if is_given(self._opts.temperature):
             extra["temperature"] = self._opts.temperature
         if is_given(self._opts.max_output_tokens):
@@ -237,10 +244,11 @@ class LLMStream(llm.LLMStream):
 
         try:
             turns, system_instruction = to_chat_ctx(self._chat_ctx, id(self._llm))
-
-            self._extra_kwargs["tools"] = [
-                types.Tool(function_declarations=to_fnc_ctx(self._tools))
-            ]
+            function_declarations = to_fnc_ctx(self._tools)
+            if function_declarations:
+                self._extra_kwargs["tools"] = [
+                    types.Tool(function_declarations=function_declarations)
+                ]
             config = types.GenerateContentConfig(
                 system_instruction=system_instruction,
                 **self._extra_kwargs,
@@ -299,7 +307,7 @@ class LLMStream(llm.LLMStream):
             raise APIStatusError(
                 "gemini llm: client error",
                 status_code=e.code,
-                body=e.message,
+                body=e.message + e.status,
                 request_id=request_id,
                 retryable=False if e.code != 429 else True,
             ) from e
@@ -307,7 +315,7 @@ class LLMStream(llm.LLMStream):
             raise APIStatusError(
                 "gemini llm: server error",
                 status_code=e.code,
-                body=e.message,
+                body=e.message + e.status,
                 request_id=request_id,
                 retryable=retryable,
             ) from e
@@ -315,13 +323,13 @@ class LLMStream(llm.LLMStream):
             raise APIStatusError(
                 "gemini llm: api error",
                 status_code=e.code,
-                body=e.message,
+                body=e.message + e.status,
                 request_id=request_id,
                 retryable=retryable,
             ) from e
         except Exception as e:
             raise APIConnectionError(
-                "gemini llm: error generating content",
+                f"gemini llm: error generating content {str(e)}",
                 retryable=retryable,
             ) from e
 

livekit/plugins/google/tts.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
+from google.api_core.client_options import ClientOptions
 from google.api_core.exceptions import DeadlineExceeded, GoogleAPICallError
 from google.cloud import texttospeech
 from google.cloud.texttospeech_v1.types import SsmlVoiceGender, SynthesizeSpeechResponse
@@ -50,6 +51,7 @@ class TTS(tts.TTS):
         pitch: int = 0,
         effects_profile_id: str = "",
         speaking_rate: float = 1.0,
+        location: str = "global",
         credentials_info: NotGivenOr[dict] = NOT_GIVEN,
         credentials_file: NotGivenOr[str] = NOT_GIVEN,
     ) -> None:
@@ -63,6 +65,7 @@ class TTS(tts.TTS):
         Args:
             voice (texttospeech.VoiceSelectionParams, optional): Voice selection parameters.
             sample_rate (int, optional): Audio sample rate in Hz. Default is 24000.
+            location (str, optional): Location for the TTS client. Default is "global".
             pitch (float, optional): Speaking pitch, ranging from -20.0 to 20.0 semitones relative to the original pitch. Default is 0.
             effects_profile_id (str): Optional identifier for selecting audio effects profiles to apply to the synthesized speech.
             speaking_rate (float, optional): Speed of speech. Default is 1.0.
@@ -81,7 +84,7 @@ class TTS(tts.TTS):
         self._client: texttospeech.TextToSpeechAsyncClient | None = None
         self._credentials_info = credentials_info
         self._credentials_file = credentials_file
-
+        self._location = location
         if not is_given(voice):
             voice = texttospeech.VoiceSelectionParams(
                 name="",
@@ -119,18 +122,24 @@ class TTS(tts.TTS):
             self._opts.audio_config.speaking_rate = speaking_rate
 
     def _ensure_client(self) -> texttospeech.TextToSpeechAsyncClient:
+        api_endpoint = "texttospeech.googleapis.com"
+        if self._location != "global":
+            api_endpoint = f"{self._location}-texttospeech.googleapis.com"
+
         if self._client is None:
             if self._credentials_info:
                 self._client = texttospeech.TextToSpeechAsyncClient.from_service_account_info(
-                    self._credentials_info
+                    self._credentials_info, client_options=ClientOptions(api_endpoint=api_endpoint)
                 )
 
             elif self._credentials_file:
                 self._client = texttospeech.TextToSpeechAsyncClient.from_service_account_file(
-                    self._credentials_file
+                    self._credentials_file, client_options=ClientOptions(api_endpoint=api_endpoint)
                 )
             else:
-                self._client = texttospeech.TextToSpeechAsyncClient()
+                self._client = texttospeech.TextToSpeechAsyncClient(
+                    client_options=ClientOptions(api_endpoint=api_endpoint)
+                )
 
         assert self._client is not None
         return self._client

livekit/plugins/google/utils.py

@@ -5,9 +5,11 @@ import re
 from copy import deepcopy
 from typing import Any
 
+from pydantic import TypeAdapter
+
 from google.genai import types
 from livekit.agents import llm
-from livekit.agents.llm import FunctionTool
+from livekit.agents.llm import FunctionTool, utils as llm_utils
 
 from .log import logger
 
@@ -78,6 +80,10 @@ def to_chat_ctx(
 
     if current_role is not None and parts:
         turns.append(types.Content(role=current_role, parts=parts))
+
+    if not turns:
+        # if no turns, add a user message with a placeholder
+        turns = [types.Content(role="user", parts=[types.Part(text=".")])]
     return turns, system_instruction
 
 
@@ -105,6 +111,16 @@ def _build_gemini_fnc(function_tool: FunctionTool) -> types.FunctionDeclaration:
     )
 
 
+def to_response_format(response_format: type | dict) -> types.SchemaUnion:
+    _, json_schema_type = llm_utils.to_response_format_param(response_format)
+    if isinstance(json_schema_type, TypeAdapter):
+        schema = json_schema_type.json_schema()
+    else:
+        schema = json_schema_type.model_json_schema()
+
+    return _GeminiJsonSchema(schema).simplify()
+
+
 class _GeminiJsonSchema:
     """
     Transforms the JSON Schema from Pydantic to be suitable for Gemini.
@@ -136,6 +152,7 @@ class _GeminiJsonSchema:
     def _simplify(self, schema: dict[str, Any], refs_stack: tuple[str, ...]) -> None:
         schema.pop("title", None)
         schema.pop("default", None)
+        schema.pop("additionalProperties", None)
         if ref := schema.pop("$ref", None):
             key = re.sub(r"^#/\$defs/", "", ref)
             if key in refs_stack:
@@ -196,7 +213,6 @@ class _GeminiJsonSchema:
             "maxItems": "max_items",
             "minProperties": "min_properties",
             "maxProperties": "max_properties",
-            "additionalProperties": "additional_properties",
         }
 
         for json_name, gemini_name in mappings.items():
@@ -204,11 +220,6 @@ class _GeminiJsonSchema:
                 schema[gemini_name] = schema.pop(json_name)
 
     def _object(self, schema: dict[str, Any], refs_stack: tuple[str, ...]) -> None:
-        # Gemini doesn't support additionalProperties
-        ad_props = schema.pop("additional_properties", None)
-        if ad_props:
-            raise ValueError("Additional properties in JSON Schema are not supported by Gemini")
-
         if properties := schema.get("properties"):
             for value in properties.values():
                 self._simplify(value, refs_stack)

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.rc6'
+__version__ = '1.0.0.rc8'

{livekit_plugins_google-1.0.0rc6.dist-info → livekit_plugins_google-1.0.0rc8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-google
-Version: 1.0.0rc6
+Version: 1.0.0rc8
 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.rc6
+Requires-Dist: livekit-agents>=1.0.0.rc8
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins Google

{livekit_plugins_google-1.0.0rc6.dist-info → livekit_plugins_google-1.0.0rc8.dist-info}/RECORD

@@ -1,18 +1,18 @@
 livekit/plugins/google/__init__.py,sha256=e_kSlFNmKhyyeliz7f4WOKc_Y0-y39QjO5nCWuguhss,1171
-livekit/plugins/google/llm.py,sha256=1yy6DaPxcO5EUN3JORpZ-q5ygdPWWmq6P3x73EbAqK4,14251
+livekit/plugins/google/llm.py,sha256=81LCCJPmpMOkApX0S0a-zu5xIvcm2Pk8lTTz-PoK5m0,14740
 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=Ezh8eX6ld_11achNzUQqT4Owe1mKgOfBTl5IInt4Fm4,8411
-livekit/plugins/google/version.py,sha256=PDOEKN5zsYLQdbfAm5Di6G1sFYANNA0LqJR8zZzeghg,604
+livekit/plugins/google/tts.py,sha256=aA3VuNaMcE6I1M43Sm-2mmvNyA9D2EyqfpyAporMUSg,8042
+livekit/plugins/google/utils.py,sha256=dLkq-8lbWDC7AQ7nULd9unWwu_Wv9czdlxchyiJQ2KQ,8740
+livekit/plugins/google/version.py,sha256=5qCM_eosxi507YOAQ3_Cf_-PVZbiE3NumVYwZ2yRcHQ,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=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.0rc6.dist-info/METADATA,sha256=FsushpxpQGoSVYyzBTT-mZ1tRLVx4kOquWN9-k-Nb0U,3496
-livekit_plugins_google-1.0.0rc6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-livekit_plugins_google-1.0.0rc6.dist-info/RECORD,,
+livekit_plugins_google-1.0.0rc8.dist-info/METADATA,sha256=eEzJyC5OWDJoXzs5SdI6HyRhYzVJhJtwttc7px5daX4,3496
+livekit_plugins_google-1.0.0rc8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+livekit_plugins_google-1.0.0rc8.dist-info/RECORD,,