Merge branch 'app-progress' into main

app/app.py

@@ -1,31 +1,11 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-import random
 from dalle_mini.backend import ServiceError, get_images_from_backend
-
 import streamlit as st
 
-# streamlit.session_state is not available in Huggingface spaces.
-# Session state hack https://huggingface.slack.com/archives/C025LJDP962/p1626527367443200?thread_ts=1626525999.440500&cid=C025LJDP962
-
-from streamlit.report_thread import get_report_ctx
-def query_cache(q_emb=None):
-    ctx = get_report_ctx()
-    session_id = ctx.session_id
-    session = st.server.server.Server.get_current()._get_session_info(session_id).session
-    if not hasattr(session, "_query_state"):
-        setattr(session, "_query_state", q_emb)
-    if q_emb:
-        session._query_state = q_emb
-    return session._query_state
-
-def set_run_again(state):
-    query_cache(state)
-
 def should_run_again():
-    state = query_cache()
-    return state if state is not None else False
+    return st.session_state.get("again", False)
 
 st.sidebar.markdown("""
 <style>
@@ -55,12 +35,31 @@ st.subheader('Generate images from text')
 
 prompt = st.text_input("What do you want to see?")
 
-#TODO: I think there's an issue where we can't run twice the same inference (not due to caching) - may need to use st.form
-
+test = st.empty()
 DEBUG = False
-if prompt != "" or (should_run_again and prompt != ""):
+if prompt != "" or (should_run_again() and prompt != ""):
     container = st.empty()
-    container.markdown(f"Generating predictions for: **{prompt}**")
+    # The following mimics `streamlit.info()`.
+    # I tried to get the secondary background color using `components.streamlit.config.get_options_for_section("theme")["secondaryBackgroundColor"]`
+    # but it returns None.
+    container.markdown(f"""
+        <style> p {{ margin:0 }} div {{ margin:0 }} </style>
+        <div data-stale="false" class="element-container css-1e5imcs e1tzin5v1">
+        <div class="stAlert">
+        <div role="alert" data-baseweb="notification" class="st-ae st-af st-ag st-ah st-ai st-aj st-ak st-g3 st-am st-b8 st-ao st-ap st-aq st-ar st-as st-at st-au st-av st-aw st-ax st-ay st-az st-b9 st-b1 st-b2 st-b3 st-b4 st-b5 st-b6">
+        <div class="st-b7">
+        <div class="css-whx05o e13vu3m50">
+        <div data-testid="stMarkdownContainer" class="css-1ekf893 e16nr0p30">
+                <img src="https://raw.githubusercontent.com/borisdayma/dalle-mini/main/app/img/loading.gif" width="30"/>
+                Generating predictions for: <b>{prompt}</b>
+        </div>
+        </div>
+        </div>
+        </div>
+        </div>
+        </div>
+        <small><i>Predictions may take up to 40s under high load. Please, stand by.</i></small>
+    """, unsafe_allow_html=True)
 
     try:
         backend_url = st.secrets["BACKEND_SERVER"]
@@ -72,8 +71,7 @@ if prompt != "" or (should_run_again and prompt != ""):
             cols[i%4].image(img)
 
         container.markdown(f"**{prompt}**")
-        
-        set_run_again(st.button('Again!', key='again_button'))
+        st.session_state["again"] = st.button('Again!', key='again_button')
     
     except ServiceError as error:
         container.text(f"Service unavailable, status: {error.status_code}")