mcp-sharepoint-us 2.0.3__tar.gz → 2.0.5__tar.gz

{mcp_sharepoint_us-2.0.3 → mcp_sharepoint_us-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-sharepoint-us
-Version: 2.0.3
+Version: 2.0.5
 Summary: SharePoint MCP Server with Modern Azure AD Authentication
 License: MIT
 Project-URL: Homepage, https://github.com/mdev26/mcp-sharepoint-us

{mcp_sharepoint_us-2.0.3 → mcp_sharepoint_us-2.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcp-sharepoint-us"
-version = "2.0.3"
+version = "2.0.5"
 description = "SharePoint MCP Server with Modern Azure AD Authentication"
 readme = "README.md"
 requires-python = ">=3.10"

{mcp_sharepoint_us-2.0.3 → mcp_sharepoint_us-2.0.5}/src/mcp_sharepoint/__init__.py

@@ -288,13 +288,14 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             raise ValueError(f"Unknown tool: {name}")
             
     except Exception as e:
-        logger.error(f"Tool '{name}' failed: {e}")
+        logger.exception(f"Tool '{name}' failed")  # <-- prints stack trace
         return [TextContent(
             type="text",
             text=f"Error executing {name}: {str(e)}"
         )]
 
 
+
 async def test_connection() -> list[TextContent]:
     """Test SharePoint connection"""
     try:
@@ -369,28 +370,33 @@ async def get_document_content(file_path: str) -> list[TextContent]:
     try:
         doc_lib = get_document_library_path()
         full_path = f"{doc_lib}/{file_path}"
-        
-        file = ctx.web.get_file_by_server_relative_path(full_path)
-        content = file.read()
-        
-        # Determine if binary based on file extension
+
+        def _read_bytes():
+            sp_file = ctx.web.get_file_by_server_relative_path(full_path)
+            # IMPORTANT: execute the request
+            return sp_file.read().execute_query()
+
+        content = await asyncio.to_thread(_read_bytes)
+
         ext = os.path.splitext(file_path)[1].lower()
         text_extensions = {'.txt', '.md', '.json', '.xml', '.html', '.csv', '.log'}
-        
+
         if ext in text_extensions:
-            # Text file
-            text_content = content.decode('utf-8')
+            text_content = content.decode("utf-8", errors="replace")
             return [TextContent(type="text", text=text_content)]
-        else:
-            # Binary file - return base64
-            b64_content = base64.b64encode(content).decode('utf-8')
-            return [TextContent(
-                type="text",
-                text=f"Binary file (base64 encoded):\n\n{b64_content[:200]}...\n\n"
-                     f"Full content length: {len(b64_content)} characters"
-            )]
-            
+
+        b64_content = base64.b64encode(content).decode("utf-8")
+        return [TextContent(
+            type="text",
+            text=(
+                "Binary file (base64 encoded):\n\n"
+                f"{b64_content[:200]}...\n\n"
+                f"Full content length: {len(b64_content)} characters"
+            )
+        )]
+
     except Exception as e:
+        logger.exception("Error reading document")
         return [TextContent(type="text", text=f"Error reading document: {str(e)}")]
 
 

{mcp_sharepoint_us-2.0.3 → mcp_sharepoint_us-2.0.5}/src/mcp_sharepoint/auth.py

@@ -4,6 +4,8 @@ Supports Azure US Government Cloud and Commercial Cloud
 """
 import os
 import logging
+import time
+import random
 from typing import Optional
 from office365.sharepoint.client_context import ClientContext
 from office365.runtime.auth.client_credential import ClientCredential
@@ -51,49 +53,87 @@ class SharePointAuthenticator:
     def get_context_with_msal(self) -> ClientContext:
         """
         Get ClientContext using MSAL for modern Azure AD authentication.
-        Supports both Commercial and US Government clouds.
-        
-        Returns:
-            Authenticated ClientContext
+        Uses a cached MSAL app + simple in-memory token cache to avoid repeated
+        OIDC discovery calls and reduce connection resets.
         """
-        def acquire_token():
-            """Acquire token using MSAL"""
-            # Set authority URL based on cloud environment
-            if self.cloud == "government" or self.cloud == "us":
-                # Azure US Government Cloud
-                authority_url = f'https://login.microsoftonline.us/{self.tenant_id}'
+
+        # Build and cache the MSAL app once per authenticator instance
+        if not hasattr(self, "_msal_app"):
+            if self.cloud in ("government", "us"):
+                authority_url = f"https://login.microsoftonline.us/{self.tenant_id}"
                 logger.info("Using Azure US Government Cloud endpoints")
             else:
-                # Commercial Cloud
-                authority_url = f'https://login.microsoftonline.com/{self.tenant_id}'
+                authority_url = f"https://login.microsoftonline.com/{self.tenant_id}"
                 logger.info("Using Azure Commercial Cloud endpoints")
-            
-            app = msal.ConfidentialClientApplication(
+
+            # Optional: enable MSAL token cache (in-memory). Helps reduce calls.
+            self._token_cache = getattr(self, "_token_cache", msal.SerializableTokenCache())
+
+            self._msal_app = msal.ConfidentialClientApplication(
                 authority=authority_url,
                 client_id=self.client_id,
-                client_credential=self.client_secret
+                client_credential=self.client_secret,
+                token_cache=self._token_cache,
             )
-            
-            # SharePoint requires the site-specific scope
-            scopes = [f"{self.site_url}/.default"]
-            
-            result = app.acquire_token_for_client(scopes=scopes)
-            
-            if "access_token" not in result:
-                error_desc = result.get("error_description", "Unknown error")
-                error = result.get("error", "Unknown")
-                raise ValueError(
-                    f"Failed to acquire token: {error} - {error_desc}\n"
-                    f"Authority: {authority_url}\n"
-                    f"Scopes: {scopes}"
-                )
-            
-            logger.info(f"Successfully acquired token for {self.site_url}")
-            return result
-        
+            self._authority_url = authority_url
+
+        # Small in-memory access-token cache (avoid repeated acquire calls)
+        # MSAL caches too, but keeping the raw token avoids extra work in Office365 callbacks.
+        if not hasattr(self, "_access_token"):
+            self._access_token = None
+            self._access_token_exp = 0
+
+        scopes = [f"{self.site_url}/.default"]
+
+        def acquire_token() -> str:
+            """
+            Token callback used by office365 ClientContext.
+            Retries transient network errors like ConnectionResetError(104).
+            """
+            now = int(time.time())
+            if self._access_token and now < (self._access_token_exp - 60):
+                return self._access_token
+
+            last_err = None
+            for attempt in range(1, 6):  # 5 attempts
+                try:
+                    result = self._msal_app.acquire_token_for_client(scopes=scopes)
+
+                    if "access_token" not in result:
+                        error_desc = result.get("error_description", "Unknown error")
+                        error = result.get("error", "Unknown")
+                        raise ValueError(
+                            f"Failed to acquire token: {error} - {error_desc}\n"
+                            f"Authority: {self._authority_url}\n"
+                            f"Scopes: {scopes}"
+                        )
+
+                    token = result["access_token"]
+
+                    # MSAL returns expires_in (seconds) for client credential tokens
+                    expires_in = int(result.get("expires_in", 3600))
+                    self._access_token = token
+                    self._access_token_exp = int(time.time()) + expires_in
+
+                    logger.info(f"Successfully acquired token for {self.site_url}")
+                    return token
+
+                except Exception as e:
+                    last_err = e
+                    # Exponential backoff with jitter
+                    sleep_s = min(8.0, (2 ** (attempt - 1)) * 0.5) + random.random() * 0.25
+                    logger.warning(
+                        f"Token acquisition attempt {attempt}/5 failed: {e}. Retrying in {sleep_s:.2f}s"
+                    )
+                    time.sleep(sleep_s)
+
+            # If we get here, all retries failed
+            raise RuntimeError(f"Token acquisition failed after retries: {last_err}")
+
         ctx = ClientContext(self.site_url).with_access_token(acquire_token)
         logger.info("Successfully authenticated using MSAL (Modern Azure AD)")
         return ctx
+
     
     def get_context_with_certificate(self) -> ClientContext:
         """

{mcp_sharepoint_us-2.0.3 → mcp_sharepoint_us-2.0.5}/src/mcp_sharepoint_us.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-sharepoint-us
-Version: 2.0.3
+Version: 2.0.5
 Summary: SharePoint MCP Server with Modern Azure AD Authentication
 License: MIT
 Project-URL: Homepage, https://github.com/mdev26/mcp-sharepoint-us