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

chatlas/_snowflake.py

@@ -1,14 +1,16 @@
-from typing import TYPE_CHECKING, Literal, Optional, TypedDict, overload
+import asyncio
+import json
+from typing import TYPE_CHECKING, Iterable, Literal, Optional, TypedDict, cast, overload
 
 from pydantic import BaseModel
 
 from ._chat import Chat
-from ._content import Content
+from ._content import Content, ContentJson, ContentText
 from ._logging import log_model_default
 from ._provider import Provider
-from ._tools import Tool
+from ._tools import Tool, basemodel_to_param_schema
 from ._turn import Turn, normalize_turns
-from ._utils import drop_none
+from ._utils import drop_none, wrap_async_iterable
 
 if TYPE_CHECKING:
     from snowflake.snowpark import Column
@@ -237,9 +239,18 @@ class SnowflakeProvider(Provider["Completion", "CompletionChunk", "CompletionChu
         data_model: Optional[type[BaseModel]] = None,
         kwargs: Optional["SubmitInputArgs"] = None,
     ):
-        raise NotImplementedError(
-            "Snowflake does not currently support async completions."
-        )
+        from snowflake.cortex import complete
+
+        kwargs = self._chat_perform_args(stream, turns, tools, data_model, kwargs)
+
+        # Prevent the main thread from being blocked (Snowflake doesn't have native async support)
+        res = await asyncio.to_thread(complete, **kwargs)
+
+        # When streaming, res is an iterable of strings, but Chat() wants an async iterable
+        if stream:
+            res = wrap_async_iterable(cast(Iterable[str], res))
+
+        return res
 
     def _chat_perform_args(
         self,
@@ -249,27 +260,31 @@ class SnowflakeProvider(Provider["Completion", "CompletionChunk", "CompletionChu
         data_model: Optional[type[BaseModel]] = None,
         kwargs: Optional["SubmitInputArgs"] = None,
     ):
-        # Cortex doesn't seem to support tools
-        if tools:
-            raise ValueError("Snowflake does not currently support tools.")
-
-        # TODO: implement data_model when this PR makes it into snowflake-ml-python
-        # https://github.com/snowflakedb/snowflake-ml-python/pull/141
-        # https://docs.snowflake.com/en/user-guide/snowflake-cortex/cortex-llm-rest-api#structured-output-example
-        if data_model:
-            raise NotImplementedError(
-                "The snowflake-ml-python package currently doesn't support structured output. "
-                "Upvote this PR to help prioritize it: "
-                "https://github.com/snowflakedb/snowflake-ml-python/pull/141"
-            )
-
         kwargs_full: "SubmitInputArgs" = {
             "stream": stream,
             "prompt": self._as_prompt_input(turns),
             "model": self._model,
+            "session": self._session,
             **(kwargs or {}),
         }
 
+        # TODO: get tools working
+        if tools:
+            raise ValueError("Snowflake does not currently support tools.")
+
+        if data_model is not None:
+            params = basemodel_to_param_schema(data_model)
+            opts = kwargs_full.get("options") or {}
+            opts["response_format"] = {
+                "type": "json",
+                "schema": {
+                    "type": "object",
+                    "properties": params["properties"],
+                    "required": params["required"],
+                },
+            }
+            kwargs_full["options"] = opts
+
         return kwargs_full
 
     def stream_text(self, chunk):
@@ -312,10 +327,18 @@ class SnowflakeProvider(Provider["Completion", "CompletionChunk", "CompletionChu
             res.append(
                 {
                     "role": turn.role,
-                    "content": turn.text,
+                    "content": str(turn),
                 }
             )
         return res
 
     def _as_turn(self, completion, has_data_model) -> Turn:
-        return Turn("assistant", completion)
+        completion = cast(str, completion)
+
+        if has_data_model:
+            data = json.loads(completion)
+            contents = [ContentJson(value=data)]
+        else:
+            contents = [ContentText(text=completion)]
+
+        return Turn("assistant", contents)

chatlas/_utils.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
+import asyncio
 import functools
 import inspect
 import os
 import re
-from typing import Awaitable, Callable, TypeVar, cast
+from typing import Any, AsyncIterable, Awaitable, Callable, Iterable, TypeVar, cast
 
 from ._typing_extensions import ParamSpec, TypeGuard
 
@@ -61,6 +62,40 @@ def is_async_callable(
     return False
 
 
+def wrap_async_iterable(x: Iterable[Any] | AsyncIterable[Any]) -> AsyncIterable[Any]:
+    """
+    Given any iterable, return an async iterable. The async iterable will yield the
+    values of the original iterable, but will also yield control to the event loop
+    after each value. This is useful when you want to interleave processing with other
+    tasks, or when you want to simulate an async iterable from a regular iterable.
+    """
+
+    if isinstance(x, AsyncIterable):
+        return x
+
+    if not isinstance(x, Iterable):
+        raise TypeError("wrap_async_iterable requires an Iterable object.")
+
+    return MakeIterableAsync(x)
+
+
+class MakeIterableAsync:
+    def __init__(self, iterable: Iterable[Any]):
+        self.iterable = iterable
+
+    def __aiter__(self):
+        self.iterator = iter(self.iterable)
+        return self
+
+    async def __anext__(self):
+        try:
+            value = next(self.iterator)
+            await asyncio.sleep(0)  # Yield control to the event loop
+            return value
+        except StopIteration:
+            raise StopAsyncIteration
+
+
 T = TypeVar("T")
 
 

chatlas/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.6.1'
-__version_tuple__ = version_tuple = (0, 6, 1)
+__version__ = version = '0.7.0'
+__version_tuple__ = version_tuple = (0, 7, 0)

chatlas/types/openai/_submit.py

@@ -38,6 +38,16 @@ class SubmitInputArgs(TypedDict, total=False):
     model: Union[
         str,
         Literal[
+            "gpt-4.1",
+            "gpt-4.1-mini",
+            "gpt-4.1-nano",
+            "gpt-4.1-2025-04-14",
+            "gpt-4.1-mini-2025-04-14",
+            "gpt-4.1-nano-2025-04-14",
+            "o4-mini",
+            "o4-mini-2025-04-16",
+            "o3",
+            "o3-2025-04-16",
             "o3-mini",
             "o3-mini-2025-01-31",
             "o1",
@@ -119,7 +129,7 @@ class SubmitInputArgs(TypedDict, total=False):
         openai.NotGiven,
     ]
     seed: Union[int, None, openai.NotGiven]
-    service_tier: Union[Literal["auto", "default"], None, openai.NotGiven]
+    service_tier: Union[Literal["auto", "default", "flex"], None, openai.NotGiven]
     stop: Union[str, None, list[str], openai.NotGiven]
     store: Union[bool, None, openai.NotGiven]
     stream: Union[Literal[False], None, Literal[True], openai.NotGiven]

{chatlas-0.6.1.dist-info → chatlas-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatlas
-Version: 0.6.1
+Version: 0.7.0
 Summary: A simple and consistent interface for chatting with LLMs
 Project-URL: Homepage, https://posit-dev.github.io/chatlas
 Project-URL: Documentation, https://posit-dev.github.io/chatlas
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Requires-Dist: jinja2
+Requires-Dist: orjson
 Requires-Dist: pydantic>=2.0
 Requires-Dist: requests
 Requires-Dist: rich
@@ -27,9 +28,13 @@ Provides-Extra: azure-openai
 Requires-Dist: openai; extra == 'azure-openai'
 Provides-Extra: bedrock-anthropic
 Requires-Dist: anthropic[bedrock]; extra == 'bedrock-anthropic'
+Provides-Extra: databricks
+Requires-Dist: databricks-sdk[openai]; extra == 'databricks'
 Provides-Extra: dev
 Requires-Dist: anthropic[bedrock]; extra == 'dev'
+Requires-Dist: databricks-sdk; extra == 'dev'
 Requires-Dist: google-genai>=1.2.0; extra == 'dev'
+Requires-Dist: htmltools; extra == 'dev'
 Requires-Dist: matplotlib; extra == 'dev'
 Requires-Dist: numpy>1.24.4; extra == 'dev'
 Requires-Dist: openai; extra == 'dev'
@@ -38,6 +43,7 @@ Requires-Dist: python-dotenv; extra == 'dev'
 Requires-Dist: ruff>=0.6.5; extra == 'dev'
 Requires-Dist: shiny; extra == 'dev'
 Requires-Dist: snowflake-ml-python; extra == 'dev'
+Requires-Dist: tenacity; extra == 'dev'
 Requires-Dist: tiktoken; extra == 'dev'
 Requires-Dist: torch; (python_version <= '3.11') and extra == 'dev'
 Provides-Extra: docs
@@ -123,6 +129,7 @@ It also supports the following enterprise cloud providers:
 
 * AWS Bedrock: [`ChatBedrockAnthropic()`](https://posit-dev.github.io/chatlas/reference/ChatBedrockAnthropic.html).
 * Azure OpenAI: [`ChatAzureOpenAI()`](https://posit-dev.github.io/chatlas/reference/ChatAzureOpenAI.html).
+* Databricks: [`ChatDatabricks()`](https://posit-dev.github.io/chatlas/reference/ChatDatabricks.html).
 * Snowflake Cortex: [`ChatSnowflake()`](https://posit-dev.github.io/chatlas/reference/ChatSnowflake.html).
 * Vertex AI: [`ChatVertex()`](https://posit-dev.github.io/chatlas/reference/ChatVertex.html).
 

{chatlas-0.6.1.dist-info → chatlas-0.7.0.dist-info}/RECORD

@@ -1,30 +1,31 @@
-chatlas/__init__.py,sha256=IVHVEEN6pspb-5WqWfBLc9wOQH-1R8vmi1Eeh-OSVFY,1358
-chatlas/_anthropic.py,sha256=IvTC1xJYeKi7Liz_Czt1wmkG_Tx12e2ME663xZTNpdI,24745
-chatlas/_auto.py,sha256=4tpwla09la4VA2PAh3phAMWs2Amgtp_4Qsjx6K02ib0,6032
-chatlas/_chat.py,sha256=czfSjsEbRX5bHLclF1IbYtfHlyZrAOH0xcP-1hzcNNk,46032
-chatlas/_content.py,sha256=yXB1IukyMfK9-Zc8ISm4h1p09O4i79YEJandzyT4UtM,8726
+chatlas/__init__.py,sha256=5bHHZOdSM84VUD1WlUYH7vYxGiHygYEoRsQzGHHDXXk,1531
+chatlas/_anthropic.py,sha256=VAtzRcrWPVe38wBBtDapxURISF2qn2yd6wg_8VY94Lk,24994
+chatlas/_auto.py,sha256=HsAvVwpSOkI9fdC35YX8beaE2IBnWLWTzOzu0ny951o,6129
+chatlas/_chat.py,sha256=wTkXu_AmL2frIHy-JZveuY44BigkrG21_06beyD3pIw,52691
+chatlas/_content.py,sha256=VW1iKOWlzeoOjTg_TNQTj1zlmdWbDXqTjBy3fxddhdc,15767
 chatlas/_content_image.py,sha256=EUK6wAint-JatLsiwvaPDu4D3W-NcIsDCkzABkXgfDg,8304
 chatlas/_content_pdf.py,sha256=cffeuJxzhUDukQ-Srkmpy62M8X12skYpU_FVq-Wvya4,2420
-chatlas/_display.py,sha256=eqdRIwQenyJxswmTEjnJ1n9YxxSxsa8vHVmA79449_o,4439
+chatlas/_databricks.py,sha256=G87AB6qWGxIlIP8tc6iHeaMpjXe47FuVZ00anPoM9ZI,4919
+chatlas/_display.py,sha256=wyQzSc6z1VqrJfkTLkw1wQcti9s1Pr4qT8UxFJESn4U,4664
 chatlas/_github.py,sha256=8_vvUIBCprgrQ5UItky5yETfEQPG2fCMM57ga77p28E,4377
-chatlas/_google.py,sha256=lXqqLwXlqFoKh0GWx-OSgJ1pge0Dv7FH8Sg-MkcXpJs,19138
+chatlas/_google.py,sha256=FfBnkXRtdJiBTViOqOg7qoConcRPLAKqWhUYKcfvhO4,19356
 chatlas/_groq.py,sha256=iuFvxeXkq81sDHxVV9zbVHjf2ZuNT94P-XkuXvqtGms,4160
 chatlas/_interpolate.py,sha256=ykwLP3x-ya9Q33U4knSU75dtk6pzJAeythEEIW-43Pc,3631
 chatlas/_live_render.py,sha256=UMZltE35LxziDKPMEeDwQ9meZ95SeqwhJi7j-y9pcro,4004
 chatlas/_logging.py,sha256=7a20sAl1PkW1qBNrfd_ieUbQXV8Gf4Vuf0Wn62LNBmk,2290
 chatlas/_merge.py,sha256=SGj_BetgA7gaOqSBKOhYmW3CYeQKTEehFrXvx3y4OYE,3924
-chatlas/_ollama.py,sha256=EgTwmphVwBV7xCIqmPC_cNlr4Uo9N5Xy4eDCb1sJoPI,3764
-chatlas/_openai.py,sha256=xnJPzZzVuRoH7al7Tq01J7SIgF7bZm3UwcO2noDENk4,24523
+chatlas/_ollama.py,sha256=np7s43abaNKt4eSygerHugvtzHjCyOQjSo0ZIRkE8Yc,3769
+chatlas/_openai.py,sha256=AIYZ6yc_euymi0OSE0ccPdA2nJLP-8wJSVSyPHckcBw,24653
 chatlas/_perplexity.py,sha256=j-jfOIYefZC5XzGjmya9GCCGQN003cRmiAv6vmo0rTQ,4454
 chatlas/_provider.py,sha256=YmdBbz_u5aP_kBxl6s26OPiSnWG_vZ_fvf9L2qvBmyI,3809
-chatlas/_snowflake.py,sha256=WUNdT3irxgLVqoc1TAeDmxnYsjBWiBw-CoH-dY4mFps,10944
+chatlas/_snowflake.py,sha256=xlDdaM-YCmz3Y8KU6jxdCICuS-H4XLpQBHjqnaiEqKk,11576
 chatlas/_tokens.py,sha256=3W3EPUp9eWXUiwuzJwEPBv43AUznbK46pm59Htti7z4,2392
 chatlas/_tokens_old.py,sha256=L9d9oafrXvEx2u4nIn_Jjn7adnQyLBnYBuPwJUE8Pl8,5005
 chatlas/_tools.py,sha256=-qt4U1AFkebQoX9kpsBy5QXK8a2PpHX6Amgm44gcQ68,4113
 chatlas/_turn.py,sha256=7pve6YmD-L4c7Oxd6_ZAPkDudJ8AMpa6pP-pSroA1dM,5067
 chatlas/_typing_extensions.py,sha256=YdzmlyPSBpIEcsOkoz12e6jETT1XEMV2Q72haE4cfwY,1036
-chatlas/_utils.py,sha256=2TPy5_8dr9QDF1YShZN-CjxRVHeArSujRiaF0SKnI4o,2895
-chatlas/_version.py,sha256=a3_WODLDfpmAw3pMw7qGqmRuXHTCC3STyQd2R1iEOgA,511
+chatlas/_utils.py,sha256=lli8ChbPUwEPebW8AoOoNoqiA95SVtoW2gb6ymj9gw4,4028
+chatlas/_version.py,sha256=itvIHlqPKoO_13qf_yPD2pmcp0U4z1s19vvBGZM927Q,511
 chatlas/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chatlas/types/__init__.py,sha256=P_EDL4eqsigKwB-u2qRmKlYQS5Y65m7oWjGC3cYmxO4,719
 chatlas/types/anthropic/__init__.py,sha256=OwubA-DPHYpYo0XyRyAFwftOI0mOxtHzAyhUSLcDx54,417
@@ -37,9 +38,9 @@ chatlas/types/google/_submit.py,sha256=b-ZqMvI551Ia7pFlWdqUQJjov3neHmVwLFw-P2bgU
 chatlas/types/openai/__init__.py,sha256=Q2RAr1bSH1nHsxICK05nAmKmxdhKmhbBkWD_XHiVSrI,411
 chatlas/types/openai/_client.py,sha256=YGm_EHtRSSHeeOZe-CV7oNvMJpEblEta3UTuU7lSRO8,754
 chatlas/types/openai/_client_azure.py,sha256=jx8D_p46CLDGzTP-k-TtGzj-f3junj6or-86m8DD_0w,858
-chatlas/types/openai/_submit.py,sha256=mflYHZ5Q3dWBR2PdVEq6lhC9qNrQGNvyMiORglYLByE,6271
+chatlas/types/openai/_submit.py,sha256=R0PUgXmhywLzRT_C3DYCsfbHCB1mD7cMY3zd8q7E-PU,6574
 chatlas/types/snowflake/__init__.py,sha256=NVKw_gLVnSlMNdE6BpikrQw8GV8LvIn5SR8eI8Afgbs,273
 chatlas/types/snowflake/_submit.py,sha256=Fgcb2Z4mXYwAR2b7Kn3SdEYFlO4gJiUvkDJ3lDoN0IY,799
-chatlas-0.6.1.dist-info/METADATA,sha256=9mB4Dz3d0zCabRMuZX6E-MG8RnT4M14dhncult9gMAQ,15085
-chatlas-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chatlas-0.6.1.dist-info/RECORD,,
+chatlas-0.7.0.dist-info/METADATA,sha256=rb2oYfWSve7uDdoKouiZb2OAltvOMc-gXfucQRJ4skY,15425
+chatlas-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chatlas-0.7.0.dist-info/RECORD,,