fix(twitter): prompt user for username if login fails with email (#31)

* refactor(app): pass thread to start()

* fix(twitter): prompt user for username if login failed with emails

* refactor(discord): use absolute imports

Author: idiotWu

npi/app/discord/app.py

@@ -7,6 +7,7 @@
 from npi.core import App, npi_tool
 from npi.config import config
 from npi.error.auth import UnauthorizedError
+from npi.core.thread import Thread
 from .schema import *
 
 client = discord.Client(intents=discord.Intents.default())
@@ -47,8 +48,8 @@ def __init__(self, llm=None):
         self.client = discord.Client(intents=discord.Intents.default())
         self._access_token = cred.access_token
 
-    async def start(self):
-        await super().start()
+    async def start(self, thread: Thread = None):
+        await super().start(thread)
         await self.client.login(self._access_token)
 
     async def dispose(self):

npi/browser_app/twitter/app.py

@@ -1,6 +1,8 @@
 import json
 import os
 import re
+
+from npiai_proto import api_pb2
 from playwright.async_api import TimeoutError
 from markdownify import MarkdownConverter
 
@@ -9,6 +11,8 @@
 from npi.browser_app.navigator import Navigator
 from npi.config import config
 from npi.error.auth import UnauthorizedError
+from npi.core.callback import callback
+from npi.core.thread import Thread
 from .schema import *
 
 __SYSTEM_PROMPT__ = """
@@ -117,12 +121,12 @@ def __init__(self, llm=None, headless: bool = True):
 
         self.register(Navigator(playwright=self.playwright))
 
-    async def start(self):
+    async def start(self, thread: Thread = None):
         if not self._started:
-            await super().start()
-            await self._login()
+            await super().start(thread)
+            await self._login(thread)
 
-    async def _login(self):
+    async def _login(self, thread: Thread):
         if os.path.exists(self.state_file):
             with open(self.state_file, 'r') as f:
                 state = json.load(f)
@@ -141,6 +145,19 @@ async def _login(self):
         await self.playwright.page.get_by_test_id('loginButton').click()
         await self.playwright.page.get_by_label('Phone, email, or username').fill(self.creds.username)
         await self.playwright.page.get_by_role('button', name='Next').click()
+
+        # check if username(not email) is required
+        await self.playwright.page.wait_for_timeout(1000)
+        username_input = self.playwright.page.get_by_test_id("ocfEnterTextTextInput")
+        if await username_input.count() != 0:
+            username = await self._request_username(thread)
+            await username_input.fill(username)
+            await self.playwright.page.get_by_test_id("ocfEnterTextNextButton").click()
+
+            await self.playwright.page.wait_for_timeout(1000)
+            if await username_input.count() != 0:
+                raise UnauthorizedError('Unable to login to Twitter. Please try again with the correct credentials.')
+
         await self.playwright.page.get_by_label('Password', exact=True).fill(self.creds.password)
         await self.playwright.page.get_by_test_id('LoginForm_Login_Button').click()
         await self.playwright.page.wait_for_url(__ROUTES__['home'])
@@ -150,6 +167,26 @@ async def _login(self):
         os.makedirs(save_dir, exist_ok=True)
         await self.playwright.context.storage_state(path=self.state_file)
 
+        await thread.send_msg(callback.Callable('Logged in to Twitter'))
+
+    @staticmethod
+    async def _request_username(thread: Thread) -> str:
+        if thread is None:
+            raise Exception('`thread` must be provided to request username')
+
+        cb = callback.Callable(
+            action=api_pb2.ActionResponse(
+                type=api_pb2.ActionType.HUMAN_FEEDBACK,
+                human_feedback=api_pb2.HumanFeedbackAction(
+                    type=api_pb2.HumanFeedbackActionType.INPUT,
+                    notice='Please enter your username (not email) to continue the login process.',
+                )
+            ),
+        )
+        cb.action.action_id = cb.id()
+        await thread.send_msg(cb=cb)
+        return await cb.wait()
+
     @npi_tool
     async def get_current_page(self):
         """Get the title and url of the current page."""

npi/core/app.py

@@ -150,7 +150,7 @@ def __init__(
         self.fn_map = {}
         _register_tools(self)
 
-    async def start(self):
+    async def start(self, thread: Thread = None):
         """Start the app"""
         self._started = True
 

npi/core/browser_app.py

@@ -43,10 +43,10 @@ def __init__(
         self.use_screenshot = use_screenshot
         self.playwright = playwright or PlaywrightContext(headless)
 
-    async def start(self):
+    async def start(self, thread: Thread = None):
         """Start the Browser App"""
         if not self._started:
-            await super().start()
+            await super().start(thread)
             await self.playwright.start()
 
     async def dispose(self):

npi/server/app.py

@@ -161,7 +161,7 @@ async def run(self, thread: Thread):
         app = None
         try:
             app = self.get_app(thread.app_type)
-            await app.start()
+            await app.start(thread)
             result = await app.chat(thread.instruction, thread)
             thread.finish(result)
         except UnauthorizedError as e: