rehacking app, getting towards full pypi mode 🤩 (#18)

* rehacking app

* include images dir

* Delete amadeusgpt/static/demo1_amadeusGPT-EPM.mov

* keep ROI demo

* Update main.py

- from #17

* Update test_EPM.py

- from #17

* bug fix

* cleaned up logging

* wip, but merge

* revert

---------
Co-authored-by: Shaokai Ye <[email protected]>

Author: MMathisLab

.gitignore

@@ -17,7 +17,6 @@ __pycache__/
 *$py.class
 
 # Binary files
-*.png
 *.jpg
 *.jpeg
 *.ipynb

Makefile

@@ -1,4 +1,4 @@
 export streamlit_app=True
 app:
 
-	streamlit run app.py --server.fileWatcherType none 
+	streamlit run amadeusgpt/app.py --server.fileWatcherType none 

amadeusgpt/__init__.py

@@ -8,4 +8,4 @@
 from amadeusgpt.implementation import AnimalBehaviorAnalysis
 from amadeusgpt.main import AMADEUS
 
-from amadeusgpt.version import __version__, VERSION
+from amadeusgpt.version import __version__, VERSION

amadeusgpt/app.py

@@ -1,5 +1,13 @@
 import os
+import subprocess
+
 import streamlit as st
+
+if "session_state" not in st.session_state:
+    st.session_state.session_id = None
+    st.session_state.username = None
+    st.session_state.email = None
+
 import traceback
 from collections import defaultdict
 import uuid
@@ -9,24 +17,69 @@
 from amadeusgpt import app_utils
 from amadeusgpt.utils import validate_openai_api_key
 
+# Initialize session state variables if not present
 st._is_running_with_streamlit = True
 os.environ["streamlit_app"] = "True"
 assert "streamlit_app" in os.environ, "The 'streamlit_app' environment variable is not set!"
 
-# Initialize session state variables if not present
 if "exist_valid_openai_api_key" not in st.session_state:
     st.session_state["exist_valid_openai_api_key"] = False
 
-def main():
-    subprocess.run(["./launch_app"], check=True)
-    st.title("AmadeusGPT")
+# Set page configuration
+st.set_page_config(layout="wide")
+app_utils.load_css("static/styles/style.css")
 
+def main():
     import time
     from streamlit_profiler import Profiler
 
-    # TITLE PANEL
-    st.set_page_config(layout="wide")
-    app_utils.load_css("static/styles/style.css")
+    def fetch_user_headers():
+        """Fetch user and email info from HTTP headers.
+
+        Output of this function is identical to querying
+        https://amadeusgpt.kinematik.ai/oauth2/userinfo, but
+        works from within the streamlit app.
+        """
+        # TODO(stes): This could change without warning n future streamlit
+        # versions. So I'll leave the import here in case sth should go
+        # wrong in the future
+        from streamlit.web.server.websocket_headers import _get_websocket_headers
+
+        headers = _get_websocket_headers()
+        AmadeusLogger.debug(f"Received Headers: {headers}")
+        return dict(
+            email=headers.get("X-Forwarded-Email", "no_email_in_header"),
+            user=headers.get("X-Forwarded-User", "no_user_in_header"),
+        )
+
+
+    def fetch_user_info():
+        url = "https://amadeusgpt.kinematik.ai/oauth2/userinfo"
+        try:
+            return fetch_user_headers()
+        # TODO(stes): Lets be on the safe side for now.
+        except Exception as e:
+            AmadeusLogger.info(f"Error: {e}")
+            return None
+
+
+    if "streamlit_app" in os.environ:
+        if "session_id" not in st.session_state:
+            session_id = str(uuid.uuid4())
+            st.session_state["session_id"] = session_id
+        user_info = fetch_user_info()
+        if user_info is not None:
+            st.session_state["username"] = "no_username"
+            st.session_state["email"] = "no_email"
+        else:
+            AmadeusLogger.info("Getting None from the endpoint")
+            st.session_state["username"] = "no_username"
+            st.session_state["email"] = "no_email"
+
+        AmadeusLogger.debug("A new user logs in ")
+
+        if f"database" not in st.session_state:
+            st.session_state[f"database"] = defaultdict(dict)
 
 
     ###### Initialize ######
@@ -116,9 +169,10 @@ def welcome_page(text):
 
             # remove this for now
             # st.caption(f"git hash: {app_utils.get_git_hash()}")
-
+        current_script_directory = os.path.dirname(os.path.abspath(__file__))
+        logo_path = os.path.join(current_script_directory, 'static/images/amadeusgpt_logo.png')
         st.image(
-            os.path.join(os.getcwd(), "static/images/amadeusgpt_logo.png"),
+            logo_path,
             caption=None,
             width=None,
             use_column_width=None,
@@ -164,9 +218,9 @@ def welcome_page(text):
         st.markdown(
             f"{small_font} - This demo serves to highlight a hosted user-experience, but does not include all the features yet..."
         )
-        st.markdown(f"{small_font} - Watch the video below to see how to use the App.")
+        #st.markdown(f"{small_font} - Watch the video below to see how to use the App.")
 
-        st.video("static/demo_withvoice.mp4")
+        #st.video("static/demo_withvoice.mp4")
 
         st.markdown("### ⚠️ Disclaimers")
 

amadeusgpt/app_utils.py

@@ -35,8 +35,9 @@
 
 LOG_DIR = os.path.join(os.path.expanduser("~"), "Amadeus_logs")
 VIDEO_EXTS = "mp4", "avi", "mov"
-user_profile_path = "static/images/cat.png"
-bot_profile_path = "static/images/chatbot.png"
+current_script_directory = os.path.dirname(os.path.abspath(__file__))
+user_profile_path = os.path.join(current_script_directory,'static/images/cat.png')
+bot_profile_path = os.path.join(current_script_directory,'static/images/chatbot.png')
 
 
 def get_git_hash():
@@ -311,9 +312,12 @@ def ask_amadeus(question):
 
 
 def load_css(css_file):
-    with open(css_file, "r") as f:
-        css = f.read()
-    st.markdown(f"<style>{css}</style>", unsafe_allow_html=True)
+    current_script_directory = os.path.dirname(os.path.abspath(__file__))
+    css_path = os.path.join(current_script_directory, 'static/styles/style.css')
+    if os.path.exists(css_path):
+        st.markdown(f'<style>{open(css_path).read()}</style>', unsafe_allow_html=True)
+    else:
+        st.error(f"File not found: {css_path}")
 
 
 # caching display roi will make the roi stick to
@@ -626,8 +630,10 @@ def get_sam_image(example):
 
 @conditional_memory_profile
 def render_page_by_example(example):
+    current_script_directory = os.path.dirname(os.path.abspath(__file__))
+    logo_path = os.path.join(current_script_directory, 'static/images/amadeusgpt_logo.png')
     st.image(
-        os.path.join(os.getcwd(), "static/images/amadeusgpt_logo.png"),
+        logo_path,
         caption=None,
         width=None,
         use_column_width=None,

amadeusgpt/logger.py

@@ -26,8 +26,8 @@ def format(cls, message):
         session_id = st.session_state.get("session_id", "")
         now = datetime.now()
         timestamp = now.strftime("%Y%m%d_%H%M%S")
-        username = st.session_state.get("username", "fake_username")
-        email = st.session_state.get("email", "fake_email")
+        username = st.session_state["username"] = "no_username"
+        email = st.session_state["email"] = "no_email"
         return f"{timestamp} - session_id:{session_id} - username:{username} - email: {email} - {message}"
 
     @classmethod

amadeusgpt/main.py

@@ -125,7 +125,7 @@ def release_cache_objects(cls):
     @classmethod
     def load_module_smartly(cls, user_input):
         sorted_query_results = match_module(user_input)
-        if sorted_query_results is None:
+        if len(sorted_query_results) == 0:
             return None
         # query result sorted by most relevant module text
         modules = []