auth final

app.py

@@ -13,8 +13,9 @@ from groq import Groq
 
 import constants as C
 import utils as U
-from auth import authenticateFunc
-from sidebar import showSidebar
+from helpers.auth import runWithAuth
+from helpers.sidebar import showSidebar
+from helpers.activities import saveLatestActivity
 
 from dotenv import load_dotenv
 load_dotenv()
@@ -273,7 +274,10 @@ def __predict():
 
 
 def __generateImage(prompt: str):
-    fluxClient = Client("black-forest-labs/FLUX.1-schnell")
+    fluxClient = Client(
+        "black-forest-labs/FLUX.1-schnell",
+        os.environ.get("HF_FLUX_CLIENT_TOKEN")
+    )
     result = fluxClient.predict(
             prompt=prompt,
             seed=0,
@@ -315,10 +319,28 @@ def __paintImageIfApplicable(
     return imagePath
 
 
+def __selectButton(optionLabel: str):
+    st.session_state["buttonValue"] = optionLabel
+    U.pprint(f"Selected: {optionLabel}")
+
+
+def __showButtons(options: list):
+    for option in options:
+        st.button(
+            option["label"],
+            key=option["id"],
+            on_click=lambda label=option["label"]: __selectButton(label)
+        )
+
+
 def __resetButtonState():
     st.session_state.buttonValue = ""
 
 
+def __resetButtons():
+    st.session_state.buttons = []
+
+
 def __resetSelectedStory():
     st.session_state.selectedStory = {}
 
@@ -348,6 +370,16 @@ if "selectedStoryTitle" not in st.session_state:
 if "isStoryChosen" not in st.session_state:
     st.session_state.isStoryChosen = False
 
+if "buttons" not in st.session_state:
+    st.session_state.buttons = []
+
+if "activityId" not in st.session_state:
+    st.session_state.activityId = None
+
+if "userActivitiesLog" not in st.session_state:
+    st.session_state.userActivitiesLog = []
+
+
 U.pprint("\n")
 U.pprint("\n")
 
@@ -360,15 +392,19 @@ def mainApp():
         __setStartMsg("")
         st.button(C.START_MSG, on_click=lambda: __setStartMsg(C.START_MSG))
 
-    for chat in st.session_state.chatHistory:
+    for (i, chat) in enumerate(st.session_state.chatHistory):
         role = chat["role"]
         content = chat["content"]
         imagePath = chat.get("image")
+        buttons = chat.get("buttons")
         avatar = C.AI_ICON if role == "assistant" else C.USER_ICON
         with st.chat_message(role, avatar=avatar):
             st.markdown(content)
             if imagePath:
                 st.image(imagePath)
+            if buttons:
+                __showButtons(buttons)
+                chat["buttons"] = []
 
     # U.pprint(f"{st.session_state.buttonValue=}")
     # U.pprint(f"{st.session_state.selectedStoryTitle=}")
@@ -381,6 +417,7 @@ def mainApp():
         or st.session_state["startMsg"]
     ):
         __resetButtonState()
+        __resetButtons()
         __setStartMsg("")
         if st.session_state["selectedStoryTitle"] != prompt:
             __resetSelectedStory()
@@ -419,10 +456,6 @@ def mainApp():
 
             U.pprint(f"{response=}")
 
-            def selectButton(optionLabel):
-                st.session_state["buttonValue"] = optionLabel
-                U.pprint(f"Selected: {optionLabel}")
-
             rawResponse = response
             responseParts = response.split(C.JSON_SEPARATOR)
 
@@ -451,12 +484,8 @@ def mainApp():
                     action = jsonObj.get("action")
 
                     if options:
-                        for option in options:
-                            st.button(
-                                option["label"],
-                                key=option["id"],
-                                on_click=lambda label=option["label"]: selectButton(label)
-                            )
+                        __showButtons(options)
+                        st.session_state.buttons = options
                     elif action:
                         U.pprint(f"{action=}")
                         if action == "SHOW_STORY_DATABASE":
@@ -466,6 +495,8 @@ def mainApp():
                 except Exception as e:
                     U.pprint(e)
 
+        saveLatestActivity()
+
 
-authenticateFunc(mainApp)
+runWithAuth(mainApp)
 showSidebar()

constants.py

@@ -156,7 +156,10 @@ Note that the final story should include twist, turns and events that make it re
 USER_ICON = "icons/man.png"
 AI_ICON = "icons/Kommuneity.png"
 LOGIN_ICON = "icons/authenticity.png"
+AVATAR_ICON = "icons/avatar.png"
+
 IMAGE_LOADER = "icons/Wedges.svg"
 TEXT_LOADER = "icons/balls.svg"
 DB_LOADER = "icons/db_loader.svg"
+
 START_MSG = "I want to create a story 😊"

data/userActivities.py

@@ -0,0 +1,61 @@
+import os
+import datetime as DT
+from typing import TypedDict, List
+from supabase import create_client, Client
+from zoneinfo import ZoneInfo
+
+from dotenv import load_dotenv
+load_dotenv()
+
+url: str = os.environ.get("SUPABASE_URL")
+key: str = os.environ.get("SUPABASE_KEY")
+supabase: Client = create_client(url, key)
+
+Activity = TypedDict("Activity", {
+    "id": str,
+    "email": str,
+    "chat_history": list,
+    "messages": list,
+    "buttons": list,
+    "created_at": str,
+    "updated_at": str,
+})
+
+
+def getUserActivities(emailId: str, id=None) -> List[Activity]:
+    filterQuery = supabase.table("user_activities") \
+        .select("*") \
+        .eq("email", emailId)
+
+    if id:
+        filterQuery = filterQuery.eq("id", id)
+
+    response = filterQuery \
+        .order("updated_at", desc=True) \
+        .execute()
+
+    activities = response.data
+    return activities or []
+
+
+def createUserActivity(emailId: str, chatHistory: list, messages: list, buttons: list) -> str:
+    data, count = supabase.table('user_activities').insert({
+        "email": emailId,
+        "chat_history": chatHistory,
+        "messages": messages,
+        "buttons": buttons,
+    }).execute()
+
+    if data:
+        print(f"{data=}")
+        activityId = data[1][0]["id"]
+        return activityId
+
+
+def updateUserActivityById(id: str, chatHistory: list, messages: list, buttons: list):
+    data, count = supabase.table('user_activities').update({
+        "chat_history": chatHistory,
+        "messages": messages,
+        "buttons": buttons,
+        "updated_at": DT.datetime.now(ZoneInfo("UTC")).isoformat()
+    }).eq("id", id).execute()

helpers/activities.py

@@ -0,0 +1,111 @@
+import streamlit as st
+from typing import List, TypedDict
+import utils as U
+from data import userActivities
+
+
+class ActivityLog(TypedDict):
+    id: str
+    created_at: str
+    updated_at: str
+
+
+ActivityLogs = List[ActivityLog]
+
+
+def saveLatestActivity():
+    emailId = st.session_state.get("user", {}).get("email")
+    if not emailId:
+        U.pprint("No user email found")
+        return
+
+    activityId = st.session_state.activityId
+
+    if activityId:
+        userActivities.updateUserActivityById(
+            id=activityId,
+            chatHistory=st.session_state.get("chatHistory", []),
+            messages=st.session_state.get("messages", []),
+            buttons=st.session_state.get("buttons", [])
+        )
+        U.pprint("Current activity updated")
+    else:
+        activityId = userActivities.createUserActivity(
+            emailId=emailId,
+            chatHistory=st.session_state.get("chatHistory", []),
+            messages=st.session_state.get("messages", []),
+            buttons=st.session_state.get("buttons", [])
+        )
+        U.pprint("New activity created")
+        st.session_state.activityId = activityId
+
+
+def __convertActivitiesToLog(activities) -> ActivityLogs:
+    if not activities:
+        return []
+
+    logs = []
+    for activity in activities:
+        logs.append({
+            "id": activity.get("id"),
+            "created_at": activity.get("created_at"),
+            "updated_at": activity.get("updated_at"),
+        })
+    return logs
+
+
+def __retrieveUserActivities():
+    emailId = st.session_state.get("user", {}).get("email")
+    if not emailId:
+        U.pprint("No user email found")
+        return
+
+    activities = userActivities.getUserActivities(emailId)
+    st.session_state.userActivitiesLog = __convertActivitiesToLog(activities)
+    U.pprint(f"{len(activities)=}")
+    return activities
+
+
+def restoreUserActivity(activityId: str = None):
+    activities = __retrieveUserActivities()
+    if activityId:
+        activities = [activity for activity in activities if activity.get("id") == activityId]
+
+    if activities:
+        latestActivity = activities[0]
+        U.pprint(f"{latestActivity=}")
+        activityId = latestActivity.get("id")
+        messages = latestActivity.get("messages", [])
+        chatHistory = latestActivity.get("chat_history", [])
+        buttons = latestActivity.get("buttons", [])
+
+        st.session_state.activityId = activityId
+        st.session_state.messages = messages
+        st.session_state.chatHistory = chatHistory
+
+        if chatHistory and buttons:
+            st.session_state.chatHistory[-1]["buttons"] = buttons
+
+        st.rerun()
+
+
+def resetActivity():
+    keysToDelete = [
+        "activityId",
+        "messages",
+        "chatHistory",
+        "userActivitiesLog",
+        "buttons",
+        "buttonValue",
+        "isStoryChosen",
+        "selectedStory",
+        "selectedStoryTitle",
+        "startMsg",
+        "isStartMsgChosen"
+    ]
+    for key in keysToDelete:
+        if key in st.session_state:
+            del st.session_state[key]
+
+    __retrieveUserActivities()
+    st.rerun()

auth.py → helpers/auth.py

@@ -3,7 +3,8 @@ from typing import Callable, Any
 import streamlit as st
 from descope.descope_client import DescopeClient
 from descope.exceptions import AuthException
-import constants as C
+from helpers.activities import restoreUserActivity
+import utils as U
 
 from dotenv import load_dotenv
 load_dotenv()
@@ -12,7 +13,7 @@ DESCOPE_PROJECT_ID = os.environ.get("DESCOPE_PROJECT_ID")
 descopeClient = DescopeClient(project_id=DESCOPE_PROJECT_ID)
 
 
-def authenticateFunc(func: Callable[[], Any]):
+def runWithAuth(func: Callable[[], Any]):
     if "token" not in st.session_state:
         if "code" in st.query_params:
             code = st.query_params["code"]
@@ -25,11 +26,13 @@ def authenticateFunc(func: Callable[[], Any]):
                     "jwt"
                 )
                 st.session_state["user"] = jwtResponse["user"]
