Update

app.py

@@ -5,7 +5,8 @@ import streamlit as st
 from core.constants import OAUTH_CLIENT_ID
 from core.constants import OAUTH_STATE
 from core.constants import REDIRECT_URI
-from core.state import CurrentStep
+from core.query_params import get_project_timestamp
+from core.state import CurrentProject
 from core.state import get_cached_user
 from core.state import User
 from utils import init_state
@@ -48,27 +49,28 @@ if OAUTH_CLIENT_ID and not user:
 
 def _back_to_menu():
     """Sends the user back to the menu."""
+    st.experimental_set_query_params()
     init_state(force=True)
 
 
 def _logout():
     """Logs the user out."""
     st.cache_data.clear()
+    _back_to_menu()
 
 
 if OAUTH_CLIENT_ID:
     col2.write("\n")  # Vertical box to shift the lgout menu
     col2.button("Log out", on_click=_logout)
 
+timestamp = get_project_timestamp()
 
-if st.session_state[CurrentStep] != CurrentStep.splash:
+if timestamp:
     col3.write("\n")  # Vertical box to shift the button menu
     col3.button("Menu", on_click=_back_to_menu)
 
 
-if st.session_state[CurrentStep] == CurrentStep.splash:
-    render_splash()
-elif st.session_state[CurrentStep] == CurrentStep.editor:
+if st.session_state.get(CurrentProject):
     render_editor()
 else:
-    st.warning("invalid unhandled app state")
+    render_splash()

core/constants.py

@@ -28,3 +28,10 @@ def PAST_PROJECTS_PATH(user) -> epath.Path:
 PROJECT_FOLDER_PATTERN = "%Y%m%d%H%M%S%f"
 
 DF_HEIGHT = 150
+
+# Tabs
+OVERVIEW = "Overview"
+METADATA = "Metadata"
+RESOURCES = "Resources"
+RECORD_SETS = "RecordSets"
+TABS = [OVERVIEW, METADATA, RESOURCES, RECORD_SETS]

core/past_projects.py

@@ -5,6 +5,7 @@ from etils import epath
 import streamlit as st
 
 from core.constants import PAST_PROJECTS_PATH
+from core.query_params import set_project
 from core.state import CurrentProject
 from core.state import get_cached_user
 from core.state import Metadata
@@ -28,6 +29,7 @@ def save_current_project():
         project = CurrentProject.create_new()
         st.session_state[CurrentProject] = project
     project.path.mkdir(parents=True, exist_ok=True)
+    set_project(project)
     with _pickle_file(project.path).open("wb") as file:
         try:
             pickle.dump(metadata, file)

core/query_params.py

@@ -0,0 +1,80 @@
+"""Module to manipulate query params."""
+
+from typing import Any
+
+import streamlit as st
+
+from core.constants import TABS
+from core.state import CurrentProject
+from core.state import RecordSet
+
+
+class QueryParams:
+    """Possible URL query params."""
+
+    OPEN_PROJECT = "project"
+    OPEN_RECORD_SET = "recordSet"
+    OPEN_TAB = "tab"
+
+
+def _get_query_param(params: dict[str, Any], name: str) -> str | None:
+    """Gets query param with the name `name`."""
+    if name in params:
+        param = params[name]
+        if isinstance(param, list) and len(param) > 0:
+            return param[0]
+    return None
+
+
+def _set_query_param(param: str, new_value: str) -> str | None:
+    params = st.experimental_get_query_params()
+    new_params = {k: v for k, v in params.items() if k != param}
+    new_params[param] = new_value
+    st.experimental_set_query_params(**new_params)
+
+
+def go_to_tab(tabs: list[str]):
+    params = st.experimental_get_query_params()
+    if QueryParams.OPEN_TAB in params:
+        try:
+            tab = int(params[QueryParams.OPEN_TAB][0])
+            if 0 <= tab and tab < len(tabs):
+                tab_id = f"tabs-bui3-tab-{tab}"
+                # Click on the tab.
+                js = f"""
+                    <script>
+                        const tab = window.parent.document.getElementById('{tab_id}');
+                        tab.click();
+                    </script>
+                """
+                st.components.v1.html(js)
+        except ValueError:
+            pass
+
+
+def set_tab(tab: str):
+    if tab not in TABS:
+        return
+    index = TABS.index(tab)
+    _set_query_param(QueryParams.OPEN_TAB, index)
+
+
+def is_record_set_expanded(record_set: RecordSet) -> bool:
+    params = st.experimental_get_query_params()
+    open_record_set_name = _get_query_param(params, QueryParams.OPEN_RECORD_SET)
+    if open_record_set_name:
+        return open_record_set_name == record_set.name
+    return False
+
+
+def expand_record_set(record_set: RecordSet) -> None:
+    _set_query_param(QueryParams.OPEN_RECORD_SET, record_set.name)
+
+
+def get_project_timestamp() -> str | None:
+    params = st.experimental_get_query_params()
+    return _get_query_param(params, QueryParams.OPEN_PROJECT)
+
+
+def set_project(project: CurrentProject):
+    _set_query_param(QueryParams.OPEN_PROJECT, project.path.name)

