dais-sdk 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

dais_sdk/mcp_client/local_mcp_client.py

@@ -1,5 +1,5 @@
 from contextlib import AsyncExitStack
-from typing import Any
+from typing import Any, override
 from mcp import ClientSession, StdioServerParameters as StdioServerParams
 from mcp.client.stdio import stdio_client
 from .base_mcp_client import McpClient, Tool, ToolResult, McpSessionNotEstablishedError
@@ -14,9 +14,11 @@ class LocalMcpClient(McpClient):
         self._exit_stack: AsyncExitStack | None = None
 
     @property
+    @override
     def name(self) -> str:
         return self._name
 
+    @override
     async def connect(self):
         self._exit_stack = AsyncExitStack()
 
@@ -32,6 +34,7 @@ class LocalMcpClient(McpClient):
             await self.disconnect()
             raise
 
+    @override
     async def list_tools(self) -> list[Tool]:
         if not self._session:
             raise McpSessionNotEstablishedError()
@@ -39,6 +42,7 @@ class LocalMcpClient(McpClient):
         result = await self._session.list_tools()
         return result.tools
 
+    @override
     async def call_tool(
         self, tool_name: str, arguments: dict[str, Any] | None = None
     ) -> ToolResult:
@@ -48,6 +52,7 @@ class LocalMcpClient(McpClient):
         response = await self._session.call_tool(tool_name, arguments)
         return ToolResult(response.isError, response.content)
 
+    @override
     async def disconnect(self) -> None:
         if self._exit_stack:
             await self._exit_stack.aclose()

dais_sdk/mcp_client/remote_mcp_client.py

@@ -2,7 +2,7 @@ import httpx
 import webbrowser
 from dataclasses import dataclass
 from contextlib import AsyncExitStack
-from typing import Any, NamedTuple
+from typing import Any, NamedTuple, override
 from mcp import ClientSession
 from mcp.client.auth import OAuthClientProvider
 from mcp.client.streamable_http import streamable_http_client
@@ -49,6 +49,7 @@ class RemoteMcpClient(McpClient):
             self._params.oauth_params.oauth_token_storage = storage
 
     @property
+    @override
     def name(self) -> str:
         return self._name
 
@@ -105,6 +106,7 @@ class RemoteMcpClient(McpClient):
             raise ValueError("OAuth context not initialized")
         return await self._oauth_context.server.wait_for_code()
 
+    @override
     async def connect(self):
         self._exit_stack = AsyncExitStack()
         if self._oauth_context:
@@ -126,6 +128,7 @@ class RemoteMcpClient(McpClient):
             await self.disconnect()
             raise
 
+    @override
     async def list_tools(self) -> list[Tool]:
         if not self._session:
             raise McpSessionNotEstablishedError()
@@ -133,6 +136,7 @@ class RemoteMcpClient(McpClient):
         result = await self._session.list_tools()
         return result.tools
 
+    @override
     async def call_tool(
         self, tool_name: str, arguments: dict[str, Any] | None = None
     ) -> ToolResult:
@@ -142,6 +146,7 @@ class RemoteMcpClient(McpClient):
         response = await self._session.call_tool(tool_name, arguments)
         return ToolResult(response.isError, response.content)
 
+    @override
     async def disconnect(self):
         try:
             if self._exit_stack:

dais_sdk/param_parser.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 from typing import Any, TYPE_CHECKING
 from litellm.types.utils import LlmProviders
 from .tool.prepare import prepare_tools

dais_sdk/tool/execute.py

@@ -1,36 +1,41 @@
 import asyncio
 import json
+import inspect
 from functools import singledispatch
 from typing import Any, assert_never, Callable, cast
 from types import FunctionType, MethodType
 from ..types.tool import ToolDef, ToolLike
-from ..types.exceptions import ToolDoesNotExistError, ToolArgumentDecodeError, ToolExecutionError
+from ..types.exceptions import LlmToolException
 from ..logger import logger
 