+                with st.spinner("Restoring your chats ..."):
+                    restoreUserActivity()
                 st.rerun()
             except AuthException:
                 st.error("Login failed!")
 
-        st.warning("Create magic. Login to begin!", icon=":material/login:")
+        st.warning("Login to Unlock the Magic ✨", icon=":material/login:")
         with st.container(border=False):
             if st.button(
                 "Sign in with Google",
@@ -47,11 +50,12 @@ def authenticateFunc(func: Callable[[], Any]):
                 )
     else:
         try:
-            with st.spinner("Authenticating ..."):
+            with st.spinner("Verifying your identity ..."):
                 jwtResponse = descopeClient.validate_and_refresh_session(
                     st.session_state.token, st.session_state.refreshToken
                 )
                 st.session_state["token"] = jwtResponse["sessionToken"].get("jwt")
+                U.pprint("User successfully authenticated!")
 
             func()
         except AuthException:

helpers/sidebar.py

@@ -0,0 +1,102 @@
+import streamlit as st
+import requests
+import datetime as DT
+from helpers.activities import resetActivity, restoreUserActivity, ActivityLogs
+import constants as C
+import utils as U
+
+
+def isValidImageUrl(url):
+    if not url:
+        return False
+    try:
+        imageResponse = requests.head(url, timeout=5)
+        contentType = imageResponse.headers.get('Content-Type', '')
+        return imageResponse.status_code == 200 and contentType.startswith('image/')
+    except Exception:
+        return False
+
+
+def showSidebar():
+    with st.sidebar:
+        if not ("user" in st.session_state and "token" in st.session_state):
+            return
+
+        st.markdown("""
+            <style>
+            .user-info {
+                display: flex;
+                align-items: center;
+                padding: 10px;
+                background-color: rgba(255, 255, 255, 0.1);
+                border-radius: 5px;
+                margin-bottom: 10px;
+                margin-top: -2rem;
+            }
+            .user-avatar {
+                width: 40px;
+                height: 40px;
+                border-radius: 50%;
+                margin-right: 10px;
+            }
+            .user-details {
+                flex-grow: 1;
+            }
+            .user-name {
+                font-weight: bold;
+                margin: 0;
+            }
+            .user-email {
+                font-size: 0.8em;
+                color: #888;
+                margin: 0;
+            }
+            </style>
+            """, unsafe_allow_html=True)
+
+        userAvatar = st.session_state["user"].get("picture", "https://example.com/default-avatar.png")
+        if not isValidImageUrl(userAvatar):
+            userAvatar = C.AVATAR_ICON
+        userName = st.session_state["user"].get("name", "User")
+        userEmail = st.session_state["user"].get("email", "")
+
+        st.markdown(f"""
+            <div class="user-info">
+                <img src="{userAvatar}" class="user-avatar">
+                <div class="user-details">
+                    <p class="user-name">{userName}</p>
+                    <p class="user-email">{userEmail}</p>
+                </div>
+            </div>
+            """, unsafe_allow_html=True)
+
+        if st.button("Logout", key="logout_button", type="secondary", use_container_width=True):
+            for key in ["token", "user"]:
+                if key in st.session_state:
+                    del st.session_state[key]
+            st.rerun()
+
+        st.markdown("---")
+
+        if st.button("\\+ New Story", help="Your current story will be auto-saved 😊", key="save_activities_button", type="primary", use_container_width=True):
+            resetActivity()
+
+        userActivityLogs: ActivityLogs = st.session_state.get("userActivitiesLog", [])
+        U.pprint(f"{userActivityLogs=}")
+
+        if not userActivityLogs:
+            return
+
+        st.markdown("""
+            ---
+            ### Your Past Stories
+        """)
+        with st.container(height=300, border=False):
+            for log in userActivityLogs:
+                updatedAt = DT.datetime.fromisoformat(log["updated_at"].replace("Z", "+00:00"))
+                localTime = updatedAt.astimezone().strftime("%b %d, %I:%M %p")
+                activityId = log["id"]
+                if activityId == st.session_state.get("activityId"):
+                    continue
+                if st.button(f"Saved ⌛ {localTime}", key=f"activity_{log['id']}", use_container_width=True):
+                    restoreUserActivity(log["id"])

