Merge branch 'claude/infallible-taussig' into 2026-run-prep

Author: DraTeots

docs/_sidebar.md

@@ -23,6 +23,7 @@
 
 **Advanced**:
 - [Development guide](development/development.md)
+- [Database selector](development/database-selector.md)
 - [Migrate to RCDB2](development/rcdb2-migration.md)
 - [DAQ Setup](daq/daq.md)
 - [Website](web_site_setup.md)

docs/development/database-selector.md

@@ -0,0 +1,68 @@
+# Multi-Database Selector
+
+The RCDB web interface supports switching between multiple databases from the browser.
+When configured, a dropdown selector appears in the navbar allowing users to pick a database.
+The selection is saved in a cookie and persists across sessions.
+
+## How It Works
+
+- The Flask app has two config keys: `AVAILABLE_DATABASES` (a dict of `name -> connection_string`)
+  and `DEFAULT_DATABASE` (the connection string to use when no cookie is set).
+- On each request, `before_request()` checks `AVAILABLE_DATABASES`. If non-empty, it reads the
+  `rcdb_database` cookie to determine which database to connect to.
+- If the cookie is missing or invalid, it falls back to `DEFAULT_DATABASE`. If `DEFAULT_DATABASE`
+  is not in the available list, it logs a warning and uses the first entry.
+- When `AVAILABLE_DATABASES` is empty (the default), all behavior is identical to a single-database setup.
+
+## Configuration
+
+### CLI (`rcdb web`)
+
+Use the `--add-db` flag (repeatable) to register named databases:
+
+```bash
+rcdb -c mysql+pymysql://rcdb@prodhost/rcdb web \
+    --add-db "Production=mysql+pymysql://rcdb@prodhost/rcdb" \
+    --add-db "Test=mysql+pymysql://rcdb@testhost/rcdb_test"
+```
+
+- Each `--add-db` value has the format `NAME=CONNECTION_STRING`.
+- The `-c` / `--connection` / `RCDB_CONNECTION` value becomes the default database.
+- If no `-c` is provided, the first `--add-db` entry is used as the default.
+
+### WSGI
+
+Set the config keys directly in the WSGI script:
+
+```python
+import rcdb.web
+
+rcdb.web.app.config["AVAILABLE_DATABASES"] = {
+    "Production": "mysql+pymysql://rcdb@prodhost/rcdb",
+    "Test": "mysql+pymysql://rcdb@testhost/rcdb_test",
+}
+rcdb.web.app.config["DEFAULT_DATABASE"] = "mysql+pymysql://rcdb@prodhost/rcdb"
+
+application = rcdb.web.app
+```
+
+When `AVAILABLE_DATABASES` is set, the `SQL_CONNECTION_STRING` key is not used
+for connection selection (though it should still be set as a fallback).
+
+## UI Behavior
+
+The selector appears to the left of the "Run or min-max" search box in the navbar.
+Each option shows the database name and a connection hint (e.g. `Production (rcdb@prodhost)`).
+
+When the user selects a different database:
+
+1. A cookie `rcdb_database` is set (1-year expiry, `SameSite=Lax`).
+2. The current page reloads, now connected to the selected database.
+
+## Key Files
+
+| File | Role |
+|------|------|
+| `python/rcdb/web/__init__.py` | Config defaults, `before_request()` logic, `_connection_hint()` helper |
+| `python/rcdb/web/templates/layouts/base.html` | Navbar `<select>` element and JS cookie handler |
+| `python/rcdb/cli/web.py` | `--add-db` CLI option parsing |

docs/development/development.md

@@ -36,6 +36,12 @@ https://github.com/JeffersonLab/rcdb
 4. Run ```test_all_rcdb```
 
 
