ims-mcp 1.0.4__py3-none-any.whl → 1.0.6__py3-none-any.whl

ims_mcp/__init__.py

@@ -11,7 +11,7 @@ Environment Variables:
 Note: Environment variables use R2R_ prefix for compatibility with underlying R2R SDK.
 """
 
-__version__ = "1.0.4"
+__version__ = "1.0.6"
 __author__ = "Igor Solomatov"
 
 from ims_mcp.server import mcp

ims_mcp/server.py

@@ -14,10 +14,11 @@ The R2RClient automatically reads these environment variables, so no manual
 configuration is needed when running via uvx or other launchers.
 """
 
+import functools
 import os
 import sys
 import uuid
-from r2r import R2RClient
+from r2r import R2RClient, R2RException
 
 # Global client instance with authentication
 _authenticated_client = None
@@ -76,6 +77,34 @@ def get_authenticated_client() -> R2RClient:
     return client
 
 
+def retry_on_auth_error(func):
+    """Decorator to handle token expiry and automatically re-authenticate.
+    
+    When R2R server restarts, all authentication tokens are invalidated.
+    This decorator catches 401/403 errors, invalidates the cached client,
+    re-authenticates, and retries the request once.
+    """
+    def invalidate_client():
+        """Invalidate cached client to force re-authentication."""
+        global _authenticated_client
+        _authenticated_client = None
+    
+    @functools.wraps(func)
+    async def wrapper(*args, **kwargs):
+        try:
+            return await func(*args, **kwargs)
+        except R2RException as e:
+            # Check if this is an authentication error (token expired)
+            if hasattr(e, 'status_code') and e.status_code in [401, 403]:
+                print(f"[ims-mcp] Token expired, re-authenticating...", file=sys.stderr)
+                invalidate_client()
+                # Retry once with fresh authentication
+                return await func(*args, **kwargs)
+            # Re-raise non-auth errors
+            raise
+    return wrapper
+
+
 def id_to_shorthand(id: str) -> str:
     """Convert a full ID to shortened version for display."""
     return str(id)[:7]
@@ -167,6 +196,7 @@ except Exception as e:
 
 # Search tool with filtering support
 @mcp.tool()
+@retry_on_auth_error
 async def search(
     query: str,
     filters: dict | None = None,
@@ -216,6 +246,7 @@ async def search(
 
 # RAG query tool with filtering and generation config
 @mcp.tool()
+@retry_on_auth_error
 async def rag(
     query: str,
     filters: dict | None = None,
@@ -270,6 +301,7 @@ async def rag(
 
 # Document upload tool with upsert semantics
 @mcp.tool()
+@retry_on_auth_error
 async def put_document(
     content: str,
     title: str,
@@ -337,6 +369,7 @@ async def put_document(
 
 # List documents tool
 @mcp.tool()
+@retry_on_auth_error
 async def list_documents(
     offset: float = 0,  # Use float to accept JSON "number" type, convert to int internally
     limit: float = 100,  # Use float to accept JSON "number" type, convert to int internally
@@ -440,6 +473,7 @@ async def list_documents(
 
 # Get document tool
 @mcp.tool()
+@retry_on_auth_error
 async def get_document(
     document_id: str | None = None,
     title: str | None = None,
@@ -504,6 +538,12 @@ async def get_document(
             
             # Found exactly one match
             document_id = matching_docs[0][0]
+        except R2RException as e:
+            # Re-raise authentication errors so the decorator can handle them
+            if hasattr(e, 'status_code') and e.status_code in [401, 403]:
+                raise
+            # For other R2RExceptions, return error message
+            return f"Error searching for document by title: {str(e)}"
         except Exception as e:
             return f"Error searching for document by title: {str(e)}"
     
@@ -521,6 +561,15 @@ async def get_document(
         
         return "\n".join(output_lines)
         
+    except R2RException as e:
+        # Re-raise authentication errors so the decorator can handle them
+        if hasattr(e, 'status_code') and e.status_code in [401, 403]:
+            raise
+        # For other R2RExceptions, return error message
+        error_msg = str(e)
+        if "not found" in error_msg.lower():
+            return f"Error: Document with ID '{document_id}' not found"
+        return f"Error downloading document: {error_msg}"
     except Exception as e:
         error_msg = str(e)
         if "not found" in error_msg.lower():
@@ -530,6 +579,7 @@ async def get_document(
 
 # Delete document tool
 @mcp.tool()
+@retry_on_auth_error
 async def delete_document(document_id: str) -> str:
     """
     Delete a document by ID

{ims_mcp-1.0.4.dist-info → ims_mcp-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ims-mcp
-Version: 1.0.4
+Version: 1.0.6
 Summary: Model Context Protocol server for IMS (Instruction Management Systems)
 Author: Igor Solomatov
 License-Expression: MIT

ims_mcp-1.0.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+ims_mcp/__init__.py,sha256=zAgLyO8bIgLsWcPtGOcLMLa08lhMgsyOysJWkm_tXE8,631
+ims_mcp/__main__.py,sha256=z4P1aCVfOgS3cTM2wgJd2pxjMmKCkGkiqYDRGgrspxw,191
+ims_mcp/server.py,sha256=_yNZrBhHKFoJiSLwZqACxqvLvJuaFdZ1jntGCHQIzlU,23787
+ims_mcp-1.0.6.dist-info/licenses/LICENSE,sha256=4d1dlH04mbnN3ya4lybcVOUwljRHGy-aSc9MYqGYW44,2534
+ims_mcp-1.0.6.dist-info/METADATA,sha256=nQWzol6KOBdwge8j9fVLYEJfHhmfJ59_1m5tBdG4T_8,9295
+ims_mcp-1.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ims_mcp-1.0.6.dist-info/entry_points.txt,sha256=xCH9I8g1pTTEqrfjnE-ANHaZo4W6EBJVy0Lg5z8SaIQ,48
+ims_mcp-1.0.6.dist-info/top_level.txt,sha256=wEXA33qFr_eov3S1PY2OF6EQBA2rtAWB_ZNJOzNNQuM,8
+ims_mcp-1.0.6.dist-info/RECORD,,

ims_mcp-1.0.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-ims_mcp/__init__.py,sha256=6hX8dryQog_XJDdunq29fTc8Pih9ApWYgabwaAE3DGI,631
-ims_mcp/__main__.py,sha256=z4P1aCVfOgS3cTM2wgJd2pxjMmKCkGkiqYDRGgrspxw,191
-ims_mcp/server.py,sha256=g7ceKx7Bxjr7LGBGfbn3AFHK2rjcPv30Y_Rhfuy3GZQ,21734
-ims_mcp-1.0.4.dist-info/licenses/LICENSE,sha256=4d1dlH04mbnN3ya4lybcVOUwljRHGy-aSc9MYqGYW44,2534
-ims_mcp-1.0.4.dist-info/METADATA,sha256=_GIf5S7xRw-FmX7U8psxa5MlYFPINanV2tTflGmP4hY,9295
-ims_mcp-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ims_mcp-1.0.4.dist-info/entry_points.txt,sha256=xCH9I8g1pTTEqrfjnE-ANHaZo4W6EBJVy0Lg5z8SaIQ,48
-ims_mcp-1.0.4.dist-info/top_level.txt,sha256=wEXA33qFr_eov3S1PY2OF6EQBA2rtAWB_ZNJOzNNQuM,8
-ims_mcp-1.0.4.dist-info/RECORD,,