core/state.py

@@ -88,13 +88,6 @@ def get_cached_user():
     return st.session_state.get(User)
 
 
-class CurrentStep:
-    """Holds all major state variables for the application."""
-
-    splash = "splash"
-    editor = "editor"
-
-
 @dataclasses.dataclass
 class CurrentProject:
     """The selected project."""
@@ -104,6 +97,10 @@ class CurrentProject:
     @classmethod
     def create_new(cls) -> CurrentProject | None:
         timestamp = datetime.datetime.now().strftime(PROJECT_FOLDER_PATTERN)
+        return cls.from_timestamp(timestamp)
+
+    @classmethod
+    def from_timestamp(cls, timestamp: str) -> CurrentProject | None:
         user = get_cached_user()
         if user is None and OAUTH_CLIENT_ID:
             return None

cypress/downloads/croissant-titanic.json

@@ -0,0 +1 @@
+{"@context": {"@language": "en", "@vocab": "https://schema.org/", "column": "ml:column", "data": {"@id": "ml:data", "@type": "@json"}, "dataType": {"@id": "ml:dataType", "@type": "@vocab"}, "extract": "ml:extract", "field": "ml:field", "fileProperty": "ml:fileProperty", "format": "ml:format", "includes": "ml:includes", "isEnumeration": "ml:isEnumeration", "jsonPath": "ml:jsonPath", "ml": "http://mlcommons.org/schema/", "parentField": "ml:parentField", "path": "ml:path", "recordSet": "ml:recordSet", "references": "ml:references", "regex": "ml:regex", "repeated": "ml:repeated", "replace": "ml:replace", "sc": "https://schema.org/", "separator": "ml:separator", "source": "ml:source", "subField": "ml:subField", "transform": "ml:transform", "wd": "https://www.wikidata.org/wiki/"}, "@type": "sc:Dataset", "name": "Titanic", "description": "The original Titanic dataset, describing the status of individual passengers on the Titanic.\n\n The titanic data does not contain information from the crew, but it does contain actual ages of half of the passengers. \n\n For more information about how this dataset was constructed: \nhttps://web.archive.org/web/20200802155940/http://biostat.mc.vanderbilt.edu/wiki/pub/Main/DataSets/titanic3info.txt\n\nOther useful information (useful for prices description for example):\nhttp://campus.lakeforest.edu/frank/FILES/MLFfiles/Bio150/Titanic/TitanicMETA.pdf\n\n Also see the following article describing shortcomings of the dataset data:\nhttps://emma-stiefel.medium.com/plugging-holes-in-kaggles-titanic-dataset-an-introduction-to-combining-datasets-with-fuzzywuzzy-60a686699da7\n", "citation": "The principal source for data about Titanic passengers is the Encyclopedia Titanica (http://www.encyclopedia-titanica.org/). The datasets used here were begun by a variety of researchers. One of the original sources is Eaton & Haas (1994) Titanic: Triumph and Tragedy, Patrick Stephens Ltd, which includes a passenger list created by many researchers and edited by Michael A. Findlay.\n\nThomas Cason of UVa has greatly updated and improved the titanic data frame using the Encyclopedia Titanica and created the dataset here. Some duplicate passengers have been dropped, many errors corrected, many missing ages filled in, and new variables created.\n", "license": "Public", "url": "https://www.openml.org/d/40945", "distribution": [{"@type": "sc:FileObject", "name": "passengers.csv", "contentSize": "117743 B", "contentUrl": "https://www.openml.org/data/get_csv/16826755/phpMYEkMl", "encodingFormat": "text/csv", "sha256": "c617db2c7470716250f6f001be51304c76bcc8815527ab8bae734bdca0735737"}, {"@type": "sc:FileObject", "name": "genders.csv", "description": "Maps gender values (\"male\", \"female\") to semantic URLs.", "contentSize": "117743 B", "contentUrl": "data/genders.csv", "encodingFormat": "text/csv", "sha256": "c617db2c7470716250f6f001be51304c76bcc8815527ab8bae734bdca0735737"}, {"@type": "sc:FileObject", "name": "embarkation_ports.csv", "description": "Maps Embarkation port initial to labeled values.", "contentSize": "117743 B", "contentUrl": "data/embarkation_ports.csv", "encodingFormat": "text/csv", "sha256": "c617db2c7470716250f6f001be51304c76bcc8815527ab8bae734bdca0735737"}], "recordSet": [{"@type": "ml:RecordSet", "name": "genders", "description": "Maps gender labels to semantic definitions.", "isEnumeration": true, "key": "label", "field": [{"@type": "ml:Field", "name": "label", "description": "One of {\"male\", \"female\"}", "dataType": ["sc:Text", "sc:name"], "source": {"distribution": "genders.csv", "extract": {"column": "label"}}}, {"@type": "ml:Field", "name": "url", "description": "Corresponding WikiData URL", "dataType": ["sc:URL", "wd:Q48277"], "source": {"distribution": "genders.csv", "extract": {"column": "url"}}}]}, {"@type": "ml:RecordSet", "name": "embarkation_ports", "description": "Maps Embarkation port initial to labeled values.", "isEnumeration": true, "key": "key", "field": [{"@type": "ml:Field", "name": "key", "description": "C, Q, S or ?", "dataType": "sc:Text", "source": {"distribution": "embarkation_ports.csv", "extract": {"column": "key"}}}, {"@type": "ml:Field", "name": "label", "description": "Human-readable label", "dataType": ["sc:Text", "sc:name"], "source": {"distribution": "embarkation_ports.csv", "extract": {"column": "label"}}}, {"@type": "ml:Field", "name": "url", "description": "Corresponding WikiData URL", "dataType": ["sc:URL", "wd:Q515"], "source": {"distribution": "embarkation_ports.csv", "extract": {"column": "url"}}}]}, {"@type": "ml:RecordSet", "name": "passengers", "description": "The list of passengers. Does not include crew members.", "field": [{"@type": "ml:Field", "name": "name", "description": "Name of the passenger", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "name"}}}, {"@type": "ml:Field", "name": "gender", "description": "Gender of passenger (male or female)", "dataType": "sc:Text", "references": {"field": "genders/label"}, "source": {"distribution": "passengers.csv", "extract": {"column": "sex"}}}, {"@type": "ml:Field", "name": "age", "description": "Age of passenger at time of death. It's a string, because some values can be `?`.", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "age"}}}, {"@type": "ml:Field", "name": "survived", "description": "Survival status of passenger (0: Lost, 1: Saved)", "dataType": "sc:Integer", "source": {"distribution": "passengers.csv", "extract": {"column": "survived"}}}, {"@type": "ml:Field", "name": "pclass", "description": "Passenger Class (1st/2nd/3rd)", "dataType": "sc:Integer", "source": {"distribution": "passengers.csv", "extract": {"column": "pclass"}}}, {"@type": "ml:Field", "name": "cabin", "description": "Passenger cabin.", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "cabin"}}}, {"@type": "ml:Field", "name": "embarked", "description": "Port of Embarkation (C: Cherbourg, Q: Queenstown, S: Southampton, ?: Unknown).", "dataType": "sc:Text", "references": {"field": "embarkation_ports/key"}, "source": {"distribution": "passengers.csv", "extract": {"column": "embarked"}}}, {"@type": "ml:Field", "name": "fare", "description": "Passenger Fare (British pound). It's a string, because some values can be `?`.", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "fare"}}}, {"@type": "ml:Field", "name": "home_destination", "description": "Home and destination", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "home.dest"}}}, {"@type": "ml:Field", "name": "ticket", "description": "Ticket Number, may include a letter.", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "ticket"}}}, {"@type": "ml:Field", "name": "num_parents_children", "description": "Number of Parents/Children Aboard", "dataType": "sc:Integer", "source": {"distribution": "passengers.csv", "extract": {"column": "parch"}}}, {"@type": "ml:Field", "name": "num_siblings_spouses", "description": "Number of Siblings/Spouses Aboard", "dataType": "sc:Integer", "source": {"distribution": "passengers.csv", "extract": {"column": "sibsp"}}}, {"@type": "ml:Field", "name": "boat", "description": "Lifeboat used by passenger", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "boat"}}}, {"@type": "ml:Field", "name": "body", "description": "Body Identification Number", "dataType": "sc:Text", "source": {"distribution": "passengers.csv", "extract": {"column": "body"}}}]}]}