-class ToolExceptionHandlerManager:
-    ToolException = ToolDoesNotExistError | ToolArgumentDecodeError | ToolExecutionError
-    Handler = Callable[[ToolException], str]
+type ExceptionHandler[E: LlmToolException] = Callable[[E], str]
 
+class ToolExceptionHandlerManager:
     def __init__(self):
-        self._handlers: dict[
-            type[ToolExceptionHandlerManager.ToolException],
-            ToolExceptionHandlerManager.Handler
-        ] = {}
+        self._handlers: dict[type[LlmToolException], ExceptionHandler[Any]] = {}
 
-    def register(self, exception_type: type[ToolException]):
-        def decorator(handler: ToolExceptionHandlerManager.Handler) -> ToolExceptionHandlerManager.Handler:
+    def register[E: LlmToolException](self, exception_type: type[E]):
+        def decorator(handler: ExceptionHandler[E]) -> ExceptionHandler[E]:
             self.set_handler(exception_type, handler)
             return handler
         return decorator
 
-    def set_handler(self, exception_type: type[ToolException], handler: Handler):
+    def set_handler[E: LlmToolException](self, exception_type: type[E], handler: ExceptionHandler[E]):
         self._handlers[exception_type] = handler
 
-    def get_handler(self, exception_type: type[ToolException]) -> Handler | None:
+    def get_handler[E: LlmToolException](self, exception_type: type[E]) -> ExceptionHandler[E] | None:
         return self._handlers.get(exception_type)
 
-    def handle(self, e: ToolException) -> str:
-        handler = self.get_handler(type(e))
+    def handle(self, e: LlmToolException) -> str:
+        def find_best_handler[E: LlmToolException](exc_type: type[E]) -> ExceptionHandler[E] | None:
+            for cls in exc_type.__mro__:
+                if cls in self._handlers:
+                    return self._handlers[cls]
+            return None
+
+        # Searches the MRO of the exception type to make sure the subclasses of
+        # the registered exception type can also be handled.
+        handler = find_best_handler(type(e))
         if handler is None:
             logger.warning(f"Unhandled tool exception: {type(e).__name__}", exc_info=e)
             return f"Unhandled tool exception | {type(e).__name__}: {e}"
@@ -66,7 +71,7 @@ def execute_tool_sync(tool: ToolLike, arguments: str | dict) -> str:
 def _(toolfn: Callable, arguments: str | dict) -> str:
     arguments = _arguments_normalizer(arguments)
     result = (asyncio.run(toolfn(**arguments))
-              if asyncio.iscoroutinefunction(toolfn)
+              if inspect.iscoroutinefunction(toolfn)
               else toolfn(**arguments))
     return _result_normalizer(result)
 
@@ -74,7 +79,7 @@ def _(toolfn: Callable, arguments: str | dict) -> str:
 def _(tooldef: ToolDef, arguments: str | dict) -> str:
     arguments = _arguments_normalizer(arguments)
     result = (asyncio.run(tooldef.execute(**arguments))
-              if asyncio.iscoroutinefunction(tooldef.execute)
+              if inspect.iscoroutinefunction(tooldef.execute)
               else tooldef.execute(**arguments))
     return _result_normalizer(result)
 
@@ -92,7 +97,7 @@ async def execute_tool(tool: ToolLike, arguments: str | dict) -> str:
 async def _(toolfn: Callable, arguments: str | dict) -> str:
     arguments = _arguments_normalizer(arguments)
     result = (await toolfn(**arguments)
-             if asyncio.iscoroutinefunction(toolfn)
+             if inspect.iscoroutinefunction(toolfn)
              else toolfn(**arguments))
     return _result_normalizer(result)
 
@@ -100,6 +105,6 @@ async def _(toolfn: Callable, arguments: str | dict) -> str:
 async def _(tooldef: ToolDef, arguments: str | dict) -> str:
     arguments = _arguments_normalizer(arguments)
     result = (await tooldef.execute(**arguments)
-             if asyncio.iscoroutinefunction(tooldef.execute)
+             if inspect.iscoroutinefunction(tooldef.execute)
              else tooldef.execute(**arguments))
     return _result_normalizer(result)

