final touches

Procfile

@@ -1 +0,0 @@
-web: uvicorn main:app --host=0.0.0.0 --port={PORT:-8000}

app.py

@@ -1,42 +1,46 @@
 from fastapi import FastAPI, Request
-from fastapi.responses import RedirectResponse
-from fastapi.responses import HTMLResponse
+from fastapi.responses import RedirectResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from google_manager.constants import SCOPES
-from pages.auth_page import html_content
+from pages.load_page import load_page
 import google_auth_oauthlib.flow
 from starlette.middleware.sessions import SessionMiddleware
-
 import gradio as gr
 from gpt_summary import Ui
 
-
+# Create an instance of the FastAPI app
 app = FastAPI()
+
+# Add Session middleware to the app
 app.add_middleware(SessionMiddleware, secret_key="mysecret")
+
+# Mount the static files directory
 app.mount("/assets", StaticFiles(directory="assets"), name="assets")
 
 
 @app.get("/", response_class=HTMLResponse)
 async def home(request: Request):
-    print("request session")
-    print(request.session)
-    state = request.session.get("state", None)
-    print("state")
-    print(state)
-    if state:
-        return RedirectResponse("/gradio")
-    else:
+    # Load the html content of the auth page
+    html_content = load_page("./pages/auth_page.html")
+    # print("request session")
+    # print(request.session)
+    creds = request.session.get("credentials", None)
+    # print("state")
+    # print(creds)
+    if not creds or not creds.valid:
         return HTMLResponse(content=html_content, status_code=200)
+    else:
+        return RedirectResponse("/gradio/?__theme=dark")
 
 
+# Define the endpoint for Google authentication
 @app.get("/auth")
-async def integreate_google(request: Request):
+async def integrate_google(request: Request):
+    # print(SCOPES)
     flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
         "credentials.json", scopes=SCOPES
     )
-
     flow.redirect_uri = "http://127.0.0.1:8000/auth_callback"
-
     authorization_url, state = flow.authorization_url(
         access_type="offline",
         include_granted_scopes="true",
@@ -45,10 +49,10 @@ async def integreate_google(request: Request):
     return RedirectResponse(url=authorization_url)
 
 
+# Define the callback endpoint after successful authentication
 @app.get("/auth_callback")
 async def auth_callback(request: Request):
     state = request.session["state"]
-
     flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
         "credentials.json", scopes=SCOPES, state=state
     )
@@ -56,17 +60,16 @@ async def auth_callback(request: Request):
 
     # Use the authorization server's response to fetch the OAuth 2.0 tokens.
     authorization_response = str(request.url)
-
     flow.fetch_token(authorization_response=authorization_response)
-
     credentials = flow.credentials
     request.session["credentials"] = credentials_to_dict(credentials)
-    return RedirectResponse("/gradio")
+    return RedirectResponse("/gradio?__theme=dark")
 
 
+# Mount the Gradio UI
 app = gr.mount_gradio_app(app, Ui, path="/gradio")
 
