llmir 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

llmir/adapter/openai.py

@@ -1,6 +1,6 @@
-from typing import TypedDict, Literal
+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
@@ -32,13 +32,13 @@ class OpenAIToolCall(TypedDict):
 OpenAIContents = OpenAIText | OpenAIImageURL
 
 
-class OpenAIMessage(TypedDict):
-    role: str
+class OpenAIMessage(TypedDict, total=False):
+    role: Required[Literal["system", "user", "assistant"]]
     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
 
@@ -78,19 +78,69 @@ def to_openai(messages: list[AIMessages]) -> list[OpenAIMessages]:
                         content=[
                             content_chunk_to_openai(chunk) for chunk in media_chunks
                         ],
-                        tool_calls=[]
                     )
                 )
         else:
-            result.append(OpenAIMessage(
-                role= role,
-                content=[
-                    content_chunk_to_openai(chunk) for chunk in message.chunks if not isinstance(chunk, AIChunkToolCall)
-                ],
-                tool_calls=[
-                    tool_call_chunk_to_openai(chunk) for chunk in message.chunks if isinstance(chunk, AIChunkToolCall)
-                ]
-            ))
+            
+            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)
+
+
+            formatted = OpenAIMessage(
+                role=role
+            )
+
+
+            result.append(
+                OpenAIMessage(
+                    role=role,
+                )
+            )
+            if media_chunks:
+                result.append(
+                    OpenAIMessage(
+                        role="user", # Hacky, but what else to circumvent API limitations in a broadly compatible way?
+                        content=[
+                            content_chunk_to_openai(chunk) for chunk in media_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",
+                    content=[
+                        content_chunk_to_openai(c) for c in media_chunks
+                    ]
+                )
+            )
+
     return result
 
 

{llmir-0.0.9.dist-info → llmir-0.0.11.dist-info}/METADATA

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

{llmir-0.0.9.dist-info → llmir-0.0.11.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=lnVhidU5FCivZ_mmFQNXAs9Hlfr7KA1Zv-OF4wjvXa8,4396
-llmir-0.0.9.dist-info/METADATA,sha256=UChge1sU00JhSXv1QlTM4McfwnMF73j1xphw1zkFI2Y,177
-llmir-0.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-llmir-0.0.9.dist-info/top_level.txt,sha256=fm538OsNUSYa_71IPztSSN2PBCvcbaD5PmUIzaO5hQs,6
-llmir-0.0.9.dist-info/RECORD,,
+llmir/adapter/openai.py,sha256=WNHJevKnOiPLJFgoQ4N2sBO1q342c4VjHGAGZQ55ovY,5906
+llmir-0.0.11.dist-info/METADATA,sha256=NNct7AEQo9RRItSTMOu2qlICoplAWUCs-5yZhPvpfnQ,178
+llmir-0.0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+llmir-0.0.11.dist-info/top_level.txt,sha256=fm538OsNUSYa_71IPztSSN2PBCvcbaD5PmUIzaO5hQs,6
+llmir-0.0.11.dist-info/RECORD,,