Update year

apps/grant.py

@@ -4,10 +4,14 @@ import pandas as pd
 import streamlit as st
 import leafmap.foliumap as leafmap
 import plotly.express as px
+import datetime
+
 
 if "dsl" not in st.session_state:
     st.session_state["dsl"] = scholarpy.Dsl()
 
+current_year = datetime.datetime.now().year
+
 
 def app():
     st.title("Search Grants")
@@ -48,7 +52,12 @@ def app():
             index=4,
         )
     with row1_col4:
-        years = st.slider("Select the start and end year:", 1950, 2030, (2010, 2025))
+        years = st.slider(
+            "Select the start and end year:",
+            1950,
+            current_year + 6,
+            (2010, current_year + 4),
+        )
 
     with row1_col5:
         limit = st.slider("Select the number of grants to return", 1, 1000, 100)

apps/journal.py

@@ -6,6 +6,9 @@ import plotly.express as px
 import streamlit as st
 import scholarpy
 import leafmap.foliumap as leafmap
+import datetime
+
+current_year = datetime.datetime.now().year
 
 if "dsl" not in st.session_state:
     st.session_state["dsl"] = scholarpy.Dsl()
@@ -132,7 +135,10 @@ def app():
 
                 with row2_col5:
                     years = st.slider(
-                        "Select the start and end year:", 1950, 2021, (1980, 2021)
+                        "Select the start and end year:",
+                        1950,
+                        current_year,
+                        (1980, current_year),
                     )
 
                 if title:
@@ -189,7 +195,10 @@ def app():
 
         with row1_col3:
             years = st.slider(
-                "Select the start and end year:", 1950, 2021, (1980, 2021)
+                "Select the start and end year:",
+                1950,
+                current_year,
+                (1980, current_year),
             )
 
         if journal:

apps/organization.py

@@ -4,6 +4,9 @@ import pandas as pd
 import streamlit as st
 import leafmap.foliumap as leafmap
 import plotly.express as px
+import datetime
+
+current_year = datetime.datetime.now().year
 
 if "dsl" not in st.session_state:
     st.session_state["dsl"] = scholarpy.Dsl()
@@ -19,8 +22,7 @@ def app():
         name = st.text_input("Enter an organization name:", "")
 
     if name:
-        orgs = dsl.search_org_by_name(
-            name, exact_match=False, return_list=True)
+        orgs = dsl.search_org_by_name(name, exact_match=False, return_list=True)
 
         if orgs is not None:
             with row1_col1:
@@ -31,8 +33,7 @@ def app():
 
                 info_df = scholarpy.json_to_df(id_info, transpose=True)
                 info_df.rename(
-                    columns={info_df.columns[0]: "Type",
-                             info_df.columns[1]: "Value"},
+                    columns={info_df.columns[0]: "Type", info_df.columns[1]: "Value"},
                     inplace=True,
                 )
                 with row1_col1:
@@ -47,14 +48,18 @@ def app():
 
                 with row1_col2:
                     years = st.slider(
-                        "Select the start and end year:", 1950, 2030, (1980, 2021))
+                        "Select the start and end year:",
+                        1950,
+                        current_year + 6,
+                        (1980, current_year),
+                    )
                     st.header("Publications by year")
 
                     pubs, fig = dsl.org_pubs_annual_stats(
-                        org_id, start_year=years[0], end_year=years[1], return_plot=True)
+                        org_id, start_year=years[0], end_year=years[1], return_plot=True
+                    )
 
-                    st.text(
-                        f'Total number of publications: {pubs["count"].sum():,}')
+                    st.text(f'Total number of publications: {pubs["count"].sum():,}')
 
                     if fig is not None:
                         st.plotly_chart(fig)