+## Multi-Database Selector
+
+The web interface supports switching between multiple databases from the browser.
+See [Database Selector](development/database-selector.md) for configuration details.
+
+
 ## Publishing on pypi
 
 ```bash

python/rcdb/cli/web.py

@@ -6,22 +6,61 @@
 
 
 @click.command("web")
+@click.option('--add-db', multiple=True,
+              help='Add a named database as NAME=CONNECTION_STRING. Can be specified multiple times.')
 @pass_rcdb_context
-def web_command(context):
+def web_command(context, add_db):
     """
     Runs the local RCDB web application using the connection string from
     either the CLI context or the RCDB_CONNECTION environment variable.
+
+    Use --add-db to enable a database selector in the web UI:
+
+        rcdb -c mysql://rcdb@host/rcdb web \\
+            --add-db "Production=mysql://rcdb@prodhost/rcdb" \\
+            --add-db "Test=mysql://rcdb@testhost/rcdb_test"
     """
-    # If user provided --connection on the CLI, context.db.connection_str is set:
+
+    # Resolve the default connection string
     rcdb_provider = context.db
     if rcdb_provider and rcdb_provider.connection_string:
         assert isinstance(rcdb_provider, RCDBProvider)
-        rcdb_web.app.config["SQL_CONNECTION_STRING"] = rcdb_provider.connection_string
+        connection_string = rcdb_provider.connection_string
     elif "RCDB_CONNECTION" in os.environ:
-        # Otherwise check the environment variable
-        rcdb_web.app.config["SQL_CONNECTION_STRING"] = os.environ["RCDB_CONNECTION"]
+        connection_string = os.environ["RCDB_CONNECTION"]
+    else:
+        connection_string = None
+
+    # Parse --add-db entries into AVAILABLE_DATABASES
+    if add_db:
+        available = {}
+        for entry in add_db:
+            if '=' not in entry:
+                click.echo(f"ERROR: --add-db value must be NAME=CONNECTION_STRING, got: {entry}")
+                raise SystemExit(1)
+            name, conn = entry.split('=', 1)
+            name = name.strip()
+            conn = conn.strip()
+            if not name or not conn:
+                click.echo(f"ERROR: --add-db value must have non-empty NAME and CONNECTION_STRING: {entry}")
+                raise SystemExit(1)
+            available[name] = conn
+
+        rcdb_web.app.config["AVAILABLE_DATABASES"] = available
+
+        if connection_string:
+            rcdb_web.app.config["DEFAULT_DATABASE"] = connection_string
+        else:
+            # No -c provided, use the first --add-db entry as default
+            first_conn = next(iter(available.values()))
+            rcdb_web.app.config["DEFAULT_DATABASE"] = first_conn
+            connection_string = first_conn
+
+        # SQL_CONNECTION_STRING is still needed as a fallback
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = connection_string
+    elif connection_string:
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = connection_string
     else:
-        # If neither is present, show an error and exit
         click.echo("ERROR: no connection string found. Provide via CLI or RCDB_CONNECTION env variable.")
         raise SystemExit(1)
 

python/rcdb/web/__init__.py

@@ -1,5 +1,8 @@
+import logging
 import os
 from datetime import datetime
+from urllib.parse import urlparse
+
 from flask import Flask, render_template, g, request, url_for
 from sqlalchemy.orm import subqueryload
 
@@ -15,11 +18,38 @@
 from rcdb.web.modules import conditions_module
 from rcdb.web.modules import select_values_module
 
+logger = logging.getLogger(__name__)
+
 DEBUG = True
 SECRET_KEY = 'development key'
 USERNAME = 'admin'
 PASSWORD = 'default'
 SQL_CONNECTION_STRING = "mysql+pymysql://rcdb@127.0.0.1/rcdb"
+AVAILABLE_DATABASES = {}   # dict of {"name": "connection_string", ...}
+DEFAULT_DATABASE = ""       # connection string used as default
+
+
+def _connection_hint(conn_str):
+    """Extract a short hint from a SQLAlchemy connection string.
+
+    Examples:
+        "mysql+pymysql://rcdb@127.0.0.1/rcdb" -> "rcdb@127.0.0.1"
+        "sqlite:///path/to/file.db"            -> "file.db"
+    """
+    try:
+        parsed = urlparse(conn_str)
+        if parsed.scheme.startswith("sqlite"):
+            # For sqlite, show just the filename
+            path = parsed.path.lstrip("/")
+            return os.path.basename(path) if path else conn_str
+        # For mysql/postgres etc, show user@host
+        host = parsed.hostname or ""
+        user = parsed.username or ""
+        if user:
+            return f"{user}@{host}"
+        return host or conn_str
+    except Exception:
+        return conn_str
 
 
 # Get the current directory
@@ -33,8 +63,45 @@
 
 @app.before_request
 def before_request():
+    available_dbs = app.config.get("AVAILABLE_DATABASES", {})
+
+    if available_dbs:
+        # Determine which database to connect to
+        cookie_db = request.cookies.get("rcdb_database", "")
+        default_conn = app.config.get("DEFAULT_DATABASE", "")
+
+        if cookie_db and cookie_db in available_dbs:
+            # Cookie points to a valid database
+            active_name = cookie_db
+        elif default_conn:
+            # Find name for the default connection string
+            active_name = None
+            for name, conn in available_dbs.items():
+                if conn == default_conn:
+                    active_name = name
+                    break
+            if active_name is None:
+                # DEFAULT_DATABASE not in AVAILABLE_DATABASES
+                active_name = next(iter(available_dbs))
+                logger.warning(
+                    "DEFAULT_DATABASE '%s' is not in AVAILABLE_DATABASES, "
+                    "using '%s' instead.", default_conn, active_name
+                )
+        else:
+            # No default set, use first available
+            active_name = next(iter(available_dbs))
+
+        connection_string = available_dbs[active_name]
+        g.active_db_name = active_name
+        g.available_databases = available_dbs
+    else:
+        # Original single-database behavior
+        connection_string = app.config["SQL_CONNECTION_STRING"]
+        g.active_db_name = None
+        g.available_databases = {}
+
     g.tdb = rcdb.ConfigurationProvider()
-    g.tdb.connect(app.config["SQL_CONNECTION_STRING"])
+    g.tdb.connect(connection_string)
     app.jinja_env.globals['datetime_now'] = datetime.now
 
 
@@ -101,6 +168,7 @@ def url_for_other_page(page):
 
 app.jinja_env.globals['url_for_other_page'] = url_for_other_page
 app.jinja_env.globals['rcdb_default_alias'] = rcdb.alias.default_aliases
+app.jinja_env.globals['connection_hint'] = _connection_hint
 
 app.register_blueprint(runs_module)
 app.register_blueprint(logs_module)

python/rcdb/web/templates/layouts/base.html

@@ -72,6 +72,13 @@
                     <!-- Search form -->
                     <form class="navbar-form navbar-left" role="search" action="{{ url_for('runs.search') }}" method="get">
                         <div class="input-group input-group-sm" style="min-width: 500px">
+                            {% if g.available_databases %}
+                            <select id="dbSelector" class="form-control" style="width:auto; margin-right:4px;">
+                                {% for name, conn in g.available_databases.items() %}
+                                <option value="{{ name }}" {% if name == g.active_db_name %}selected{% endif %}>{{ name }} ({{ connection_hint(conn) }})</option>
+                                {% endfor %}
+                            </select>
+                            {% endif %}
                             <input type="text" class="form-control" placeholder="Run or min-max" name="rr" style="width:28%; margin-right:4px;">
                             <input type="text" class="form-control" placeholder="Query" name="q" style="width:70%; ">
                             <span class="input-group-btn"><button id="qGoBtn" type="submit" class="btn btn-default">GO</button></span>
@@ -269,6 +276,13 @@
 
             var $editor = $('#editor');
 
+            // Database selector: save choice in cookie and reload
+            $("#dbSelector").on("change", function() {
+                var dbName = $(this).val();
+                document.cookie = "rcdb_database=" + encodeURIComponent(dbName) + ";path=/;max-age=31536000;SameSite=Lax";
+                location.reload();
+            });
+
             {#%
                 Show help popover about how to use query window
             %#}