mirascope 1.18.2__py3-none-any.whl → 1.18.4__py3-none-any.whl

mirascope/llm/call_response.py

@@ -13,6 +13,7 @@ from mirascope.core.base import (
     BaseCallResponse,
     BaseMessageParam,
     BaseTool,
+    Usage,
     transform_tool_outputs,
 )
 from mirascope.core.base.message_param import ToolResultPart
@@ -22,14 +23,11 @@ from mirascope.llm.tool import Tool
 
 _ResponseT = TypeVar("_ResponseT")
 
-_ToolMessageParamT = TypeVar("_ToolMessageParamT")
-_BaseToolT = TypeVar("_BaseToolT", bound=BaseTool)
-
 
 class CallResponse(
     BaseCallResponse[
         _ResponseT,
-        _BaseToolT,
+        Tool,
         Any,
         BaseDynamicConfig[Any, Any, Any],
         BaseMessageParam,
@@ -44,11 +42,11 @@ class CallResponse(
     We rely on _response having `common_` methods or properties for normalization.
     """
 
-    _response: BaseCallResponse[_ResponseT, _BaseToolT, Any, Any, Any, Any, Any]
+    _response: BaseCallResponse[_ResponseT, Tool, Any, Any, Any, Any, Any]
 
     def __init__(
         self,
-        response: BaseCallResponse[_ResponseT, _BaseToolT, Any, Any, Any, Any, Any],
+        response: BaseCallResponse[_ResponseT, Tool, Any, Any, Any, Any, Any],
     ) -> None:
         super().__init__(
             **{
@@ -65,7 +63,13 @@ class CallResponse(
     def __getattribute__(self, name: str) -> Any:  # noqa: ANN401
         special_names = {
             "_response",
+            "finish_reasons",
+            "usage",
+            "message_param",
             "user_message_param",
+            "tools",
+            "tool",
+            "tool_message_params",
             "__dict__",
             "__class__",
             "model_fields",
@@ -97,17 +101,20 @@ class CallResponse(
     def finish_reasons(self) -> list[FinishReason] | None:  # pyright: ignore [reportIncompatibleMethodOverride]
         return self._response.common_finish_reasons
 
+    @property
+    def usage(self) -> Usage | None:
+        """Returns the usage of the chat completion."""
+        return self._response.common_usage
+
     @computed_field
     @cached_property
     def message_param(self) -> BaseMessageParam:
         return self._response.common_message_param  # pyright: ignore [reportReturnType]
 
-    @computed_field
     @cached_property
     def tools(self) -> list[Tool] | None:  # pyright: ignore [reportIncompatibleVariableOverride]
         return self._response.common_tools
 
-    @computed_field
     @cached_property
     def tool(self) -> Tool | None:  # pyright: ignore [reportIncompatibleVariableOverride]
         tools = self._response.common_tools
@@ -118,7 +125,7 @@ class CallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[BaseTool, str]]
+        cls, tools_and_outputs: list[tuple[Tool, str]]
     ) -> list[BaseMessageParam]:
         """Returns the tool message parameters for tool call results.
 

mirascope/llm/llm_call.py

@@ -191,31 +191,59 @@ def _call(
         }
         decorated = provider_call(**_original_args)(fn)
 
-        @wraps(decorated)
-        def inner(
-            *args: _P.args, **kwargs: _P.kwargs
-        ) -> CallResponse | Stream | Awaitable[CallResponse | Stream]:
-            result = decorated(*args, **kwargs)
-            if fn_is_async(decorated):
-
-                async def async_wrapper() -> CallResponse | Stream:
-                    final = await result
-                    return _wrap_result(final)
-
-                return async_wrapper()
-            else:
-
-                def sync_wrapper() -> CallResponse | Stream:
-                    final = result
-                    return _wrap_result(final)
-
-                return sync_wrapper()
-
-        inner._original_args = _original_args  # pyright: ignore [reportAttributeAccessIssue]
-        inner._original_provider_call = provider_call  # pyright: ignore [reportAttributeAccessIssue]
-        inner._original_fn = fn  # pyright: ignore [reportAttributeAccessIssue]
-        inner._original_provider = provider  # pyright: ignore [reportAttributeAccessIssue]
-        return inner
+        if fn_is_async(decorated):
+
+            @wraps(decorated)
+            async def inner_async(
+                *args: _P.args, **kwargs: _P.kwargs
+            ) -> CallResponse | Stream:
+                result = await decorated(*args, **kwargs)
+                return _wrap_result(result)
+
+            inner_async._original_args = _original_args  # pyright: ignore [reportAttributeAccessIssue]
+            inner_async._original_provider_call = provider_call  # pyright: ignore [reportAttributeAccessIssue]
+            inner_async._original_fn = fn  # pyright: ignore [reportAttributeAccessIssue]
+            inner_async._original_provider = provider  # pyright: ignore [reportAttributeAccessIssue]
+
+            return inner_async
+        else:
+
+            @wraps(decorated)
+            def inner(*args: _P.args, **kwargs: _P.kwargs) -> CallResponse | Stream:
+                result = decorated(*args, **kwargs)
+                return _wrap_result(result)
+
+            inner._original_args = _original_args  # pyright: ignore [reportAttributeAccessIssue]
+            inner._original_provider_call = provider_call  # pyright: ignore [reportAttributeAccessIssue]
+            inner._original_fn = fn  # pyright: ignore [reportAttributeAccessIssue]
+            inner._original_provider = provider  # pyright: ignore [reportAttributeAccessIssue]
+            return inner
+
+        # @wraps(decorated)
+        # def inner(
+        #     *args: _P.args, **kwargs: _P.kwargs
+        # ) -> CallResponse | Stream | Awaitable[CallResponse | Stream]:
+        #     result = decorated(*args, **kwargs)
+        #     if fn_is_async(decorated):
+
+        #         async def async_wrapper() -> CallResponse | Stream:
+        #             final = await result
+        #             return _wrap_result(final)
+
+        #         return async_wrapper()
+        #     else:
+
+        #         def sync_wrapper() -> CallResponse | Stream:
+        #             final = result
+        #             return _wrap_result(final)
+
+        #         return sync_wrapper()
+
+        # inner._original_args = _original_args  # pyright: ignore [reportAttributeAccessIssue]
+        # inner._original_provider_call = provider_call  # pyright: ignore [reportAttributeAccessIssue]
+        # inner._original_fn = fn  # pyright: ignore [reportAttributeAccessIssue]
+        # inner._original_provider = provider  # pyright: ignore [reportAttributeAccessIssue]
+        # return inner
 
     return wrapper  # pyright: ignore [reportReturnType]
 

mirascope/llm/stream.py

@@ -62,10 +62,21 @@ class Stream(
         _BaseCallParamsT,
     ],
 ):
-    """
-    A non-pydantic class that inherits from BaseStream.
+    """A non-pydantic class that inherits from BaseStream."""
 
-    """
+    _stream: BaseStream[
+        _BaseCallResponseT,
+        _BaseCallResponseChunkT,
+        _UserMessageParamT,
+        _AssistantMessageParamT,
+        _ToolMessageParamT,
+        _MessageParamT,
+        _BaseToolT,
+        _ToolSchemaT,
+        _BaseDynamicConfigT,
+        _BaseCallParamsT,
+        FinishReason,
+    ]
 
     def __init__(
         self,
@@ -85,20 +96,27 @@ class Stream(
         ],
     ) -> None:
         """Initialize the Stream class."""
-        self._stream = stream
-        super().__init__(
-            stream=stream.stream,
-            metadata=stream.metadata,
-            tool_types=stream.tool_types,
-            call_response_type=stream.call_response_type,
-            model=stream.model,
-            prompt_template=stream.prompt_template,
-            fn_args=stream.fn_args or {},
-            dynamic_config=stream.dynamic_config,
-            messages=stream.messages,
-            call_params=stream.call_params,
-            call_kwargs=stream.call_kwargs,
-        )
+        object.__setattr__(self, "_stream", stream)
+
+    def __getattribute__(self, name: str) -> Any:  # noqa: ANN401
+        special_names = {
+            "_stream",
+            "cost",
+            "_construct_message_param",
+            "construct_call_response",
+            "tool_message_params",
+            "__dict__",
+            "__class__",
+            "__repr__",
+            "__str__",
+            "__iter__",
+            "__aiter__",
+        }
+
+        if name in special_names:
+            return object.__getattribute__(self, name)
+        response = object.__getattribute__(self, "_stream")
+        return getattr(response, name)
 
     def __iter__(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
@@ -110,7 +128,7 @@ class Stream(
         None,
     ]:
         """Iterate over the stream."""
-        for chunk, tool in super().__iter__():
+        for chunk, tool in self._stream:
             yield (
                 CallResponseChunk(response=chunk),  # pyright: ignore [reportAbstractUsage]
                 Tool(tool=tool) if tool is not None else None,  # pyright: ignore [reportAbstractUsage]
@@ -125,20 +143,12 @@ class Stream(
         None,
     ]:
         """Iterates over the stream and stores useful information."""
-        async for chunk, tool in super().__aiter__():
+        async for chunk, tool in self._stream:
             yield (
                 CallResponseChunk(response=chunk),  # pyright: ignore [reportAbstractUsage]
                 Tool(tool=tool) if tool is not None else None,  # pyright: ignore [reportAbstractUsage]
             )
 
-    def common_construct_call_response(
-        self,
-    ) -> CallResponse[_BaseCallResponseT, Tool[_ToolMessageParamT]]:
-        """A common method that constructs a CallResponse instance."""
-        return CallResponse[_BaseCallResponseT, Tool](
-            response=self._stream.construct_call_response()
-        )  # pyright: ignore [reportAbstractUsage]
-
     @property
     def cost(self) -> float | None:
         return self._stream.cost
@@ -152,12 +162,14 @@ class Stream(
 
     def construct_call_response(  # pyright: ignore [reportIncompatibleMethodOverride]
         self,
-    ) -> CallResponse[_BaseCallResponseT, Tool[_ToolMessageParamT]]:
-        return self.common_construct_call_response()
+    ) -> CallResponse[_BaseCallResponseT]:
+        return CallResponse[_BaseCallResponseT](
+            response=self._stream.construct_call_response()
+        )  # pyright: ignore [reportAbstractUsage]
 
     @classmethod
-    def common_tool_message_params(
-        cls, tools_and_outputs: list[tuple[BaseTool, JsonableType]]
+    def tool_message_params(  # pyright: ignore [reportIncompatibleMethodOverride]
+        cls, tools_and_outputs: list[tuple[Tool, JsonableType]]
     ) -> list[BaseMessageParam]:
         """Returns the tool message parameters for tool call results.
 

mirascope/retries/__init__.py

@@ -8,4 +8,4 @@ with suppress(ImportError):
     from . import tenacity as tenacity
 
 
-__all__ = ["fallback", "FallbackError", "tenacity"]
+__all__ = ["FallbackError", "fallback", "tenacity"]

mirascope/tools/__init__.py

@@ -21,6 +21,7 @@ with suppress(ImportError):
     from .web._requests import Requests, RequestsConfig
 
 __all__ = [
+    "HTTPX",
     "AsyncHTTPX",
     "DockerOperationToolKit",
     "DockerOperationToolKitConfig",
@@ -28,10 +29,9 @@ __all__ = [
     "DuckDuckGoSearchConfig",
     "FileSystemToolKit",
     "FileSystemToolKitConfig",
-    "HTTPX",
     "HTTPXConfig",
-    "ParseURLContent",
     "ParseURLConfig",
+    "ParseURLContent",
     "Requests",
     "RequestsConfig",
 ]

{mirascope-1.18.2.dist-info → mirascope-1.18.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mirascope
-Version: 1.18.2
+Version: 1.18.4
 Summary: LLM abstractions that aren't obstructions
 Project-URL: Homepage, https://mirascope.com
 Project-URL: Documentation, https://mirascope.com/WELCOME
@@ -116,7 +116,7 @@ Description-Content-Type: text/markdown
 
 ---
 
-Mirascope is a powerful, flexible, and user-friendly library that simplifies the process of working with LLMs through a unified interface that works across various supported providers, including [OpenAI](https://openai.com/), [Anthropic](https://www.anthropic.com/), [Mistral](https://mistral.ai/), [Gemini](https://gemini.google.com), [Groq](https://groq.com/), [Cohere](https://cohere.com/), [LiteLLM](https://www.litellm.ai/), [Azure AI](https://azure.microsoft.com/en-us/solutions/ai), [Vertex AI](https://cloud.google.com/vertex-ai), and [Bedrock](https://aws.amazon.com/bedrock/).
+Mirascope is a powerful, flexible, and user-friendly library that simplifies the process of working with LLMs through a unified interface that works across various supported providers, including [OpenAI](https://openai.com/), [Anthropic](https://www.anthropic.com/), [Mistral](https://mistral.ai/), [Google (Gemini/Vertex)](https://googleapis.github.io/python-genai/), [Groq](https://groq.com/), [Cohere](https://cohere.com/), [LiteLLM](https://www.litellm.ai/), [Azure AI](https://azure.microsoft.com/en-us/solutions/ai), and [Bedrock](https://aws.amazon.com/bedrock/).
 
 Whether you're generating text, extracting structured information, or developing complex AI-driven agent systems, Mirascope provides the tools you need to streamline your development process and create powerful, robust applications.