vectorvein 0.1.52__py3-none-any.whl → 0.1.54__py3-none-any.whl

vectorvein/chat_clients/__init__.py

@@ -6,6 +6,7 @@ from typing import overload, Literal
 from .base_client import BaseChatClient, BaseAsyncChatClient
 
 from .yi_client import YiChatClient, AsyncYiChatClient
+from .xai_client import XAIChatClient, AsyncXAIChatClient
 from .groq_client import GroqChatClient, AsyncGroqChatClient
 from .qwen_client import QwenChatClient, AsyncQwenChatClient
 from .local_client import LocalChatClient, AsyncLocalChatClient
@@ -41,6 +42,7 @@ BackendMap = {
         BackendType.ZhiPuAI: ZhiPuAIChatClient,
         BackendType.Baichuan: BaichuanChatClient,
         BackendType.StepFun: StepFunChatClient,
+        BackendType.XAI: XAIChatClient,
     },
     "async": {
         BackendType.Anthropic: AsyncAnthropicChatClient,
@@ -57,6 +59,7 @@ BackendMap = {
         BackendType.ZhiPuAI: AsyncZhiPuAIChatClient,
         BackendType.Baichuan: AsyncBaichuanChatClient,
         BackendType.StepFun: AsyncStepFunChatClient,
+        BackendType.XAI: AsyncXAIChatClient,
     },
 }
 
@@ -257,6 +260,20 @@ def create_chat_client(
 ) -> StepFunChatClient: ...
 
 
