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

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/adapter/openai.py

@@ -1,19 +1,19 @@
 from typing import TypedDict, Literal
 
 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,24 +22,24 @@ 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
     content: list[OpenAIContents]
+    tool_calls: list[OpenAIToolCall]
 
 class OpenAIMessageToolResponse(TypedDict):
     role: Literal["tool"]
     tool_call_id: str
-    name: str
     content: str
 
 
@@ -68,7 +68,6 @@ def to_openai(messages: list[AIMessages]) -> list[OpenAIMessages]:
                 OpenAIMessageToolResponse(
                     role=role,
                     tool_call_id=message.id,
-                    name=message.name,
                     content=text,
                 )
             )
@@ -77,30 +76,34 @@ 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
+                        ],
+                        tool_calls=[]
                     )
                 )
         else:
             result.append(OpenAIMessage(
                 role= role,
-                content= [
-                    chunk_to_openai(chunk) for chunk in message.chunks
+                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)
                 ]
             ))
     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,
@@ -109,7 +112,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}",
@@ -117,20 +120,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.7.dist-info → llmir-0.0.9.dist-info}/METADATA

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

{llmir-0.0.7.dist-info → llmir-0.0.9.dist-info}/RECORD

@@ -5,9 +5,9 @@ llmir/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=UWfxC24Yll1GBataj4Aur_6RsdQwHQ1fV4ycTUhu7OA,479
-llmir/adapter/openai.py,sha256=PdQzxDvFs3ivjy0NS_kWm-NAOKR75e_3VDHEnpDaZY4,4167
-llmir-0.0.7.dist-info/METADATA,sha256=Z3G9fpXA0eEfzJh2TDL1Ry5XfyoQuOBEDtkpzvYFxAk,177
-llmir-0.0.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-llmir-0.0.7.dist-info/top_level.txt,sha256=fm538OsNUSYa_71IPztSSN2PBCvcbaD5PmUIzaO5hQs,6
-llmir-0.0.7.dist-info/RECORD,,
+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,,