Merge pull request #43 from mminichino/mm--fix-tool-import

fix(server): fix issue with tool discovery

Author: mortensi

src/common/server.py

@@ -1,4 +1,14 @@
+import importlib
+import pkgutil
 from mcp.server.fastmcp import FastMCP
 
+def load_tools():
+    import src.tools as tools_pkg
+    for _, module_name, _ in pkgutil.iter_modules(tools_pkg.__path__):
+        importlib.import_module(f"src.tools.{module_name}")
+
 # Initialize FastMCP server
 mcp = FastMCP("Redis MCP Server", dependencies=["redis", "dotenv", "numpy"])
+
+# Load tools
+load_tools()

src/tools/string.py

@@ -1,28 +1,42 @@
+import json
+from typing import Union
+
 from redis.exceptions import RedisError
-from redis.typing import EncodableT
+from redis import Redis
 
 from src.common.connection import RedisConnectionManager
 from src.common.server import mcp
 
 
 @mcp.tool()
-async def set(key: str, value: EncodableT, expiration: int = None) -> str:
+async def set(key: str, value: Union[str, bytes, int, float, dict], expiration: int = None) -> str:
     """Set a Redis string value with an optional expiration time.
 
     Args:
         key (str): The key to set.
-        value (str): The value to store.
+        value (str, bytes, int, float, dict): The value to store.
         expiration (int, optional): Expiration time in seconds.
 
     Returns:
         str: Confirmation message or an error message.
     """
+    if isinstance(value, bytes):
+        encoded_value = value
+    elif isinstance(value, dict):
+        encoded_value = json.dumps(value)
+    else:
+        encoded_value = str(value)
+
+    if isinstance(encoded_value, str):
+        encoded_value = encoded_value.encode("utf-8")
+
     try:
-        r = RedisConnectionManager.get_connection()
+        r: Redis = RedisConnectionManager.get_connection()
         if expiration:
-            r.setex(key, expiration, value)
+            r.setex(key, expiration, encoded_value)
         else:
-            r.set(key, value)
+            r.set(key, encoded_value)
+
         return f"Successfully set {key}" + (
             f" with expiration {expiration} seconds" if expiration else ""
         )
@@ -31,18 +45,29 @@ async def set(key: str, value: EncodableT, expiration: int = None) -> str:
 
 
 @mcp.tool()
-async def get(key: str) -> str:
+async def get(key: str) -> Union[str, bytes]:
     """Get a Redis string value.
 
     Args:
         key (str): The key to retrieve.
 
     Returns:
-        str: The stored value or an error message.
+        str, bytes: The stored value or an error message.
     """
     try:
-        r = RedisConnectionManager.get_connection()
+        r: Redis = RedisConnectionManager.get_connection()
         value = r.get(key)
-        return value if value else f"Key {key} does not exist"
+
+        if value is None:
+            return f"Key {key} does not exist"
+
+        if isinstance(value, bytes):
+            try:
+                text = value.decode("utf-8")
+                return text
+            except UnicodeDecodeError:
+                return value
+
+        return value
     except RedisError as e:
         return f"Error retrieving key {key}: {str(e)}"