Experimenting with direct merge conflict push to Spaces

data_measurements/streamlit_utils.py

@@ -161,14 +161,10 @@ def expander_text_lengths(dstats, column_id):
         st.markdown(
             "### Here is the relative frequency of different text lengths in your dataset:"
         )
-<<<<<<< HEAD
-        st.pyplot(dstats.fig_tok_length, use_container_width=True)
-=======
         try:
             st.image(dstats.fig_tok_length_png)
         except:
             st.pyplot(dstats.fig_tok_length, use_container_width=True)
->>>>>>> a0a4b0702daf66f24d3114997945e3d42906bc95
         st.markdown(
             "The average length of text instances is **"
             + str(dstats.avg_length)
@@ -179,10 +175,8 @@ def expander_text_lengths(dstats, column_id):
         # This is quite a large file and is breaking our ability to navigate the app development.
         # Just passing if it's not already there for launch v0
         if dstats.length_df is not None:
-<<<<<<< HEAD
             start_id_show_lengths= st.selectbox("Show examples of length:", sorted(dstats.length_df["length"].unique().tolist()))
             st.table(dstats.length_df[dstats.length_df["length"] == start_id_show_lengths].set_index("length"))
-=======
             start_id_show_lengths = st.selectbox(
                 "Show examples of length:",
                 sorted(dstats.length_df["length"].unique().tolist()),
@@ -193,7 +187,6 @@ def expander_text_lengths(dstats, column_id):
                     dstats.length_df["length"] == start_id_show_lengths
                 ].set_index("length")
             )
->>>>>>> a0a4b0702daf66f24d3114997945e3d42906bc95
 
 
 ### Third, use a sentence embedding model