Update app.py

app.py

@@ -1,165 +1,3 @@
-# from datetime import datetime
-
-# import streamlit as st
-# import streamlit_authenticator as stauth
-# import yaml
-# from yaml.loader import SafeLoader
-
-# from utils.frontend.helper import *
-
-# st.set_page_config(page_title="SAAS Template App", page_icon="🧊", layout="wide")
-
-# with open("config.yaml") as file:
-#     config = yaml.load(file, Loader=SafeLoader)
-
-
-# cookie_config = config.get("cookie", {})
-# authenticator = stauth.Authenticate(
-#     config.get("credentials"),
-#     cookie_config.get("name"),
-#     cookie_config.get("key"),
-#     cookie_config.get("expiry_days"),
-#     config.get("preauthorized"),
-# )
-
-# # authenticator = stauth.Authenticate(
-# #     config["credentials"],
-# #     config["cookie"]["name"],
-# #     config["cookie"]["key"],
-# #     config["cookie"]["expiry_days"],
-# #     config["preauthorized"],
-# # )
-
-# with st.sidebar:
-#     if not st.session_state["authentication_status"]:
-#         st.markdown(
-#             """
-#             # Welcome to **Name of the App**
-
-#             """
-#         )
-
-#         # Login
-#         with st.expander("Login 🔒", expanded=True):
-#             authenticator.login("Login", "main")
-
-#             if st.session_state["authentication_status"]:
-#                 authenticator.logout("Logout", "main", key="unique_key")
-#                 st.write(f'Welcome *{st.session_state["name"]}*')
-#                 st.title(
-#                     "You logged in! You can choose a session in the bottom of the sidebar and view content."
-#                 )
-#             elif st.session_state["authentication_status"] is False:
-#                 st.error("Username/password is incorrect")
-#             elif st.session_state["authentication_status"] is None:
-#                 st.warning("Please enter your username and password")
-
-#         # Reset Password
-#         with st.expander("Reset password 😕"):
-#             if st.session_state["authentication_status"]:
-#                 try:
-#                     if authenticator.reset_password(
-#                         st.session_state["username"], "Reset password"
-#                     ):
-#                         st.success("Password modified successfully")
-#                 except Exception as e:
-#                     st.error(e)
-
-#         # Forgot Password
-#         with st.expander("Forgot password 😕"):
-#             try:
-#                 (
-#                     username_of_forgotten_password,
-#                     email_of_forgotten_password,
-#                     new_random_password,
-#                 ) = authenticator.forgot_password("Forgot password")
-#                 if username_of_forgotten_password:
-#                     st.success("New password to be sent securely")
-#                     # Random password should be transferred to user securely
-#                 else:
-#                     st.error("Username not found")
-#             except Exception as e:
-#                 st.error(e)
-
-#         # Update User
-#         with st.expander("Update user 😋"):
-#             if st.session_state["authentication_status"]:
-#                 try:
-#                     if authenticator.update_user_details(
-#                         st.session_state["username"], "Update user details"
-#                     ):
-#                         st.success("Entries updated successfully")
-#                 except Exception as e:
-#                     st.error(e)
-
-#         # Register User
-#         with st.expander("Register user 😋", expanded=False):
-#             try:
-#                 # payment_key = st.text_input("Enter Payment Key:")
-#                 if authenticator.register_user("Register user", preauthorization=False):
-#                     # if register_user(payment_key):
-#                     st.success("User registered successfully")
-#             except Exception as e:
-#                 st.error(e)
-
-#             with open("config.yaml", "w") as file:
-#                 yaml.dump(config, file, default_flow_style=False)
-
-
-# # Main
-# if st.session_state["authentication_status"]:
-#     st.markdown(
-#         """
-#         # Content of the App
-
-#         Welcome!
-#         """
-#     )
-
-#     # Add Main Content Here
-#     # TODO
-#     main_chatbot_page()
-
-#     # Log out
-#     with st.sidebar:
-#         with st.expander("Login 🔒", expanded=True):
-#             authenticator.login("Login", "main")
-
-#             if st.session_state["authentication_status"]:
-#                 authenticator.logout("Logout", "main", key="unique_key_to_log_out")
-#                 st.write(f'Welcome *{st.session_state["name"]}*')
-#                 st.title(
-#                     "You logged in! You can choose a session in the bottom of the sidebar and view content."
-#                 )
-#                 st.markdown(
-#                     "### 🖱️Press "
-#                     R" on your keyboard⌨️ to rerun the app for faster loading 🔄."
-#                 )
-#             elif st.session_state["authentication_status"] is False:
-#                 st.error("Username/password is incorrect")
-#             elif st.session_state["authentication_status"] is None:
-#                 st.warning("Please enter your username and password")
-# else:
-#     st.warning("Please login to view content.")
-
-
-# with st.sidebar:
-#     # Credit: Time
-#     def current_year():
-#         now = datetime.now()
-#         return now.year
-
-#     # Credit:
-#     current_year = current_year()  # This will print the current year
-#     st.markdown(
-#         f"""
-#             <h6 style='text-align: left;'>Copyright © 2010-{current_year} Present Yiqiao Yin</h6>
-#         """,
-#         unsafe_allow_html=True,
-#     )
-
-
-
 from datetime import datetime
 
 import streamlit as st