events/fields.py

@@ -3,6 +3,8 @@ from typing import Any
 
 import streamlit as st
 
+from core.constants import RECORD_SETS
+from core.query_params import set_tab
 from core.state import Field
 from core.state import Metadata
 import mlcroissant as mlc
@@ -77,6 +79,7 @@ def handle_field_change(
     key: str,
     **kwargs,
 ):
+    set_tab(RECORD_SETS)
     value = st.session_state[key]
     if change == FieldEvent.NAME:
         old_name = field.name

events/metadata.py

@@ -2,6 +2,8 @@ import enum
 
 import streamlit as st
 
+from core.constants import METADATA
+from core.query_params import set_tab
 from core.state import Metadata
 
 
@@ -16,6 +18,7 @@ class MetadataEvent(enum.Enum):
 
 
 def handle_metadata_change(event: MetadataEvent, metadata: Metadata, key: str):
+    set_tab(METADATA)
     if event == MetadataEvent.NAME:
         metadata.name = st.session_state[key]
     elif event == MetadataEvent.DESCRIPTION:

events/record_sets.py

@@ -2,6 +2,9 @@ import enum
 
 import streamlit as st
 
+from core.constants import RECORD_SETS
+from core.query_params import expand_record_set
+from core.query_params import set_tab
 from core.state import Metadata
 from core.state import RecordSet
 
