Spaces:

Agents-MCP-Hackathon
/

MailQuery

Running

App Files Files Community

Da-123 commited on 1 day ago

Commit

8f7fd07

1 Parent(s): def32a7

remove local

Browse files

Files changed (2) hide show

agentic_implementation/email_mcp_server_oauth.py +122 -10
agentic_implementation/oauth_manager.py +160 -22

agentic_implementation/email_mcp_server_oauth.py CHANGED Viewed

@@ -120,6 +120,17 @@ def authenticate_user() -> str:
     try:
         logger.info("Starting OAuth authentication flow...")
         # Check if OAuth is configured
         if not oauth_manager.client_secrets_file.exists():
             return json.dumps({
@@ -144,16 +155,44 @@ def authenticate_user() -> str:
                 ]
             }
         else:
-            result = {
-                "success": False,
-                "error": "Authentication failed",
-                "message": "Please try again or check your internet connection.",
-                "instructions": [
-                    "Make sure you have internet connection",
-                    "Ensure you complete the authentication in the browser",
-                    "Try running 'python setup_oauth.py' if problems persist"
-                ]
-            }
         return json.dumps(result, indent=2)
@@ -165,6 +204,79 @@ def authenticate_user() -> str:
             "message": "Authentication failed due to an error."
         }
         return json.dumps(error_result, indent=2)
 def switch_account(target_email: str) -> str:
     """

     try:
         logger.info("Starting OAuth authentication flow...")
+        if oauth_manager.is_authenticated():
+            user_email = oauth_manager.get_current_account()
+            return json.dumps({
+                "success": True,
+                "message": "Already authenticated!",
+                "user_email": user_email,
+                "instructions": [
+                    "You are already authenticated and ready to use email tools",
+                    f"Currently authenticated as: {user_email}"
+                ]
+            }, indent=2)
         # Check if OAuth is configured
         if not oauth_manager.client_secrets_file.exists():
             return json.dumps({
                 ]
             }
         else:
+            # Authentication not completed, provide manual instructions
+            auth_url = oauth_manager.get_pending_auth_url()
+            callback_url = oauth_manager.get_hf_redirect_uri()
+            if auth_url:
+                result = {
+                    "success": False,
+                    "message": "Manual authentication required",
+                    "auth_url": auth_url,
+                    "callback_url": callback_url,
+                    "instructions": [
+                        "Authentication URL has been generated",
+                        "Please click the link below to authenticate:",
+                        "1. Click the authentication URL",
+                        "2. Sign in with your Google account",
+                        "3. Grant Gmail access permissions",
+                        "4. You'll be redirected back automatically",
+                        "5. Try clicking 'Submit' again after completing authentication"
+                    ],
+                    "note": "After completing authentication in the popup, click Submit again to verify"
+                }
+            else:
+                result = {
+                    "success": False,
+                    "error": "Failed to generate authentication URL",
+                    "message": "Could not start authentication process. Check your OAuth configuration."
+                }
+            # result = {
+            #     "success": False,
+            #     "error": "Authentication failed",
+            #     "message": "Please try again or check your internet connection.",
+            #     "instructions": [
+            #         "Make sure you have internet connection",
+            #         "Ensure you complete the authentication in the browser",
+            #         "Try running 'python setup_oauth.py' if problems persist"
+            #     ]
+            # }
         return json.dumps(result, indent=2)
             "message": "Authentication failed due to an error."
         }
         return json.dumps(error_result, indent=2)
+def handle_oauth_callback(auth_code: str) -> str:
+    """Handle OAuth callback for Hugging Face Spaces
+    Args:
+        auth_code: Authorization code from OAuth callback
+    Returns:
+        HTML response string
+    """
+    try:
+        if not auth_code:
+            return """
+            <html>
+            <head><title>OAuth Error</title></head>
+            <body style="font-family: Arial, sans-serif; text-align: center; padding: 50px;">
+                <h1 style="color: #d32f2f;">Authentication Error</h1>
+                <p>No authorization code received.</p>
+                <button onclick="window.close()" style="padding: 10px 20px; margin: 20px; background: #1976d2; color: white; border: none; border-radius: 4px; cursor: pointer;">Close Window</button>
+            </body>
+            </html>
+            """
+        success = oauth_manager.complete_hf_spaces_auth(auth_code)
+        if success:
+            user_email = oauth_manager.get_current_account()
+            return f"""
+            <html>
+            <head><title>OAuth Success</title></head>
+            <body style="font-family: Arial, sans-serif; text-align: center; padding: 50px;">
+                <h1 style="color: #2e7d32;">🎉 Authentication Successful!</h1>
+                <p>You are now authenticated as:</p>
+                <p style="font-weight: bold; font-size: 18px; color: #1976d2;">{user_email}</p>
+                <p>You can now close this window and return to the main application.</p>
+                <p style="color: #666; font-size: 14px;">This window will close automatically in 5 seconds...</p>
+                <button onclick="window.close()" style="padding: 10px 20px; margin: 20px; background: #2e7d32; color: white; border: none; border-radius: 4px; cursor: pointer;">Close Window</button>
+                <script>
+                    setTimeout(function() {{
+                        window.close();
+                    }}, 5000);
+                </script>
+            </body>
+            </html>
+            """
+        else:
+            return """
+            <html>
+            <head><title>OAuth Error</title></head>
+            <body style="font-family: Arial, sans-serif; text-align: center; padding: 50px;">
+                <h1 style="color: #d32f2f;">Authentication Failed</h1>
+                <p>Unable to complete authentication. Please try again.</p>
+                <p>Make sure you granted all required permissions.</p>
+                <button onclick="window.close()" style="padding: 10px 20px; margin: 20px; background: #d32f2f; color: white; border: none; border-radius: 4px; cursor: pointer;">Close Window</button>
+            </body>
+            </html>
+            """
+    except Exception as e:
+        logger.error(f"Error handling OAuth callback: {e}")
+        return f"""
+        <html>
+        <head><title>OAuth Error</title></head>
+        <body style="font-family: Arial, sans-serif; text-align: center; padding: 50px;">
+            <h1 style="color: #d32f2f;">Authentication Error</h1>
+            <p>An error occurred during authentication:</p>
+            <pre style="background: #f5f5f5; padding: 10px; border-radius: 4px; text-align: left; max-width: 500px; margin: 0 auto;">{str(e)}</pre>
+            <button onclick="window.close()" style="padding: 10px 20px; margin: 20px; background: #d32f2f; color: white; border: none; border-radius: 4px; cursor: pointer;">Close Window</button>
+        </body>
+        </html>
+        """
 def switch_account(target_email: str) -> str:
     """

