lm-deluge 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl

lm_deluge/api_requests/openai.py

@@ -1,5 +1,6 @@
 import json
 import os
+import traceback as tb
 import warnings
 from types import SimpleNamespace
 
@@ -341,7 +342,13 @@ class OpenAIResponsesRequest(APIRequestBase):
                                     elif content_item.get("type") == "refusal":
                                         parts.append(Text(content_item["refusal"]))
                             elif item.get("type") == "reasoning":
-                                parts.append(Thinking(item["summary"]["text"]))
+                                summary = item["summary"]
+                                if not summary:
+                                    continue
+                                if isinstance(summary, list) and len(summary) > 0:
+                                    summary = summary[0]
+                                assert isinstance(summary, dict), "summary isn't a dict"
+                                parts.append(Thinking(summary["text"]))
                             elif item.get("type") == "function_call":
                                 parts.append(
                                     ToolCall(
@@ -432,6 +439,9 @@ class OpenAIResponsesRequest(APIRequestBase):
                 except Exception as e:
                     is_error = True
                     error_message = f"Error parsing {self.model.name} responses API response: {str(e)}"
+                    print("got data:", data)
+                    traceback = tb.format_exc()
+                    print(f"Error details:\n{traceback}")
 
         elif mimetype and "json" in mimetype.lower():
             print("is_error True, json response")

lm_deluge/api_requests/response.py

@@ -14,7 +14,7 @@ class APIResponse:
     # request information
     id: int  # should be unique to the request within a given prompt-processing call
     model_internal: str  # our internal model tag
-    prompt: Conversation | dict
+    prompt: Conversation | dict  # dict if converted to log
     sampling_params: SamplingParams
 
     # http response information

lm_deluge/client.py

@@ -357,6 +357,8 @@ class _LLMClient(BaseModel):
         prompts = prompts_to_conversations(prompts)
         ids = list(range(len(prompts)))
         results: list[APIResponse | None] = [None for _ in range(len(prompts))]
+        contexts: list[RequestContext | None] = [None for _ in range(len(prompts))]
+        inflight_tasks: set[asyncio.Task[None]] = set()
         # Use existing tracker if client has been opened; otherwise open/close automatically
         tracker: StatusTracker
         tracker_preopened = self._tracker is not None
@@ -419,6 +421,8 @@ class _LLMClient(BaseModel):
                 )
 
                 # Launch simplified request processing
+                contexts[next_context.task_id] = next_context
+
                 async def process_and_store(ctx: RequestContext):
                     try:
                         response = await self.process_single_request(ctx, retry_queue)
@@ -439,7 +443,9 @@ class _LLMClient(BaseModel):
                         if ctx.status_tracker:
                             ctx.status_tracker.task_failed(ctx.task_id)
 
-                asyncio.create_task(process_and_store(next_context))
+                task = asyncio.create_task(process_and_store(next_context))
+                inflight_tasks.add(task)
+                task.add_done_callback(inflight_tasks.discard)
                 next_context = None  # Reset after successful dispatch
                 next_is_retry = False
 
@@ -456,9 +462,37 @@ class _LLMClient(BaseModel):
             # Yield briefly to allow in-flight tasks to progress
             await asyncio.sleep(min(0.01, seconds_to_sleep_each_loop))
 
+        if inflight_tasks:
+            await asyncio.gather(*inflight_tasks, return_exceptions=True)
+
         if not tracker_preopened:
             self.close()
 
+        for idx, response in enumerate(results):
+            if response is None:
+                ctx = contexts[idx]
+                prompt = ctx.prompt if ctx else prompts[idx]
+                sampling_params = (
+                    ctx.sampling_params
+                    if ctx
+                    else self.sampling_params[0]
+                    if self.sampling_params
+                    else SamplingParams()
+                )
+                model_name = ctx.model_name if ctx else self.model_names[0]
+                assert isinstance(
+                    prompt, Conversation
+                ), "expected prompt to be a conversation"
+                results[idx] = APIResponse(
+                    id=idx,
+                    model_internal=model_name,
+                    prompt=prompt,
+                    sampling_params=sampling_params,
+                    status_code=None,
+                    is_error=True,
+                    error_message="Internal error: no response produced.",
+                )
+
         if return_completions_only:
             return [r.completion if r is not None else None for r in results]
 

lm_deluge/tool.py

@@ -58,14 +58,14 @@ class Tool(BaseModel):
     """
 
     name: str
-    description: str | None
-    parameters: dict[str, Any] | None
+    description: str | None = None
+    parameters: dict[str, Any] | None = None
     required: list[str] = Field(default_factory=list)
     additionalProperties: bool | None = None  # only
     # if desired, can provide a callable to run the tool
     run: Callable | None = None
     # for built-in tools that don't require schema
-    built_in: bool = False
+    is_built_in: bool = False
     type: str | None = None
     built_in_args: dict[str, Any] = Field(default_factory=dict)
 
@@ -309,7 +309,7 @@ class Tool(BaseModel):
     def for_openai_completions(
         self, *, strict: bool = True, **kwargs
     ) -> dict[str, Any]:
-        if self.built_in:
+        if self.is_built_in:
             return {"type": self.type, **self.built_in_args, **kwargs}
         if strict:
             # For strict mode, remove defaults and make all parameters required
@@ -338,7 +338,7 @@ class Tool(BaseModel):
         return self.for_openai_completions(strict=strict, **kwargs)
 
     def for_openai_responses(self, **kwargs) -> dict[str, Any]:
-        if self.built_in:
+        if self.is_built_in:
             return {"type": self.type, **self.built_in_args, **kwargs}
         return {
             "type": "function",
@@ -349,7 +349,7 @@ class Tool(BaseModel):
 
     def for_anthropic(self, **kwargs) -> dict[str, Any]:
         # built-in tools have "name", "type", maybe metadata
-        if self.built_in:
+        if self.is_built_in:
             return {
                 "name": self.name,
                 "type": self.type,
@@ -392,6 +392,14 @@ class Tool(BaseModel):
             return self.for_google()
         raise ValueError(provider)
 
+    @classmethod
+    def built_in(cls, name: str, **kwargs):
+        if "type" in kwargs:
+            type = kwargs.pop("type")
+        else:
+            type = name
+        return cls(name=name, type=type, is_built_in=True, built_in_args=kwargs)
+
 
 class OpenAIMCPSpec(TypedDict):
     type: str

{lm_deluge-0.0.50.dist-info → lm_deluge-0.0.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lm_deluge
-Version: 0.0.50
+Version: 0.0.52
 Summary: Python utility for using LLM API models.
 Author-email: Benjamin Anderson <ben@trytaylor.ai>
 Requires-Python: >=3.10

{lm_deluge-0.0.50.dist-info → lm_deluge-0.0.52.dist-info}/RECORD

@@ -3,7 +3,7 @@ lm_deluge/agent.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lm_deluge/batches.py,sha256=rQocJLyIs3Ko_nRdAE9jT__5cKWYxiIRAH_Lw3L0E1k,24653
 lm_deluge/cache.py,sha256=xO2AIYvP3tUpTMKQjwQQYfGRJSRi6e7sMlRhLjsS-u4,4873
 lm_deluge/cli.py,sha256=Ilww5gOw3J5v0NReq_Ra4hhxU4BCIJBl1oTGxJZKedc,12065
-lm_deluge/client.py,sha256=syXTBHkuPFWKDeY5B_OnzTQncYzY0VSSnPjbqib1ois,34379
+lm_deluge/client.py,sha256=WIz1M6PLZi08Y3SFhGS3Pxs1fP8P0nKSLMYzFUdNnOQ,35814
 lm_deluge/config.py,sha256=H1tQyJDNHGFuwxqQNL5Z-CjWAC0luHSBA3iY_pxmACM,932
 lm_deluge/embed.py,sha256=CO-TOlC5kOTAM8lcnicoG4u4K664vCBwHF1vHa-nAGg,13382
 lm_deluge/errors.py,sha256=oHjt7YnxWbh-eXMScIzov4NvpJMo0-2r5J6Wh5DQ1tk,209
@@ -13,7 +13,7 @@ lm_deluge/image.py,sha256=5AMXmn2x47yXeYNfMSMAOWcnlrOxxOel-4L8QCJwU70,8928
 lm_deluge/prompt.py,sha256=2-6bALg_hOfExh9vHeKPFA6E_O8rHe6p9eIdvCulERs,59654
 lm_deluge/request_context.py,sha256=o33LSEwnK6YPhZeulUoSE_VrdKCXiCQa0tjjixK2K6M,2540
 lm_deluge/rerank.py,sha256=-NBAJdHz9OB-SWWJnHzkFmeVO4wR6lFV7Vw-SxG7aVo,11457
-lm_deluge/tool.py,sha256=kQbXsEgjTaW_y4ZPDRJg8G6Zhh1PXnFwxzvAnlYBv2M,15936
+lm_deluge/tool.py,sha256=3weKo09E_srEKwHlz2WMVhk2BuDr5pJpi1UP0-qlcmo,16210
 lm_deluge/tracker.py,sha256=EHFPsS94NmsON2u97rSE70q1t6pwCsixUmGV-kIphMs,11531
 lm_deluge/usage.py,sha256=VMEKghePFIID5JFBObqYxFpgYxnbYm_dnHy7V1-_T6M,4866
 lm_deluge/api_requests/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -23,8 +23,8 @@ lm_deluge/api_requests/bedrock.py,sha256=GmVxXz3ERAeQ7e52Nlztt81O4H9eJOQeOnS6b65
 lm_deluge/api_requests/common.py,sha256=BZ3vRO5TB669_UsNKugkkuFSzoLHOYJIKt4nV4sf4vc,422
 lm_deluge/api_requests/gemini.py,sha256=COHqPWmeaq9fpg0YwOZqQTUbijKnXNF4cvMLnW9kLl8,7857
 lm_deluge/api_requests/mistral.py,sha256=S_LpOfCGbCVEROH_od3P-tYeNYTKFMamMTL-c_wFCBI,4597
-lm_deluge/api_requests/openai.py,sha256=queIeUwQnXUZpa7ebCkSACNCGY3LXnz9_St-AnWcCJU,22656
-lm_deluge/api_requests/response.py,sha256=Zc9kxBqB4JJIFR6OhXW-BS3ulK5JygE75JNBEpKgn5Q,5989
+lm_deluge/api_requests/openai.py,sha256=frxSdQn9ZAAweSO-HMKRZ6gKU3Wdl1PqTVPhwy-iNA8,23202
+lm_deluge/api_requests/response.py,sha256=ji5m-BazYRk0gdUjKFnwG5uM2sJdgxoawB2FBNzaR7Y,6017
 lm_deluge/api_requests/deprecated/bedrock.py,sha256=WrcIShCoO8JCUSlFOCHxg6KQCNTZfw3TpYTvSpYk4mA,11320
 lm_deluge/api_requests/deprecated/cohere.py,sha256=KgDScD6_bWhAzOY5BHZQKSA3kurt4KGENqC4wLsGmcU,5142
 lm_deluge/api_requests/deprecated/deepseek.py,sha256=FEApI93VAWDwuaqTooIyKMgONYqRhdUmiAPBRme-IYs,4582
@@ -66,8 +66,8 @@ lm_deluge/util/logprobs.py,sha256=UkBZakOxWluaLqHrjARu7xnJ0uCHVfLGHJdnYlEcutk,11
 lm_deluge/util/spatial.py,sha256=BsF_UKhE-x0xBirc-bV1xSKZRTUhsOBdGqsMKme20C8,4099
 lm_deluge/util/validation.py,sha256=hz5dDb3ebvZrZhnaWxOxbNSVMI6nmaOODBkk0htAUhs,1575
 lm_deluge/util/xml.py,sha256=Ft4zajoYBJR3HHCt2oHwGfymGLdvp_gegVmJ-Wqk4Ck,10547
-lm_deluge-0.0.50.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
-lm_deluge-0.0.50.dist-info/METADATA,sha256=rJjaKCn6fcI-68Ce4hjKl7nhahpWFCU0RGkU_Ud-Kn4,13443
-lm_deluge-0.0.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lm_deluge-0.0.50.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
-lm_deluge-0.0.50.dist-info/RECORD,,
+lm_deluge-0.0.52.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
+lm_deluge-0.0.52.dist-info/METADATA,sha256=X1JJBjExVA0NNXSaoB2NkOpT9f660AFe9u58BmKdb2w,13443
+lm_deluge-0.0.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lm_deluge-0.0.52.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
+lm_deluge-0.0.52.dist-info/RECORD,,