mirascope 1.22.5__py3-none-any.whl → 1.23.0__py3-none-any.whl

mirascope/core/google/_utils/_handle_stream.py

@@ -8,28 +8,51 @@ from ..call_response_chunk import GoogleCallResponseChunk
 from ..tool import GoogleTool
 
 
+def _handle_chunk(
+    chunk: GenerateContentResponse, tool_types: list[type[GoogleTool]] | None = None
+) -> Generator[tuple[GoogleCallResponseChunk, GoogleTool | None], None, None]:
+    """Handles a chunk of the stream and yields any tools that are found.
+
+    Note: google seems to only ever return full tool calls, so no partial possible here.
+    """
+    call_response_chunk = GoogleCallResponseChunk(chunk=chunk)
+    has_tools = False
+    if tool_types and (
+        (candidates := chunk.candidates)
+        and (content := candidates[0].content)
+        and (parts := content.parts)
+    ):
+        for part in parts:
+            if function_call := part.function_call:
+                has_tools = True
+                for tool_type in tool_types:
+                    if tool_type._name() == function_call.name:
+                        tool = tool_type.from_tool_call(function_call)
+                        yield (call_response_chunk, tool)
+    if not has_tools:
+        yield call_response_chunk, None
+
+
 def handle_stream(
     stream: Generator[GenerateContentResponse, None, None],
     tool_types: list[type[GoogleTool]] | None = None,
     partial_tools: bool = False,
-) -> Generator[tuple[GoogleCallResponseChunk, None], None, None]:
-    """Iterator over the stream and constructs tools as they are streamed.
-
-    Note: google does not currently support streaming tools.
-    """
+) -> Generator[tuple[GoogleCallResponseChunk, GoogleTool | None], None, None]:
+    """Iterator over the stream and constructs tools as they are streamed."""
     for chunk in stream:
-        yield GoogleCallResponseChunk(chunk=chunk), None
+        yield from _handle_chunk(chunk, tool_types)
 
 
 async def handle_stream_async(
     stream: AsyncGenerator[GenerateContentResponse, None],
     tool_types: list[type[GoogleTool]] | None = None,
     partial_tools: bool = False,
-) -> AsyncGenerator[tuple[GoogleCallResponseChunk, None], None]:
+) -> AsyncGenerator[tuple[GoogleCallResponseChunk, GoogleTool | None], None]:
     """
     Async iterator over the stream and constructs tools as they are streamed.
 
     Note: google does not currently support streaming tools.
     """
     async for chunk in stream:
-        yield GoogleCallResponseChunk(chunk=chunk), None
+        for call_response_chunk, tool in _handle_chunk(chunk, tool_types):
+            yield call_response_chunk, tool

mirascope/core/google/call_response_chunk.py

