Update app.py

app.py

@@ -2,10 +2,13 @@
 # coding: utf-8
 import json
 import os
+import re
 import time
+from random import random
+import socket
 
-import gradio as gr
-import tweepy
+from threading import Thread
+from time import sleep
 
 test_html = '''
 <!-- Header -->
@@ -79,7 +82,7 @@ test_html = '''
     <p id="caption" class="w3-opacity w3-large"></p>
   </div>
 </div>
-
+ 
 <script>
 // Modal Image Gallery
 function onClick(element) {
@@ -112,52 +115,95 @@ function toggleFunction() {
 </html>
 '''
 
+import gradio as gr
+import tweepy
+from fastapi import FastAPI, Request
+
 consumer_token = os.getenv('CONSUMER_TOKEN')
 consumer_secret = os.getenv('CONSUMER_SECRET')
 my_access_token = os.getenv('ACCESS_TOKEN')
 my_access_secret = os.getenv('ACCESS_SECRET')
 bearer = os.getenv('BEARER')
-client_id = os.getenv('CLIENT_ID')
-client_secret = os.getenv('CLIENT_SECRET')
-
-oauth1_user_handler = tweepy.OAuth2UserHandler(client_id=client_id,
-                                               client_secret=client_secret,
-                                               redirect_uri="https://hf.space/embed/User1342/WatchTower/",
-                                               scope=["block.write"]
 
-                                               )
+global_oauth1_user_handler = None
 
-target_website = oauth1_user_handler.get_authorization_url()
-print(target_website)
+oauth1_user_handler = tweepy.OAuth1UserHandler(
+    consumer_token, consumer_secret,
+    callback="https://huggingface.co/spaces/User1342/WatchTower"
+)
+target_website = oauth1_user_handler.get_authorization_url(signin_with_twitter=True)
 
 block = gr.Blocks(css=".container { max-width: 800px; margin: auto; }")
 
 chat_history = []
 
-def predict(text, url_params):
-    print(url_params)
-    chat(radio.value, slider.value, url_params)
-    return ["Hello " + text + "!!", url_params]
-
-def get_client_from_tokens(url):
-    oauth1_user_handler = tweepy.OAuth2UserHandler(client_id=client_id,
-                                                   client_secret=client_secret,
-                                                   redirect_uri="https://hf.space/embed/User1342/WatchTower/",
-                                                   scope=["block.write"])
-
+def get_client_from_tokens(oauth_verifier, oauth_token):
+    new_oauth1_user_handler = tweepy.OAuth1UserHandler(
+        consumer_token, consumer_secret,
+        callback="http://127.0.0.1:7860/"
+    )
+    new_oauth1_user_handler.request_token = {
+        "oauth_token": oauth_token,
+        "oauth_token_secret": consumer_secret
+    }
 
-    url = "https://hf.space/embed/User1342/WatchTower/?state={}&code={}&client_id={}".format(url["state"],url["code"],client_id)
-    print("urls {}".format(url))
-    their_client = None
-    if url != None:
+    access_token, access_token_secret = new_oauth1_user_handler.get_access_token(
+        oauth_verifier
+    )
 
-        access_token = oauth1_user_handler.fetch_token(
-            url
-        )
-        their_client = tweepy.Client(access_token)
+    their_client = tweepy.Client(
+        bearer_token=bearer,
+        consumer_key=consumer_token,
+        consumer_secret=consumer_secret,
+        access_token=access_token,
+        access_token_secret=access_token_secret
+    )
 
     return their_client
 
+def get_oath_headers():
+    oauth_verifier = None
+    oauth_token = None
+    did_find = False
+    if hasattr(block, "server"):
+        for connection in block.server.server_state.connections:
+            # connection_app_id = connection.app.app.blocks.app_id
+            # if active_app_id == connection_app_id:
+            #    print("Its a match")
+            if connection.headers != None:
+                for header in connection.headers:
+                    header = header[1].decode()
+                    if "oauth_verifier" in header:
+                        oauth_verifier = re.search(r"oauth_verifier=(.+)", header).group(1)
+                        oauth_token = re.search(r"oauth_token=(.+)&", header).group(1)
+                        if oauth_token and oauth_verifier:
+                            did_find = True
+                            break
+                if did_find:
+                    break
+    return oauth_verifier, oauth_token
+
+def get_oath_headers():
+    oauth_verifier = None
+    oauth_token = None
+    did_find = False
+    if hasattr(block, "server"):
+        for connection in block.server.server_state.connections:
+            # connection_app_id = connection.app.app.blocks.app_id
+            # if active_app_id == connection_app_id:
+            #    print("Its a match")
+            if connection.headers != None:
+                for header in connection.headers:
+                    header = header[1].decode()
+                    if "oauth_verifier" in header:
+                        oauth_verifier = re.search(r"oauth_verifier=(.+)", header).group(1)
+                        oauth_token = re.search(r"oauth_token=(.+)&", header).group(1)
+                        if oauth_token and oauth_verifier:
+                            did_find = True
+                            break
+                if did_find:
+                    break
+    return oauth_verifier, oauth_token
 
 def block_users(client, threshold, dataset):
     num_users_blocked = 0
@@ -188,39 +234,40 @@ def block_users(client, threshold, dataset):
 
     return num_users_blocked
 
+def has_oath_header():
+    headers = get_oath_headers()
+    if headers[0] == None:
+        return False
+    else:
+        return True
 
 username_populated = False
+def chat(radio_score = None, selected_option = None):
+    global client
+    history =  []
 
-
-def chat(radio_score, selected_option, url_params):
-
-    client = get_client_from_tokens(url_params)
-    history = []
+# app id
+    chat_history.append(["headers",get_oath_headers()])
 
     if radio_score != None and selected_option != None:
         response = "no blocking"
         if client != None:
-            chat_history.append(
-                ["Model tuned to a '{}%' threshold and is using the '{}' dataset.".format(radio_score, selected_option),
-                 "{} Account blocking initialised".format(selected_option.capitalize())])
-            num_users_blocked = block_users(client, radio_score, selected_option)
-            chat_history.append(
-                ["Blocked {} user account(s).".format(num_users_blocked), "Thank you for using Watchtower."])
+            chat_history.append(["Model tuned to a '{}%' threshold and is using the '{}' dataset.".format(radio_score, selected_option),
+                                 "{} Account blocking initialised".format(selected_option.capitalize())])
+            num_users_blocked = block_users(client,radio_score,selected_option)
+            chat_history.append(["Blocked {} user account(s).".format(num_users_blocked), "Thank you for using Watchtower."])
     elif radio_score != None or selected_option != None:
-        chat_history.append(["Initialisation error!", "Please tune the model by using the above options"])
+        chat_history.append(["Initialisation error!","Please tune the model by using the above options"])
 
     return chat_history
 
-
 def infer(prompt):
     pass
 
-
 have_initialised = False
 client = None
 name = None
 
-
 def changed_tab():
     global have_initialised
     global chatbot
@@ -230,8 +277,7 @@ def changed_tab():
 
     name = "no username"
 
-    chat_history = [
-        ["Welcome to Watchtower.".format(name), "Log in via Twitter and configure your blocking options above."]]
+    chat_history = [["Welcome to Watchtower.".format(name), "Log in via Twitter and configure your blocking options above."]]
 
     if client != None and name != "no username":
         chat_history = [["Welcome {}".format(name), "Initialising WatchTower"]]
@@ -239,25 +285,25 @@ def changed_tab():
         print("changed tabs - {}".format(name))
         chatbot.value = chat_history
         chatbot.update(value=chat_history)
+    elif has_oath_header() and client==None:
 
-        client = get_client_from_tokens()
-        name = client.get_me().data.name
-        have_initialised = True
-        chat_history = [["Welcome {}".format(name), "Initialising WatchTower"]]
+        tokens = get_oath_headers()
+        if tokens[0] and client==None:
+            client = get_client_from_tokens(tokens[0],tokens[1])
+            name = client.get_me().data.name
+            have_initialised = True
+            chat_history = [["Welcome {}".format(name), "Initialising WatchTower"]]
 
         chatbot.value = chat_history
         chatbot.update(value=chat_history)
 
-get_window_url_params = """
-    function(text_input, url_params) {
-        console.log(text_input, url_params);
-        const params = new URLSearchParams(window.location.search);
-        url_params = Object.fromEntries(params);
-        return [text_input, url_params];
-        }
-    """
+    elif not has_oath_header() and not have_initialised:
+        chatbot.value = chat_history
+        chatbot.update(value=chat_history)
+
 with block:
     gr.HTML('''
+    
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
     <!-- Navbar (sit on top) -->
@@ -269,11 +315,12 @@ with block:
 ''')
     gr.HTML("<center><p><br></p></center>")
 
-    # todo check if user signed in
+
+    #todo check if user signed in
 
     user_message = "Log in via Twitter and configure your blocking options above."
 
-    chat_history.append(["Welcome to Watchtower.", user_message])
+    chat_history.append(["Welcome to Watchtower.",user_message])
     tabs = gr.Tabs()
     with tabs:
         intro_tab = gr.TabItem("Introduction")
@@ -281,9 +328,6 @@ with block:
             gr.HTML(test_html)
 
         prediction_tab = gr.TabItem("Getting Started")
-        text_input = gr.Text(label="Input")
-        text_output = gr.Text(label="Output")
-
         with prediction_tab:
             gr.HTML('''
             <header class="w3-display-container w3-content w3-wide" style="max-height:250px;" id="home">
@@ -307,9 +351,10 @@ with block:
 
                     chatbot = gr.Chatbot(value=chat_history, label="Watchtower Output").style()
                     btn = gr.Button("Run WatchTower").style(full_width=True)
-        url_params = gr.JSON({}, visible=True, label="URL Params")
-        btn.click(fn=predict, inputs=[text_input, url_params],
-                  outputs=[text_output, url_params], _js=get_window_url_params)
+        #radio.change(fn=chat, inputs=[radio], outputs=chatbot)
+        #slider.change(fn=chat, inputs=[slider], outputs=chatbot)
+        #text.submit(fn=chat, inputs=[text,text], outputs=chatbot)
+        btn.click(fn=chat, inputs=[slider,radio], outputs=chatbot)
         tabs.change(fn=changed_tab, inputs=None, outputs=None)
 
     gr.Markdown(
@@ -321,5 +366,4 @@ with block:
    </p>"""
     )
 
-
 block.launch(enable_queue=False)