dais_sdk/tool/toolset/mcp_toolset.py

@@ -1,4 +1,5 @@
 from dataclasses import replace
+from typing import override
 from mcp.types import TextContent, ImageContent, AudioContent, ResourceLink, EmbeddedResource, TextResourceContents, BlobResourceContents
 from .toolset import Toolset
 from ...mcp_client.base_mcp_client import McpClient, Tool, ToolResult
@@ -72,9 +73,11 @@ class McpToolset(Toolset):
                              for tool in mcp_tools]
 
     @property
+    @override
     def name(self) -> str:
         return self._client.name
 
+    @override
     def get_tools(self, namespaced_tool_name: bool = True) -> list[ToolDef]:
         if self._tools_cache is None:
             raise RuntimeError(f"Not connected to MCP server. Call await {self.__class__.__name__}(...).connect() first")

dais_sdk/tool/toolset/python_toolset.py

@@ -1,17 +1,17 @@
 import inspect
-from typing import Any, Callable, TypeVar
+from typing import Any, Callable, override
 from .toolset import Toolset
 from ...types.tool import ToolDef
 
-F = TypeVar("F", bound=Callable[..., Any])
 TOOL_FLAG = "__is_tool__"
 
-def python_tool(func: F) -> F:
+def python_tool[F: Callable[..., Any]](func: F) -> F:
     setattr(func, TOOL_FLAG, True)
     return func
 
 class PythonToolset(Toolset):
     @property
+    @override
     def name(self) -> str:
         """
         Since the usage of PythonToolset is to inherit and define methods as tools,
@@ -19,6 +19,7 @@ class PythonToolset(Toolset):
         """
         return self.__class__.__name__
 
+    @override
     def get_tools(self, namespaced_tool_name: bool = True) -> list[ToolDef]:
         result = []
         for _, method in inspect.getmembers(self, predicate=inspect.ismethod):

dais_sdk/types/exceptions.py

@@ -1,7 +1,6 @@
-from __future__ import annotations
 import json
 from typing import TYPE_CHECKING
-from litellm.exceptions import (  
+from litellm.exceptions import (
     AuthenticationError,
     PermissionDeniedError,
     RateLimitError,

dais_sdk/types/message.py

@@ -2,7 +2,7 @@ import json
 import dataclasses
 import uuid
 from abc import ABC, abstractmethod
-from typing import Any, Literal, NamedTuple, cast
+from typing import Any, Literal, cast
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from litellm.types.utils import (
     Message as LiteLlmMessage,
@@ -186,7 +186,7 @@ class ToolCallChunk:
     arguments: str
     index: int
 
-MessageChunk = TextChunk | UsageChunk | ReasoningChunk | AudioChunk | ImageChunk | ToolCallChunk
+type MessageChunk = TextChunk | UsageChunk | ReasoningChunk | AudioChunk | ImageChunk | ToolCallChunk
 
 def openai_chunk_normalizer(
         chunk: LiteLlmModelResponseStream

dais_sdk/types/tool.py

@@ -3,7 +3,7 @@ from collections.abc import Callable
 from typing import Any, Awaitable
 from ..logger import logger
 
-ToolFn = Callable[..., Any] | Callable[..., Awaitable[Any]]
+type ToolFn = Callable[..., Any] | Callable[..., Awaitable[Any]]
 
 """
 RawToolDef example:
@@ -23,7 +23,7 @@ RawToolDef example:
     }
 }
 """
-RawToolDef = dict[str, Any]
+type RawToolDef = dict[str, Any]
 
 @dataclasses.dataclass
 class ToolDef:
@@ -44,4 +44,4 @@ class ToolDef:
             execute=tool_fn,
         )
 
-ToolLike = ToolDef | RawToolDef | ToolFn
+type ToolLike = ToolDef | RawToolDef | ToolFn

{dais_sdk-0.6.1.dist-info → dais_sdk-0.6.3.dist-info}/METADATA

@@ -1,34 +1,24 @@
 Metadata-Version: 2.4
 Name: dais-sdk
-Version: 0.6.1
+Version: 0.6.3
 Summary: A wrapper of LiteLLM
 Author-email: BHznJNs <bhznjns@outlook.com>
-Requires-Python: >=3.10
+Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
 Requires-Dist: litellm>=1.80.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: httpx==0.28.1
-Requires-Dist: mcp==1.25.0
+Requires-Dist: mcp==1.26.0
 Requires-Dist: starlette==0.50.0
 Requires-Dist: uvicorn==0.40.0
-Requires-Dist: python-dotenv>=1.2.1 ; extra == "dev"
-Requires-Dist: pytest-cov ; extra == "test"
-Requires-Dist: pytest-mock ; extra == "test"
-Requires-Dist: pytest-runner ; extra == "test"
-Requires-Dist: pytest ; extra == "test"
-Requires-Dist: pytest-github-actions-annotate-failures ; extra == "test"
 Project-URL: Source, https://github.com/Dais-Project/Dais-SDK
 Project-URL: Tracker, https://github.com/Dais-Project/Dais-SDK/issues
-Provides-Extra: dev
-Provides-Extra: test
 
 # Dais-SDK
 
@@ -98,3 +88,20 @@ for message in messages:
             print("Tool: ", message.result)
 ```
 
+## Development
+
+Create virtual environment
+```
+uv venv
+```
+
+Install all dependencies
+```
+uv sync --all-groups
+```
+
+Run test
+```
+uv run pytest
+```
+

{dais_sdk-0.6.1.dist-info → dais_sdk-0.6.3.dist-info}/RECORD

@@ -1,27 +1,27 @@
 dais_sdk/__init__.py,sha256=5QAoL8GyyFuKfe4HZ-TiRVj9VIpHc45i2xMMYORoWXU,11805
 dais_sdk/debug.py,sha256=T7qIy1BeeUGlF40l9JCMMVn8pvvMJAEQeG4adQbOydA,69
 dais_sdk/logger.py,sha256=99vJAQRKcu4CuHgZYAJ2zDQtGea6Bn3vJJrS-mtza7c,677
-dais_sdk/param_parser.py,sha256=gXRFoCi74ZA9xdisqMPgQmWR2i6aTlPEeot78y2vyhM,1909
+dais_sdk/param_parser.py,sha256=QIxt1izv69r725pzU1qhq5bilcrGUgzlpiItHEWOrdc,1874
 dais_sdk/stream.py,sha256=yu9Zvr3CUrPD9sGsjqwNXy_233Tw25Hd72kwjrraMAM,3170
 dais_sdk/mcp_client/__init__.py,sha256=B86aC4nnGzwfjk7H0CZ38YlMDiEx3EIDEAgJKUnwqIU,405
 dais_sdk/mcp_client/base_mcp_client.py,sha256=jWAfinzY00aL-qdNgyzYXKM-LhPHkmdqL24Uw439v-0,1055
-dais_sdk/mcp_client/local_mcp_client.py,sha256=unuS-cp4zi0A2x2EYnDFzSpJUzOgVQbnEK0mLBFudy8,1871
+dais_sdk/mcp_client/local_mcp_client.py,sha256=JI7jdFyyL4VkrUuzwUybHJ3Y1vgEH0iCG3WqAgyLO1g,1951
 dais_sdk/mcp_client/oauth_server.py,sha256=pELKmAjE1QoNpy3_6BPNoORwWYu0j2BYOnnVfMd0iOA,3361
-dais_sdk/mcp_client/remote_mcp_client.py,sha256=853jbgGmrTe6EgQNqZNIfZ53rQH2VpzO_8aNfH1l3Gg,5959
+dais_sdk/mcp_client/remote_mcp_client.py,sha256=8iPX-lGMRCR0FzT8MFi2CvYJXUCWHI_jYGaI30NaBuc,6039
 dais_sdk/tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dais_sdk/tool/execute.py,sha256=OiL1CVPakqIW1o0ZHpWCWs0AooXovMwECLyXB9oXGBo,3978
+dais_sdk/tool/execute.py,sha256=wqIlfVounvK-I4mJ48iDXXqalySNQUplPPauNqFfSls,4220
 dais_sdk/tool/prepare.py,sha256=5UZiQc64Ao30Gh3aHqeJGeyUq7ud9A--GUU5QxYPC0M,11572
 dais_sdk/tool/utils.py,sha256=jYv_U6BHvi5Hh7H21_9nDRB9gp_qM_UEle0xq2XwX4M,706
 dais_sdk/tool/toolset/__init__.py,sha256=uh8hGSl1KSn0JI45fCPJnnk31hflOI0mYxC8cdbH-OQ,309
-dais_sdk/tool/toolset/mcp_toolset.py,sha256=-sivM6EUiC3V3gcISnh4u5dosf-lnwVjd7YM3L0U3Ik,4056
-dais_sdk/tool/toolset/python_toolset.py,sha256=JlYw49LH9xDL6tk_82EogqxW2U71hhsygamrb-lNvcE,1071
+dais_sdk/tool/toolset/mcp_toolset.py,sha256=J4gOsy8aR61Ui8tUj58AOG51fhKvLPWIL_SWIs-kmrE,4112
+dais_sdk/tool/toolset/python_toolset.py,sha256=p4QeBY_yZpzpnDT5w1S4EECtPOwt8dF8T_rTQv7CtME,1080
 dais_sdk/tool/toolset/toolset.py,sha256=X1xqWiWov4fboWQowB_YgJ_Tc-fIDmxbP8GreTj_7ME,322
 dais_sdk/types/__init__.py,sha256=-i1MYWIlUfjQIX0xZJta6phQNL44vXPSIx1eGyIYZXc,710
-dais_sdk/types/exceptions.py,sha256=kWE9SBe72O6zXHqQo203WEIfSy7PNO3fRqq2XQDFvXY,1476
-dais_sdk/types/message.py,sha256=A0Sdt1a5fXLW6Z63RxLnuDS2qggxYC-h4p7Jv8pCxiI,7777
+dais_sdk/types/exceptions.py,sha256=ZlQW6QfzPatbfHJi_1s_2XBAHK4bZaeSreI3SUAX_5c,1439
+dais_sdk/types/message.py,sha256=a65Q6K3Hq1aVhsedUv2XjyJq2rQQJi9SkEAPPHcLtFw,7770
 dais_sdk/types/request_params.py,sha256=8Jq-aTeK933YENE-9ay_8q88hEr-oeZZGC7l52tOKEM,1635
-dais_sdk/types/tool.py,sha256=s0sPwXPl-BeijWgRxgXkXguz_quzmP92sVS2aT7n_nA,1362
-dais_sdk-0.6.1.dist-info/licenses/LICENSE,sha256=cTeVgQVJJcRdm1boa2P1FBnOeXfA_egV6s4PouyrCxg,1064
-dais_sdk-0.6.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-dais_sdk-0.6.1.dist-info/METADATA,sha256=K7nvqeMSnozBD3sppaMEM4_nvzbn0z1wImehT7cii4A,2910
-dais_sdk-0.6.1.dist-info/RECORD,,
+dais_sdk/types/tool.py,sha256=GT6gxjAGdnVzk6W84nPzZb24bLznzqilkHN6uvocf5M,1377
+dais_sdk-0.6.3.dist-info/licenses/LICENSE,sha256=Qwd-hsctqFqJErH4OWNNttmd0jccbH0ZCsf-YtAFNdo,1064
+dais_sdk-0.6.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+dais_sdk-0.6.3.dist-info/METADATA,sha256=Tm4_bgcDUtx7rp1rW82aLeA9VpvBnM-fctwQHiqyPgY,2612
+dais_sdk-0.6.3.dist-info/RECORD,,

{dais_sdk-0.6.1.dist-info → dais_sdk-0.6.3.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 BHznJNs
+Copyright (c) 2026 BHznJNs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal