chatlas 0.6.1__py3-none-any.whl → 0.7.1__py3-none-any.whl

chatlas/__init__.py

@@ -2,8 +2,10 @@ from . import types
 from ._anthropic import ChatAnthropic, ChatBedrockAnthropic
 from ._auto import ChatAuto
 from ._chat import Chat
+from ._content import ContentToolRequest, ContentToolResult
 from ._content_image import content_image_file, content_image_plot, content_image_url
 from ._content_pdf import content_pdf_file, content_pdf_url
+from ._databricks import ChatDatabricks
 from ._github import ChatGithub
 from ._google import ChatGoogle, ChatVertex
 from ._groq import ChatGroq
@@ -26,6 +28,7 @@ __all__ = (
     "ChatAnthropic",
     "ChatAuto",
     "ChatBedrockAnthropic",
+    "ChatDatabricks",
     "ChatGithub",
     "ChatGoogle",
     "ChatGroq",
@@ -41,6 +44,8 @@ __all__ = (
     "content_image_url",
     "content_pdf_file",
     "content_pdf_url",
+    "ContentToolRequest",
+    "ContentToolResult",
     "interpolate",
     "interpolate_file",
     "Provider",

chatlas/_anthropic.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
 import base64
-import json
 import warnings
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union, cast, overload
 
+import orjson
 from pydantic import BaseModel
 
 from ._chat import Chat
@@ -366,8 +366,8 @@ class AnthropicProvider(Provider[Message, RawMessageStreamEvent, Message]):
             this_content = completion.content[chunk.index]
             if this_content.type == "tool_use" and isinstance(this_content.input, str):
                 try:
-                    this_content.input = json.loads(this_content.input or "{}")
-                except json.JSONDecodeError as e:
+                    this_content.input = orjson.loads(this_content.input or "{}")
+                except orjson.JSONDecodeError as e:
                     raise ValueError(f"Invalid JSON input: {e}")
         elif chunk.type == "message_delta":
             completion.stop_reason = chunk.delta.stop_reason
@@ -451,7 +451,10 @@ class AnthropicProvider(Provider[Message, RawMessageStreamEvent, Message]):
     @staticmethod
     def _as_content_block(content: Content) -> "ContentBlockParam":
         if isinstance(content, ContentText):
-            return {"text": content.text, "type": "text"}
+            text = content.text
+            if text == "" or text.isspace():
+                text = "[empty string]"
+            return {"type": "text", "text": text}
         elif isinstance(content, ContentJson):
             return {"text": "<structured data/>", "type": "text"}
         elif isinstance(content, ContentPDF):
@@ -485,12 +488,15 @@ class AnthropicProvider(Provider[Message, RawMessageStreamEvent, Message]):
                 "input": content.arguments,
             }
         elif isinstance(content, ContentToolResult):
-            return {
+            res: ToolResultBlockParam = {
                 "type": "tool_result",
                 "tool_use_id": content.id,
-                "content": content.get_final_value(),
                 "is_error": content.error is not None,
             }
+            # Anthropic supports non-text contents like ImageBlockParam
+            res["content"] = content.get_model_value()  # type: ignore
+            return res
+
         raise ValueError(f"Unknown content type: {type(content)}")
 
     @staticmethod

chatlas/_auto.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
-import json
 import os
 from typing import Callable, Literal, Optional
 
+import orjson
+
 from ._anthropic import ChatAnthropic, ChatBedrockAnthropic
 from ._chat import Chat
+from ._databricks import ChatDatabricks
 from ._github import ChatGithub
 from ._google import ChatGoogle, ChatVertex
 from ._groq import ChatGroq
@@ -18,6 +20,7 @@ from ._turn import Turn
 AutoProviders = Literal[
     "anthropic",
     "bedrock-anthropic",
+    "databricks",
     "github",
     "google",
     "groq",
@@ -32,6 +35,7 @@ AutoProviders = Literal[
 _provider_chat_model_map: dict[AutoProviders, Callable[..., Chat]] = {
     "anthropic": ChatAnthropic,
     "bedrock-anthropic": ChatBedrockAnthropic,
+    "databricks": ChatDatabricks,
     "github": ChatGithub,
     "google": ChatGoogle,
     "groq": ChatGroq,
@@ -55,7 +59,7 @@ def ChatAuto(
     """
     Use environment variables (env vars) to configure the Chat provider and model.
 
-    Creates a `:class:~chatlas.Chat` instance based on the specified provider.
+    Creates a :class:`~chatlas.Chat` instance based on the specified provider.
     The provider may be specified through the `provider` parameter and/or the
     `CHATLAS_CHAT_PROVIDER` env var. If both are set, the env var takes
     precedence. Similarly, the provider's model may be specified through the
@@ -175,7 +179,7 @@ def ChatAuto(
 
     env_kwargs = {}
     if env_kwargs_str := os.environ.get("CHATLAS_CHAT_ARGS"):
-        env_kwargs = json.loads(env_kwargs_str)
+        env_kwargs = orjson.loads(env_kwargs_str)
 
     kwargs = {**kwargs, **env_kwargs, **base_args}
     kwargs = {k: v for k, v in kwargs.items() if v is not None}