+@overload
+def create_chat_client(
+    backend: Literal[BackendType.XAI],
+    model: str | None = None,
+    stream: bool = False,
+    temperature: float = 0.7,
+    context_length_control: ContextLengthControlType = defs.CONTEXT_LENGTH_CONTROL,
+    random_endpoint: bool = True,
+    endpoint_id: str = "",
+    http_client: httpx.Client | None = None,
+    **kwargs,
+) -> XAIChatClient: ...
+
+
 @overload
 def create_chat_client(
     backend: BackendType,
@@ -496,6 +513,20 @@ def create_async_chat_client(
 ) -> AsyncStepFunChatClient: ...
 
 
+@overload
+def create_async_chat_client(
+    backend: Literal[BackendType.XAI],
+    model: str | None = None,
+    stream: bool = False,
+    temperature: float = 0.7,
+    context_length_control: ContextLengthControlType = defs.CONTEXT_LENGTH_CONTROL,
+    random_endpoint: bool = True,
+    endpoint_id: str = "",
+    http_client: httpx.AsyncClient | None = None,
+    **kwargs,
+) -> AsyncXAIChatClient: ...
+
+
 @overload
 def create_async_chat_client(
     backend: BackendType,

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/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/chat_clients/xai_client.py

@@ -0,0 +1,15 @@
+# @Author: Bi Ying
+# @Date:   2024-07-26 14:48:55
+from ..types.enums import BackendType
+from ..types.defaults import XAI_DEFAULT_MODEL
+from .openai_compatible_client import OpenAICompatibleChatClient, AsyncOpenAICompatibleChatClient
+
+
+class XAIChatClient(OpenAICompatibleChatClient):
+    DEFAULT_MODEL = XAI_DEFAULT_MODEL
+    BACKEND_NAME = BackendType.XAI
+
+
+class AsyncXAIChatClient(AsyncOpenAICompatibleChatClient):
+    DEFAULT_MODEL = XAI_DEFAULT_MODEL
+    BACKEND_NAME = BackendType.XAI

vectorvein/settings/__init__.py

@@ -35,6 +35,7 @@ class Settings(BaseModel):
     zhipuai: BackendSettings = Field(default_factory=BackendSettings, description="Zhipuai models settings.")
     baichuan: BackendSettings = Field(default_factory=BackendSettings, description="Baichuan models settings.")
     stepfun: BackendSettings = Field(default_factory=BackendSettings, description="StepFun models settings.")
+    xai: BackendSettings = Field(default_factory=BackendSettings, description="XAI models settings.")
 
     def __init__(self, **data):
         model_types = {

vectorvein/types/defaults.py

@@ -724,3 +724,14 @@ STEPFUN_MODELS: Final[Dict[str, Dict[str, Any]]] = {
         "native_multimodal": True,
     },
 }
+
+
+XAI_DEFAULT_MODEL: Final[str] = "grok-beta"
+XAI_MODELS: Final[Dict[str, Dict[str, Any]]] = {
+    "grok-beta": {
+        "id": "grok-beta",
+        "context_length": 131072,
+        "function_call_available": True,
+        "response_format_available": True,
+    },
+}

vectorvein/types/enums.py

@@ -50,6 +50,9 @@ class BackendType(str, Enum):
     # StepFun
     StepFun = "stepfun"
 
+    # XAI
+    XAI = "xai"
+
     def __repr__(self):
         """Get a string representation."""
         return f'"{self.value}"'

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

{vectorvein-0.1.52.dist-info → vectorvein-0.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.1.52
+Version: 0.1.54
 Summary: Default template for PDM package
 Author-Email: Anderson <andersonby@163.com>
 License: MIT

{vectorvein-0.1.52.dist-info → vectorvein-0.1.54.dist-info}/RECORD

@@ -1,9 +1,9 @@
-vectorvein-0.1.52.dist-info/METADATA,sha256=7Tl7WKTmbcQa7SG_fgPtxaZJbR8pOGzM5mOi07ivvpo,644
-vectorvein-0.1.52.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.1.52.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.1.54.dist-info/METADATA,sha256=6BddXEmSVPZ4gez8n20Kr6XNLLUBaPANKrZZVtmS0kU,644
+vectorvein-0.1.54.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.1.54.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/chat_clients/__init__.py,sha256=dW169oK1n3v8Z0uD8itghzlCP72rxiaS-XYn6fvI2xM,16788
-vectorvein/chat_clients/anthropic_client.py,sha256=i1fMYSkUovd-Lc9B64bWMgzSTUFw4S3fj3AJ_pDokT4,34029
+vectorvein/chat_clients/__init__.py,sha256=Oev7Lv1DIEWCMD-2Pm7e2cwzX7JFQTnIK-j6o4iUuyQ,17725
+vectorvein/chat_clients/anthropic_client.py,sha256=G68JGM98E0pYyi8Tjvo4VQtnug9ncugFbb4d0DrPVQo,36122
 vectorvein/chat_clients/baichuan_client.py,sha256=CVMvpgjdrZGv0BWnTOBD-f2ufZ3wq3496wqukumsAr4,526
 vectorvein/chat_clients/base_client.py,sha256=0Uj0e-JR0a68sRS_WfUMVd91Av7lzJh6-DukjutlaD0,9497
 vectorvein/chat_clients/deepseek_client.py,sha256=3qWu01NlJAP2N-Ff62d5-CZXZitlizE1fzb20LNetig,526
@@ -18,18 +18,19 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=D2VmhpDVct4w2y58s87An
 vectorvein/chat_clients/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/qwen_client.py,sha256=-ryh-m9PgsO0fc4ulcCmPTy1155J8YUy15uPoJQOHA0,513
 vectorvein/chat_clients/stepfun_client.py,sha256=zsD2W5ahmR4DD9cqQTXmJr3txrGuvxbRWhFlRdwNijI,519
-vectorvein/chat_clients/utils.py,sha256=HUPtdn-OSxghJNCF5Q8PsL3Ye-1Nu16O84lntPqKyao,26439
+vectorvein/chat_clients/utils.py,sha256=J-lv-XNlpFwcvLREqVZWKOA4QkN1t9XsOU6h0kxkWO4,26553
+vectorvein/chat_clients/xai_client.py,sha256=eLFJJrNRJ-ni3DpshODcr3S1EJQLbhVwxyO1E54LaqM,491
 vectorvein/chat_clients/yi_client.py,sha256=RNf4CRuPJfixrwLZ3-DEc3t25QDe1mvZeb9sku2f8Bc,484
 vectorvein/chat_clients/zhipuai_client.py,sha256=Ys5DSeLCuedaDXr3PfG1EW2zKXopt-awO2IylWSwY0s,519
 vectorvein/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
-vectorvein/settings/__init__.py,sha256=dyTCLhevXiKVJhOb1tjgZGMH38Indy4dkWVdDX543g0,3771
+vectorvein/settings/__init__.py,sha256=g01y74x0k2JEAqNpRGG0PDs0NTULjOAZV6HRhydPX1c,3874
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/defaults.py,sha256=orYqYQiQj8lj1wzsQdnyHWC3bSVYhRB14Zkm6qQDYcU,22661
-vectorvein/types/enums.py,sha256=x_S0IJiEWijOAEiMNdiGDGEWGtmt7TwMriJVDqrDmTo,1637
+vectorvein/types/defaults.py,sha256=BxnXL_Hz_gM8mYDI6Y62J660ipCanFlAturV9lDj3aQ,22940
+vectorvein/types/enums.py,sha256=7KTJSVtQueImmbr1fSwv3rQVtc0RyMWXJmoE2tDOaso,1667
 vectorvein/types/exception.py,sha256=gnW4GnJ76jND6UGnodk9xmqkcbeS7Cz2rvncA2HpD5E,69
 vectorvein/types/llm_parameters.py,sha256=5o-C_yXxxQWZy_e8OWowB2107GTS-Eawx4Mvb1q55Co,5256
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/utilities/media_processing.py,sha256=cnzLrU1OaJvSv87IOnc36FrDXtmGMDStPbxtIJ33YN4,5880
+vectorvein/utilities/media_processing.py,sha256=CTRq-lGlFkFgP_FSRhNwF_qUgmOrXPf2_1Ok9HY42_g,5887
 vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM,2208
-vectorvein-0.1.52.dist-info/RECORD,,
+vectorvein-0.1.54.dist-info/RECORD,,