mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
fix(databricks): read pydantic message objects in the non-string text check
This commit is contained in:
parent
b17496361d
commit
ebbd84637e
2 changed files with 21 additions and 5 deletions
|
|
@ -86,9 +86,9 @@ def _is_bare_assistant_message(message_dict: Mapping[str, object]) -> bool:
|
|||
_CONTENT_BLOCKS: Final = TypeAdapter(tuple[object, ...])
|
||||
|
||||
|
||||
def _content_blocks(message: Mapping[str, object]) -> tuple[object, ...]:
|
||||
match content := message.get("content"):
|
||||
case list():
|
||||
def _content_blocks(message: object) -> tuple[object, ...]:
|
||||
match message.model_dump(exclude_none=True) if isinstance(message, BaseModel) else message:
|
||||
case {"content": list() as content}:
|
||||
return _CONTENT_BLOCKS.validate_python(content)
|
||||
case _:
|
||||
return ()
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
import copy
|
||||
import json
|
||||
from collections.abc import AsyncIterator, Iterator
|
||||
from typing import Final
|
||||
from typing import Final, cast
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import httpx
|
||||
import pytest
|
||||
import respx
|
||||
from openai.lib.streaming.chat import ChatCompletionStreamState
|
||||
from openai.types.chat import ChatCompletionChunk
|
||||
from openai.types.chat import ChatCompletionChunk, ChatCompletionMessage
|
||||
from pydantic import TypeAdapter
|
||||
from fastapi.testclient import TestClient
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
|
|
@ -716,6 +716,22 @@ def test_transform_request_rejects_a_text_block_whose_text_is_a_truthy_non_strin
|
|||
assert error.value.status_code == 400
|
||||
|
||||
|
||||
def test_transform_request_accepts_an_openai_message_object_in_history() -> None:
|
||||
earlier_answer: Final = ChatCompletionMessage(role="assistant", content="Earlier answer")
|
||||
|
||||
outgoing: Final = _outgoing_messages(
|
||||
"databricks-meta-llama-3-3-70b-instruct",
|
||||
[
|
||||
{"role": "user", "content": "Earlier question"},
|
||||
cast(AllMessageValues, earlier_answer), # cast-ok: SDK callers pass response messages back as history
|
||||
{"role": "user", "content": "Next question"},
|
||||
],
|
||||
{},
|
||||
)
|
||||
|
||||
assert [message.get("content") for message in outgoing] == ["Earlier question", "Earlier answer", "Next question"]
|
||||
|
||||
|
||||
def test_transform_request_json_object_keeps_earlier_turns_as_sent() -> None:
|
||||
earlier_turn: Final[AllMessageValues] = {
|
||||
"role": "user",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue