lm-deluge 0.0.49__py3-none-any.whl → 0.0.51__py3-none-any.whl

lm_deluge/tool.py

@@ -1,14 +1,14 @@
 import asyncio
 import inspect
-from typing import Any, Callable, Coroutine, Literal, TypedDict, get_type_hints
 from concurrent.futures import ThreadPoolExecutor
+from typing import Any, Callable, Coroutine, Literal, TypedDict, get_type_hints
 
 from fastmcp import Client  # pip install fastmcp >= 2.0
 from mcp.types import Tool as MCPTool
 from pydantic import BaseModel, Field, field_validator
 
-from lm_deluge.prompt import Text, ToolResultPart
 from lm_deluge.image import Image
+from lm_deluge.prompt import Text, ToolResultPart
 
 
 async def _load_all_mcp_tools(client: Client) -> list["Tool"]:
@@ -18,10 +18,14 @@ async def _load_all_mcp_tools(client: Client) -> list["Tool"]:
         async def _async_call(**kw):
             async with client:
                 # maybe should be call_tool_mcp if don't want to raise error
-                content_blocks = await client.call_tool(name, kw)
+                raw_result = await client.call_tool(name, kw)
 
                 # for now just concatenate them all into a result string
                 results = []
+                if not isinstance(raw_result, list):  # newer versions of fastmcp
+                    content_blocks = raw_result.content
+                else:
+                    content_blocks = raw_result
                 for block in content_blocks:
                     if block.type == "text":
                         results.append(Text(block.text))
@@ -54,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)
 
@@ -305,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
@@ -334,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",
@@ -345,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,
@@ -388,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.49.dist-info → lm_deluge-0.0.51.dist-info}/METADATA

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

{lm_deluge-0.0.49.dist-info → lm_deluge-0.0.51.dist-info}/RECORD

@@ -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=_coOKB9nPNVZoseMRumRyQ8BMR7_d0IlstzMHNT69JY,15732
+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
@@ -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.49.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
-lm_deluge-0.0.49.dist-info/METADATA,sha256=wxyjPS3Kf3XlXbO_Qc6RcmEWp7Lfe3La3tcDB_OH0_w,13443
-lm_deluge-0.0.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-lm_deluge-0.0.49.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
-lm_deluge-0.0.49.dist-info/RECORD,,
+lm_deluge-0.0.51.dist-info/licenses/LICENSE,sha256=uNNXGXPCw2TC7CUs7SEBkA-Mz6QBQFWUUEWDMgEs1dU,1058
+lm_deluge-0.0.51.dist-info/METADATA,sha256=sxR1kvdWYelDXwqSq0pIu3ZtQ8ejmNFQ7RWF36_KhRo,13443
+lm_deluge-0.0.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+lm_deluge-0.0.51.dist-info/top_level.txt,sha256=hqU-TJX93yBwpgkDtYcXyLr3t7TLSCCZ_reytJjwBaE,10
+lm_deluge-0.0.51.dist-info/RECORD,,