@@ -15,6 +18,7 @@ class RecordSetEvent(enum.Enum):
 
 
 def handle_record_set_change(event: RecordSetEvent, record_set: RecordSet, key: str):
+    set_tab(RECORD_SETS)
     value = st.session_state[key]
     if event == RecordSetEvent.NAME:
         old_name = record_set.name
@@ -27,3 +31,4 @@ def handle_record_set_change(event: RecordSetEvent, record_set: RecordSet, key:
         record_set.description = value
     elif event == RecordSetEvent.IS_ENUMERATION:
         record_set.is_enumeration = value
+    expand_record_set(record_set=record_set)

events/resources.py

@@ -2,6 +2,8 @@ import enum
 
 import streamlit as st
 
+from core.constants import RESOURCES
+from core.query_params import set_tab
 from core.state import FileObject
 from core.state import FileSet
 from core.state import Metadata
@@ -21,6 +23,7 @@ class ResourceEvent(enum.Enum):
 
 
 def handle_resource_change(event: ResourceEvent, resource: Resource, key: str):
+    set_tab(RESOURCES)
     value = st.session_state[key]
     if event == ResourceEvent.NAME:
         old_name = resource.name

utils.py

@@ -1,7 +1,8 @@
 import streamlit as st
 
+from core.past_projects import open_project
+from core.query_params import get_project_timestamp
 from core.state import CurrentProject
-from core.state import CurrentStep
 from core.state import Metadata
 from core.state import SelectedRecordSet
 from core.state import SelectedResource
@@ -12,33 +13,34 @@ def needed_field(text: str) -> str:
     return f"{text}:red[*]"
 
 
-def jump_to(step: str):
-    """Maintains the user's location within the editor."""
-    if step is not None:
-        st.session_state[CurrentStep] = step
-
-
 def init_state(force=False):
     """Initializes the session state. `force=True` to force re-initializing it."""
 
+    timestamp = get_project_timestamp()
+    if timestamp and not force:
+        project = CurrentProject.from_timestamp(timestamp)
+        if (
+            project
+            and CurrentProject not in st.session_state
+            and Metadata not in st.session_state
+        ):
+            st.session_state[CurrentProject] = project
+            st.session_state[Metadata] = open_project(project.path)
+    else:
+        st.session_state[CurrentProject] = None
+
     if Metadata not in st.session_state or force:
         st.session_state[Metadata] = Metadata()
 
     if mlc.Dataset not in st.session_state or force:
         st.session_state[mlc.Dataset] = None
 
-    if CurrentStep not in st.session_state or force:
-        st.session_state[CurrentStep] = CurrentStep.splash
-
     if SelectedResource not in st.session_state or force:
         st.session_state[SelectedResource] = None
 
     if SelectedResource not in st.session_state or force:
         st.session_state[SelectedRecordSet] = None
 
-    if CurrentProject not in st.session_state or force:
-        st.session_state[CurrentProject] = CurrentProject.create_new()
-
     # Uncomment those lines if you work locally in order to avoid clicks at each reload.
     # And comment all previous lines in `init_state`.
     # if mlc.Dataset not in st.session_state or force:
@@ -47,7 +49,5 @@ def init_state(force=False):
     #     st.session_state[Metadata] = Metadata.from_canonical(
     #         st.session_state[mlc.Dataset].metadata
     #     )
-    # if CurrentStep not in st.session_state or force:
-    #     st.session_state[CurrentStep] = CurrentStep.editor
     # if CurrentProject not in st.session_state or force:
     #     st.session_state[CurrentProject] = CurrentProject.create_new()

views/files.py

@@ -1,16 +1,15 @@
-import enum
-
 import streamlit as st
 
 from components.tree import render_tree
 from core.constants import DF_HEIGHT
+from core.constants import RESOURCES
 from core.files import file_from_form
 from core.files import file_from_upload
 from core.files import file_from_url
 from core.files import FILE_OBJECT
-from core.files import FILE_SET
 from core.files import FILE_TYPES
 from core.files import RESOURCE_TYPES
+from core.query_params import set_tab
 from core.record_sets import infer_record_sets
 from core.state import FileObject
 from core.state import FileSet
@@ -70,6 +69,7 @@ def _render_resources_panel(files: list[Resource]) -> Resource | None:
     if not name:
         return None
     file = filename_to_file[name]
+    # set_tab(RESOURCES)
     return file
 
 

views/load.py

@@ -5,13 +5,12 @@ import streamlit as st
 
 from core.constants import EDITOR_CACHE
 from core.past_projects import save_current_project
-from core.state import CurrentStep
 from core.state import Metadata
 import mlcroissant as mlc
-from utils import jump_to
 
 
 def _on_file_upload(key):
+    """Triggers when a new file gets uploaded to load the Croissant metadata."""
     file = st.session_state[key]
     file_cont = file.read()
     # TODO(marcenacp): The Python library should support loading from an open file/dict.
@@ -22,8 +21,7 @@ def _on_file_upload(key):
     try:
         dataset = mlc.Dataset(newfile_name)
         st.session_state[Metadata] = Metadata.from_canonical(dataset.metadata)
-        jump_to(CurrentStep.editor)
-        save_current_project()
+        # save_current_project()
     except mlc.ValidationError as e:
         st.warning(e)
         st.toast(body="Invalid Croissant File!", icon="🔥")

views/previous_files.py

@@ -6,16 +6,16 @@ import streamlit as st
 from core.constants import PROJECT_FOLDER_PATTERN
 from core.past_projects import load_past_projects_paths
 from core.past_projects import open_project
+from core.query_params import set_project
 from core.state import CurrentProject
-from core.state import CurrentStep
 from core.state import Metadata
-from utils import jump_to
 
 
 def _load_croissant(metadata: Metadata, path: epath.Path) -> None:
     st.session_state[Metadata] = metadata
-    st.session_state[CurrentProject] = CurrentProject(path)
-    jump_to(CurrentStep.editor)
+    project = CurrentProject(path)
+    st.session_state[CurrentProject] = project
+    set_project(project)
 
 
 def _remove_croissant(path: epath.Path) -> None:
@@ -24,29 +24,30 @@ def _remove_croissant(path: epath.Path) -> None:
 
 def render_previous_files():
     paths = load_past_projects_paths()
-    if not paths:
+    has_no_project = True
+    for index, path in enumerate(paths):
+        try:
+            metadata = open_project(path)
+            timestamp = datetime.datetime.strptime(
+                path.name, PROJECT_FOLDER_PATTERN
+            ).strftime("%Y/%m/%d %H:%M")
+            label = f"{metadata.name or 'Unnamed dataset'} - {timestamp}"
+            col1, col2 = st.columns([10, 1])
+            col1.button(
+                label,
+                key=f"splash-{index}-load",
+                on_click=_load_croissant,
+                args=(metadata, path),
+            )
+            col2.button(
+                "✖️",
+                help="Warning: this will delete the project.",
+                key=f"splash-{index}-remove",
+                on_click=_remove_croissant,
+                args=(path,),
+            )
+            has_no_project = False
+        except:
+            pass
+    if has_no_project:
         st.write("No past project to load. Create one on the left!")
-    else:
-        for index, path in enumerate(paths):
-            try:
-                metadata = open_project(path)
-                timestamp = datetime.datetime.strptime(
-                    path.name, PROJECT_FOLDER_PATTERN
-                ).strftime("%Y/%m/%d %H:%M")
-                label = f"{metadata.name or 'Unnamed dataset'} - {timestamp}"
-                col1, col2 = st.columns([10, 1])
-                col1.button(
-                    label,
-                    key=f"splash-{index}-load",
-                    on_click=_load_croissant,
-                    args=(metadata, path),
-                )
-                col2.button(
-                    "✖️",
-                    help="Warning: this will delete the project.",
-                    key=f"splash-{index}-remove",
-                    on_click=_remove_croissant,
-                    args=(path,),
-                )
-            except:
-                pass

views/record_sets.py

@@ -1,8 +1,12 @@
+from typing import Any
+
 import numpy as np
 import pandas as pd
 from rdflib import term
 import streamlit as st
 
+from core.query_params import expand_record_set
+from core.query_params import is_record_set_expanded
 from core.state import Field
 from core.state import Metadata
 from core.state import RecordSet
@@ -88,7 +92,10 @@ def _handle_create_record_set():
     metadata.add_record_set(RecordSet(name="new-record-set", description=""))
 
 
-def _handle_fields_change(record_set_key: int, record_set: RecordSet):
+def _handle_fields_change(
+    record_set_key: int, record_set: RecordSet, params: dict[str, Any]
+):
+    expand_record_set(record_set=record_set)
     data_editor_key = _data_editor_key(record_set_key, record_set)
     result = st.session_state[data_editor_key]
     # `result` has the following structure:
@@ -155,7 +162,7 @@ def _render_left_panel():
     for record_set_key, record_set in enumerate(record_sets):
         title = f"**{record_set.name or '-'}** ({len(record_set.fields)} fields)"
         prefix = f"record-set-{record_set_key}"
-        with st.expander(title, expanded=False):
+        with st.expander(title, expanded=is_record_set_expanded(record_set)):
             col1, col2 = st.columns([1, 3])
             key = f"{prefix}-name"
             col1.text_input(
@@ -200,25 +207,25 @@ def _render_left_panel():
                         "Left join",
                         disabled=True,
                         value=left[0],
-                        key=f"{prefix}-left-join-{left}",
+                        key=f"{prefix}-left-join-{left[0]}-{left[1]}",
                     )
                     col2.text_input(
                         "Left key",
                         disabled=True,
                         value=left[1],
-                        key=f"{prefix}-left-key-{left}",
+                        key=f"{prefix}-left-key-{left[0]}-{left[1]}",
                     )
                     col4.text_input(
                         "Right join",
                         disabled=True,
                         value=right[0],
-                        key=f"{prefix}-right-join-{right}",
+                        key=f"{prefix}-right-join-{right[0]}-{right[1]}",
                     )
                     col5.text_input(
                         "Right key",
                         disabled=True,
                         value=right[1],
-                        key=f"{prefix}-right-key-{right}",
+                        key=f"{prefix}-right-key-{right[0]}-{right[1]}",
                     )
             names = [field.name for field in record_set.fields]
             descriptions = [field.description for field in record_set.fields]

views/splash.py

@@ -4,14 +4,12 @@ import requests
 import streamlit as st
 
 from core.constants import OAUTH_CLIENT_ID
+from core.query_params import set_project
 from core.state import CurrentProject
-from core.state import CurrentStep
 from core.state import Metadata
 import mlcroissant as mlc
-from utils import jump_to
 from views.load import render_load
 from views.previous_files import render_previous_files
-from views.side_buttons import jump_to
 
 
 def render_splash():
@@ -30,8 +28,9 @@ def render_splash():
 
             def create_new_croissant():
                 st.session_state[Metadata] = Metadata()
-                st.session_state[CurrentProject] = CurrentProject.create_new()
-                jump_to(CurrentStep.editor)
+                project = CurrentProject.create_new()
+                st.session_state[CurrentProject] = project
+                set_project(project)
 
             st.button(
                 "Create",
@@ -46,8 +45,9 @@ def render_splash():
                     json = requests.get(url).json()
                     metadata = mlc.Metadata.from_json(mlc.Issues(), json, None)
                     st.session_state[Metadata] = Metadata.from_canonical(metadata)
-                    st.session_state[CurrentProject] = CurrentProject.create_new()
-                    jump_to(CurrentStep.editor)
+                    project = CurrentProject.create_new()
+                    st.session_state[CurrentProject] = project
+                    set_project(project)
                 except Exception as exception:
                     logging.error(exception)
                     st.error(

views/wizard.py

@@ -3,7 +3,12 @@ import json
 import streamlit as st
 import streamlit_nested_layout  # Do not remove this allows nesting columns.
 
+from core.constants import TABS
 from core.past_projects import save_current_project
+from core.query_params import get_project_timestamp
+from core.query_params import go_to_tab
+from core.query_params import QueryParams
+from core.query_params import set_tab
 from core.state import Metadata
 import mlcroissant as mlc
 from views.files import render_files
@@ -26,16 +31,10 @@ def render_export_button(col):
         col.download_button("Export", disabled=True, data="", help=str(exception))
 
 
-OVERVIEW = "Overview"
-METADATA = "Metadata"
-RESOURCES = "Resources"
-RECORD_SETS = "RecordSets"
-
-
 def render_editor():
     col1, col2 = st.columns([10, 1])
     render_export_button(col2)
-    tab1, tab2, tab3, tab4 = col1.tabs([OVERVIEW, METADATA, RESOURCES, RECORD_SETS])
+    tab1, tab2, tab3, tab4 = col1.tabs(TABS)
 
     with tab1:
         render_overview()
@@ -46,3 +45,4 @@ def render_editor():
     with tab4:
         render_record_sets()
     save_current_project()
+    go_to_tab(TABS)