@@ -48,7 +48,14 @@ class GoogleCallResponseChunk(
     @property
     def content(self) -> str:
         """Returns the chunk content for the 0th choice."""
-        return self.chunk.candidates[0].content.parts[0].text  # pyright: ignore [reportOptionalMemberAccess, reportOptionalSubscript, reportReturnType]
+        if (
+            not (candidates := self.chunk.candidates)
+            or not (content := candidates[0].content)
+            or not (parts := content.parts)
+            or not (text := parts[0].text)
+        ):
+            return ""
+        return text
 
     @property
     def finish_reasons(self) -> list[GoogleFinishReason]:

{mirascope-1.22.5.dist-info → mirascope-1.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mirascope
-Version: 1.22.5
+Version: 1.23.0
 Summary: LLM abstractions that aren't obstructions
 Project-URL: Homepage, https://mirascope.com
 Project-URL: Documentation, https://mirascope.com/WELCOME

{mirascope-1.22.5.dist-info → mirascope-1.23.0.dist-info}/RECORD

@@ -214,7 +214,7 @@ mirascope/core/google/_call.py,sha256=GJOPyvHzVlSXvJpgQhJFg4wFHFUYsvvrbjhNxU-nSl
 mirascope/core/google/_call_kwargs.py,sha256=baCYcxWsmV06ATw6nuQhh6FPm3k6oWmKOn0MyjESDGc,372
 mirascope/core/google/call_params.py,sha256=9Dt5m1pPVjpl5Qppz6Egl_9FyGjjz9aGCnXkVps7C_Q,538
 mirascope/core/google/call_response.py,sha256=nAlH1XWQMiMfCKgi6sG3qIA0YccxIzLWzY_NNl2JtqM,7372
-mirascope/core/google/call_response_chunk.py,sha256=oORYaGjOBv4U1IVhsR_ZS-Vr-B58I8G0-9d6Kcj9RM4,3427
+mirascope/core/google/call_response_chunk.py,sha256=14ggxCYtl92LdyA3nxY8awKQVSBvFV1Wse2Jm7rfvJc,3535
 mirascope/core/google/dynamic_config.py,sha256=O6j8F0fLVFuuNwURneu5OpPuu_bMEtbDEFHhJXRT6V0,857
 mirascope/core/google/stream.py,sha256=bTxB8OUrKXxzmcX0C7_-LqtBfaAAazA5HjKZGSxxtLw,4466
 mirascope/core/google/tool.py,sha256=61a9Ejdxz41pwaab9VE2yvP_J1Aebua3BeRPJ_GJSnE,5138
@@ -223,7 +223,7 @@ mirascope/core/google/_utils/_convert_common_call_params.py,sha256=TF7GWBHcpfzb7
 mirascope/core/google/_utils/_convert_finish_reason_to_common_finish_reasons.py,sha256=ig4tb7Zanz-tyZpvc9Ncd47a2FNTOS7-wl1PYBq-4cY,879
 mirascope/core/google/_utils/_convert_message_params.py,sha256=9I7Q79Z8tBCLZtfjWJNQkuKgz0n2L43SzHB3cV3hNmY,8926
 mirascope/core/google/_utils/_get_json_output.py,sha256=sxDgT0Ra6YJynL5_hhakf0dNJEhZm0DfAgfcvC_DAFU,1596
-mirascope/core/google/_utils/_handle_stream.py,sha256=BxFuheAu1LKPrPsDxxiLWd2KoajkwJyx2_QT1NXwtWE,1212
+mirascope/core/google/_utils/_handle_stream.py,sha256=xTaQvAWnJ195YI_h68USvit4-G8T_fogmtBZFhu1qoE,2238
 mirascope/core/google/_utils/_message_param_converter.py,sha256=qOj8bAdQusFhLg-mzQ1TJwbMQHvjY7DYrTGOIylu5hs,6661
 mirascope/core/google/_utils/_setup_call.py,sha256=UoV4McGgSS79PKErjArCmrq1HmpFvq2qegJYoyY4P5U,6469
 mirascope/core/google/_utils/_validate_media_type.py,sha256=sUOjKpC498L-NCiECejAAfSzMUAvZT84rf-2Yo-JE58,1042
@@ -371,7 +371,7 @@ mirascope/v0/base/ops_utils.py,sha256=1Qq-VIwgHBaYutiZsS2MUQ4OgPC3APyywI5bTiTAmA
 mirascope/v0/base/prompts.py,sha256=FM2Yz98cSnDceYogiwPrp4BALf3_F3d4fIOCGAkd-SE,1298
 mirascope/v0/base/types.py,sha256=ZfatJoX0Yl0e3jhv0D_MhiSVHLYUeJsdN3um3iE10zY,352
 mirascope/v0/base/utils.py,sha256=XREPENRQTu8gpMhHU8RC8qH_am3FfGUvY-dJ6x8i-mw,681
-mirascope-1.22.5.dist-info/METADATA,sha256=HIVPcLXEYG16Rr2SxAz1ogSCdHk5vQGGJZrcmmdB56M,8783
-mirascope-1.22.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.22.5.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.22.5.dist-info/RECORD,,
+mirascope-1.23.0.dist-info/METADATA,sha256=IRI77JnWVALVxY382zMjwubZwgKE4IY5r52YSNoNYD8,8783
+mirascope-1.23.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.23.0.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.23.0.dist-info/RECORD,,