llmir 0.0.8__tar.gz → 0.0.10__tar.gz

{llmir-0.0.8 → llmir-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llmir
-Version: 0.0.8
+Version: 0.0.10
 Summary: Core message and tool IR for LLM pipelines
 Author: Mathis Siebert
 Requires-Python: >=3.11

{llmir-0.0.8 → llmir-0.0.10}/llmir/adapter/__init__.py

@@ -1,4 +1,4 @@
-from .openai import to_openai, OpenAIMessages, OpenAIMessage, OpenAIMessageToolResponse, OpenAIContents, OpenAITextContent, OpenAIImageURLContent, OpenAIImageURLURL, OpenAIToolCallContent, OpenAIToolCallFunction
+from .openai import to_openai, OpenAIMessages, OpenAIMessage, OpenAIMessageToolResponse, OpenAIContents, OpenAIText, OpenAIImageURL, OpenAIImageURLURL, OpenAIToolCall, OpenAIToolCallFunction
 
 __all__ = [
     "to_openai",
@@ -6,9 +6,9 @@ __all__ = [
     "OpenAIMessage",
     "OpenAIMessageToolResponse",
     "OpenAIContents",
-    "OpenAITextContent",
-    "OpenAIImageURLContent",
+    "OpenAIText",
+    "OpenAIImageURL",
     "OpenAIImageURLURL",
-    "OpenAIToolCallContent",
+    "OpenAIToolCall",
     "OpenAIToolCallFunction",
 ]

{llmir-0.0.8 → llmir-0.0.10}/llmir/adapter/openai.py

@@ -1,19 +1,19 @@
-from typing import TypedDict, Literal
+from typing import TypedDict, Literal, Required
 
 from ..messages import AIMessages, AIMessageToolResponse
-from ..chunks import AIChunks, AIChunkText, AIChunkImageURL, AIChunkFile, AIChunkToolCall
+from ..chunks import AIChunkText, AIChunkImageURL, AIChunkFile, AIChunkToolCall
 import base64
 import json
 
 
-class OpenAITextContent(TypedDict):
+class OpenAIText(TypedDict):
     type: Literal["text"]
     text: str
 
 class OpenAIImageURLURL(TypedDict):
     url: str
 
-class OpenAIImageURLContent(TypedDict):
+class OpenAIImageURL(TypedDict):
     type: Literal["image_url"]
     image_url: OpenAIImageURLURL
 
@@ -22,22 +22,23 @@ class OpenAIToolCallFunction(TypedDict):
     name: str
     arguments: str
 
-class OpenAIToolCallContent(TypedDict):
+class OpenAIToolCall(TypedDict):
     id: str
     type: Literal["function"]
     function: OpenAIToolCallFunction
 
     
 
-OpenAIContents = OpenAITextContent | OpenAIImageURLContent | OpenAIToolCallContent
+OpenAIContents = OpenAIText | OpenAIImageURL
 
 
-class OpenAIMessage(TypedDict):
-    role: str
+class OpenAIMessage(TypedDict, total=False):
+    role: Required[str]
     content: list[OpenAIContents]
+    tool_calls: list[OpenAIToolCall]
 
-class OpenAIMessageToolResponse(TypedDict):
-    role: Literal["tool"]
+class OpenAIMessageToolResponse(TypedDict, total=False):
+    role: Required[Literal["tool"]]
     tool_call_id: str
     content: str
 
@@ -75,30 +76,40 @@ def to_openai(messages: list[AIMessages]) -> list[OpenAIMessages]:
                     OpenAIMessage(
                         role="user", # Hacky, but what else to circumvent API limitations in a broadly compatible way?
                         content=[
-                            chunk_to_openai(chunk) for chunk in media_chunks
-                        ]
+                            content_chunk_to_openai(chunk) for chunk in media_chunks
+                        ],
                     )
                 )
         else:
-            result.append(OpenAIMessage(
-                role= role,
-                content= [
-                    chunk_to_openai(chunk) for chunk in message.chunks
-                ]
-            ))
+            formatted = OpenAIMessage(
+                role=role
+            )
+            content: list[OpenAIContents] = [
+                content_chunk_to_openai(chunk) for chunk in message.chunks if not isinstance(chunk, AIChunkToolCall)
+            ]
+            tool_calls: list[OpenAIToolCall] = [
+                tool_call_chunk_to_openai(chunk) for chunk in message.chunks if isinstance(chunk, AIChunkToolCall)
+            ]
+            if content:
+                formatted["content"] = content
+            if tool_calls:
+                formatted["tool_calls"] = tool_calls
+
+            result.append(formatted)
+
     return result
 
 
-def chunk_to_openai(chunk: AIChunks) -> OpenAIContents:
+def content_chunk_to_openai(chunk: AIChunkText | AIChunkFile | AIChunkImageURL) -> OpenAIContents:
 
     match chunk:
         case AIChunkText():
-            return OpenAITextContent(
+            return OpenAIText(
                 type="text",
                 text=chunk.text,
             )
         case AIChunkImageURL():
-            return OpenAIImageURLContent(
+            return OpenAIImageURL(
                 type="image_url",
                 image_url={
                     "url": chunk.url,
@@ -107,7 +118,7 @@ def chunk_to_openai(chunk: AIChunks) -> OpenAIContents:
         case AIChunkFile():
             if chunk.mimetype.startswith("image/"):
                 base64_data = base64.b64encode(chunk.bytes).decode('utf-8')
-                return OpenAIImageURLContent(
+                return OpenAIImageURL(
                     type= "image_url",
                     image_url= {
                         "url": f"data:{chunk.mimetype};base64,{base64_data}",
@@ -115,20 +126,22 @@ def chunk_to_openai(chunk: AIChunks) -> OpenAIContents:
                 )
             elif chunk.mimetype == "text/plain":
                 text = chunk.bytes.decode(encoding="utf-8")
-                return OpenAITextContent(
+                return OpenAIText(
                     type="text",
                     text=text
                 )
             else:
                 raise ValueError(f"Unsupported file type for OpenAI: {chunk.mimetype}")
-        case AIChunkToolCall():
-            return OpenAIToolCallContent(
+        case _:
+            raise ValueError(f"Unsupported chunk type: {type(chunk)}")
+        
+def tool_call_chunk_to_openai(chunk: AIChunkToolCall) -> OpenAIToolCall:
+
+    return OpenAIToolCall(
                 id=chunk.id,
                 type="function",
                 function=OpenAIToolCallFunction(
                     name=chunk.name,
                     arguments=json.dumps(chunk.arguments)
                 )
-            )
-        case _:
-            raise ValueError(f"Unsupported chunk type: {type(chunk)}")
+            )

{llmir-0.0.8 → llmir-0.0.10}/llmir.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llmir
-Version: 0.0.8
+Version: 0.0.10
 Summary: Core message and tool IR for LLM pipelines
 Author: Mathis Siebert
 Requires-Python: >=3.11

{llmir-0.0.8 → llmir-0.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llmir"
-version = "0.0.8"
+version = "0.0.10"
 description = "Core message and tool IR for LLM pipelines"
 authors = [{ name="Mathis Siebert" }]
 requires-python = ">=3.11"