-
+# Define a helper function to convert credentials to dictionary
 def credentials_to_dict(credentials):
     return {
         "token": credentials.token,

google_manager/auth.py

@@ -1,80 +1,16 @@
-import os.path
-from google.auth.transport.requests import Request
-from google.oauth2.credentials import Credentials
-from google_auth_oauthlib.flow import InstalledAppFlow
-from google_manager.constants import SCOPES
-
-from starlette.responses import RedirectResponse
-from gradio.routes import App
-
-import google.oauth2.credentials
 import google_auth_oauthlib.flow
 
 
-def authenticate(SCOPES):
-    """
-    Request access for the google docs api
-    """
-    creds = None
-
-    if os.path.exists("token.json"):
-        creds = Credentials.from_authorized_user_file("token.json", SCOPES)
-
-    # If there are no (valid) credentials available, let the user log in.
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            flow = InstalledAppFlow.from_client_secrets_file("credentials.json", SCOPES)
-            creds = flow.run_local_server(port=7200)
-
-        # Save the credentials for the next run
-        with open("token.json", "w") as token:
-            token.write(creds.to_json())
-
-    return creds
-
-
 def get_oauth_url(SCOPES, redirect_url):
     flow = google_auth_oauthlib.flow.Flow.from_client_secrets_file(
         "credentials.json", scopes=SCOPES
     )
 
-    # flow.redirect_uri = "http://127.0.0.1:8000/gradio/?__theme=dark"
-    # flow.redirect_uri = app.url_path_for(redirect_url)
     flow.redirect_uri = redirect_url
 
-    # Generate URL for request to Google's OAuth 2.0 server.
-    # Use kwargs to set optional request parameters.
     authorization_url, state = flow.authorization_url(
-        # Enable offline access so that you can refresh an access token without
-        # re-prompting the user for permission. Recommended for web server apps.
         access_type="offline",
-        # Enable incremental authorization. Recommended as a best practice.
         include_granted_scopes="true",
     )
-    print("state")
-    print(state)
 
     return authorization_url
-
-
-def authenticate_production(SCOPES):
-    creds = None
-
-    if os.path.exists("token.json"):
-        creds = Credentials.from_authorized_user_file("token.json", SCOPES)
-
-    # If there are no (valid) credentials available, let the user log in.
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            flow = InstalledAppFlow.from_client_secrets_file("credentials.json", SCOPES)
-            creds = flow.run_local_server(port=7200)
-
-        # Save the credentials for the next run
-        with open("token.json", "w") as token:
-            token.write(creds.to_json())
-
-    return creds

google_manager/constants.py

@@ -1,7 +1,10 @@
-SCOPES = [
-    "https://www.googleapis.com/auth/documents",
-    "https://www.googleapis.com/auth/drive.file",
-]
+import os
+import json
+from dotenv import load_dotenv
 
+load_dotenv()
 
-FOLDER_NAME = "GptSummary"
+
+SCOPES = os.getenv("SCOPES")
+SCOPES = json.loads(SCOPES)
+FOLDER_NAME = os.getenv("FOLDER_NAME")

google_manager/docs_api.py

@@ -1,61 +0,0 @@
-# import os.path
-
-# from google.auth.transport.requests import Request
-# from google.oauth2.credentials import Credentials
-# from google_auth_oauthlib.flow import InstalledAppFlow
-# from googleapiclient.discovery import build
-# from googleapiclient.errors import HttpError
-
-# # If modifying these scopes, delete the file token.json.
-# SCOPES = [
-#     "https://www.googleapis.com/auth/documents",
-#     "https://www.googleapis.com/auth/drive.file",
-# ]
-
-
-# def get_auth():
-#     """
-#     Request access for the google docs api
-#     """
-#     creds = None
-#     # The file token.json stores the user's access and refresh tokens, and is
-#     # created automatically when the authorization flow completes for the first
-#     # time.
-#     if os.path.exists("token.json"):
-#         creds = Credentials.from_authorized_user_file("token.json", SCOPES)
-#     # If there are no (valid) credentials available, let the user log in.
-#     if not creds or not creds.valid:
-#         if creds and creds.expired and creds.refresh_token:
-#             creds.refresh(Request())
-#         else:
-#             flow = InstalledAppFlow.from_client_secrets_file("credentials.json", SCOPES)
-#             creds = flow.run_local_server(port=7860)
-#         # Save the credentials for the next run
-#         with open("token.json", "w") as token:
-#             token.write(creds.to_json())
-
-
-# def save_doc(creds, title):
-#     try:
-#         service = build("docs", "v1", credentials=creds)
-
-#         # create a document
-#         title = "My Document"
-#         body = {"title": title}
-#         doc = service.documents().create(body=body).execute()
-#         print("Created document with title: {0}".format(doc.get("title")))
-
-#     except HttpError as err:
-#         print(err)
-
-
-# import datetime
-
-# # Get the current date and time
-# now = datetime.datetime.now()
-
-# # Format the date and time as a string
-# timestamp = now.strftime("%Y-%m-%d_%H-%M-%S")
-
-# # Define the filename with the timestamp
-# filename = f"file_{timestamp}.txt"

google_manager/fassade.py

@@ -1,17 +1,15 @@
-from google_manager.auth import authenticate, authenticate_production
 from google_manager.drive import create_folder, search_folder
 from google_manager.docs import save_doc, move_doc, name_doc
-from google_manager.constants import SCOPES, FOLDER_NAME
+from google_manager.constants import FOLDER_NAME
 
 
 class Fassade:
     def __init__(self):
         self.creds = None
 
-    def upload_to_drive(content, FOLDER_NAME=FOLDER_NAME):
+    def upload_to_drive(creds, content, FOLDER_NAME=FOLDER_NAME):
         FOLDER_NAME = "GptSummary"
 
-        creds = authenticate_production(SCOPES)
         files = search_folder(creds, FOLDER_NAME)
 
         if not files:

google_manager/test.py

@@ -1,9 +0,0 @@
-from fassade import Fassade
-
-CONTENT = """
-Cars were invented in 1886, when German inventor Carl Benz patented his Benz Patent-Motorwagen.[3][4][5] Cars became widely available during the 20th century. One of the first cars affordable by the masses was the 1908 Model T, an American car manufactured by the Ford Motor Company. Cars were rapidly adopted in the US, where they replaced horse-drawn carriages.[6] In Europe and other parts of the world, demand for automobiles did not increase until after World War II.[7] The car is considered an essential part of the developed economy
-"""
-
-
-if __name__ == "__main__":
-    Fassade.upload_to_drive(CONTENT)

gpt_summary.py

@@ -4,13 +4,8 @@ from dotenv import load_dotenv
 import openai
 from utils import compress
 from google_manager.fassade import Fassade
-
-
+from google.oauth2.credentials import Credentials
 from description import DESCRIPTION
-
-# fastApi
-
-import fastapi
 import gradio as gr
 
 
@@ -51,20 +46,31 @@ def transcribe(audio_file):
     return transcription
 
 
-def predict(input, history=[]):
+def predict(input, request: gr.Request, history=[]):
     compress(input)
+    print("whisper starts")
     transcription = transcribe(input)
+    print("whisper ends")
+    print("gpt starts")
     answer = chat(transcription)
+    print("gpt ends")
 
     # upload the input/answer to google drive
-    doc_content = f"""
-user:
-{transcription}
-
-summary:
-{answer}
-"""
-    # Fassade.upload_to_drive(doc_content)
+
+    doc_content = "user:\n" f"{transcription}\n" "\n" "summary:\n" f"{answer}\n"
+
+    creds_dict = vars(request.session).get("credentials", {})
+    if not creds_dict:
+        raise Exception("Credentials not found in session")
+
+    # Create credentials object from dictionary
+    try:
+        creds = Credentials.from_authorized_user_info(info=vars(creds_dict))
+
+    except Exception as e:
+        raise Exception(f"Invalid credentials in session with the following error{e}")
+
+    Fassade.upload_to_drive(creds, doc_content)
 
     history.append((transcription, answer))
     response = history

main.py

@@ -1,17 +1,16 @@
 import uvicorn
-from pathlib import Path
 import os
 from app import app
 
 os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
 os.environ["OAUTHLIB_RELAX_TOKEN_SCOPE"] = "1"
 
-
-# if __name__ == "__main__":
-#     uvicorn.run(
-#         f"app:app",
-#         port=8000,
-#         reload=True,
-#     )
-
 app = app
+
+# use this for local development
+if __name__ == "__main__":
+    uvicorn.run(
+        f"app:app",
+        port=8000,
+        reload=True,
+    )

pages/auth_page.html

@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <title>Button Page</title>
+    <title>Google Cloud Integration</title>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@600&display=swap" rel="stylesheet">
@@ -12,8 +12,13 @@
 
         }
 
