vectorvein 0.1.8__tar.gz → 0.1.9__tar.gz

{vectorvein-0.1.8 → vectorvein-0.1.9}/PKG-INFO

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

{vectorvein-0.1.8 → vectorvein-0.1.9}/pyproject.toml

@@ -16,7 +16,7 @@ description = "Default template for PDM package"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.1.8"
+version = "0.1.9"
 
 [project.license]
 text = "MIT"

{vectorvein-0.1.8 → vectorvein-0.1.9}/src/vectorvein/chat_clients/minimax_client.py

@@ -93,7 +93,7 @@ class MiniMaxChatClient(BaseChatClient):
                 model=self.model_setting.id,
             )
 
-        if tools is not None:
+        if tools:
             tools_params = {
                 "tools": [
                     {
@@ -149,24 +149,19 @@ class MiniMaxChatClient(BaseChatClient):
                 for chunk in response.iter_lines():
                     if chunk:
                         chunk_data = json.loads(chunk[6:])
+                        if chunk_data["object"] != "chat.completion.chunk":
+                            continue
                         tool_calls_params = extract_tool_calls(chunk_data)
                         has_tool_calls = True if tool_calls_params else False
                         if has_tool_calls:
-                            if "usage" not in chunk_data:
-                                continue
-                            else:
-                                if chunk_data["object"] != "chat.completion.chunk":
-                                    continue
-                                yield ChatCompletionDeltaMessage(
-                                    **{
-                                        "content": chunk_data["choices"][0]["delta"].get("content"),
-                                        "role": "assistant",
-                                        **tool_calls_params,
-                                    }
-                                )
+                            yield ChatCompletionDeltaMessage(
+                                **{
+                                    "content": chunk_data["choices"][0]["delta"].get("content"),
+                                    "role": "assistant",
+                                    **tool_calls_params,
+                                }
+                            )
                         else:
-                            if "usage" in chunk_data:
-                                continue
                             yield ChatCompletionDeltaMessage(
                                 **{
                                     "content": chunk_data["choices"][0]["delta"]["content"],
@@ -250,7 +245,7 @@ class AsyncMiniMaxChatClient(BaseAsyncChatClient):
                 model=self.model_setting.id,
             )
 
-        if tools is not None:
+        if tools:
             tools_params = {
                 "tools": [
                     {
@@ -305,24 +300,19 @@ class AsyncMiniMaxChatClient(BaseAsyncChatClient):
                     async for chunk in response.aiter_lines():
                         if chunk:
                             chunk_data = json.loads(chunk[6:])
+                            if chunk_data["object"] != "chat.completion.chunk":
+                                continue
                             tool_calls_params = extract_tool_calls(chunk_data)
                             has_tool_calls = True if tool_calls_params else False
                             if has_tool_calls:
-                                if "usage" not in chunk_data:
-                                    continue
-                                else:
-                                    if chunk_data["object"] != "chat.completion.chunk":
-                                        continue
-                                    yield ChatCompletionDeltaMessage(
-                                        **{
-                                            "content": chunk_data["choices"][0]["delta"].get("content"),
-                                            "role": "assistant",
-                                            **tool_calls_params,
-                                        }
-                                    )
+                                yield ChatCompletionDeltaMessage(
+                                    **{
+                                        "content": chunk_data["choices"][0]["delta"].get("content"),
+                                        "role": "assistant",
+                                        **tool_calls_params,
+                                    }
+                                )
                             else:
-                                if "usage" in chunk_data:
-                                    continue
                                 yield ChatCompletionDeltaMessage(
                                     **{
                                         "content": chunk_data["choices"][0]["delta"]["content"],

{vectorvein-0.1.8 → vectorvein-0.1.9}/tests/sample_settings.py

@@ -425,7 +425,6 @@ sample_settings = {
                 "id": "gpt-35-turbo",
                 "endpoints": [
                     "azure-openai-vectorvein-east-us",
-                    "azure-openai-vectorvein-east-us-2",
                     "azure-openai-vectorvein-au-east",
                 ],
             },

{vectorvein-0.1.8 → vectorvein-0.1.9}/tests/test_create_chat_client.py

@@ -192,9 +192,6 @@ model = "deepseek-chat"
 # model = "moonshot-v1-8k"
 # backend = BackendType.OpenAI
 # model = "gpt-4o"
-# backend = BackendType.MiniMax
-# model = "abab6.5s-chat"
-# backend = BackendType.OpenAI
 # model = "gpt-35-turbo"
 # backend = BackendType.MiniMax
 # model = "abab6.5s-chat"
@@ -225,13 +222,13 @@ model = "deepseek-chat"
 # model = "mistral-large"
 
 start_time = time.perf_counter()
-# test_sync(backend=backend, model=model, stream=False, use_tool=False)
+test_sync(backend=backend, model=model, stream=False, use_tool=False)
 test_sync(backend=backend, model=model, stream=False, use_tool=True)
-# test_sync(backend=backend, model=model, stream=True, use_tool=False)
+test_sync(backend=backend, model=model, stream=True, use_tool=False)
 test_sync(backend=backend, model=model, stream=True, use_tool=True)
-# asyncio.run(test_async(backend=backend, model=model, stream=False, use_tool=False))
-# asyncio.run(test_async(backend=backend, model=model, stream=False, use_tool=True))
-# asyncio.run(test_async(backend=backend, model=model, stream=True, use_tool=False))
-# asyncio.run(test_async(backend=backend, model=model, stream=True, use_tool=True))
+asyncio.run(test_async(backend=backend, model=model, stream=False, use_tool=False))
+asyncio.run(test_async(backend=backend, model=model, stream=False, use_tool=True))
+asyncio.run(test_async(backend=backend, model=model, stream=True, use_tool=False))
+asyncio.run(test_async(backend=backend, model=model, stream=True, use_tool=True))
 end_time = time.perf_counter()
 print(f"Stream time elapsed: {end_time - start_time} seconds")