Update app.py

app.py

@@ -38,58 +38,6 @@ else:
 # Your application logic goes here
 print("Logged in successfully to Hugging Face Hub!")
 
-
-
-
-
-# Flask app for authentication
-auth_app = Flask(__name__)
-auth_app.secret_key = os.urandom(24)
-
-client_id = os.getenv("GOOGLE_CLIENT_ID")
-client_secret = os.getenv("GOOGLE_CLIENT_SECRET")
-authorization_base_url = 'https://accounts.google.com/o/oauth2/auth'
-token_url = 'https://accounts.google.com/o/oauth2/token'
-redirect_uri = 'http://localhost:5000/callback'
-
-scope = [
-    "https://www.googleapis.com/auth/userinfo.profile",
-    "https://www.googleapis.com/auth/userinfo.email",
-    "openid",
-]
-
-@auth_app.route("/")
-def home():
-    return '<a href="/login">Login with Google</a>'
-
-@auth_app.route("/login")
-def login():
-    google = OAuth2Session(client_id, scope=scope, redirect_uri=redirect_uri)
-    authorization_url, state = google.authorization_url(authorization_base_url, access_type="offline")
-    session['oauth_state'] = state
-    return redirect(authorization_url)
-
-@auth_app.route("/callback")
-def callback():
-    google = OAuth2Session(client_id, state=session['oauth_state'], redirect_uri=redirect_uri)
-    token = google.fetch_token(token_url, client_secret=client_secret, authorization_response=request.url)
-    session['oauth_token'] = token
-    return redirect(url_for('.profile'))
-
-@auth_app.route("/profile")
-def profile():
-    google = OAuth2Session(client_id, token=session['oauth_token'])
-    response = google.get('https://www.googleapis.com/oauth2/v1/userinfo')
-    user_info = response.json()
-    return f"Hello, {user_info['name']}! Your email is {user_info['email']}."
-
-# Check if user is authenticated
-def check_auth():
-    if 'oauth_token' not in session:
-        return redirect(url_for('login'))
-
-
-
 # Set up logging
 logging.basicConfig(level=logging.DEBUG)
 
@@ -966,33 +914,57 @@ def update_images():
 # initialize_database()
 
 
+# Google OAuth2 settings
+client_id = os.getenv("GOOGLE_CLIENT_ID")
+client_secret = os.getenv("GOOGLE_CLIENT_SECRET")
+authorization_base_url = 'https://accounts.google.com/o/oauth2/auth'
+token_url = 'https://accounts.google.com/o/oauth2/token'
+redirect_uri = 'http://localhost:7860/callback'
+scope = [
+    "https://www.googleapis.com/auth/userinfo.profile",
+    "https://www.googleapis.com/auth/userinfo.email",
+    "openid",
+]
+user_info = {}
+
+def login():
+    google = OAuth2Session(client_id, scope=scope, redirect_uri=redirect_uri)
+    authorization_url, state = google.authorization_url(authorization_base_url, access_type="offline")
+    user_info['oauth_state'] = state
+    return authorization_url
+
+def callback(params):
+    global user_info
+    parsed_url = urlparse(params)
+    query_params = parse_qs(parsed_url.query)
+    state = query_params.get('state', [None])[0]
+    if state != user_info.get('oauth_state'):
+        return "Invalid state parameter"
+
+    google = OAuth2Session(client_id, redirect_uri=redirect_uri, state=state)
+    token = google.fetch_token(token_url, client_secret=client_secret, authorization_response=params)
+    user_info.update(google.get('https://www.googleapis.com/oauth2/v1/userinfo').json())
+    return f"Hello {user_info['name']}! You have successfully logged in."
+
+def create_gradio_interface():
+    def greet(name):
+        return f"Hello {name}, welcome to the Gradio app!"
+
+        
 
 
 
 
-with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
-    state = gr.State({'authenticated': False})
 
-    with gr.Row():
-        with gr.Column():
-            gr.Markdown("<h1>Welcome to the App</h1>")
-            
-            # with gr.Tab("Sign Up"):
-            #     signup_email = gr.Textbox(placeholder="Email", label="Email", type="email")
-            #     signup_password = gr.Textbox(placeholder="Password", label="Password", type="password")
-            #     signup_button = gr.Button("Sign Up")
-            #     signup_output = gr.Textbox(interactive=False, label="Output")
-            #     signup_button.click(signup, inputs=[signup_email, signup_password], outputs=signup_output)
-
-            # with gr.Tab("Login"):
-            #     login_email = gr.Textbox(placeholder="Email", label="Email", type="email")
-            #     login_password = gr.Textbox(placeholder="Password", label="Password", type="password")
-            #     login_button = gr.Button("Login")
-            #     login_output = gr.Textbox(interactive=False, label="Output")
-            #     login_button.click(login, inputs=[login_email, login_password, state], outputs=[login_output, state, login_button])
-            #     login_button.click(logout, inputs=[state], outputs=[login_output, state, login_button, login_email, login_password], show_progress=False)
+with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
+        state = gr.State({'authenticated': False})
+        if user_info:
+            gr.Markdown(f"### Hello, {user_info['name']}! Welcome to the Gradio App")
+            name = gr.Textbox(label="Enter your name")
+            greet_btn = gr.Button("Greet")
+            output = gr.Textbox(label="Greeting")
+            greet_btn.click(greet, inputs=name, outputs=output)
             
-            state = gr.State()
             chatbot = gr.Chatbot([], elem_id="RADAR:Channel 94.1", bubble_full_width=False)
             choice = gr.Radio(label="Select Style", choices=["Details", "Conversational"], value="Conversational")
             
@@ -1011,21 +983,29 @@ with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
             gr.Markdown("<h1 style='color: red;'>Map</h1>", elem_id="location-markdown")
             location_output = gr.HTML()
             bot_msg.then(show_map_if_details, [chatbot, choice], [location_output, location_output])
-        
-        with gr.Column():
+            
             weather_output = gr.HTML(value=fetch_local_weather())
             news_output = gr.HTML(value=fetch_local_news())
             events_output = gr.HTML(value=fetch_local_events())
             
-        with gr.Column():
             image_output_1 = gr.Image(value=generate_image(hardcoded_prompt_1), width=400, height=400)
             image_output_2 = gr.Image(value=generate_image(hardcoded_prompt_2), width=400, height=400)
             image_output_3 = gr.Image(value=generate_image(hardcoded_prompt_3), width=400, height=400)
             refresh_button = gr.Button("Refresh Images")
             refresh_button.click(fn=update_images, inputs=None, outputs=[image_output_1, image_output_2, image_output_3])
+        else:
+            login_url = login()
+            gr.Markdown(f"[Login with Google]({login_url})")
+
+    return demo
+
+def main(params=None):
+    if params:
+        callback(params)
+    demo = create_gradio_interface()
+    demo.launch()
 
 if __name__ == "__main__":
-    from threading import Thread
-    Thread(target=auth_app.run, kwargs={'port': 5000, 'debug': True}).start()
-    demo.queue()
-    demo.launch(share=True)
+    import sys
+    params = sys.argv[1] if len(sys.argv) > 1 else None
+    main(params)