llmir 0.0.5__tar.gz → 0.0.7__tar.gz

{llmir-0.0.5 → llmir-0.0.7}/PKG-INFO

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

{llmir-0.0.5 → llmir-0.0.7}/llmir/__init__.py

@@ -1,10 +1,10 @@
-from .chunks import AIChunk, AIChunkText, AIChunkFile, AIChunkImageURL, AIChunkToolCall
+from .chunks import AIChunks, AIChunkText, AIChunkFile, AIChunkImageURL, AIChunkToolCall
 from .roles import AIRoles
 from .messages import AIMessages, AIMessage, AIMessageToolResponse
 from .tools import Tool
 
 __all__ = [
-    "AIChunk",
+    "AIChunks",
     "AIChunkText",
     "AIChunkFile",
     "AIChunkImageURL",

llmir-0.0.7/llmir/adapter/__init__.py

@@ -0,0 +1,14 @@
+from .openai import to_openai, OpenAIMessages, OpenAIMessage, OpenAIMessageToolResponse, OpenAIContents, OpenAITextContent, OpenAIImageURLContent, OpenAIImageURLURL, OpenAIToolCallContent, OpenAIToolCallFunction
+
+__all__ = [
+    "to_openai",
+    "OpenAIMessages",
+    "OpenAIMessage",
+    "OpenAIMessageToolResponse",
+    "OpenAIContents",
+    "OpenAITextContent",
+    "OpenAIImageURLContent",
+    "OpenAIImageURLURL",
+    "OpenAIToolCallContent",
+    "OpenAIToolCallFunction",
+]

{llmir-0.0.5 → llmir-0.0.7}/llmir/adapter/openai.py

@@ -1,7 +1,7 @@
-from typing import TypedDict, Literal, Union
+from typing import TypedDict, Literal
 
 from ..messages import AIMessages, AIMessageToolResponse
-from ..chunks import AIChunk, AIChunkText, AIChunkImageURL, AIChunkFile, AIChunkToolCall
+from ..chunks import AIChunks, AIChunkText, AIChunkImageURL, AIChunkFile, AIChunkToolCall
 import base64
 import json
 
@@ -29,35 +29,58 @@ class OpenAIToolCallContent(TypedDict):
 
     
 
-OpenAIContent = Union[OpenAITextContent, OpenAIImageURLContent, OpenAIToolCallContent]
+OpenAIContents = OpenAITextContent | OpenAIImageURLContent | OpenAIToolCallContent
 
 
 class OpenAIMessage(TypedDict):
     role: str
-    content: list[OpenAIContent]
+    content: list[OpenAIContents]
 
-class OpenAIMessageToolResponse(OpenAIMessage):
+class OpenAIMessageToolResponse(TypedDict):
+    role: Literal["tool"]
     tool_call_id: str
     name: str
+    content: str
 
 
-def to_openai(messages: list[AIMessages]) -> list[OpenAIMessage]:
+OpenAIMessages = OpenAIMessage | OpenAIMessageToolResponse
+
+
+
+def to_openai(messages: list[AIMessages]) -> list[OpenAIMessages]:
     
 
-    result: list[OpenAIMessage] = []
+    result: list[OpenAIMessages] = []
     for message in messages:
         role = message.role.value
         if isinstance(message, AIMessageToolResponse):
+            assert(role == "tool")
+            text: str = ""
+            media_chunks: list[AIChunkFile | AIChunkImageURL] = []
+            for chunk in message.chunks:
+                if isinstance(chunk, AIChunkText):
+                    text += chunk.text
+                elif isinstance(chunk, AIChunkImageURL) or isinstance(chunk, AIChunkFile):
+                    media_chunks.append(chunk)
+                else:
+                    raise Exception(f"Invalid chunk type for Tool Response: {chunk.type}")
             result.append(
                 OpenAIMessageToolResponse(
                     role=role,
                     tool_call_id=message.id,
                     name=message.name,
-                    content=[
-                        chunk_to_openai(chunk) for chunk in message.chunks
-                    ]
+                    content=text,
                 )
             )
+            if media_chunks:
+                result.append(
+                    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
+                        ]
+                    )
+                )
         else:
             result.append(OpenAIMessage(
                 role= role,
@@ -68,7 +91,7 @@ def to_openai(messages: list[AIMessages]) -> list[OpenAIMessage]:
     return result
 
 
-def chunk_to_openai(chunk: AIChunk) -> OpenAIContent:
+def chunk_to_openai(chunk: AIChunks) -> OpenAIContents:
 
     match chunk:
         case AIChunkText():

{llmir-0.0.5 → llmir-0.0.7}/llmir/chunks.py

@@ -23,4 +23,4 @@ class AIChunkToolCall(RichReprMixin, BaseModel):
     arguments: dict[str, object]
 
 
-AIChunk = Union[AIChunkText, AIChunkFile, AIChunkImageURL, AIChunkToolCall]
+AIChunks = Union[AIChunkText, AIChunkFile, AIChunkImageURL, AIChunkToolCall]

{llmir-0.0.5 → llmir-0.0.7}/llmir/messages.py

@@ -1,17 +1,17 @@
 from pydantic import BaseModel, Field
 from typing import Literal
-from .chunks import AIChunk
+from .chunks import AIChunks
 from .roles import AIRoles
 
 class AIMessage(BaseModel):
 
     role: Literal[AIRoles.USER, AIRoles.MODEL, AIRoles.SYSTEM]
-    chunks: list[AIChunk] = Field(default_factory=list[AIChunk])
+    chunks: list[AIChunks] = Field(default_factory=list[AIChunks])
 
 class AIMessageToolResponse(BaseModel):
 
     role: Literal[AIRoles.TOOL] = AIRoles.TOOL
-    chunks: list[AIChunk] = Field(default_factory=list[AIChunk])
+    chunks: list[AIChunks] = Field(default_factory=list[AIChunks])
     id: str
     name: str
 

{llmir-0.0.5 → llmir-0.0.7}/llmir.egg-info/PKG-INFO

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

{llmir-0.0.5 → llmir-0.0.7}/pyproject.toml

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

llmir-0.0.5/llmir/adapter/__init__.py

@@ -1,13 +0,0 @@
-from .openai import to_openai, OpenAIMessage, OpenAIMessageToolResponse, OpenAIContent, OpenAITextContent, OpenAIImageURLContent, OpenAIImageURLURL, OpenAIToolCallContent, OpenAIToolCallFunction
-
-__all__ = [
-    "to_openai",
-    "OpenAIMessage",
-    "OpenAIMessageToolResponse",
-    "OpenAIContent",
-    "OpenAITextContent",
-    "OpenAIImageURLContent",
-    "OpenAIImageURLURL",
-    "OpenAIToolCallContent",
-    "OpenAIToolCallFunction",
-]