+        h1 {
+            padding-top: 20vh;
+            color: white;
+        }
+
         .button-wrapper {
-            height: 100vh;
+            height: 60vh;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -46,6 +51,10 @@
 </head>
 
 <body>
+    <!-- <h1>Want to save your work in Google Drive</h1> -->
+    <center>
+        <h1>Do you want to save your work in Google Drive?</h1>
+    </center>
     <div class="button-wrapper">
         <div>
             <button onclick="location.href='/auth'" class="integrate">

pages/auth_page.py

@@ -1,54 +0,0 @@
-html_content = """
-    <html>
-        <head>
-            <title>Button Page</title>
-            <link rel="preconnect" href="https://fonts.googleapis.com">
-            <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-            <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@600&display=swap" rel="stylesheet">
-            <style>
-            body {
-                background-color: #090F1E;
-                font-family: 'Poppins', sans-serif;
-  
-            }
-            .button-wrapper {
-                height: 100vh;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-            }
-            button {
-                border: none;
-                margin-right: 10px;
-                border-radius: 5px;
-                color: #090F1E;
-                font-weight: 400;
-                font-size: 1rem;
-            }
-            .integrate {
-                display: flex;
-
-                align-items: center;
-            }
-            .skip {
-                color: #95BDFF;
-                text-decoration: none;
-            }
-
-            img {
-                width: 2rem;
-            }
-            </style>
-        </head>
-        <body>
-            <div class="button-wrapper">
-                <div>
-                    <button onclick="location.href='/auth'" class="integrate">
-                        <img src="assets/google_logo.svg"> Integrate Google Cloud
-                    </button>
-                </div>
-                    <a class="skip" href="/gradio?__theme=dark">skip</a>
-            </div>
-        </body>
-    </html>
-    """

pages/load_page.py

@@ -0,0 +1,5 @@
+def load_page(path):
+    with open(path, "r") as file:
+        html_text = file.read()
+
+    return html_text

utils.py

@@ -1,26 +1,7 @@
 import librosa
-from pathlib import Path, PurePath
 import soundfile as sf
 
 
-# def serialize(messages):
-#     """
-#     Converts a list of tuples where each element of the list represents a message to dictionary of
-#     messages
-#     """
-
-#     serialized_messages = []
-#     for message in messages:
-#         serialized_message = [
-#             {"role": "system", "content": message[0]},
-#             {"role": "user", "content": message[1]},
-#         ]
-
-#         serialized_messages.extend(serialized_message)
-
-#     return serialized_messages
-
-
 def compress(audio_file):
     y, s = librosa.load(audio_file, sr=8000)  # Downsample 44.1kHz to 8kHz
     sf.write(audio_file, y, s, "PCM_24")