Revert "Merge branch 'main' into webui_overhaul"

This reverts commit 631e67c, reversing
changes made to 06f4d95.

Author: coffandro

.github/workflows/build-dataset.yml

@@ -69,8 +69,6 @@ jobs:
 
       - name: Build dataset
         run: |
-          # Build the dataset
-          # Output will be deployed to https://api.openfilamentdatabase.org/
           python -m builder.build \
             --version "${{ steps.version.outputs.version }}"
 
@@ -107,136 +105,53 @@ jobs:
         id: deployment
         uses: actions/deploy-pages@v4
 
-      # Get the last release tag for generating release notes
-      - name: Get last release tag
-        id: last_release
-        run: |
-          LAST_TAG=$(git tag -l 'dataset-v*' --sort=-version:refname | head -n 1)
-          if [ -z "$LAST_TAG" ]; then
-            echo "previous_tag=" >> $GITHUB_OUTPUT
-            echo "No previous dataset release found"
-          else
-            echo "previous_tag=$LAST_TAG" >> $GITHUB_OUTPUT
-            echo "Last release: $LAST_TAG"
-          fi
-
-      # Generate release notes with only changes since last release
-      - name: Generate release notes
-        id: release_notes
-        run: |
-          PREVIOUS_TAG="${{ steps.last_release.outputs.previous_tag }}"
-
-          # Start building release notes
-          cat > release_notes.md << 'EOF'
-          ## Open Filament Database v${{ steps.version.outputs.version }}
-
-          All paths below are relative to the base API URL: **https://api.openfilamentdatabase.org/**
-
-          ### Downloads
-
-          | Format | Description | File |
-          |--------|-------------|------|
-          | **SQLite (Filaments)** | Relational database with full schema | `sqlite/filaments.db` |
-          | **SQLite (Stores)** | Store information database | `sqlite/stores.db` |
-          | **SQLite (compressed)** | XZ compressed SQLite files | `sqlite/*.db.xz` |
-          | **JSON** | Complete dataset in one file | `json/all.json` |
-          | **JSON (compressed)** | Gzipped JSON | `json/all.json.gz` |
-          | **NDJSON** | Newline-delimited JSON for streaming | `json/all.ndjson` |
-          | **CSV** | Multiple CSV files | `csv/` directory |
-
-          ### API Endpoints
-
-          All endpoints are relative to: **https://api.openfilamentdatabase.org/**
-
-          #### Brands & Filaments
-          - `api/v1/index.json` - API root with version and stats
-          - `api/v1/brands/index.json` - List of all brands
-          - `api/v1/brands/{slug}/index.json` - Individual brand with materials
-          - `api/v1/brands/{slug}/materials/{material_slug}/index.json` - Material with filaments
-          - `api/v1/brands/{slug}/materials/{material_slug}/filaments/{filament_slug}/index.json` - Filament with variants
-          - `api/v1/brands/{slug}/materials/{material_slug}/filaments/{filament_slug}/variants/{variant_slug}.json` - Variant details with sizes
-
-          #### Stores
-          - `api/v1/stores/index.json` - List of stores
-          - `api/v1/stores/{slug}.json` - Individual store details
-
-          #### Logos
-          - `api/v1/brands/logo/index.json` - List of all brand logos
-          - `api/v1/brands/logo/{logo_id}.json` - Brand logo metadata
-          - `api/v1/brands/logo/{logo_id}.{ext}` - Brand logo image file
-          - `api/v1/stores/logo/index.json` - List of all store logos
-          - `api/v1/stores/logo/{logo_id}.json` - Store logo metadata
-          - `api/v1/stores/logo/{logo_id}.{ext}` - Store logo image file
-
-          #### Schemas
-          - `api/v1/schemas/index.json` - List of available JSON schemas
-          - `api/v1/schemas/{name}.json` - Individual JSON schema
-
-          ### Direct Downloads
-
-          All paths relative to: **https://api.openfilamentdatabase.org/**
-
-          - `json/all.json` - Complete dataset
-          - `sqlite/filaments.db` - SQLite database (filaments)
-          - `sqlite/stores.db` - SQLite database (stores)
-          - `csv/` - CSV files
-
-          ### Checksums
-
-          See `manifest.json` for SHA256 checksums of all files.
-
-          EOF
-
-          # Add changes section only if there was a previous release
-          if [ -n "$PREVIOUS_TAG" ]; then
-            echo "" >> release_notes.md
-            echo "### Changes Since $PREVIOUS_TAG" >> release_notes.md
-            echo "" >> release_notes.md
-
-            # Verify tag exists before running git log
-            if git rev-parse "$PREVIOUS_TAG" >/dev/null 2>&1; then
-              # Get commit log since last release, using -- to separate paths from revisions
-              if git log "$PREVIOUS_TAG..HEAD" --oneline --no-merges -- data/ stores/ builder/ schemas/ > commits.txt 2>/dev/null; then
-                if [ -s commits.txt ]; then
-                  # Group changes by type
-                  echo "#### Recent Updates" >> release_notes.md
-                  echo "" >> release_notes.md
-                  while read line; do
-                    echo "- $line" >> release_notes.md
-                  done < commits.txt
-                else
-                  echo "- Infrastructure and maintenance updates" >> release_notes.md
-                fi
-              else
-                echo "- Unable to retrieve commit history" >> release_notes.md
-              fi
-            else
-              echo "- First release or previous tag not found" >> release_notes.md
-            fi
-          fi
-
-          # Set output
-          echo "notes_file=release_notes.md" >> $GITHUB_OUTPUT
-
       # Create Release
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: dataset-v${{ steps.version.outputs.version }}
           name: Dataset v${{ steps.version.outputs.version }}
-          body_path: release_notes.md
+          body: |
+            ## Open Filament Database v${{ steps.version.outputs.version }}
+            
+            ### Downloads
+            
+            | Format | Description | File |
+            |--------|-------------|------|
+            | **SQLite** | Relational database with full schema | `filaments.db` |
+            | **SQLite (compressed)** | XZ compressed SQLite | `filaments.db.xz` |
+            | **JSON** | Complete dataset in one file | `all.json` |
+            | **JSON (compressed)** | Gzipped JSON | `all.json.gz` |
+            | **NDJSON** | Newline-delimited JSON for streaming | `all.ndjson` |
+            | **CSV** | Multiple CSV files | `csv/` directory |
+
+            ### Endpoints
+
+            - `/api/v1/brands/{slug}/index.json` - Individual brand with filaments
+            - `/api/v1/stores/index.json` - List of stores
+            - `/api/v1/stores/{slug}.json` - Individual store
+            - `/api/v1/schemas/index.json` - List of available JSON schemas
+            - `/api/v1/schemas/{name}.json` - Individual JSON schema
+
+            ### Direct Downloads
+
+            - `/json/all.json` - Complete dataset
+            - `/sqlite/filaments.db` - SQLite database
+            - `/csv/` - CSV files
+            
+            ### Checksums
+            
+            See `manifest.json` for SHA256 checksums of all files.
           files: |
             dist/json/all.json
             dist/json/all.json.gz
             dist/json/all.ndjson
             dist/sqlite/filaments.db
             dist/sqlite/filaments.db.xz
-            dist/sqlite/stores.db
-            dist/sqlite/stores.db.xz
             dist/manifest.json
           draft: false
           prerelease: false
-          generate_release_notes: false
+          generate_release_notes: true
 
   # Validate the build
   validate:
@@ -258,16 +173,12 @@ jobs:
 
       - name: Validate SQLite
         run: |
-          echo "Validating SQLite databases..."
-          echo "Filaments database:"
+          echo "Validating SQLite database..."
           sqlite3 dist/sqlite/filaments.db "SELECT COUNT(*) FROM brand;"
           sqlite3 dist/sqlite/filaments.db "SELECT COUNT(*) FROM filament;"
           sqlite3 dist/sqlite/filaments.db "SELECT COUNT(*) FROM variant;"
           sqlite3 dist/sqlite/filaments.db "SELECT COUNT(*) FROM size;"
-          echo ""
-          echo "Stores database:"
-          sqlite3 dist/sqlite/stores.db "SELECT COUNT(*) FROM store;"
-          echo "✓ SQLite databases are valid"
+          echo "✓ SQLite database is valid"
 
       - name: Test SQLite queries
         run: |

.github/workflows/update_profiles.yaml

@@ -4,14 +4,9 @@ on:
     schedule:
         -   cron: "0 0 * * *"
     workflow_dispatch:
-    push:
-        branches:
-            - main
 
 jobs:
     update_slicer_profiles:
-        # Only run on main branch, not on PRs
-        if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
         runs-on: ubuntu-latest
         permissions:
             contents: write

README.md

@@ -35,52 +35,33 @@ git clone https://github.com/YOUR_USERNAME/open-filament-database.git
 cd open-filament-database
 ```
 ### 5. Make your changes!
-Use the web editor (recommended) or edit files manually:
-
-**Using the WebUI (Recommended):**
+Either use the web editor by simply running these commands or [following the guide](docs/webui.md), if you want to do it manually you can [use this one](docs/manual.md)
 ```bash
 cd webui
 npm ci
 npm run dev
 ```
-Then access it in your browser at http://localhost:5173
-
-The WebUI includes built-in validation and data sorting features to help ensure your changes are correct. [Full WebUI guide](docs/webui.md)
-
-**Manual editing:** If you prefer to edit files directly, [follow this guide](docs/manual.md)
-
-### 6. Validate and sort your changes
-The WebUI can validate and sort your data automatically:
-
-1. Click the "Validate" button in the top-right corner to check for errors
-2. Click the "Sort Data" button to organize your JSON files consistently
-3. Fix any validation errors that appear (they'll be highlighted in red)
+and access it in your browser at http://localhost:5173
 
-Alternatively, you can use the command-line validation scripts ([see guide](docs/validation.md)):
+### 6. Validate your changes
+Once you've finished modifying the database you can use these commands or [this guide](docs/validation.md) to make sure your data is correct, fix any errors that pop up
 ```bash
