vectorvein 0.1.53__tar.gz → 0.1.55__tar.gz

{vectorvein-0.1.53 → vectorvein-0.1.55}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.1.53
-Summary: Default template for PDM package
+Version: 0.1.55
+Summary: VectorVein python SDK
 Author-Email: Anderson <andersonby@163.com>
 License: MIT
 Requires-Python: >=3.10

{vectorvein-0.1.53 → vectorvein-0.1.55}/pyproject.toml

@@ -13,11 +13,11 @@ dependencies = [
     "qwen-tokenizer>=0.2.0",
     "google-auth>=2.35.0",
 ]
-description = "Default template for PDM package"
+description = "VectorVein python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.1.53"
+version = "0.1.55"
 
 [project.license]
 text = "MIT"

{vectorvein-0.1.53 → vectorvein-0.1.55}/src/vectorvein/chat_clients/anthropic_client.py

@@ -12,6 +12,7 @@ from anthropic import Anthropic, AnthropicVertex, AsyncAnthropic, AsyncAnthropic
 from anthropic._types import NOT_GIVEN
 from anthropic.types import (
     TextBlock,
+    MessageParam,
     ToolUseBlock,
     RawMessageDeltaEvent,
     RawMessageStartEvent,
@@ -112,6 +113,38 @@ def format_messages_alternate(messages: list) -> list:
     return formatted_messages
 
 
+def refactor_into_openai_messages(messages: Iterable[MessageParam]):
+    formatted_messages = []
+    for message in messages:
+        content = message["content"]
+        if isinstance(content, str):
+            formatted_messages.append(message)
+        elif isinstance(content, list):
+            _content = []
+            for item in content:
+                if isinstance(item, (TextBlock, ToolUseBlock)):
+                    _content.append(item.model_dump())
+                elif item.get("type") == "image":
+                    image_data = item.get("source", {}).get("data", "")
+                    media_type = item.get("source", {}).get("media_type", "")
+                    data_url = f"data:{media_type};base64,{image_data}"
+                    _content.append(
+                        {
+                            "type": "image_url",
+                            "image_url": {
+                                "url": data_url,
+                                "detail_type": "auto",
+                            },
+                        }
+                    )
+                else:
+                    _content.append(item)
+            formatted_messages.append({"role": message["role"], "content": _content})
+        else:
+            formatted_messages.append(message)
+    return formatted_messages
+
+
 class AnthropicChatClient(BaseChatClient):
     DEFAULT_MODEL: str | None = defs.ANTHROPIC_DEFAULT_MODEL
     BACKEND_NAME: BackendType = BackendType.Anthropic
@@ -290,6 +323,9 @@ class AnthropicChatClient(BaseChatClient):
         if self.endpoint.api_schema_type == "openai":
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
             _tool_choice = OPENAI_NOT_GIVEN if tool_choice is NOT_GIVEN else tool_choice
+
+            formatted_messages = refactor_into_openai_messages(messages)
+
             if self.stream:
 
                 def _generator():
@@ -303,7 +339,16 @@ class AnthropicChatClient(BaseChatClient):
                         http_client=self.http_client,
                         backend_name=self.BACKEND_NAME,
                     ).create_completion(
-                        messages, model, True, temperature, max_tokens, _tools, _tool_choice, response_format, **kwargs
+                        messages=formatted_messages,
+                        model=model,
+                        stream=True,
+                        temperature=temperature,
+                        max_tokens=max_tokens,
+                        tools=_tools,
+                        tool_choice=_tool_choice,
+                        response_format=response_format,
+                        stream_options=stream_options,
+                        **kwargs,
                     )
                     for chunk in response:
                         yield chunk
@@ -320,7 +365,7 @@ class AnthropicChatClient(BaseChatClient):
                     http_client=self.http_client,
                     backend_name=self.BACKEND_NAME,
                 ).create_completion(
-                    messages=messages,
+                    messages=formatted_messages,
                     model=model,
                     stream=False,
                     temperature=temperature,
@@ -643,6 +688,9 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if self.endpoint.api_schema_type == "openai":
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
             _tool_choice = OPENAI_NOT_GIVEN if tool_choice is NOT_GIVEN else tool_choice
+
+            formatted_messages = refactor_into_openai_messages(messages)
+
             if self.stream:
 
                 async def _generator():
@@ -657,7 +705,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                         backend_name=self.BACKEND_NAME,
                     )
                     response = await client.create_completion(
-                        messages=messages,
+                        messages=formatted_messages,
                         model=model,
                         stream=True,
                         temperature=temperature,
@@ -684,7 +732,15 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                     backend_name=self.BACKEND_NAME,
                 )
                 return await client.create_completion(
-                    messages, model, False, temperature, max_tokens, _tools, _tool_choice, response_format, **kwargs
+                    messages=formatted_messages,
+                    model=model,
+                    stream=False,
+                    temperature=temperature,
+                    max_tokens=max_tokens,
+                    tools=_tools,
+                    tool_choice=_tool_choice,
+                    response_format=response_format,
+                    **kwargs,
                 )
 
         assert isinstance(self.raw_client, AsyncAnthropic | AsyncAnthropicVertex)

{vectorvein-0.1.53 → vectorvein-0.1.55}/src/vectorvein/chat_clients/utils.py

@@ -9,6 +9,7 @@ from typing import Iterable
 import httpx
 import tiktoken
 from anthropic import Anthropic
+from openai.types.chat import ChatCompletionMessageParam
 
 from ..settings import settings
 from ..utilities.retry import Retry
@@ -567,7 +568,7 @@ def format_workflow_messages(message: dict, content: str, backend: BackendType):
     return formatted_messages
 
 
-def format_openai_message(message, backend):
+def transform_from_openai_message(message: ChatCompletionMessageParam, backend: BackendType):
     role = message.get("role", "user")
     content = message.get("content", "")
 
@@ -635,7 +636,7 @@ def format_messages(
                 formatted_messages.extend(format_workflow_messages(message, content, backend))
         else:
             # 处理 OpenAI 格式的消息
-            formatted_message = format_openai_message(message, backend)
+            formatted_message = transform_from_openai_message(message, backend)
             formatted_messages.append(formatted_message)
 
     return formatted_messages

{vectorvein-0.1.53 → vectorvein-0.1.55}/src/vectorvein/types/defaults.py

@@ -558,7 +558,7 @@ ANTHROPIC_MODELS: Final[Dict[str, Dict[str, Any]]] = {
         "max_output_tokens": 8192,
         "function_call_available": True,
         "response_format_available": False,
-        "native_multimodal": True,
+        "native_multimodal": False,
     },
     "claude-3-5-sonnet-20240620": {
         "id": "claude-3-5-sonnet-20240620",

{vectorvein-0.1.53 → vectorvein-0.1.55}/src/vectorvein/utilities/media_processing.py

@@ -36,7 +36,7 @@ class ImageProcessor:
             image_url = self.image_source
             response = httpx.get(image_url)
             return Image.open(BytesIO(response.content))
-        elif isinstance(self.image_source, Path):
+        elif isinstance(self.image_source, (Path, str)):
             return Image.open(self.image_source)
         elif isinstance(self.image_source, Image.Image):
             return self.image_source