fix version pins

Author: TimoDiepers

Dockerfile

@@ -0,0 +1,26 @@
+# This sets up the container with Python 3.10 installed.
+FROM python:3.10-slim
+
+# This copies everything in your current directory to the /app directory in the container.
+COPY . /app
+
+# This sets the /app directory as the working directory for any RUN, CMD, ENTRYPOINT, or COPY instructions that follow.
+WORKDIR /app
+
+# This runs pip install for all the packages listed in your requirements.txt file.
+RUN pip install -r requirements.txt
+
+# This tells Docker to listen on port 80 at runtime. Port 80 is the standard port for HTTP.
+EXPOSE 8501
+
+# # This command creates a .streamlit directory in the home directory of the container.
+# RUN mkdir ~/.streamlit
+
+# # This copies your Streamlit configuration file into the .streamlit directory you just created.
+# RUN cp config.toml ~/.streamlit/config.toml
+
+# Similar to the previous step, this copies your Streamlit credentials file into the .streamlit directory.
+# RUN cp credentials.toml ~/.streamlit/credentials.toml
+
+# This sets the default command for the container to run the app with Streamlit.
+ENTRYPOINT ["streamlit", "run", "bw_timex_app/welcome.py"]

.streamlit/config.toml renamed to bw_timex_app/.streamlit/config.toml

@@ -3,5 +3,5 @@
 import os
 
 def main():
-    app_path = os.path.join(os.path.dirname(__file__), "project_selection.py")
+    app_path = os.path.join(os.path.dirname(__file__), "welcome.py")
     subprocess.run([sys.executable, "-m", "streamlit", "run", app_path])

bw_timex_app/cli.py

@@ -23,7 +23,7 @@
 )
 
 if "current_project" not in st.session_state:
-    st.switch_page("project_selection.py")
+    st.switch_page("pages/project_selection.py")
 
 bd.projects.set_current(st.session_state.current_project)
 
@@ -263,16 +263,15 @@ def plot_characterized_inventory(tlca, **kwargs):
 
         def custom_convert_to_datetime(x):
             if x == "dynamic":
-                return x
-            else:
-                return datetime.strptime(x, "%Y-%m-%d")
-
-        database_date_dict = dict(
-            zip(
-                editor["Database"],
-                editor["Representative Date"].apply(custom_convert_to_datetime),
-            )
-        )
+                return x  # Return as string
+            try:
+                return datetime.strptime(x, "%Y-%m-%d")  # Convert to datetime
+            except ValueError:
+                raise ValueError(f"Invalid date format or value: {x}")  # Raise error for invalid strings
+            
+        representative_dates = editor["Representative Date"].apply(custom_convert_to_datetime)
+        database_date_dict = {db_name: date for db_name, date in zip(editor["Database"], representative_dates)}
+
         with st.status("Crunching the Numbers..."):
             st.write("Initializing TimexLCA")
             tlca = TimexLCA(
@@ -282,6 +281,7 @@ def custom_convert_to_datetime(x):
             )
             st.write("Building the Timeline")
             timeline = tlca.build_timeline()
+            timeline
             st.write("Calculating time-explicit LCI")
             tlca.lci()
             st.write("Done!")

bw_timex_app/pages/calculate.py

@@ -6,7 +6,7 @@
 )
 
 if "current_project" not in st.session_state:
-    st.switch_page("project_selection.py")
+    st.switch_page("pages/project_selection.py")
 
 _, col, _ = st.columns([1, 2, 1])
 with col:

bw_timex_app/pages/mode.py

@@ -108,6 +108,7 @@ def add_timex_getting_started_project():
 def add_timex_ev_example_project():
     if "timex_ev_example" in bd.projects:
         bd.projects.delete_project("timex_ev_example", delete_dir=True)
+        bd.projects.purge_deleted_directories()
     bd.projects.set_current("timex_ev_example")
     biosphere = bd.Database("biosphere")
     biosphere.write(
@@ -315,10 +316,10 @@ def add_timex_ev_example_project():
 add_timex_getting_started_project()
 # if "timex_ev_example" not in bd.projects:
 add_timex_ev_example_project()
-
+    
 _, col, _ = st.columns([1, 2, 1])
 with col:
-    st.title("Select a Project")
+    st.subheader("Select a Project")
     st.text("")
     project_names = [
         project.name for project in bd.projects

bw_timex_app/project_selection.py renamed to bw_timex_app/pages/project_selection.py

@@ -46,7 +46,7 @@
 
 
 if "current_project" not in st.session_state:
-    st.switch_page("project_selection.py")
+    st.switch_page("pages/project_selection.py")
 
 
 def identify_activity_type(activity):

bw_timex_app/pages/temporalize.py

@@ -0,0 +1,25 @@
+import streamlit as st
+
+st.set_page_config(
+    page_title="bw_timex_app", layout="centered", initial_sidebar_state="collapsed"
+)
+
+st.markdown("""
+    <style>
+    a[href] {
+        text-decoration: underline;
+        color: #9c5ffd;
+    }
+    </style>
+    """, unsafe_allow_html=True)
+
+_, col_welcome, _ = st.columns([1, 5, 1])
+with col_welcome:
+    st.title(" Welcome ⏳🌿")
+    st.write("This is the `bw_timex` web app. Here, you can temporalize your data, calculate time-explicit LCAs and interactively investigate the results.")
+    st.write("")
+    st.write("To learn more about the `bw_timex` package, check out our [docs](https://docs.brightway.dev/projects/bw-timex/en/latest/). The source code for this app is availabe [on GitHub](https://github.com/TimoDiepers/bw_timex_app).")
+    st.write("")
+    
+    if st.button("Get Started", use_container_width=True, type="primary"):
+        st.switch_page("pages/project_selection.py")

bw_timex_app/welcome.py

@@ -25,7 +25,7 @@ requirements:
     - setuptools
   run:
     - python >=3.9
-    - bw_timex >=0.2.6
+    - bw_timex ==0.2.6
     - bw2io >=0.9.dev38
     - bw2data >=4.0.dev56
     - streamlit >=1.38.0
@@ -48,9 +48,9 @@ build:
     - archive/*
 
   entry_points:
-    - bw-timex = bw_timex_app.cli:main
+    - timex-app = bw_timex_app.cli:main
 
 files:
   include:
     - bw_timex_app/**
-    - ../.streamlit/**
+    - bw_timex_app/.streamlit/**