@@ -72,12 +77,13 @@ def app():
                     st.header("Top funders")
 
                     funder_count = st.slider(
-                        "Select the number of funders:", 1, 100, 20)
+                        "Select the number of funders:", 1, 100, 20
+                    )
 
                     funders, fig = dsl.org_grant_funders(
-                        org_id, limit=funder_count, return_plot=True)
-                    st.text(
-                        f'Total funding amount: ${funders["funding"].sum():,}')
+                        org_id, limit=funder_count, return_plot=True
+                    )
+                    st.text(f'Total funding amount: ${funders["funding"].sum():,}')
                     if fig is not None:
                         st.plotly_chart(fig)
                         leafmap.st_download_button(
@@ -92,7 +98,8 @@ def app():
                 with row1_col2:
                     st.header("The number of grants by year")
                     grants, fig_count, fig_amount = dsl.org_grants_annual_stats(
-                        org_id, start_year=years[0], end_year=years[1], return_plot=True)
+                        org_id, start_year=years[0], end_year=years[1], return_plot=True
+                    )
 
                     st.plotly_chart(fig_count)
                     st.plotly_chart(fig_amount)
@@ -107,7 +114,8 @@ def app():
                     st.header("List of grants")
                     st.text("Only the first 1000 grants are shown")
                     result = dsl.search_grants_by_org(
-                        org_id, start_year=years[0], end_year=years[1])
+                        org_id, start_year=years[0], end_year=years[1]
+                    )
                     df = result.as_dataframe()
                     if not df.empty:
                         st.dataframe(df)
@@ -135,7 +143,9 @@ def app():
                             "Download data", df, file_name="data.csv", csv_sep="\t"
                         )
 
-                df, area_fig, journal_fig = dsl.org_pubs_top_areas(org_id, return_plot=True)
+                df, area_fig, journal_fig = dsl.org_pubs_top_areas(
+                    org_id, return_plot=True
+                )
                 if not df.empty:
                     with row1_col1:
                         st.header("Research areas of most cited publications")
@@ -145,7 +155,7 @@ def app():
                         # )
                     with row1_col2:
                         st.header("Journals of most cited publications")
-                        st.plotly_chart(journal_fig)                    
+                        st.plotly_chart(journal_fig)
                         leafmap.st_download_button(
                             "Download data", df, file_name="data.csv", csv_sep="\t"
                         )

apps/publication.py

@@ -4,6 +4,9 @@ import pandas as pd
 import streamlit as st
 import leafmap.foliumap as leafmap
 import plotly.express as px
+import datetime
+
+current_year = datetime.datetime.now().year
 
 if "dsl" not in st.session_state:
     st.session_state["dsl"] = scholarpy.Dsl()
@@ -46,7 +49,12 @@ def app():
         )
 
     with row1_col4:
-        years = st.slider("Select the start and end year:", 1950, 2030, (1980, 2022))
+        years = st.slider(
+            "Select the start and end year:",
+            1950,
+            current_year + 6,
+            (1980, current_year),
+        )
 
     with row1_col5:
         limit = st.slider("Select the number of publications to return", 1, 1000, 100)
@@ -63,11 +71,11 @@ def app():
 
         df = scholarpy.json_to_df(result)
         affiliations = result.as_dataframe_authors_affiliations()
-        country_df = affiliations.groupby(['pub_id'])['aff_country'].unique()
-        df = df.merge(country_df, left_on='id', right_on='pub_id')
+        country_df = affiliations.groupby(["pub_id"])["aff_country"].unique()
+        df = df.merge(country_df, left_on="id", right_on="pub_id")
 
-        countries = [c[c.astype(bool)].size for c in df['aff_country']]
-        df['country_count'] = countries
+        countries = [c[c.astype(bool)].size for c in df["aff_country"]]
+        df["country_count"] = countries
 
         journal_counts = df.copy()["journal.title"].value_counts()
         if limit > result.count_total:
@@ -116,7 +124,5 @@ def app():
                 leafmap.st_download_button("Download data", summary, csv_sep="\t")
 
             with row3_col2:
-                fig = px.box(df, x='year', y='country_count', title='Country Counts')
+                fig = px.box(df, x="year", y="country_count", title="Country Counts")
                 st.plotly_chart(fig)
-
-