@@ -174,6 +12,7 @@ st.set_page_config(page_title="SAAS Template App", page_icon="🧊", layout="wid
 with open("config.yaml") as file:
     config = yaml.load(file, Loader=SafeLoader)
 
+
 cookie_config = config.get("cookie", {})
 authenticator = stauth.Authenticate(
     config.get("credentials"),
@@ -183,82 +22,92 @@ authenticator = stauth.Authenticate(
     config.get("preauthorized"),
 )
 
+# authenticator = stauth.Authenticate(
+#     config["credentials"],
+#     config["cookie"]["name"],
+#     config["cookie"]["key"],
+#     config["cookie"]["expiry_days"],
+#     config["preauthorized"],
+# )
+
 with st.sidebar:
-    if not st.session_state.get("authentication_status"):
+    if not st.session_state["authentication_status"]:
         st.markdown(
             """
             # Welcome to **Name of the App**
-            """
-        )
 
-    # Login
-    with st.expander("Login 🔒", expanded=True):
-        authenticator.login("Login", "main")
-
-    if st.session_state.get("authentication_status"):
-        authenticator.logout("Logout", "main", key="logout_main")
-        st.write(f'Welcome *{st.session_state["name"]}*')
-        st.title(
-            "You logged in! You can choose a session in the bottom of the sidebar and view content."
+            """
         )
-    elif st.session_state.get("authentication_status") is False:
-        st.error("Username/password is incorrect")
-    elif st.session_state.get("authentication_status") is None:
-        st.warning("Please enter your username and password")
-
-# Reset Password
-with st.expander("Reset password 😕"):
-    if st.session_state.get("authentication_status"):
-        try:
-            if authenticator.reset_password(
-                st.session_state["username"], "Reset password"
-            ):
-                st.success("Password modified successfully")
-        except Exception as e:
-            st.error(e)
 
-# Forgot Password
-with st.expander("Forgot password 😕"):
-    try:
-        (
-            username_of_forgotten_password,
-            email_of_forgotten_password,
-            new_random_password,
-        ) = authenticator.forgot_password("Forgot password")
-        if username_of_forgotten_password:
-            st.success("New password to be sent securely")
-            # Random password should be transferred to user securely
-        else:
-            st.error("Username not found")
-    except Exception as e:
-        st.error(e)
-
-# Update User
-with st.expander("Update user 😋"):
-    if st.session_state.get("authentication_status"):
-        try:
-            if authenticator.update_user_details(
-                st.session_state["username"], "Update user details"
-            ):
-                st.success("Entries updated successfully")
-        except Exception as e:
-            st.error(e)
+        # Login
+        with st.expander("Login 🔒", expanded=True):
+            authenticator.login("Login", "main")
 
-# Register User
-with st.expander("Register user 😋", expanded=False):
-    try:
-        # payment_key = st.text_input("Enter Payment Key:")
-        if authenticator.register_user("Register user", preauthorization=False):
-            # if register_user(payment_key):
-            st.success("User registered successfully")
-    except Exception as e:
-        st.error(e)
+            if st.session_state["authentication_status"]:
+                authenticator.logout("Logout", "main", key="logout_main")
+                st.write(f'Welcome *{st.session_state["name"]}*')
+                st.title(
+                    "You logged in! You can choose a session in the bottom of the sidebar and view content."
+                )
+            elif st.session_state["authentication_status"] is False:
+                st.error("Username/password is incorrect")
+            elif st.session_state["authentication_status"] is None:
+                st.warning("Please enter your username and password")
+
+        # Reset Password
+        with st.expander("Reset password 😕"):
+            if st.session_state["authentication_status"]:
+                try:
+                    if authenticator.reset_password(
+                        st.session_state["username"], "Reset password"
+                    ):
+                        st.success("Password modified successfully")
+                except Exception as e:
+                    st.error(e)
+
+        # Forgot Password
+        with st.expander("Forgot password 😕"):
+            try:
+                (
+                    username_of_forgotten_password,
+                    email_of_forgotten_password,
+                    new_random_password,
+                ) = authenticator.forgot_password("Forgot password")
+                if username_of_forgotten_password:
+                    st.success("New password to be sent securely")
+                    # Random password should be transferred to user securely
+                else:
+                    st.error("Username not found")
+            except Exception as e:
+                st.error(e)
+
+        # Update User
+        with st.expander("Update user 😋"):
+            if st.session_state["authentication_status"]:
+                try:
+                    if authenticator.update_user_details(
+                        st.session_state["username"], "Update user details"
+                    ):
+                        st.success("Entries updated successfully")
+                except Exception as e:
+                    st.error(e)
+
+        # Register User
+        with st.expander("Register user 😋", expanded=False):
+            try:
+                # payment_key = st.text_input("Enter Payment Key:")
+                if authenticator.register_user("Register user", preauthorization=False):
+                    # if register_user(payment_key):
+                    st.success("User registered successfully")
+            except Exception as e:
+                st.error(e)
+
+            with open("config.yaml", "w") as file:
+                yaml.dump(config, file, default_flow_style=False)
 
-with open("config.yaml", "w") as file:
-    yaml.dump(config, file, default_flow_style=False)
 
 # Main
-if st.session_state.get("authentication_status"):
+if st.session_state["authentication_status"]:
     st.markdown(
         """
         # Content of the App
@@ -276,21 +125,26 @@ if st.session_state.get("authentication_status"):
         with st.expander("Login 🔒", expanded=True):
             authenticator.login("Login", "main")
 
-        if st.session_state.get("authentication_status"):
-            authenticator.logout("Logout", "main", key="logout_sidebar")
-            st.write(f'Welcome *{st.session_state["name"]}*')
-            st.title(
-                "You logged in! You can choose a session in the bottom of the sidebar and view content."
-            )
-            st.markdown(
-                "### 🖱️Press 'R' on your keyboard⌨️ to rerun the app for faster loading 🔄."
-            )
-        elif st.session_state.get("authentication_status") is False:
-            st.error("Username/password is incorrect")
-        elif st.session_state.get("authentication_status") is None:
-            st.warning("Please enter your username and password")
-        else:
-            st.warning("Please login to view content.")
+            if st.session_state["authentication_status"]:
+                try:
+                    authenticator.logout("Logout", "main", key="logout_sidebar")
+                except KeyError as e:
+                    st.warning(f"Logout failed: {str(e)}")
+                st.write(f'Welcome *{st.session_state["name"]}*')
+                st.title(
+                    "You logged in! You can choose a session in the bottom of the sidebar and view content."
+                )
+                st.markdown(
+                    "### 🖱️Press "
+                    R" on your keyboard⌨️ to rerun the app for faster loading 🔄."
+                )
+            elif st.session_state["authentication_status"] is False:
+                st.error("Username/password is incorrect")
+            elif st.session_state["authentication_status"] is None:
+                st.warning("Please enter your username and password")
+else:
+    st.warning("Please login to view content.")
+
 
 with st.sidebar:
     # Credit: Time
@@ -302,7 +156,7 @@ with st.sidebar:
     current_year = current_year()  # This will print the current year
     st.markdown(
         f"""
-        <h6 style='text-align: left;'>Copyright © 2010-{current_year} Present Yiqiao Yin</h6>
+            <h6 style='text-align: left;'>Copyright © 2010-{current_year} Present Yiqiao Yin</h6>
         """,
         unsafe_allow_html=True,
-    )
+    )