feat: optimize google authorization

Author: wenfengwang

npiai/app/google/calendar/app.py

@@ -2,27 +2,35 @@
 
 import datetime
 import json
+import os
 
-from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
+from oauth2client import file
 
 from npiai import function, App
-
+from npiai.error import UnauthorizedError
 
 # https://developers.google.com/calendar/quickstart/python
 # API Reference: https://developers.google.com/calendar/api/v3/reference
 
 
 class GoogleCalendar(App):
-    def __init__(self, credentials: Credentials):
+    def __init__(self, cred_file: str | None = None):
         super().__init__(
             name='google_calendar',
             description='Manage events on Google Calendar',
-            system_prompt='You are an assistant interacting with Google Calendar API. Your job is the selecting the best function based the tool list.',
+            system_prompt='You are an assistant interacting with Google Calendar API. '
+                          'Your job is the selecting the best function based the tool list.',
         )
+        if cred_file is None:
+            cred_file = os.environ.get("GOOGLE_CREDENTIAL")
+
+        if cred_file is None:
+            raise UnauthorizedError
 
+        store = file.Storage(cred_file)
         self.service = build(
-            'calendar', 'v3', credentials=credentials
+            'calendar', 'v3', credentials=store.get()
         )
 
     @function

npiai/app/google/gmail/app.py

@@ -1,43 +1,35 @@
 import asyncio
 import json
+import os
 from typing import List
 from textwrap import dedent
 
 from googleapiclient.errors import HttpError
 from markdown import markdown
 from simplegmail.message import Message
 
-from google.oauth2.credentials import Credentials
-from oauth2client.client import OAuth2Credentials
-
 from npiai import App, function
-from npiai.app.google.gmail.client import GmailClientWrapper
-
-
-def convert_credentials(google_credentials: Credentials) -> OAuth2Credentials:
-    return OAuth2Credentials(
-        access_token=None,
-        client_id=google_credentials._client_id,
-        client_secret=google_credentials._client_secret,
-        refresh_token=google_credentials._refresh_token,
-        token_expiry=google_credentials.expiry,
-        token_uri=google_credentials._token_uri,
-        user_agent=None
-    )
+from npiai.error import UnauthorizedError
+from .client import GmailClientWrapper
 
 
 class Gmail(App):
     gmail_client: GmailClientWrapper
 
-    def __init__(self, credentials: Credentials):
+    def __init__(self, cred_file: str | None = None):
         super().__init__(
             name='gmail',
             description='interact with Gmail using English, e.g., gmail("send an email to test@gmail.com")',
             system_prompt='You are a Gmail Agent helping users to manage their emails',
         )
+        if cred_file is None:
+            cred_file = os.environ.get("GOOGLE_CREDENTIAL")
+
+        if cred_file is None:
+            raise UnauthorizedError
 
         self.gmail_client = GmailClientWrapper(
-            _creds=convert_credentials(credentials),
+            creds_file=cred_file,
         )
 
     def _get_messages_from_ids(self, message_ids: List[str]) -> List[Message]:
@@ -123,12 +115,12 @@ def remove_labels(self, message_ids: List[str], labels: List[str]) -> str:
 
     @function
     def create_draft(
-        self,
-        to: str,
-        subject: str,
-        message: str = None,
-        cc: List[str] = None,
-        bcc: List[str] = None,
+            self,
+            to: str,
+            subject: str,
+            message: str = None,
+            cc: List[str] = None,
+            bcc: List[str] = None,
     ) -> str:
         """
         Create an email draft.
@@ -154,13 +146,13 @@ def create_draft(
 
     @function
     def create_reply_draft(
-        self,
-        to: str,
-        subject: str,
-        recipient_id: str,
-        message: str = None,
-        cc: List[str] = None,
-        bcc: List[str] = None,
+            self,
+            to: str,
+            subject: str,
+            recipient_id: str,
+            message: str = None,
+            cc: List[str] = None,
+            bcc: List[str] = None,
     ):
         """
         Create a draft that replies to the last email retrieved in the previous chat.
@@ -203,13 +195,13 @@ def create_reply_draft(
 
     @function
     def reply(
-        self,
-        to: str,
-        subject: str,
-        recipient_id: str,
-        message: str = None,
-        cc: List[str] = None,
-        bcc: List[str] = None,
+            self,
+            to: str,
+            subject: str,
+            recipient_id: str,
+            message: str = None,
+            cc: List[str] = None,
+            bcc: List[str] = None,
     ):
         """
         Reply to the last email retrieved in the previous chat.
@@ -268,12 +260,12 @@ def search_emails(self, query: str = None, max_results: int = 100) -> str:
 
     @function
     async def send_email(
-        self,
-        to: str,
-        subject: str,
-        message: str = None,
-        cc: List[str] = None,
-        bcc: List[str] = None,
+            self,
+            to: str,
+            subject: str,
+            message: str = None,
+            cc: List[str] = None,
+            bcc: List[str] = None,
     ):
         """
         Send an email.

npiai/error/__init__.py

@@ -0,0 +1,5 @@
+from .auth import UnauthorizedError
+
+__all__ = [
+    UnauthorizedError,
+]

playground/main.py

@@ -0,0 +1,24 @@
+from pydantic import BaseModel
+from fastapi import FastAPI
+
+
+class ChatRequest(BaseModel):
+    thread_id: str
+    tool_id: str
+    instruction: str
+    action_id: str
+    action_result: str
+    pass
+
+
+pg = FastAPI()
+
+
+@pg.get("/getScreen")
+def get_web_screen():
+    pass
+
+
+@pg.post("/chat")
+def chat(req: ChatRequest):
+    pass