ims-mcp 1.0.1__py3-none-any.whl → 1.0.3__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.1"
+__version__ = "1.0.3"
 __author__ = "Igor Solomatov"
 
 from ims_mcp.server import mcp

ims_mcp/server.py

@@ -7,14 +7,74 @@ Environment Variables:
     R2R_API_BASE or R2R_BASE_URL: R2R server URL (default: http://localhost:7272)
     R2R_COLLECTION: Collection name for queries (optional, uses server default)
     R2R_API_KEY: API key for authentication (optional)
+    R2R_EMAIL: Email for authentication (optional, requires R2R_PASSWORD)
+    R2R_PASSWORD: Password for authentication (optional, requires R2R_EMAIL)
 
 The R2RClient automatically reads these environment variables, so no manual
 configuration is needed when running via uvx or other launchers.
 """
 
+import os
+import sys
 import uuid
 from r2r import R2RClient
 
+# Global client instance with authentication
+_authenticated_client = None
+
+
+def get_authenticated_client() -> R2RClient:
+    """Get or create an authenticated R2R client.
+    
+    This function handles authentication using either:
+    1. API key (R2R_API_KEY) - preferred method
+    2. Email/password (R2R_EMAIL + R2R_PASSWORD) - fallback method
+    
+    Returns:
+        Authenticated R2RClient instance
+    """
+    global _authenticated_client
+    
+    # If client already exists and is authenticated, reuse it
+    if _authenticated_client is not None:
+        return _authenticated_client
+    
+    # Log startup info (only on first call)
+    from ims_mcp import __version__
+    base_url = os.getenv('R2R_API_BASE') or os.getenv('R2R_BASE_URL') or 'http://localhost:7272'
+    collection = os.getenv('R2R_COLLECTION', 'default')
+    api_key = os.getenv('R2R_API_KEY', '')
+    email = os.getenv('R2R_EMAIL', '')
+    password = os.getenv('R2R_PASSWORD', '')
+    
+    print(f"[ims-mcp v{__version__}]", file=sys.stderr)
+    print(f"  server={base_url}", file=sys.stderr)
+    print(f"  collection={collection}", file=sys.stderr)
+    print(f"  api_key={api_key[:3] + '...' if api_key else 'none'}", file=sys.stderr)
+    print(f"  email={email if email else 'none'}", file=sys.stderr)
+    print(f"  password={password[:3] + '...' if password else 'none'}", file=sys.stderr)
+    
+    # Create new client
+    client = R2RClient()
+    
+    # Check for email/password authentication
+    email = os.getenv("R2R_EMAIL")
+    password = os.getenv("R2R_PASSWORD")
+    
+    if email and password:
+        try:
+            # Login - R2RClient automatically handles token internally
+            client.users.login(email=email, password=password)
+            print(f"[ims-mcp] Login successful", file=sys.stderr)
+        except Exception as e:
+            print(f"[ims-mcp] Login failed: {e}", file=sys.stderr)
+            # If login fails, continue without authentication (might work for local servers)
+            pass
+    
+    # Cache the client for reuse
+    _authenticated_client = client
+    return client
+
 
 def id_to_shorthand(id: str) -> str:
     """Convert a full ID to shortened version for display."""
@@ -127,7 +187,7 @@ async def search(
     Returns:
         Formatted search results from the knowledge base
     """
-    client = R2RClient()
+    client = get_authenticated_client()
 
     # Only build search_settings if user provided any parameters
     # This preserves original behavior: search("query") → search(query=query) with NO search_settings
@@ -178,7 +238,7 @@ async def rag(
     Returns:
         Generated answer from RAG
     """
-    client = R2RClient()
+    client = get_authenticated_client()
 
     # Only build configs if user provided parameters
     # This preserves original behavior: rag("query") → rag(query=query) with NO configs
@@ -228,7 +288,7 @@ async def put_document(
     Returns:
         Status message with document_id and operation type
     """
-    client = R2RClient()
+    client = get_authenticated_client()
 
     # Build metadata with title
     final_metadata = {"title": title}
@@ -299,7 +359,7 @@ async def list_documents(
     Returns:
         Formatted list of documents
     """
-    client = R2RClient()
+    client = get_authenticated_client()
 
     # Build kwargs for list call
     kwargs = {"offset": int(offset), "limit": min(int(limit), 100)}  # Convert to int, cap at 100
@@ -394,7 +454,7 @@ async def get_document(
     Returns:
         Formatted document details
     """
-    client = R2RClient()
+    client = get_authenticated_client()
     
     # Validate that at least one parameter is provided
     if not document_id and not title:
@@ -480,7 +540,7 @@ async def delete_document(document_id: str) -> str:
     Returns:
         Status message confirming deletion or describing error
     """
-    client = R2RClient()
+    client = get_authenticated_client()
     
     try:
         # Delete the document

{ims_mcp-1.0.1.dist-info → ims_mcp-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ims-mcp
-Version: 1.0.1
+Version: 1.0.3
 Summary: Model Context Protocol server for IMS (Instruction Management Systems)
 Author: Igor Solomatov
 License-Expression: MIT
@@ -82,6 +82,13 @@ The server automatically reads configuration from environment variables:
 | `R2R_API_BASE` or `R2R_BASE_URL` | IMS server URL | `http://localhost:7272` |
 | `R2R_COLLECTION` | Collection name for queries | Server default |
 | `R2R_API_KEY` | API key for authentication | None |
+| `R2R_EMAIL` | Email for authentication (requires R2R_PASSWORD) | None |
+| `R2R_PASSWORD` | Password for authentication (requires R2R_EMAIL) | None |
+
+**Authentication Priority:**
+1. If `R2R_API_KEY` is set, it will be used
+2. If `R2R_EMAIL` and `R2R_PASSWORD` are set, they will be used to login and obtain an access token
+3. If neither is set, the client will attempt unauthenticated access (works for local servers)
 
 **Note:** Environment variables use `R2R_` prefix for compatibility with the underlying R2R SDK.
 
@@ -89,6 +96,8 @@ The server automatically reads configuration from environment variables:
 
 ### Cursor IDE
 
+**Local server (no authentication):**
+
 Add to `.cursor/mcp.json`:
 
 ```json
@@ -106,6 +115,25 @@ Add to `.cursor/mcp.json`:
 }
 ```
 
+**Remote server (with email/password authentication):**
+
+```json
+{
+  "mcpServers": {
+    "KnowledgeBase": {
+      "command": "uvx",
+      "args": ["ims-mcp"],
+      "env": {
+        "R2R_API_BASE": "https://your-server.example.com/",
+        "R2R_COLLECTION": "your-collection",
+        "R2R_EMAIL": "your-email@example.com",
+        "R2R_PASSWORD": "your-password"
+      }
+    }
+  }
+}
+```
+
 ### Claude Desktop
 
 Add to Claude Desktop configuration (`~/Library/Application Support/Claude/claude_desktop_config.json` on macOS):

ims_mcp-1.0.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+ims_mcp/__init__.py,sha256=IXSdAG7JlNgU0FZHnI56CEvjhIHzAc3cxuuEINXfbRQ,631
+ims_mcp/__main__.py,sha256=z4P1aCVfOgS3cTM2wgJd2pxjMmKCkGkiqYDRGgrspxw,191
+ims_mcp/server.py,sha256=g_MwgGhVN9jv03qKYTLWNRz_Q-7_cMl9zmbCaVh6LNI,21741
+ims_mcp-1.0.3.dist-info/licenses/LICENSE,sha256=4d1dlH04mbnN3ya4lybcVOUwljRHGy-aSc9MYqGYW44,2534
+ims_mcp-1.0.3.dist-info/METADATA,sha256=TuJNag9JatA25mo5PWAm4hAfsn6FtSJ0MH1UcZyOCv4,9200
+ims_mcp-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ims_mcp-1.0.3.dist-info/entry_points.txt,sha256=xCH9I8g1pTTEqrfjnE-ANHaZo4W6EBJVy0Lg5z8SaIQ,48
+ims_mcp-1.0.3.dist-info/top_level.txt,sha256=wEXA33qFr_eov3S1PY2OF6EQBA2rtAWB_ZNJOzNNQuM,8
+ims_mcp-1.0.3.dist-info/RECORD,,

ims_mcp-1.0.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-ims_mcp/__init__.py,sha256=dIRAdqSZq-o4id0nSxuiW276aWMGIaqRgJdXHOuFeZE,631
-ims_mcp/__main__.py,sha256=z4P1aCVfOgS3cTM2wgJd2pxjMmKCkGkiqYDRGgrspxw,191
-ims_mcp/server.py,sha256=Gk3-R8g6E3ULxuMCCfNmqpAa6_cw4boiy5WTWO5smqc,19384
-ims_mcp-1.0.1.dist-info/licenses/LICENSE,sha256=4d1dlH04mbnN3ya4lybcVOUwljRHGy-aSc9MYqGYW44,2534
-ims_mcp-1.0.1.dist-info/METADATA,sha256=UiLxBGHePFVUvQXaVGZ_a08I7ZWIoCcoNBdv2_5M6xU,8350
-ims_mcp-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ims_mcp-1.0.1.dist-info/entry_points.txt,sha256=xCH9I8g1pTTEqrfjnE-ANHaZo4W6EBJVy0Lg5z8SaIQ,48
-ims_mcp-1.0.1.dist-info/top_level.txt,sha256=wEXA33qFr_eov3S1PY2OF6EQBA2rtAWB_ZNJOzNNQuM,8
-ims_mcp-1.0.1.dist-info/RECORD,,