Skip to content

Commit 4e0e9f5

Browse files
committed
improve
1 parent bc532a2 commit 4e0e9f5

14 files changed

Lines changed: 71 additions & 31 deletions

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ from lm15 import LMRequest, Message, Part, build_default
2222
lm = build_default()
2323
resp = lm.complete(LMRequest(
2424
model="claude-sonnet-4-5",
25-
messages=(Message(role="user", parts=(Part.text_part("Hello."),)),),
25+
messages=(Message.user("Hello."),),
2626
))
27-
print(resp.message.parts[0].text)
27+
print(resp.text)
2828
```
2929

3030
Switch models by changing the string. Same types, same streaming protocol, same error hierarchy. That's it.
@@ -62,16 +62,16 @@ export GEMINI_API_KEY=... # or GOOGLE_API_KEY
6262
```python
6363
req = LMRequest(model="gpt-4.1-mini", messages=(...))
6464
for event in lm.stream(req):
65-
if event.type == "delta" and event.delta and event.delta.get("type") == "text":
66-
print(event.delta["text"], end="")
65+
if event.delta_text is not None:
66+
print(event.delta_text, end="")
6767
```
6868

6969
### Tool calling
7070

7171
```python
7272
from lm15 import Tool, ToolConfig
7373

74-
tools = (Tool(name="get_weather", description="...", parameters={...}),)
74+
tools = (Tool(name="get_weather", description="...", parameters={...}),) # type defaults to "function"
7575
req = LMRequest(model="gemini-2.5-flash", messages=(...), tools=tools)
7676
resp = lm.complete(req)
7777
# resp.message.parts may contain Part(type="tool_call", ...)
@@ -93,8 +93,8 @@ lm.batch_submit(BatchRequest(...))
9393
from lm15 import with_retries, with_cache, with_history
9494

