lm-deluge 0.0.65__py3-none-any.whl → 0.0.67__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- lm_deluge/api_requests/anthropic.py +3 -0
- lm_deluge/api_requests/openai.py +122 -108
- lm_deluge/prompt.py +12 -0
- {lm_deluge-0.0.65.dist-info → lm_deluge-0.0.67.dist-info}/METADATA +1 -1
- {lm_deluge-0.0.65.dist-info → lm_deluge-0.0.67.dist-info}/RECORD +8 -8
- {lm_deluge-0.0.65.dist-info → lm_deluge-0.0.67.dist-info}/WHEEL +0 -0
- {lm_deluge-0.0.65.dist-info → lm_deluge-0.0.67.dist-info}/licenses/LICENSE +0 -0
- {lm_deluge-0.0.65.dist-info → lm_deluge-0.0.67.dist-info}/top_level.txt +0 -0
|
@@ -90,6 +90,9 @@ def _build_anthropic_request(
|
|
|
90
90
|
for tool in tools:
|
|
91
91
|
if isinstance(tool, Tool):
|
|
92
92
|
tool_definitions.append(tool.dump_for("anthropic"))
|
|
93
|
+
elif isinstance(tool, dict) and "url" in tool:
|
|
94
|
+
_add_beta(base_headers, "mcp-client-2025-04-04")
|
|
95
|
+
mcp_servers.append(tool)
|
|
93
96
|
elif isinstance(tool, dict):
|
|
94
97
|
tool_definitions.append(tool)
|
|
95
98
|
# add betas if needed
|
lm_deluge/api_requests/openai.py
CHANGED
|
@@ -184,7 +184,8 @@ class OpenAIRequest(APIRequestBase):
|
|
|
184
184
|
|
|
185
185
|
content = Message("assistant", parts)
|
|
186
186
|
|
|
187
|
-
usage
|
|
187
|
+
if "usage" in data and data["usage"] is not None:
|
|
188
|
+
usage = Usage.from_openai_usage(data["usage"])
|
|
188
189
|
if (
|
|
189
190
|
self.context.sampling_params.logprobs
|
|
190
191
|
and "logprobs" in data["choices"][0]
|
|
@@ -349,7 +350,8 @@ class OpenAIResponsesRequest(APIRequestBase):
|
|
|
349
350
|
assert self.context.status_tracker
|
|
350
351
|
|
|
351
352
|
if status_code == 500:
|
|
352
|
-
|
|
353
|
+
res_text = await http_response.text()
|
|
354
|
+
print("Internal Server Error: ", res_text)
|
|
353
355
|
|
|
354
356
|
if status_code >= 200 and status_code < 300:
|
|
355
357
|
try:
|
|
@@ -361,126 +363,138 @@ class OpenAIResponsesRequest(APIRequestBase):
|
|
|
361
363
|
)
|
|
362
364
|
if not is_error:
|
|
363
365
|
assert data is not None, "data is None"
|
|
364
|
-
try:
|
|
365
|
-
# Parse Responses API format
|
|
366
|
-
parts = []
|
|
367
366
|
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
367
|
+
# Check if response is incomplete
|
|
368
|
+
if data.get("status") == "incomplete":
|
|
369
|
+
is_error = True
|
|
370
|
+
incomplete_reason = data.get("incomplete_details", {}).get(
|
|
371
|
+
"reason", "unknown"
|
|
372
|
+
)
|
|
373
|
+
error_message = f"Response incomplete: {incomplete_reason}"
|
|
374
|
+
|
|
375
|
+
if not is_error:
|
|
376
|
+
try:
|
|
377
|
+
# Parse Responses API format
|
|
378
|
+
parts = []
|
|
379
|
+
|
|
380
|
+
# Get the output array from the response
|
|
381
|
+
output = data.get("output", [])
|
|
382
|
+
if not output:
|
|
383
|
+
is_error = True
|
|
384
|
+
error_message = "No output in response"
|
|
385
|
+
else:
|
|
386
|
+
# Process each output item
|
|
387
|
+
for item in output:
|
|
388
|
+
if item.get("type") == "message":
|
|
389
|
+
message_content = item.get("content", [])
|
|
390
|
+
for content_item in message_content:
|
|
391
|
+
if content_item.get("type") == "output_text":
|
|
392
|
+
parts.append(Text(content_item["text"]))
|
|
393
|
+
elif content_item.get("type") == "refusal":
|
|
394
|
+
parts.append(Text(content_item["refusal"]))
|
|
395
|
+
elif item.get("type") == "reasoning":
|
|
396
|
+
summary = item["summary"]
|
|
397
|
+
if not summary:
|
|
398
|
+
continue
|
|
399
|
+
if isinstance(summary, list) and len(summary) > 0:
|
|
400
|
+
summary = summary[0]
|
|
401
|
+
assert isinstance(
|
|
402
|
+
summary, dict
|
|
403
|
+
), "summary isn't a dict"
|
|
404
|
+
parts.append(Thinking(summary["text"]))
|
|
405
|
+
elif item.get("type") == "function_call":
|
|
406
|
+
parts.append(
|
|
407
|
+
ToolCall(
|
|
408
|
+
id=item["call_id"],
|
|
409
|
+
name=item["name"],
|
|
410
|
+
arguments=json.loads(item["arguments"]),
|
|
411
|
+
)
|
|
397
412
|
)
|
|
398
|
-
)
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
413
|
+
elif item.get("type") == "mcp_call":
|
|
414
|
+
parts.append(
|
|
415
|
+
ToolCall(
|
|
416
|
+
id=item["id"],
|
|
417
|
+
name=item["name"],
|
|
418
|
+
arguments=json.loads(item["arguments"]),
|
|
419
|
+
built_in=True,
|
|
420
|
+
built_in_type="mcp_call",
|
|
421
|
+
extra_body={
|
|
422
|
+
"server_label": item["server_label"],
|
|
423
|
+
"error": item.get("error"),
|
|
424
|
+
"output": item.get("output"),
|
|
425
|
+
},
|
|
426
|
+
)
|
|
412
427
|
)
|
|
413
|
-
)
|
|
414
428
|
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
429
|
+
elif item.get("type") == "computer_call":
|
|
430
|
+
parts.append(
|
|
431
|
+
ToolCall(
|
|
432
|
+
id=item["call_id"],
|
|
433
|
+
name="computer_call",
|
|
434
|
+
arguments=item.get("action"),
|
|
435
|
+
built_in=True,
|
|
436
|
+
built_in_type="computer_call",
|
|
437
|
+
)
|
|
423
438
|
)
|
|
424
|
-
)
|
|
425
439
|
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
440
|
+
elif item.get("type") == "web_search_call":
|
|
441
|
+
parts.append(
|
|
442
|
+
ToolCall(
|
|
443
|
+
id=item["id"],
|
|
444
|
+
name="web_search_call",
|
|
445
|
+
arguments={},
|
|
446
|
+
built_in=True,
|
|
447
|
+
built_in_type="web_search_call",
|
|
448
|
+
extra_body={"status": item["status"]},
|
|
449
|
+
)
|
|
435
450
|
)
|
|
436
|
-
)
|
|
437
451
|
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
452
|
+
elif item.get("type") == "file_search_call":
|
|
453
|
+
parts.append(
|
|
454
|
+
ToolCall(
|
|
455
|
+
id=item["id"],
|
|
456
|
+
name="file_search_call",
|
|
457
|
+
arguments={"queries": item["queries"]},
|
|
458
|
+
built_in=True,
|
|
459
|
+
built_in_type="file_search_call",
|
|
460
|
+
extra_body={
|
|
461
|
+
"status": item["status"],
|
|
462
|
+
"results": item["results"],
|
|
463
|
+
},
|
|
464
|
+
)
|
|
450
465
|
)
|
|
451
|
-
)
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
466
|
+
elif item.get("type") == "image_generation_call":
|
|
467
|
+
parts.append(
|
|
468
|
+
ToolCall(
|
|
469
|
+
id=item["id"],
|
|
470
|
+
name="image_generation_call",
|
|
471
|
+
arguments={},
|
|
472
|
+
built_in=True,
|
|
473
|
+
built_in_type="image_generation_call",
|
|
474
|
+
extra_body={
|
|
475
|
+
"status": item["status"],
|
|
476
|
+
"result": item["result"],
|
|
477
|
+
},
|
|
478
|
+
)
|
|
464
479
|
)
|
|
465
|
-
)
|
|
466
480
|
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
481
|
+
# Handle reasoning if present
|
|
482
|
+
if "reasoning" in data and data["reasoning"].get("summary"):
|
|
483
|
+
thinking = data["reasoning"]["summary"]
|
|
484
|
+
parts.append(Thinking(thinking))
|
|
471
485
|
|
|
472
|
-
|
|
486
|
+
content = Message("assistant", parts)
|
|
473
487
|
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
488
|
+
# Extract usage information
|
|
489
|
+
if "usage" in data and data["usage"] is not None:
|
|
490
|
+
usage = Usage.from_openai_usage(data["usage"])
|
|
477
491
|
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
492
|
+
except Exception as e:
|
|
493
|
+
is_error = True
|
|
494
|
+
error_message = f"Error parsing {self.model.name} responses API response: {str(e)}"
|
|
495
|
+
print("got data:", data)
|
|
496
|
+
traceback = tb.format_exc()
|
|
497
|
+
print(f"Error details:\n{traceback}")
|
|
484
498
|
|
|
485
499
|
elif mimetype and "json" in mimetype.lower():
|
|
486
500
|
print("is_error True, json response")
|
lm_deluge/prompt.py
CHANGED
|
@@ -329,6 +329,18 @@ class Message:
|
|
|
329
329
|
"""Get all thinking parts with proper typing."""
|
|
330
330
|
return [part for part in self.parts if part.type == "thinking"] # type: ignore
|
|
331
331
|
|
|
332
|
+
# @staticmethod
|
|
333
|
+
# def dump_part(part: Part):
|
|
334
|
+
# if isinstance(value, Text):
|
|
335
|
+
# return {"type": "text", "text": value.text}
|
|
336
|
+
# if isinstance(value, Image):
|
|
337
|
+
# w, h = value.size
|
|
338
|
+
# return {"type": "image", "tag": f"<Image ({w}×{h})>"}
|
|
339
|
+
# if isinstance(value, File):
|
|
340
|
+
# size = value.size
|
|
341
|
+
# return {"type": "file", "tag": f"<File ({size} bytes)>"}
|
|
342
|
+
# return repr(value)
|
|
343
|
+
|
|
332
344
|
def to_log(self) -> dict:
|
|
333
345
|
"""
|
|
334
346
|
Return a JSON-serialisable dict that fully captures the message.
|
|
@@ -8,7 +8,7 @@ lm_deluge/embed.py,sha256=CO-TOlC5kOTAM8lcnicoG4u4K664vCBwHF1vHa-nAGg,13382
|
|
|
8
8
|
lm_deluge/errors.py,sha256=oHjt7YnxWbh-eXMScIzov4NvpJMo0-2r5J6Wh5DQ1tk,209
|
|
9
9
|
lm_deluge/file.py,sha256=PTmlJQ-IaYcYUFun9V0bJ1NPVP84edJrR0hvCMWFylY,19697
|
|
10
10
|
lm_deluge/image.py,sha256=5AMXmn2x47yXeYNfMSMAOWcnlrOxxOel-4L8QCJwU70,8928
|
|
11
|
-
lm_deluge/prompt.py,sha256=
|
|
11
|
+
lm_deluge/prompt.py,sha256=Bgszws8-3GPefiVRa-Mht4tfyfoqD_hV5MX1nrbkJn0,63465
|
|
12
12
|
lm_deluge/request_context.py,sha256=cBayMFWupWhde2OjRugW3JH-Gin-WFGc6DK2Mb4Prdc,2576
|
|
13
13
|
lm_deluge/rerank.py,sha256=-NBAJdHz9OB-SWWJnHzkFmeVO4wR6lFV7Vw-SxG7aVo,11457
|
|
14
14
|
lm_deluge/tool.py,sha256=Kp2O5lDq_WVo_ASxjLQSHzVRbaxZkS6J0JIIskBjux0,28909
|
|
@@ -16,13 +16,13 @@ lm_deluge/tracker.py,sha256=aeS9GUJpgOSQRVXAnGDvlMO8qYpSxpTNLYj2hrMg0m8,14757
|
|
|
16
16
|
lm_deluge/usage.py,sha256=xz9tAw2hqaJvv9aAVhnQ6N1Arn7fS8Shb28VwCW26wI,5136
|
|
17
17
|
lm_deluge/warnings.py,sha256=nlDJMCw30VhDEFxqLO2-bfXH_Tv5qmlglzUSbokCSw8,1498
|
|
18
18
|
lm_deluge/api_requests/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
|
19
|
-
lm_deluge/api_requests/anthropic.py,sha256=
|
|
19
|
+
lm_deluge/api_requests/anthropic.py,sha256=QGq3G5jJIGcoM2HdRt73GgkvZs4GOViyjYexWex05Vk,8927
|
|
20
20
|
lm_deluge/api_requests/base.py,sha256=GCcydwBRx4_xAuYLvasXlyj-TgqvKAVhVvxRfJkvPbY,9471
|
|
21
21
|
lm_deluge/api_requests/bedrock.py,sha256=Uppne03GcIEk1tVYzoGu7GXK2Sg94a_xvFTLDRN_phY,15412
|
|
22
22
|
lm_deluge/api_requests/common.py,sha256=BZ3vRO5TB669_UsNKugkkuFSzoLHOYJIKt4nV4sf4vc,422
|
|
23
23
|
lm_deluge/api_requests/gemini.py,sha256=4uD7fQl0yWyAvYkPNi3oO1InBnvYfo5_QR6k-va-2GI,7838
|
|
24
24
|
lm_deluge/api_requests/mistral.py,sha256=8JZP2CDf1XZfaPcTk0WS4q-VfYYj58ptpoH8LD3MQG4,4528
|
|
25
|
-
lm_deluge/api_requests/openai.py,sha256=
|
|
25
|
+
lm_deluge/api_requests/openai.py,sha256=d1Ddf5sSutx9Ti1riwOEkeADnhYG7Y4vQm2DOhKl67I,25925
|
|
26
26
|
lm_deluge/api_requests/response.py,sha256=vG194gAH5p7ulpNy4qy5Pryfb1p3ZV21-YGoj__ru3E,7436
|
|
27
27
|
lm_deluge/api_requests/deprecated/bedrock.py,sha256=WrcIShCoO8JCUSlFOCHxg6KQCNTZfw3TpYTvSpYk4mA,11320
|
|
28
28
|
lm_deluge/api_requests/deprecated/cohere.py,sha256=KgDScD6_bWhAzOY5BHZQKSA3kurt4KGENqC4wLsGmcU,5142
|
|
@@ -65,8 +65,8 @@ lm_deluge/util/logprobs.py,sha256=UkBZakOxWluaLqHrjARu7xnJ0uCHVfLGHJdnYlEcutk,11
|
|
|
65
65
|
lm_deluge/util/spatial.py,sha256=BsF_UKhE-x0xBirc-bV1xSKZRTUhsOBdGqsMKme20C8,4099
|
|
66
66
|
lm_deluge/util/validation.py,sha256=hz5dDb3ebvZrZhnaWxOxbNSVMI6nmaOODBkk0htAUhs,1575
|
|
67
67
|
lm_deluge/util/xml.py,sha256=Ft4zajoYBJR3HHCt2oHwGfymGLdvp_gegVmJ-Wqk4Ck,10547
|
|
68
|
-
lm_deluge-0.0.
|
|
69
|
-
lm_deluge-0.0.
|
|
70
|
-
lm_deluge-0.0.
|
|
71
|
-
lm_deluge-0.0.
|
|
72
|
-
lm_deluge-0.0.
|
|
68
|
+
lm_deluge-0.0.67.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
|
|
69
|
+
lm_deluge-0.0.67.dist-info/METADATA,sha256=I15oTqc18y9F5bfeURskxLXXgkJ1AZ-ffA-xfUJRKTo,13443
|
|
70
|
+
lm_deluge-0.0.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
71
|
+
lm_deluge-0.0.67.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
|
|
72
|
+
lm_deluge-0.0.67.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|