llmir 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

llmir/adapter/openai.py

@@ -1,6 +1,6 @@
 from typing import TypedDict, Literal, Required
 
-from ..messages import AIMessages, AIMessageToolResponse
+from ..messages import AIMessages, AIMessageToolResponse, AIRoles
 from ..chunks import AIChunkText, AIChunkImageURL, AIChunkFile, AIChunkToolCall
 import base64
 import json
@@ -33,7 +33,7 @@ OpenAIContents = OpenAIText | OpenAIImageURL
 
 
 class OpenAIMessage(TypedDict, total=False):
-    role: Required[str]
+    role: Required[Literal["system", "user", "assistant"]]
     content: list[OpenAIContents]
     tool_calls: list[OpenAIToolCall]
 
@@ -81,21 +81,44 @@ def to_openai(messages: list[AIMessages]) -> list[OpenAIMessages]:
                     )
                 )
         else:
-            formatted = OpenAIMessage(
-                role=role
+            
+            assert(role != "tool")
+            content_chunks: list[AIChunkText | AIChunkFile | AIChunkImageURL] = []
+            tool_call_chunks: list[AIChunkToolCall] = []
+
+            media_chunks: list[AIChunkFile | AIChunkImageURL] = []
+
+            for chunk in message.chunks:
+
+                if isinstance(chunk, AIChunkToolCall):
+                    tool_call_chunks.append(chunk)
+
+                elif role != AIRoles.USER and not isinstance(chunk, AIChunkText):
+                    media_chunks.append(chunk)
+
+                else:
+                    content_chunks.append(chunk)
+
+
+            if content_chunks or tool_call_chunks:
+                formatted = OpenAIMessage(
+                    role=role
+                )
+                if content_chunks:
+                    formatted["content"] = [content_chunk_to_openai(c) for c in content_chunks]
+                if tool_call_chunks:
+                    formatted["tool_calls"] = [tool_call_chunk_to_openai(c) for c in tool_call_chunks]
+
+                result.append(formatted)
+            
+            if media_chunks:
+                result.append(OpenAIMessage(
+                    role="user", # Hacky too, but what else to circumvent API limitations in a broadly compatible way?
+                    content=[
+                        content_chunk_to_openai(c) for c in media_chunks
+                    ]
+                )
             )
-            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
 

{llmir-0.0.10.dist-info → llmir-0.0.12.dist-info}/METADATA

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

{llmir-0.0.10.dist-info → llmir-0.0.12.dist-info}/RECORD

@@ -6,8 +6,8 @@ llmir/rich_repr.py,sha256=ZGAfpcPkYJSUpFdir8B1MoORVFBSzVckCrRHVVkJIj4,559
 llmir/roles.py,sha256=B9PmxTHAb8XoiA9en_J1yIP19woddzx4SRUz5XkUxFc,133
 llmir/tools.py,sha256=fpkC3IafHqZJnwo7imtHdkTdGLBHQuR6DtdztXZrlWg,147
 llmir/adapter/__init__.py,sha256=6yYVuYUXWiPPx5-v9PdSojEEw0TSFKz_4ELK9ntpRCw,437
-llmir/adapter/openai.py,sha256=mBoMgznljHOW05vAQu5Gv4p-eTUAD7YyPIypJZ7R8kQ,4622
-llmir-0.0.10.dist-info/METADATA,sha256=jZ9YcuNGqQRnkkUjzne3wJrA7m32hh5DD-i-sQ1Z3IM,178
-llmir-0.0.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-llmir-0.0.10.dist-info/top_level.txt,sha256=fm538OsNUSYa_71IPztSSN2PBCvcbaD5PmUIzaO5hQs,6
-llmir-0.0.10.dist-info/RECORD,,
+llmir/adapter/openai.py,sha256=gXPh_4kjF_hgxXCCjROQXRriDPQtECVUhVW0M3pYl84,5470
+llmir-0.0.12.dist-info/METADATA,sha256=nLPChWuQr3M6er0dvA2mS0pNQMt6-lcZVW9b2gdNFYo,178
+llmir-0.0.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+llmir-0.0.12.dist-info/top_level.txt,sha256=fm538OsNUSYa_71IPztSSN2PBCvcbaD5PmUIzaO5hQs,6
+llmir-0.0.12.dist-info/RECORD,,