sidebar.py

@@ -1,57 +0,0 @@
-import streamlit as st
-
-
-def showSidebar():
-    with st.sidebar:
-        if "user" in st.session_state and "token" in st.session_state:
-            st.markdown("""
-                <style>
-                .user-info {
-                    display: flex;
-                    align-items: center;
-                    padding: 10px;
-                    background-color: rgba(255, 255, 255, 0.1);
-                    border-radius: 5px;
-                    margin-bottom: 10px;
-                    margin-top: -2rem;
-                }
-                .user-avatar {
-                    width: 40px;
-                    height: 40px;
-                    border-radius: 50%;
-                    margin-right: 10px;
-                }
-                .user-details {
-                    flex-grow: 1;
-                }
-                .user-name {
-                    font-weight: bold;
-                    margin: 0;
-                }
-                .user-email {
-                    font-size: 0.8em;
-                    color: #888;
-                    margin: 0;
-                }
-                </style>
-                """, unsafe_allow_html=True)
-
-            user_avatar = st.session_state["user"].get("picture", "https://example.com/default-avatar.png")
-            user_name = st.session_state["user"].get("name", "User")
-            user_email = st.session_state["user"].get("email", "")
-
-            st.markdown(f"""
-                <div class="user-info">
-                    <img src="{user_avatar}" class="user-avatar">
-                    <div class="user-details">
-                        <p class="user-name">{user_name}</p>
-                        <p class="user-email">{user_email}</p>
-                    </div>
-                </div>
-                """, unsafe_allow_html=True)
-
-            if st.button("Logout", key="logout_button", type="secondary", use_container_width=True):
-                for key in ["token", "user"]:
-                    if key in st.session_state:
-                        del st.session_state[key]
-                st.rerun()

utils.py

@@ -115,6 +115,15 @@ def applyCommonStyles():
             background-color: #1a1c23 !important;
         }
 
+        div[data-testid="stSidebarUserContent"] {
+            padding-bottom: 1rem !important;
+        }
+
+        div[data-testid="stMarkdownContainer"] > hr {
+            margin-top: 0.5rem;
+            margin-bottom: 1rem;
+        }
+
         </style>
         """,
         unsafe_allow_html=True