agentic_implementation/oauth_manager.py CHANGED Viewed

@@ -14,7 +14,7 @@ import webbrowser
 import threading
 import time
 from http.server import HTTPServer, BaseHTTPRequestHandler
-import urllib.parse as urlparse
 from logger import logger
 from dotenv import load_dotenv
 load_dotenv()
@@ -205,41 +205,95 @@ class GmailOAuthManager:
         return auth_url
     def authenticate_interactive(self) -> bool:
-        """Interactive authentication flow that opens browser
         Returns:
             True if authentication successful, False otherwise
         """
         try:
-            # Start local HTTP server for OAuth callback
-            server = HTTPServer(('localhost', 8080), OAuthCallbackHandler)
-            server.auth_code = None
             # Get authorization URL
             auth_url = self.get_authorization_url()
-            logger.info("Opening browser for authentication...")
-            logger.info(f"If browser doesn't open, visit: {auth_url}")
-            # Open browser
-            webbrowser.open(auth_url)
-            # Start server in background thread
-            server_thread = threading.Thread(target=server.handle_request)
-            server_thread.daemon = True
-            server_thread.start()
-            # Wait for callback (max 5 minutes)
-            timeout = 300  # 5 minutes
             start_time = time.time()
-            while server.auth_code is None and (time.time() - start_time) < timeout:
-                time.sleep(1)
-            if server.auth_code is None:
-                logger.error("Authentication timed out")
-                return False
             # Exchange authorization code for credentials
             flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
                 str(self.client_secrets_file),
@@ -247,7 +301,7 @@ class GmailOAuthManager:
             )
             flow.redirect_uri = self.redirect_uri
-            flow.fetch_token(code=server.auth_code)
             credentials = flow.credentials
             # Get user email from credentials
@@ -266,8 +320,92 @@ class GmailOAuthManager:
             return True
         except Exception as e:
-            logger.error(f"Authentication failed: {e}")
             return False
     def _get_email_from_credentials(self, credentials: Credentials) -> Optional[str]:
         """Get email address from credentials"""

 import threading
 import time
 from http.server import HTTPServer, BaseHTTPRequestHandler
+from urllib.parse import  urlparse,parse_qs
 from logger import logger
 from dotenv import load_dotenv
 load_dotenv()
         return auth_url
     def authenticate_interactive(self) -> bool:
+        """Interactive authentication flow for Hugging Face Spaces
         Returns:
             True if authentication successful, False otherwise
         """
         try:
+            # Check if already authenticated
+            if self.is_authenticated():
+                logger.info("Already authenticated")
+                return True
             # Get authorization URL
             auth_url = self.get_authorization_url()
+            logger.info("Running on Hugging Face Spaces")
+            logger.info(f"Authentication URL generated: {auth_url}")
+            logger.info("User must visit the URL manually to complete authentication")
+            # Store the auth URL for the Gradio interface to use
+            self._pending_auth_url = auth_url
+            self._auth_completed = False
+            # For setup_oauth.py and testing contexts, we'll print the URL
+            # and wait briefly to see if authentication completes
+            print(f"\n🌐 Please visit this URL to authenticate:")
+            print(f"   {auth_url}")
+            print("\n⏳ Waiting for authentication completion...")
+            # Wait for a reasonable time to see if auth completes
+            # This allows the callback to potentially complete the auth
+            timeout = 60  # 1 minute for manual completion
             start_time = time.time()
