Relationship Updates (#3)

* Add Generator tab updated

* Mapping tab notice and update expander titles after user updates label or types

* New generator tab updated to support creating relationship generators

* Streamlit multipage app structure added

* Property mapping shifted certain properties to be optional + moved loading state functions from overview to default_state widget

* WIP node mapping and relationship mapping row widgets started

* nav bar added but commented out

* Import page refactored

* secondary mappings and mapping widgets removed - returned to single mappings page (temp was Properties page)

* Assignment generator type added

* Original SPA tab app updated

* Exhaustive assignment generator mostly working

* Generator importing from csv + GeneratorArg now includes hints and descriptions

* Copy & Paste json import added

* Minor UI copy updates

* Empty node and relationship mappings added + mapping page support for non imported scenarios

* WIP No import option support - new empty nodes supported

* Relationship nodes updated to support non-imported scenarios

* Minor clean up

* Globals simplified

* Fixes for adding and removing nodes and relationships when no imported data used

* MAJOR cleanup + data import tab added

Author: jalakoo

README.md

@@ -1,5 +1,5 @@
-# MOCK DATA GENERATOR
-An app for generating mock graph data for [Neo4j](https://neo4j.com/) database instances.
+# MOCK GRAPH DATA GENERATOR
+This is a prototype app for generating mock graph data for [Neo4j](https://neo4j.com/) database instances.
 
 ## Requirements
 [Poetry](https://python-poetry.org/) should be installed. Code in this repo uses Poetry for managing dependencies and running a virtual environment.
@@ -8,4 +8,4 @@ The app uses [Streamlit](https://streamlit.io/) to create and manage the UI inte
 
 ## Running
 Locally
-`poetry run streamlit run mock_generators/app.py`
+`poetry run streamlit run mock_generators/app.py`

mock_generators/app.py

@@ -7,11 +7,10 @@
 from tabs.generate_tab import generate_tab
 from tabs.export_tab import export_tab
 from tabs.importing_tab import import_tab
-from models.generator import Generator
+from tabs.design_tab import design_tab
+from tabs.data_importer import data_importer_tab
 from models.mapping import Mapping
-from models.node_mapping import NodeMapping
-from models.relationship_mapping import RelationshipMapping
-from models.property_mapping import PropertyMapping
+
 
 # SETUP
 st.set_page_config(layout="wide")
@@ -34,6 +33,10 @@
 # TODO: Replace with reference to selected import file
 if IMPORTED_FILE not in st.session_state:
     st.session_state[IMPORTED_FILE] = None
+if IMPORTED_NODES not in st.session_state:
+    st.session_state[IMPORTED_NODES] = []
+if IMPORTED_RELATIONSHIPS not in st.session_state:
+    st.session_state[IMPORTED_RELATIONSHIPS] = []
 if EXPORTS_PATH not in st.session_state:
     st.session_state[EXPORTS_PATH] = DEFAULT_EXPORTS_PATH
 if CODE_TEMPLATE_FILE not in st.session_state:
@@ -50,25 +53,32 @@
 generators = None
 imported_file = None
 
-tab1, tab2, tab3, tab4, tab5, tab6, tab7 = st.tabs(["Config >", "Import >",  "Mapping >", "Generators >", "New Generator >", "Generate >", "Export"])
+# Streamlit runs from top-to-bottom from tabs 1 through 8. This is essentially one giant single page app.  Earlier attempt to use Streamlit's multi-page app functionality resulted in an inconsistent state between pages.
+tab1, tab2, tab3, tab4, tab5, tab6, tab7, tab8, tab9 = st.tabs(["Config >", "Design >", "Import >",  "Mapping >", "Search Generators >", "Add New Generator >", "Generate >", "Export >", "Data Importer"])
 
 with tab1:
     config_tab()
 
 with tab2:
-    import_tab()
+    design_tab()
 
 with tab3:
-    mapping_tab()
+    import_tab()
 
 with tab4:
-    generators_tab()
+    mapping_tab()
 
 with tab5:
-    create_tab()
+    generators_tab()
 
 with tab6:
-    generate_tab()
+    create_tab()
 
 with tab7:
-    export_tab()
+    generate_tab()
+
+with tab8:
+    export_tab()
+
+with tab9:
+    data_importer_tab()

mock_generators/base_generators/README.md

@@ -0,0 +1 @@
+These files used as base classes in the original schema to make generator implementations. However, issues were encountered with the generators accessing these abstract base classes. They are retained here for reference.

mock_generators/base_generators/bool_generator.py

@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 
 class BoolGenerator(ABC):
     def __init__(self):

mock_generators/constants.py

@@ -13,14 +13,38 @@
 GENERATORS = "generators"
 SPEC_FILE = "spec_filepath"
 CODE_FILE = "code_filepath"
-IMPORTED_FILE = "uploaded_file" # Old key for selected import file
+IMPORTED_FILE = "uploaded_file" # Old key for selected import file, this is the raw imported file
 IMPORTED_FILENAME = "imported_filename"
+IMPORTED_NODES = "imported_nodes"
+IMPORTED_RELATIONSHIPS = "imported_relationships"
 SAMPLE_ARROWS_FILE= "sample_arrows"
 IMPORTS_PATH = "imports_path"
 EXPORTS_PATH = "exports_path"
 ZIPS_PATH = "zips_path"
 CODE_TEMPLATE_FILE = "templates_file"
 DEFAULT_DATA_IMPORTER_FILENAME = "neo4j_importer_model"
+NEW_GENERATOR_ARGS = "new_generator_args"
 
 # TODO: Can Streamlit's st.session hold all the data we'll be generating?
 MAPPINGS = "mappings"
+
+# TODO: Add page titles
+# OVERVIEW_PAGE_TITLE = "🏠 Overview"
+# DESIGN_PAGE_TITLE = "✍️ Design"
+# IMPORT_PAGE_TITLE = "🔼 Import"
+# SETTINGS_PAGE_TITLE = "⚙️ Settings"
+# MAPPINGS_PAGE_TITLE = "🔀 Mapping"
+# GENERATORS_PAGE_TITLE = "👨‍👩‍👧‍👦 Generators"
+# GENERATE_PAGE_TITLE = "🏃‍♂️ Generate"
+# EXPORT_PAGE_TITLE = "🔽 Export"
+# PROPERTIES_PAGE_TITLE = "🧩 Properties"
+
+# OVERVIEW_SHORT_TITLE = "Overview"
+# DESIGN_SHORT_TITLE = "Design"
+# IMPORT_SHORT_TITLE = "Import"
+# PROPERTIES_SHORT_TITLE = "Properties"
+# MAPPINGS_SHORT_TITLE = "Mapping"
+# GENERATE_SHORT_TITLE = "Generate"
+# EXPORT_SHORT_TITLE = "Export"
+# SETTINGS_SHORT_TITLE = "Settings"
+# GENERATORS_SHORT_TITLE = "Generators"

mock_generators/datasets/README.md

@@ -0,0 +1 @@
+Sample datasets of files that can be used by some of the generators.