mirascope 2.0.0a5__py3-none-any.whl → 2.0.1__py3-none-any.whl

mirascope/llm/__init__.py

@@ -51,24 +51,37 @@ from .content import (
     URLImageSource,
     UserContentPart,
 )
-from .context import Context
+from .context import Context, DepsT
 from .exceptions import (
     APIError,
     AuthenticationError,
     BadRequestError,
     ConnectionError,
+    Error,
     FeatureNotSupportedError,
-    FormattingModeNotSupportedError,
-    MirascopeLLMError,
+    MissingAPIKeyError,
     NoRegisteredProviderError,
     NotFoundError,
+    ParseError,
     PermissionError,
+    ProviderError,
     RateLimitError,
+    ResponseValidationError,
     ServerError,
     TimeoutError,
+    ToolError,
+    ToolExecutionError,
     ToolNotFoundError,
 )
-from .formatting import Format, FormattingMode, Partial, format
+from .formatting import (
+    Format,
+    FormattableT,
+    FormattingMode,
+    OutputParser,
+    Partial,
+    format,
+    output_parser,
+)
 from .messages import (
     AssistantContent,
     AssistantMessage,
@@ -78,7 +91,15 @@ from .messages import (
     UserContent,
     UserMessage,
 )
-from .models import Model, model, model_from_context, use_model
+from .models import (
+    Model,
+    Params,
+    ThinkingConfig,
+    ThinkingLevel,
+    model,
+    model_from_context,
+    use_model,
+)
 from .prompts import (
     AsyncContextPrompt,
     AsyncPrompt,
@@ -89,13 +110,13 @@ from .prompts import (
 )
 from .providers import (
     ModelId,
-    Params,
     Provider,
     ProviderId,
     register_provider,
     reset_provider_registry,
 )
 from .responses import (
+    AnyResponse,
     AsyncChunkIterator,
     AsyncContextResponse,
     AsyncContextStreamResponse,
@@ -111,6 +132,7 @@ from .responses import (
     FinishReason,
     RawMessageChunk,
     Response,
+    RootResponse,
     Stream,
     StreamResponse,
     StreamResponseChunk,
@@ -121,19 +143,28 @@ from .responses import (
     UsageDeltaChunk,
 )
 from .tools import (
+    AnyToolFn,
+    AnyToolSchema,
     AsyncContextTool,
     AsyncContextToolkit,
     AsyncTool,
     AsyncToolkit,
+    BaseToolkit,
     ContextTool,
     ContextToolkit,
     Tool,
     Toolkit,
+    ToolkitT,
+    ToolSchema,
     tool,
 )
+from .types import Jsonable
 
 __all__ = [
     "APIError",
+    "AnyResponse",
+    "AnyToolFn",
+    "AnyToolSchema",
     "AssistantContent",
     "AssistantContentChunk",
     "AssistantContentPart",
@@ -160,6 +191,7 @@ __all__ = [
     "BadRequestError",
     "Base64AudioSource",
     "Base64ImageSource",
+    "BaseToolkit",
     "Call",
     "CallDecorator",
     "ChunkIterator",
@@ -171,29 +203,37 @@ __all__ = [
     "ContextStreamResponse",
     "ContextTool",
     "ContextToolkit",
+    "DepsT",
     "Document",
+    "Error",
     "FeatureNotSupportedError",
     "FinishReason",
     "Format",
+    "FormattableT",
     "FormattingMode",
-    "FormattingModeNotSupportedError",
     "Image",
+    "Jsonable",
     "Message",
-    "MirascopeLLMError",
+    "MissingAPIKeyError",
     "Model",
     "ModelId",
     "NoRegisteredProviderError",
     "NotFoundError",
+    "OutputParser",
     "Params",
+    "ParseError",
     "Partial",
     "PermissionError",
     "Prompt",
     "PromptDecorator",
     "Provider",
+    "ProviderError",
     "ProviderId",
     "RateLimitError",
     "RawMessageChunk",
     "Response",
+    "ResponseValidationError",
+    "RootResponse",
     "ServerError",
     "Stream",
     "StreamResponse",
@@ -205,6 +245,8 @@ __all__ = [
     "TextEndChunk",
     "TextStartChunk",
     "TextStream",
+    "ThinkingConfig",
+    "ThinkingLevel",
     "Thought",
     "ThoughtChunk",
     "ThoughtEndChunk",
@@ -217,9 +259,13 @@ __all__ = [
     "ToolCallEndChunk",
     "ToolCallStartChunk",
     "ToolCallStream",
+    "ToolError",
+    "ToolExecutionError",
     "ToolNotFoundError",
     "ToolOutput",
+    "ToolSchema",
     "Toolkit",
+    "ToolkitT",
     "URLImageSource",
     "Usage",
     "UsageDeltaChunk",
@@ -237,6 +283,7 @@ __all__ = [
     "model",
     "model_from_context",
     "models",
+    "output_parser",
     "prompt",
     "prompts",
     "providers",

mirascope/llm/calls/__init__.py

@@ -1,6 +1,6 @@
 """The `llm.calls` module."""
 
-from .calls import AsyncCall, AsyncContextCall, Call, ContextCall
+from .calls import AsyncCall, AsyncContextCall, Call, CallT, ContextCall
 from .decorator import (
     CallDecorator,
     call,
@@ -11,6 +11,7 @@ __all__ = [
     "AsyncContextCall",
     "Call",
     "CallDecorator",
+    "CallT",
     "ContextCall",
     "call",
 ]

mirascope/llm/calls/calls.py

@@ -1,7 +1,7 @@
 """The Call module for generating responses using LLMs."""
 
 from dataclasses import dataclass
-from typing import Generic, overload
+from typing import Generic, TypeVar, overload
 
 from ..context import Context, DepsT
 from ..formatting import FormattableT
@@ -24,6 +24,8 @@ from ..responses import (
 )
 from ..types import P
 
+CallT = TypeVar("CallT", bound="BaseCall")
+
 
 @dataclass
 class BaseCall:

mirascope/llm/calls/decorator.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 from dataclasses import dataclass
-from typing import Generic, cast, overload
+from typing import TYPE_CHECKING, Generic, cast, overload
 from typing_extensions import Unpack
 
 from ..context import DepsT
-from ..formatting import Format, FormattableT
+from ..formatting import Format, FormattableT, OutputParser
 from ..models import Model
 from ..prompts import (
     AsyncContextMessageTemplate,
@@ -21,7 +21,7 @@ from ..prompts import (
     Prompt,
     _utils,
 )
-from ..providers import ModelId, Params
+from ..providers import ModelId
 from ..tools import (
     AsyncContextTool,
     AsyncContextToolkit,
@@ -36,6 +36,9 @@ from ..tools import (
 from ..types import P
 from .calls import AsyncCall, AsyncContextCall, Call, ContextCall
 
+if TYPE_CHECKING:
+    from ..models import Params
+
 
 @dataclass(kw_only=True)
 class CallDecorator(Generic[ToolT, FormattableT]):
@@ -58,7 +61,9 @@ class CallDecorator(Generic[ToolT, FormattableT]):
     tools: Sequence[ToolT] | None
     """The tools that are included in the prompt, if any."""
 
-    format: type[FormattableT] | Format[FormattableT] | None
+    format: (
+        type[FormattableT] | Format[FormattableT] | OutputParser[FormattableT] | None
+    )
     """The structured output format off the prompt, if any."""
 
     @overload
@@ -154,7 +159,10 @@ def call(
     model: ModelId,
     *,
     tools: Sequence[ToolT] | None = None,
-    format: type[FormattableT] | Format[FormattableT] | None = None,
+    format: type[FormattableT]
+    | Format[FormattableT]
+    | OutputParser[FormattableT]
+    | None = None,
     **params: Unpack[Params],
 ) -> CallDecorator[ToolT, FormattableT]:
     """Decorator for converting prompt functions into LLM calls.
@@ -169,7 +177,10 @@ def call(
     model: Model,
     *,
     tools: Sequence[ToolT] | None = None,
-    format: type[FormattableT] | Format[FormattableT] | None = None,
+    format: type[FormattableT]
+    | Format[FormattableT]
+    | OutputParser[FormattableT]
+    | None = None,
 ) -> CallDecorator[ToolT, FormattableT]:
     """Decorator for converting prompt functions into LLM calls.
 
@@ -182,7 +193,10 @@ def call(
     model: ModelId | Model,
     *,
     tools: Sequence[ToolT] | None = None,
-    format: type[FormattableT] | Format[FormattableT] | None = None,
+    format: type[FormattableT]
+    | Format[FormattableT]
+    | OutputParser[FormattableT]
+    | None = None,
     **params: Unpack[Params],
 ) -> CallDecorator[ToolT, FormattableT]:
     """Decorates a `MessageTemplate` to create a `Call` that can be invoked directly.

mirascope/llm/content/tool_call.py

@@ -49,6 +49,9 @@ class ToolCallChunk:
     content_type: Literal["tool_call"] = "tool_call"
     """The type of content reconstructed by this chunk."""
 
+    id: str
+    """A unique identifier for this tool call."""
+
     delta: str
     """The incremental json args added in this chunk."""
 
@@ -61,3 +64,6 @@ class ToolCallEndChunk:
 
     content_type: Literal["tool_call"] = "tool_call"
     """The type of content reconstructed by this chunk."""
+
+    id: str
+    """A unique identifier for this tool call."""

mirascope/llm/content/tool_output.py

@@ -1,13 +1,14 @@
 """The `ToolOutput` content class."""
 
 from dataclasses import dataclass
-from typing import Generic, Literal
+from typing import Generic, Literal, cast
 
-from ..types import JsonableT
+from ..exceptions import ToolError
+from ..types import JsonableCovariantT
 
 
 @dataclass(kw_only=True)
-class ToolOutput(Generic[JsonableT]):
+class ToolOutput(Generic[JsonableCovariantT]):
     """Tool output content for a message.
 
     Represents the output from a tool call. This is part of a user message's
@@ -22,5 +23,21 @@ class ToolOutput(Generic[JsonableT]):
     name: str
     """The name of the tool that created this output."""
 
-    value: JsonableT
-    """The output value from the tool call."""
+    result: JsonableCovariantT | str
+    """The result of calling the tool.
+    
+    If the tool executed successfully, this will be the tool output.
+    If the tool errored, this will be the error message, as a string.
+    
+    In either case, the result should be passed back to the LLM (so it can
+    either process the output, or re-try with awareness of the error.)
+    """
+
+    error: ToolError | None = None
+    """The error from calling the tool, if any."""
+
+    @property
+    def output(self) -> JsonableCovariantT:
+        if self.error is not None:
+            raise self.error
+        return cast(JsonableCovariantT, self.result)