livekit-plugins-volcenginee 1.3.4__tar.gz → 1.3.5__tar.gz

{livekit_plugins_volcenginee-1.3.4 → livekit_plugins_volcenginee-1.3.5}/.gitignore

@@ -4,3 +4,4 @@
 __pycache__/
 .env
 .env.*
+dist/

{livekit_plugins_volcenginee-1.3.4 → livekit_plugins_volcenginee-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-volcenginee
-Version: 1.3.4
+Version: 1.3.5
 Summary: LiveKit Agent Plugins for Volcengine
 Author-email: linsanzhu <2287225730@qq.com>
 Keywords: audio,livekit,realtime,video,webrtc

{livekit_plugins_volcenginee-1.3.4 → livekit_plugins_volcenginee-1.3.5}/livekit/plugins/volcengine/llm.py

@@ -21,7 +21,7 @@ from livekit.agents.types import (
 from livekit.agents.utils import is_given
 
 from .log import logger
-from .utils import to_chat_ctx, to_fnc_ctx
+from .utils import to_fnc_ctx
 
 
 @dataclass
@@ -206,7 +206,7 @@ class LLMStream(llm.LLMStream):
             stream: openai.AsyncStream[
                 ChatCompletionChunk
             ] = await self._client.chat.completions.create(
-                messages=to_chat_ctx(self._chat_ctx, id(self._llm)),
+                messages=self._chat_ctx.to_provider_format(format="openai")[0],
                 tools=to_fnc_ctx(self._tools) if self._tools else openai.NOT_GIVEN,
                 model=self._model,
                 stream_options={"include_usage": True},

livekit_plugins_volcenginee-1.3.5/livekit/plugins/volcengine/utils.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+import os
+from collections.abc import Sequence
+from typing import Awaitable, Callable, Union, cast
+
+from livekit.agents import llm
+from openai.types.chat import ChatCompletionToolParam
+
+AsyncAzureADTokenProvider = Callable[[], Union[str, Awaitable[str]]]
+
+
+def get_base_url(base_url: str | None) -> str:
+    if not base_url:
+        base_url = os.getenv(
+            "VOLCENGINE_LLM_BASE_URL", "https://ark.cn-beijing.volces.com/api/v3"
+        )
+    return base_url
+
+
+def to_fnc_ctx(fnc_ctx: Sequence[llm.Tool]) -> list[ChatCompletionToolParam]:
+    return cast(
+        list[ChatCompletionToolParam],
+        llm.ToolContext(fnc_ctx).parse_function_tools("openai"),
+    )

livekit_plugins_volcenginee-1.3.5/livekit/plugins/volcengine/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.5"

livekit_plugins_volcenginee-1.3.4/livekit/plugins/volcengine/utils.py

@@ -1,154 +0,0 @@
-from __future__ import annotations
-
-import base64
-import os
-from collections import OrderedDict
-from collections.abc import Awaitable, Sequence
-from typing import Any, Callable, Union, cast
-
-from openai.types.chat import (
-    ChatCompletionContentPartParam,
-    ChatCompletionMessageParam,
-    ChatCompletionToolParam,
-)
-
-from livekit.agents import llm
-
-AsyncAzureADTokenProvider = Callable[[], Union[str, Awaitable[str]]]
-
-
-def get_base_url(base_url: str | None) -> str:
-    if not base_url:
-        base_url = os.getenv(
-            "VOLCENGINE_LLM_BASE_URL", "https://ark.cn-beijing.volces.com/api/v3"
-        )
-    return base_url
-
-
-def to_fnc_ctx(fnc_ctx: Sequence[llm.Tool]) -> list[ChatCompletionToolParam]:
-    return cast(
-        list[ChatCompletionToolParam],
-        llm.ToolContext(fnc_ctx).parse_function_tools("openai"),
-    )
-
-
-def to_chat_ctx(
-    chat_ctx: llm.ChatContext, cache_key: Any
-) -> list[ChatCompletionMessageParam]:
-    # group the message and function_calls
-    item_groups: dict[str, list[llm.ChatItem]] = OrderedDict()
-    for item in chat_ctx.items:
-        if (
-            item.type == "message" and item.role == "assistant"
-        ) or item.type == "function_call":
-            group_id = item.id.split("/")[0]
-            if group_id not in item_groups:
-                item_groups[group_id] = []
-            item_groups[group_id].append(item)
-        else:
-            item_groups[item.id] = [item]
-
-    return [_group_to_chat_item(items, cache_key) for items in item_groups.values()]
-
-
-def _group_to_chat_item(
-    items: list[llm.ChatItem], cache_key: Any
-) -> ChatCompletionMessageParam:
-    if len(items) == 1:
-        return _to_chat_item(items[0], cache_key)
-    else:
-        msg = {"role": "assistant", "tool_calls": []}
-        for item in items:
-            if item.type == "message":
-                assert item.role == "assistant", (
-                    "only assistant messages can be grouped"
-                )
-                assert "content" not in msg, (
-                    "only one assistant message is allowed in a group"
-                )
-
-                msg.update(_to_chat_item(item, cache_key))
-            elif item.type == "function_call":
-                msg["tool_calls"].append(
-                    {
-                        "id": item.call_id,
-                        "type": "function",
-                        "function": {"name": item.name, "arguments": item.arguments},
-                    }
-                )
-        return msg
-
-
-def _to_chat_item(msg: llm.ChatItem, cache_key: Any) -> ChatCompletionMessageParam:
-    if msg.type == "message":
-        list_content: list[ChatCompletionContentPartParam] = []
-        text_content = ""
-        for content in msg.content:
-            if isinstance(content, str):
-                if text_content:
-                    text_content += "\n"
-                text_content += content
-            elif isinstance(content, llm.ImageContent):
-                list_content.append(_to_image_content(content, cache_key))
-
-        if not list_content:
-            # certain providers require text-only content in a string vs a list.
-            # for max-compatibility, we will combine all text content into a single string.
-            return {
-                "role": msg.role,  # type: ignore
-                "content": text_content,
-            }
-
-        if text_content:
-            list_content.append({"type": "text", "text": text_content})
-
-        return {
-            "role": msg.role,  # type: ignore
-            "content": list_content,
-        }
-
-    elif msg.type == "function_call":
-        return {
-            "role": "assistant",
-            "tool_calls": [
-                {
-                    "id": msg.call_id,
-                    "type": "function",
-                    "function": {
-                        "name": msg.name,
-                        "arguments": msg.arguments,
-                    },
-                }
-            ],
-        }
-
-    elif msg.type == "function_call_output":
-        return {
-            "role": "tool",
-            "tool_call_id": msg.call_id,
-            "content": msg.output,
-        }
-
-
-def _to_image_content(
-    image: llm.ImageContent, cache_key: Any
-) -> ChatCompletionContentPartParam:
-    img = llm.utils.serialize_image(image)
-    if img.external_url:
-        return {
-            "type": "image_url",
-            "image_url": {
-                "url": img.external_url,
-                "detail": img.inference_detail,
-            },
-        }
-    if cache_key not in image._cache:
-        image._cache[cache_key] = img.data_bytes
-    b64_data = base64.b64encode(image._cache[cache_key]).decode("utf-8")
-    return {
-        "type": "image_url",
-        "image_url": {
-            "url": f"data:{img.mime_type};base64,{b64_data}",
-            "detail": img.inference_detail,
-        },
-    }

livekit_plugins_volcenginee-1.3.4/livekit/plugins/volcengine/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.4"