+            while (time.time() - start_time) < timeout:
+                # Check if authentication was completed via callback
+                if getattr(self, '_auth_completed', False):
+                    logger.info("Authentication completed successfully!")
+                    return True
+                # Check if user is now authenticated (credentials were saved)
+                if self.is_authenticated():
+                    self._auth_completed = True
+                    logger.info("Authentication verified successful!")
+                    return True
+                time.sleep(2)  # Check every 2 seconds
+            # Timeout reached - authentication not completed
+            logger.info("Authentication timeout. Please complete authentication via the provided URL.")
+            return False
+        except Exception as e:
+            logger.error(f"Authentication failed: {e}")
+            return False
+    def complete_hf_spaces_auth(self, auth_code: str) -> bool:
+        """Complete authentication for HF Spaces with received auth code
+        Args:
+            auth_code: Authorization code received from OAuth callback
+        Returns:
+            True if authentication successful, False otherwise
+        """
+        try:
+            success = self._exchange_code_for_credentials(auth_code)
+            if success:
+                # Mark authentication as completed
+                self._auth_completed = True
+                logger.info("HF Spaces authentication marked as completed")
+            return success
+        except Exception as e:
+            logger.error(f"Failed to complete HF Spaces authentication: {e}")
+            return False
+    def _exchange_code_for_credentials(self, auth_code: str) -> bool:
+        """Exchange authorization code for credentials
+        Args:
+            auth_code: Authorization code from OAuth flow
+        Returns:
+            True if successful, False otherwise
+        """
+        try:
             # Exchange authorization code for credentials
             flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
                 str(self.client_secrets_file),
             )
             flow.redirect_uri = self.redirect_uri
+            flow.fetch_token(code=auth_code)
             credentials = flow.credentials
             # Get user email from credentials
             return True
         except Exception as e:
+            logger.error(f"Failed to exchange code for credentials: {e}")
             return False
+    def get_pending_auth_url(self) -> str:
+        """Get the pending authentication URL for manual completion
+        Returns:
+            Authentication URL string or None if not available
+        """
+        return getattr(self, '_pending_auth_url', None)
+    def get_hf_redirect_uri(self) -> str:
+        """Get the Hugging Face Spaces redirect URI
+        Returns:
+            Redirect URI string
+        """
+        space_id = os.getenv('SPACE_ID')
+        space_author = os.getenv('SPACE_AUTHOR', 'username')
+        return f"https://{space_author}-{space_id}.hf.space/oauth/callback"
+    # def authenticate_interactive(self) -> bool:
+    #     """Interactive authentication flow that opens browser
+    #     Returns:
+    #         True if authentication successful, False otherwise
+    #     """
+    #     try:
+    #         # Start local HTTP server for OAuth callback
+    #         server = HTTPServer(('localhost', 8080), OAuthCallbackHandler)
+    #         server.auth_code = None
+    #         # Get authorization URL
+    #         auth_url = self.get_authorization_url()
+    #         logger.info("Opening browser for authentication...")
+    #         logger.info(f"If browser doesn't open, visit: {auth_url}")
+    #         # Open browser
+    #         webbrowser.open(auth_url)
+    #         # Start server in background thread
+    #         server_thread = threading.Thread(target=server.handle_request)
+    #         server_thread.daemon = True
+    #         server_thread.start()
+    #         # Wait for callback (max 5 minutes)
+    #         timeout = 300  # 5 minutes
+    #         start_time = time.time()
+    #         while server.auth_code is None and (time.time() - start_time) < timeout:
+    #             time.sleep(1)
+    #         if server.auth_code is None:
+    #             logger.error("Authentication timed out")
+    #             return False
+    #         # Exchange authorization code for credentials
+    #         flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
+    #             str(self.client_secrets_file),
+    #             scopes=self.SCOPES
+    #         )
+    #         flow.redirect_uri = self.redirect_uri
+    #         flow.fetch_token(code=server.auth_code)
+    #         credentials = flow.credentials
+    #         # Get user email from credentials
+    #         user_email = self._get_email_from_credentials(credentials)
+    #         if not user_email:
+    #             logger.error("Failed to get user email from credentials")
+    #             return False
+    #         # Save encrypted credentials for this account
+    #         self._save_credentials(user_email, credentials)
+    #         # Set as current account
+    #         self._save_current_account(user_email)
+    #         logger.info("Authentication successful!")
+    #         return True
+    #     except Exception as e:
+    #         logger.error(f"Authentication failed: {e}")
+    #         return False
     def _get_email_from_credentials(self, credentials: Credentials) -> Optional[str]:
         """Get email address from credentials"""