9595
lm.middleware.add(with_retries(max_retries=3))
96-
lm.middleware.add(with_cache())
97-
lm.middleware.add(with_history())
96+
lm.middleware.add(with_cache({}))
97+
lm.middleware.add(with_history([]))
9898
```
9999

100100
### External plugins

‎examples/01_basic_text.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def main() -> None:
2121
lm = build_default(use_pycurl=True)
2222
req = LMRequest(model="gpt-4.1-mini", messages=(Message(role="user", parts=(Part.text_part("Reply with exactly: ok"),)),))
2323
resp = lm.complete(req)
24-
print(resp.message.parts[0].text if resp.message.parts else "")
24+
print(resp.text or "")
2525

2626

2727
if __name__ == "__main__":

‎examples/02_streaming.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def main() -> None:
2121
lm = build_default(use_pycurl=True)
2222
req = LMRequest(model="gpt-4.1-mini", messages=(Message(role="user", parts=(Part.text_part("Write 'ok' and stop."),)),))
2323
for event in lm.stream(req, provider="openai"):
24-
if event.type == "delta" and event.delta and event.delta.get("type") == "text":
25-
print(event.delta.get("text", ""), end="")
24+
if event.delta_text is not None:
25+
print(event.delta_text, end="")
2626
print()
2727

2828

‎examples/03_tools.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def main() -> None:
2121
lm = build_default(use_pycurl=True)
2222
tools = (
2323
Tool(
24-
type="function",
2524
name="get_weather",
2625
description="Get weather by city",
2726
parameters={"type": "object", "properties": {"city": {"type": "string"}}, "required": ["city"]},

‎examples/04_multimodal.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ def main() -> None:
2525
messages=(Message(role="user", parts=(image, Part.text_part("Describe this image in one sentence."))),),
2626
)
2727
resp = lm.complete(req, provider="gemini")
28-
text = "\n".join(p.text or "" for p in resp.message.parts if p.type == "text")
29-
print(text)
28+
print(resp.text or "")
3029

3130

3231
if __name__ == "__main__":

‎examples/06_reliability.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def main() -> None:
2323

2424
history = []
2525
cache = {}
26-
lm.middleware.complete_mw.append(with_cache(cache))
27-
lm.middleware.complete_mw.append(with_history(history))
28-
lm.middleware.complete_mw.append(with_retries(max_retries=2))
26+
lm.middleware.add(with_cache(cache))
27+
lm.middleware.add(with_history(history))
28+
lm.middleware.add(with_retries(max_retries=2))
2929

3030
req = LMRequest(model="gpt-4.1-mini", messages=(Message(role="user", parts=(Part.text_part("Reply with ok"),)),))
3131
_ = lm.complete(req, provider="openai")

‎lm15/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
LiveServerEvent,
2828
Message,
2929
Part,
30+
PartDelta,
3031
StreamEvent,
3132
Tool,
3233
ToolConfig,
@@ -69,6 +70,7 @@ def build_default(
6970
"LMResponse",
7071
"Message",
7172
"Part",
73+
"PartDelta",
7274
"StreamEvent",
7375
"EmbeddingRequest",
7476
"EmbeddingResponse",

‎lm15/middleware.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ class MiddlewarePipeline:
1818
complete_mw: list[CompleteMiddleware] = field(default_factory=list)
1919
stream_mw: list[StreamMiddleware] = field(default_factory=list)
2020

21+
def add(self, middleware: CompleteMiddleware) -> None:
22+
"""Add a completion middleware to the pipeline."""
23+
self.complete_mw.append(middleware)
24+
2125
def wrap_complete(self, fn: CompleteFn) -> CompleteFn:
2226
wrapped = fn
2327
for mw in reversed(self.complete_mw):

‎lm15/providers/anthropic.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
LMResponse,
1919
Message,
2020
Part,
21+
PartDelta,
2122
StreamEvent,
2223
Usage,
2324
)
@@ -142,11 +143,11 @@ def parse_stream_event(self, request: LMRequest, raw_event: SSEEvent) -> StreamE
142143
if et == "content_block_delta":
143144
delta = payload.get("delta", {})
144145
if delta.get("type") == "text_delta":
145-
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta={"type": "text", "text": delta.get("text", "")})
146+
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta=PartDelta(type="text", text=delta.get("text", "")))
146147
if delta.get("type") == "input_json_delta":
147-
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta={"type": "tool_call", "input": delta.get("partial_json", "")})
148+
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta=PartDelta(type="tool_call", input=delta.get("partial_json", "")))
148149
if delta.get("type") == "thinking_delta":
149-
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta={"type": "thinking", "text": delta.get("thinking", "")})
150+
return StreamEvent(type="delta", part_index=payload.get("index", 0), delta=PartDelta(type="thinking", text=delta.get("thinking", "")))
150151
return None
151152
if et == "content_block_stop":
152153
return StreamEvent(type="part_end", part_index=payload.get("index", 0))

‎lm15/providers/gemini.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
LMResponse,
2727
Message,
2828
Part,
29+
PartDelta,
2930
StreamEvent,
3031
Usage,
3132
)
@@ -205,15 +206,15 @@ def parse_stream_event(self, request: LMRequest, raw_event: SSEEvent) -> StreamE
205206
return None
206207
part = (cands[0].get("content", {}).get("parts") or [{}])[0]
207208
if "text" in part:
208-
return StreamEvent(type="delta", part_index=0, delta={"type": "text", "text": part["text"]})
209+
return StreamEvent(type="delta", part_index=0, delta=PartDelta(type="text", text=part["text"]))
209210
if "functionCall" in part:
210211
fc = part["functionCall"]
211-
return StreamEvent(type="delta", part_index=0, delta={"type": "tool_call", "input": json.dumps(fc.get("args", {}))})
212+
return StreamEvent(type="delta", part_index=0, delta=PartDelta(type="tool_call", input=json.dumps(fc.get("args", {}))))
212213
if "inlineData" in part:
213214
inline = part["inlineData"]
214215
mime = inline.get("mimeType", "application/octet-stream")
215216
if mime.startswith("audio/"):
216-
return StreamEvent(type="delta", part_index=0, delta={"type": "audio", "data": inline.get("data", "")})
217+
return StreamEvent(type="delta", part_index=0, delta=PartDelta(type="audio", data=inline.get("data", "")))
217218
return None
218219

219220
def embeddings(self, request: EmbeddingRequest) -> EmbeddingResponse:

0 commit comments

Comments
 (0)