Update app.py

app.py

@@ -129,7 +129,7 @@ global_oauth1_user_handler = None
 
 oauth1_user_handler = tweepy.OAuth1UserHandler(
     consumer_token, consumer_secret,
-    callback="https://huggingface.co/spaces/User1342/WatchTower"
+    callback="http://127.0.0.1:7860/"
 )
 target_website = oauth1_user_handler.get_authorization_url(signin_with_twitter=True)
 
@@ -137,6 +137,7 @@ block = gr.Blocks(css=".container { max-width: 800px; margin: auto; }")
 
 chat_history = []
 
+
 def get_client_from_tokens(oauth_verifier, oauth_token):
     new_oauth1_user_handler = tweepy.OAuth1UserHandler(
         consumer_token, consumer_secret,
@@ -159,51 +160,10 @@ def get_client_from_tokens(oauth_verifier, oauth_token):
         access_token_secret=access_token_secret
     )
 
-    return their_client
+    global client
+    client = 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
+    return their_client
 
 def block_users(client, threshold, dataset):
     num_users_blocked = 0
@@ -215,7 +175,7 @@ def block_users(client, threshold, dataset):
         users = json.load(user_file)
 
         for user in users:
-            if threshold >= user["threshold"]:
+            if user["threshold"] >= threshold:
 
                 user_id = str(user["username"])
 
@@ -234,40 +194,52 @@ 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 =  []
 
-# app id
-    chat_history.append(["headers",get_oath_headers()])
 
+def chat(selected_option=None,radio_score=None, url_params = None):
+    global client
+    global chat_history
+    history = []
+
+    # app id
+    if "oauth_verifier" in url_params and "oauth_token" in url_params and client is None:
+        client = get_client_from_tokens(url_params["oauth_verifier"], url_params["oauth_token"])
     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."])
+            history.append(
+                ["Model tuned to a '{}%' threshold and is using the '{}' dataset.".format(radio_score, selected_option),
+                 "{} Account blocking initialised".format(str(selected_option).capitalize())])
+            num_users_blocked = block_users(client, radio_score, selected_option)
+            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"])
+
+    history = chat_history + history
+    chatbot.value = history
+    chatbot.update(value=history)
+
+    return history
+
 
-    return chat_history
 
 def infer(prompt):
     pass
 
+
 have_initialised = False
 client = None
 name = None
 
+def predict(text, url_params):
+    print(url_params)
+    return [None,chat(radio.value, slider.value, url_params)]
+
+
 def changed_tab():
     global have_initialised
     global chatbot
@@ -277,33 +249,25 @@ def changed_tab():
 
     name = "no username"
 
-    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"]]
-
-        print("changed tabs - {}".format(name))
-        chatbot.value = chat_history
-        chatbot.update(value=chat_history)
-    elif has_oath_header() and client==None:
+    chat_history = [
+        ["Welcome to Watchtower.".format(name), "Log in via Twitter and configure your blocking options above."]]
 
-        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)
+    chatbot.value = chat_history
+    chatbot.update(value=chat_history)
 
-    elif not has_oath_header() and not have_initialised:
-        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];
+        }
+    """
 
 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) -->
@@ -315,12 +279,11 @@ 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")
@@ -339,6 +302,9 @@ with block:
 ''')
             with gr.Group():
                 with gr.Box():
+                    url_params = gr.JSON({}, visible=False, label="URL Params")
+                    text_input = gr.Text(label="Input", visible=False)
+                    text_output = gr.Text(label="Output", visible=False)
                     with gr.Row().style(mobile_collapse=False, equal_height=True):
                         gr.HTML(
                             value='<a href={}><img src="https://cdn.cms-twdigitalassets.com/content/dam/developer-twitter/auth-docs/sign-in-with-twitter-gray.png.twimg.1920.png" alt="Log In With Twitter"></a><br>'.format(
@@ -347,20 +313,18 @@ with block:
                         radio = gr.CheckboxGroup(value="Violent", choices=["Violent", "Hate Speech", "Misinformation"],
                                                  interactive=False, label="Behaviour To Block")
 
-                        slider = gr.Slider(value=80, label="Threshold Certainty Tolerance")
+                        slider = gr.Slider(value=80,interactive=True, label="Threshold Certainty Tolerance")
 
                     chatbot = gr.Chatbot(value=chat_history, label="Watchtower Output").style()
                     btn = gr.Button("Run WatchTower").style(full_width=True)
-        #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)
+        btn.click(fn=predict, inputs=[text_input, url_params],
+                  outputs=[text_output, chatbot], _js=get_window_url_params)
         tabs.change(fn=changed_tab, inputs=None, outputs=None)
 
     gr.Markdown(
         """___
    <p style='text-align: center'>
-   Created by <a href="https://twitter.com/borisdayma" target="_blank"James Stevenson</a> et al. 2021-2022
+   Created by <a href="https://twitter.com/_JamesStevenson" target="_blank"James Stevenson</a> et al. 2021-2022
    <br/>
    <a href="https://github.com/CartographerLabs/Pinpoint" target="_blank">GitHub</a>
    </p>"""