-python data_validator.py --folder-names  # Validates folder names
-python data_validator.py --logo-files    # Validates logo files
-python data_validator.py --json-files    # Validates JSON files
-python data_validator.py --store-ids     # Validates store IDs
+python data_validator.py --folder-names # Validates folder names.
+python data_validator.py --logo-files # Validates logo files.
+python data_validator.py --json-files # Validates json files.
+python data_validator.py --store-ids # Validates store ids.
 ```
 ### 7. Submit your changes
-Before submitting, make sure your data is sorted consistently:
-- **In the WebUI:** Click the "Sort Data" button in the top-right corner
-- **Or via command line:** Run `python scripts/sort_data.py`
-
-Then add your changes:
+Start by running this command to add all your changes up
 ```bash
 git add .
 ```
-
-Create a commit with a descriptive message (e.g., "Added Elegoo Red PLA variant"):
+Then run this command but replace `COMMIT_MESSAGE` with a title of what you did, e.g. "Added filament A to brand B"
 ```bash
 git commit -m "COMMIT_MESSAGE"
 ```
-
-Upload your changes to GitHub:
+When that's done you can run this command to upload your stuff
 ```bash
 git push -u origin YOUR_BRANCHNAME
 ```
-
-Finally, make a pull request [using this guide](docs/pull-requesting.md)
+Afterwards you can make a pull request [using this guide](docs/pull-requesting.md)

builder/build.py

@@ -5,7 +5,7 @@
 This script crawls the data directory, normalizes all entities,
 and exports them to multiple formats:
 - JSON (all.json, all.ndjson, per-brand)
-- SQLite databases (filaments.db, stores.db)
+- SQLite database (filaments.db)
 - CSV files
 - Static API (for GitHub Pages)
 - HTML landing page (index.html)
@@ -19,7 +19,7 @@
     --stores-dir DIR    Stores directory (default: stores)
     --version VERSION   Dataset version (default: auto-generated)
     --skip-json         Skip JSON export
-    --skip-sqlite       Skip SQLite export (both filaments and stores)
+    --skip-sqlite       Skip SQLite export
     --skip-csv          Skip CSV export
     --skip-api          Skip static API export
     --skip-html         Skip HTML landing page export
@@ -37,7 +37,7 @@
 
 from builder.crawler import crawl_data
 from builder.errors import BuildResult
-from builder.exporters import export_json, export_sqlite, export_sqlite_stores, export_csv, export_api, export_html
+from builder.exporters import export_json, export_sqlite, export_csv, export_api, export_html
 from builder.utils import get_current_timestamp
 
 
@@ -147,7 +147,6 @@ def main():
     data_dir = project_root / args.data_dir
     stores_dir = project_root / args.stores_dir
     schemas_dir = project_root / "schemas"
-    builder_schemas_dir = project_root / "builder" / "schemas"
     output_dir = project_root / args.output_dir
 
     # Generate version if not provided
@@ -171,51 +170,44 @@ def main():
     build_result = BuildResult()
 
     # Step 1: Crawl data
-    print("\n[1/7] Crawling data...")
+    print("\n[1/6] Crawling data...")
     db, crawl_result = crawl_data(str(data_dir), str(stores_dir))
     build_result.merge(crawl_result)
 
     # Step 2: Export JSON
     if not args.skip_json:
-        print("\n[2/7] Exporting JSON...")
+        print("\n[2/6] Exporting JSON...")
         export_json(db, str(output_dir), version, generated_at)
     else:
-        print("\n[2/7] Skipping JSON export")
+        print("\n[2/6] Skipping JSON export")
 
-    # Step 3: Export SQLite (filaments)
+    # Step 3: Export SQLite
     if not args.skip_sqlite:
-        print("\n[3/7] Exporting SQLite (filaments)...")
+        print("\n[3/6] Exporting SQLite...")
         export_sqlite(db, str(output_dir), version, generated_at)
     else:
-        print("\n[3/7] Skipping SQLite export")
+        print("\n[3/6] Skipping SQLite export")
 
-    # Step 4: Export SQLite (stores)
-    if not args.skip_sqlite:
-        print("\n[4/7] Exporting SQLite (stores)...")
-        export_sqlite_stores(db, str(output_dir), version, generated_at)
-    else:
-        print("\n[4/7] Skipping SQLite stores export")
-
-    # Step 5: Export CSV
+    # Step 4: Export CSV
     if not args.skip_csv:
-        print("\n[5/7] Exporting CSV...")
+        print("\n[4/6] Exporting CSV...")
         export_csv(db, str(output_dir), version, generated_at)
     else:
-        print("\n[5/7] Skipping CSV export")
+        print("\n[4/6] Skipping CSV export")
 
-    # Step 6: Export Static API
+    # Step 5: Export Static API
     if not args.skip_api:
-        print("\n[6/7] Exporting Static API...")
-        export_api(db, str(output_dir), version, generated_at, schemas_dir=str(schemas_dir), builder_schemas_dir=str(builder_schemas_dir), data_dir=str(data_dir), stores_dir=str(stores_dir))
+        print("\n[5/6] Exporting Static API...")
+        export_api(db, str(output_dir), version, generated_at, schemas_dir=str(schemas_dir))
     else:
-        print("\n[6/7] Skipping Static API export")
+        print("\n[5/6] Skipping Static API export")
 
-    # Step 7: Export HTML landing page
+    # Step 6: Export HTML landing page
     if not args.skip_html:
-        print("\n[7/7] Exporting HTML landing page...")
+        print("\n[6/6] Exporting HTML landing page...")
         export_html(db, str(output_dir), version, generated_at, Path(__file__).parent.resolve().joinpath("templates"))
     else:
-        print("\n[7/7] Skipping HTML export")
+        print("\n[6/6] Skipping HTML export")
 
     # Calculate checksums and write manifest
     print("\nGenerating checksums and manifest...")

builder/exporters/__init__.py

@@ -4,7 +4,6 @@
 
 from .json_exporter import export_json, export_all_json, export_ndjson, export_per_brand_json
 from .sqlite_exporter import export_sqlite
-from .sqlite_stores_exporter import export_sqlite_stores
 from .csv_exporter import export_csv
 from .api_exporter import export_api
 from .html_exporter import export_html
@@ -15,7 +14,6 @@
     'export_ndjson',
     'export_per_brand_json',
     'export_sqlite',
-    'export_sqlite_stores',
     'export_csv',
     'export_api',
     'export_html',