updated app.py

app.py

@@ -39,19 +39,12 @@ KEYWORDS = {
     ]
 }
 
-def get_gmail_service(state_dict):
+def get_gmail_service(auth_code=None):
     """Creates Gmail API service"""
     creds = None
     
-    # Check if token exists in state
-    if 'token' in state_dict:
-        creds = Credentials.from_authorized_user_info(state_dict['token'], SCOPES)
-
-    # If credentials are invalid or don't exist
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
+    if auth_code:
+        try:
             # Configure OAuth2 with redirect URI
             flow = InstalledAppFlow.from_client_config(
                 CLIENT_CONFIG,
@@ -66,12 +59,12 @@ def get_gmail_service(state_dict):
                 prompt='consent'
             )
             
-            # Create an iframe for Google Sign-In
-            return f"""
-                <iframe src="{auth_url}" width="100%" height="600px" frameborder="0"></iframe>
-                """
+            return auth_url
+            
+        except Exception as e:
+            return f"Error in authentication: {str(e)}"
 
-    return build('gmail', 'v1', credentials=creds)
+    return None
 
 def get_email_content(service, msg_id):
     """Retrieves email content and metadata"""
@@ -135,13 +128,20 @@ def classify_email(email_data):
 
 def fetch_emails(days_back, auth_code="", include_job=True, include_personal=True, progress=gr.Progress()):
     """Main function to fetch and filter emails"""
-    state_dict = {}
+    if not auth_code:
+        auth_url = get_gmail_service()
+        if auth_url:
+            return f"""Please visit this URL to authorize the application:
+            
+{auth_url}
+
+After authorization, you will receive a code. Please paste it here and click 'Connect and Fetch Emails' again."""
     
     try:
-        service = get_gmail_service(state_dict)
-        if isinstance(service, str):
-            # This means we got an auth URL instead of a service
-            return service
+        # Process the auth code and fetch emails
+        flow = InstalledAppFlow.from_client_config(CLIENT_CONFIG, SCOPES)
+        flow.fetch_token(code=auth_code)
+        service = build('gmail', 'v1', credentials=flow.credentials)
         
         # Search for recent emails
         query = f'after:{int((datetime.now() - timedelta(days=int(days_back))).timestamp())}'
@@ -200,47 +200,43 @@ def fetch_emails(days_back, auth_code="", include_job=True, include_personal=Tru
         return f"Error: {str(e)}"
 
 # Create Gradio interface
-def create_interface():
-    with gr.Blocks(title="Email Filter") as demo:
-        gr.Markdown("# 📧 Smart Email Filter")
-        gr.Markdown("Connect to your Gmail account to filter important emails")
-        
-        # Add HTML component for OAuth iframe
-        auth_html = gr.HTML()
-        
-        with gr.Row():
-            days_back = gr.Slider(
-                minimum=1, 
-                maximum=30, 
-                value=7, 
-                step=1, 
-                label="Days to look back"
-            )
-            include_job = gr.Checkbox(
-                value=True, 
-                label="Include Job Related Emails"
-            )
-            include_personal = gr.Checkbox(
-                value=True, 
-                label="Include Personal Emails"
-            )
-        
-        fetch_button = gr.Button("Connect and Fetch Emails")
-        output = gr.Textbox(
-            label="Results", 
-            lines=20,
-            show_copy_button=True
+with gr.Blocks(title="Email Filter") as demo:
+    gr.Markdown("# 📧 Smart Email Filter")
+    gr.Markdown("Connect to your Gmail account to filter important emails")
+    
+    with gr.Row():
+        days_back = gr.Slider(
+            minimum=1, 
+            maximum=30, 
+            value=7, 
+            step=1, 
+            label="Days to look back"
         )
-        
-        # Update the click handler
-        fetch_button.click(
-            fn=fetch_emails,
-            inputs=[days_back, include_job, include_personal],
-            outputs=[auth_html, output]
+        include_job = gr.Checkbox(
+            value=True, 
+            label="Include Job Related Emails"
+        )
+        include_personal = gr.Checkbox(
+            value=True, 
+            label="Include Personal Emails"
         )
     
-    return demo
+    auth_code = gr.Textbox(
+        label="Authorization Code",
+        placeholder="Enter the authorization code here after visiting the auth URL"
+    )
+    
+    fetch_button = gr.Button("Connect and Fetch Emails")
+    output = gr.Textbox(
+        label="Results", 
+        lines=20,
+        show_copy_button=True
+    )
+    
+    fetch_button.click(
+        fn=fetch_emails,
+        inputs=[days_back, auth_code, include_job, include_personal],
+        outputs=output
+    )
 
-if __name__ == "__main__":
-    demo = create_interface()
-    demo.launch()
+demo.launch()