Update app.py

app.py

@@ -10,11 +10,13 @@ DATA_FILE = "data/gwf_2017-2021_specter2_base.json"
 THEMES = {"cluster": "fall", "year": "mint", "source": "phase"}
 
 
-def decorated_to_string(list_of_things):
-    if len(list_of_things) > 2:
-        return ", ".join(list_of_things[:-1]) + ", and " + list_of_things[-1]
+def to_string_authors(list_of_authors):
+    if len(list_of_authors) > 6:
+        return ", ".join(list_of_authors[:6]) + ", et al."
+    elif len(list_of_authors) > 2:
+        return ", ".join(list_of_authors[:-1]) + ", and " + list_of_authors[-1]
     else:
-        return " and ".join(list_of_things)
+        return " and ".join(list_of_authors)
 
 
 def load_df(data_file: os.PathLike):
@@ -25,10 +27,9 @@ def load_df(data_file: os.PathLike):
     df["year"] = df["year"].astype(int)
 
     df["authors_trimmed"] = df.authors.apply(
-        lambda row: [(x[x.index(",") + 1:].strip() + " " + x.split(",")[0].strip()) if "," in x else x for x in row]
-    )
-    df["authors_trimmed"] = df.authors_trimmed.apply(
-        lambda row: decorated_to_string(row[:5]) + (" et al." if len(row) > 5 else "")
+        lambda row: to_string_authors(
+            [(x[x.index(",") + 1 :].strip() + " " + x.split(",")[0].strip()) if "," in x else x for x in row]
+        )
     )
 
     if "publication_type" in df.columns:
@@ -114,4 +115,4 @@ fig.update_layout(
 fig.update_xaxes(title="")
 fig.update_yaxes(title="")
 
-st.plotly_chart(fig, use_container_width=True)
+st.plotly_chart(fig, use_container_width=True)