mirascope 2.0.0a6__py3-none-any.whl → 2.0.2__py3-none-any.whl

mirascope/api/_generated/types/pricing_unavailable_error.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+
+
+class PricingUnavailableError(UniversalBaseModel):
+    message: str
+    provider: typing.Optional[str] = None
+    model: typing.Optional[str] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

mirascope/api/_generated/types/rate_limit_error.py

@@ -0,0 +1,31 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+import typing_extensions
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ..core.serialization import FieldMetadata
+from .rate_limit_error_tag import RateLimitErrorTag
+
+
+class RateLimitError(UniversalBaseModel):
+    message: str
+    organization_id: typing_extensions.Annotated[
+        str, FieldMetadata(alias="organizationId")
+    ]
+    limit: float
+    retry_after: typing_extensions.Annotated[float, FieldMetadata(alias="retryAfter")]
+    plan_tier: typing_extensions.Annotated[str, FieldMetadata(alias="planTier")]
+    tag: RateLimitErrorTag
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

mirascope/api/_generated/types/rate_limit_error_tag.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+RateLimitErrorTag = typing.Union[typing.Literal["RateLimitError"], typing.Any]

mirascope/api/_generated/types/service_unavailable_error_body.py

@@ -0,0 +1,24 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from .service_unavailable_error_tag import ServiceUnavailableErrorTag
+
+
+class ServiceUnavailableErrorBody(UniversalBaseModel):
+    message: str
+    service: typing.Optional[str] = None
+    tag: ServiceUnavailableErrorTag
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

mirascope/api/_generated/types/service_unavailable_error_tag.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ServiceUnavailableErrorTag = typing.Union[
+    typing.Literal["ServiceUnavailableError"], typing.Any
+]

mirascope/api/_generated/types/subscription_past_due_error.py

@@ -0,0 +1,31 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import pydantic
+import typing_extensions
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, UniversalBaseModel
+from ..core.serialization import FieldMetadata
+from .subscription_past_due_error_tag import SubscriptionPastDueErrorTag
+
+
+class SubscriptionPastDueError(UniversalBaseModel):
+    message: str
+    stripe_customer_id: typing_extensions.Annotated[
+        str, FieldMetadata(alias="stripeCustomerId")
+    ]
+    past_due_subscription_ids: typing_extensions.Annotated[
+        typing.List[str], FieldMetadata(alias="pastDueSubscriptionIds")
+    ]
+    tag: SubscriptionPastDueErrorTag
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

mirascope/api/_generated/types/subscription_past_due_error_tag.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+SubscriptionPastDueErrorTag = typing.Union[
+    typing.Literal["SubscriptionPastDueError"], typing.Any
+]

mirascope/api/settings.py

@@ -15,7 +15,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 class Settings(BaseSettings):
     """Global settings for Mirascope SDK."""
 
-    base_url: str = Field(default="https://v2.mirascope.com")
+    base_url: str = Field(default="https://mirascope.com/api/v2")
     api_key: str | None = None
 
     def update(self, **kwargs: Any) -> None:  # noqa: ANN401
@@ -46,6 +46,24 @@ def get_settings() -> Settings:
     return settings
 
 
+def update_settings(
+    *,
+    api_key: str | None = None,
+    base_url: str | None = None,
+) -> None:
+    """Update the current settings with provided values.
+
+    This allows programmatic configuration of settings (e.g., from ops.configure)
+    that will be used by get_sync_client() and get_async_client().
+
+    Args:
+        api_key: API key to set (if provided)
+        base_url: Base URL to set (if provided)
+    """
+    current = get_settings()
+    current.update(api_key=api_key, base_url=base_url)
+
+
 @contextmanager
 def settings(
     base_url: str | None = None,

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,15 +110,13 @@ from .prompts import (
 )
 from .providers import (
     ModelId,
-    Params,
     Provider,
     ProviderId,
-    ThinkingConfig,
-    ThinkingLevel,
     register_provider,
     reset_provider_registry,
 )
 from .responses import (
+    AnyResponse,
     AsyncChunkIterator,
     AsyncContextResponse,
     AsyncContextStreamResponse,
@@ -113,6 +132,7 @@ from .responses import (
     FinishReason,
     RawMessageChunk,
     Response,
+    RootResponse,
     Stream,
     StreamResponse,
     StreamResponseChunk,
@@ -123,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",
@@ -162,6 +191,7 @@ __all__ = [
     "BadRequestError",
     "Base64AudioSource",
     "Base64ImageSource",
+    "BaseToolkit",
     "Call",
     "CallDecorator",
     "ChunkIterator",
@@ -173,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",
@@ -221,9 +259,13 @@ __all__ = [
     "ToolCallEndChunk",
     "ToolCallStartChunk",
     "ToolCallStream",
+    "ToolError",
+    "ToolExecutionError",
     "ToolNotFoundError",
     "ToolOutput",
+    "ToolSchema",
     "Toolkit",
+    "ToolkitT",
     "URLImageSource",
     "Usage",
     "UsageDeltaChunk",
@@ -241,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,8 +1,10 @@
 """The Call module for generating responses using LLMs."""
 
-from dataclasses import dataclass
-from typing import Generic, overload
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from typing import Any, Generic, TypeVar, overload
 
+from ..._utils import copy_function_metadata
 from ..context import Context, DepsT
 from ..formatting import FormattableT
 from ..models import Model, use_model
@@ -12,6 +14,7 @@ from ..prompts import (
     ContextPrompt,
     Prompt,
 )
+from ..prompts.prompts import BasePrompt
 from ..responses import (
     AsyncContextResponse,
     AsyncContextStreamResponse,
@@ -24,22 +27,35 @@ from ..responses import (
 )
 from ..types import P
 
+PromptT = TypeVar("PromptT", bound=BasePrompt[Callable[..., Any]])
+CallT = TypeVar("CallT", bound="BaseCall[Any]")
 
-@dataclass
-class BaseCall:
+
+@dataclass(kw_only=True)
+class BaseCall(Generic[PromptT]):
     """Base class for all Call types with shared model functionality."""
 
     default_model: Model
     """The default model that will be used if no model is set in context."""
 
+    prompt: PromptT
+    """The underlying Prompt instance that generates messages with tools and format."""
+
+    __name__: str = field(init=False, repr=False, default="")
+    """The name of the underlying function (preserved for decorator stacking)."""
+
     @property
     def model(self) -> Model:
         """The model used for generating responses. May be overwritten via `with llm.model(...)`."""
         return use_model(self.default_model)
 
+    def __post_init__(self) -> None:
+        """Preserve standard function attributes for decorator stacking."""
+        copy_function_metadata(self, self.prompt.fn)
+
 
 @dataclass
-class Call(BaseCall, Generic[P, FormattableT]):
+class Call(BaseCall[Prompt[P, FormattableT]], Generic[P, FormattableT]):
     """A call that directly generates LLM responses without requiring a model argument.
 
     Created by decorating a `MessageTemplate` with `llm.call`. The decorated function
@@ -51,9 +67,6 @@ class Call(BaseCall, Generic[P, FormattableT]):
     The model can be overridden at runtime using `with llm.model(...)` context manager.
     """
 
-    prompt: Prompt[P, FormattableT]
-    """The underlying Prompt instance that generates messages with tools and format."""
-
     @overload
     def __call__(
         self: "Call[P, None]", *args: P.args, **kwargs: P.kwargs
@@ -102,7 +115,7 @@ class Call(BaseCall, Generic[P, FormattableT]):
 
 
 @dataclass
-class AsyncCall(BaseCall, Generic[P, FormattableT]):
+class AsyncCall(BaseCall[AsyncPrompt[P, FormattableT]], Generic[P, FormattableT]):
     """An async call that directly generates LLM responses without requiring a model argument.
 
     Created by decorating an async `MessageTemplate` with `llm.call`. The decorated async
@@ -114,9 +127,6 @@ class AsyncCall(BaseCall, Generic[P, FormattableT]):
     The model can be overridden at runtime using `with llm.model(...)` context manager.
     """
 
-    prompt: AsyncPrompt[P, FormattableT]
-    """The underlying AsyncPrompt instance that generates messages with tools and format."""
-
     @overload
     async def __call__(
         self: "AsyncCall[P, None]", *args: P.args, **kwargs: P.kwargs
@@ -167,7 +177,9 @@ class AsyncCall(BaseCall, Generic[P, FormattableT]):
 
 
 @dataclass
-class ContextCall(BaseCall, Generic[P, DepsT, FormattableT]):
+class ContextCall(
+    BaseCall[ContextPrompt[P, DepsT, FormattableT]], Generic[P, DepsT, FormattableT]
+):
     """A context-aware call that directly generates LLM responses without requiring a model argument.
 
     Created by decorating a `ContextMessageTemplate` with `llm.call`. The decorated function
@@ -180,9 +192,6 @@ class ContextCall(BaseCall, Generic[P, DepsT, FormattableT]):
     The model can be overridden at runtime using `with llm.model(...)` context manager.
     """
 
-    prompt: ContextPrompt[P, DepsT, FormattableT]
-    """The underlying ContextPrompt instance that generates messages with tools and format."""
-
     @overload
     def __call__(
         self: "ContextCall[P, DepsT, None]",
@@ -253,7 +262,10 @@ class ContextCall(BaseCall, Generic[P, DepsT, FormattableT]):
 
 
 @dataclass
-class AsyncContextCall(BaseCall, Generic[P, DepsT, FormattableT]):
+class AsyncContextCall(
+    BaseCall[AsyncContextPrompt[P, DepsT, FormattableT]],
+    Generic[P, DepsT, FormattableT],
+):
     """An async context-aware call that directly generates LLM responses without requiring a model argument.
 
     Created by decorating an async `ContextMessageTemplate` with `llm.call`. The decorated async
@@ -266,9 +278,6 @@ class AsyncContextCall(BaseCall, Generic[P, DepsT, FormattableT]):
     The model can be overridden at runtime using `with llm.model(...)` context manager.
     """
 
-    prompt: AsyncContextPrompt[P, DepsT, FormattableT]
-    """The underlying AsyncContextPrompt instance that generates messages with tools and format."""
-
     @overload
     async def __call__(
         self: "AsyncContextCall[P, DepsT, None]",

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_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)