rcdb 2.3.1__tar.gz → 2.3.2__tar.gz

{rcdb-2.3.1/rcdb.egg-info → rcdb-2.3.2}/PKG-INFO

@@ -1,9 +1,12 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.3.1
+Version: 2.3.2
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT
+Project-URL: Homepage, https://github.com/JeffersonLab/rcdb
+Project-URL: Documentation, https://jeffersonlab.github.io/rcdb
+Project-URL: Repository, https://github.com/JeffersonLab/rcdb.git
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{rcdb-2.3.1 → rcdb-2.3.2}/pyproject.toml

@@ -50,8 +50,11 @@ dependencies = [
 examples = ["jsonpickle", "pandas"]
 dev = ["pyflakes>=3"]
 
+[project.urls]
+Homepage = "https://github.com/JeffersonLab/rcdb"
+Documentation = "https://jeffersonlab.github.io/rcdb"
+Repository = "https://github.com/JeffersonLab/rcdb.git"
 
-# If you want a console script, define it in [project.scripts]
 [project.scripts]
 rcdb = "rcdb.cli.app:rcdb_cli"
 

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/app_context.py

@@ -19,6 +19,18 @@ class RcdbApplicationContext(object):
             self._db_instance = RCDBProvider(self.connection_str)
         return self._db_instance
 
+    def close(self):
+        """Disconnect the database if one was opened.
+
+        Safe to call when no connection was ever made. The CLI registers this on
+        the Click context so the engine is disposed deterministically when the
+        command finishes, instead of waiting for garbage collection (which on
+        Python 3.13+ leaks a ``ResourceWarning: unclosed database``).
+        """
+        if self._db_instance is not None:
+            self._db_instance.disconnect()
+            self._db_instance = None
+
     def require_connected_db(self) -> RCDBProvider:
         """Return the RCDBProvider, or fail with a clear CLI error if no connection was given.
 

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/cli/app.py

@@ -60,6 +60,12 @@ def rcdb_cli(ctx, user_config, connection, config, verbose):
     for key, value in config:
         ctx.obj.set_config(key, value)
 
+    # Dispose the DB engine deterministically when the command finishes, rather
+    # than leaving it to garbage collection. On Python 3.13+ a lingering, GC'd
+    # SQLite connection emits "ResourceWarning: unclosed database" at an
+    # unpredictable time, which can leak into command output captured by tests.
+    ctx.call_on_close(ctx.obj.close)
+
     # Bo commands given
     if ctx.invoked_subcommand is None:
         # There is a connection but no subcommand

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/provider.py

@@ -150,9 +150,19 @@ class RCDBProvider(object):
     # Closes connection to data
     # ------------------------------------------------
     def disconnect(self):
-        """Closes connection to database"""
+        """Closes connection to database.
+
+        Closes the ORM session and disposes the SQLAlchemy engine so the
+        underlying connection pool releases its DBAPI connections. Without the
+        ``engine.dispose()`` the pooled SQLite/MySQL connection stays open until
+        the engine is garbage collected, which on Python 3.13+ surfaces as a
+        ``ResourceWarning: unclosed database`` at an unpredictable time.
+        """
         self._is_connected = False
-        self.session.close()
+        if self.session is not None:
+            self.session.close()
+        if self.engine is not None:
+            self.engine.dispose()
 
     # -------------------------------------------------
     # indicates ether the connection is open or not

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/version.py

@@ -1,5 +1,5 @@
 # String version. Used both for setup.py and for internal code
-version = '2.3.1'
+version = '2.3.2'
 
 # version as the tuple of ints
 version_tuple = tuple(int(val) for val in version.split('.'))

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/web/modules/select_values.py

@@ -1,3 +1,5 @@
+import sys
+
 from flask import Blueprint, request, render_template, flash, g, redirect, url_for
 from sqlalchemy import desc
 
@@ -22,16 +24,21 @@ def index():
         # Handle search request
         search_query = request.args.get('q', '')
         run_range = request.args.get('rr', '')
-        req_conditions_values = req_conditions_str.split(',')
+        # Drop blanks so an empty field or trailing comma doesn't become a bogus condition name
+        req_conditions_values = [name.strip() for name in req_conditions_str.split(',') if name.strip()]
 
         if run_from_str or run_to_str:
             run_range = run_from_str + "-" + run_to_str
 
         run_from, run_to = _parse_run_range(run_range)
 
+        # An empty field means "no bound" - map it to the full run range the API expects
+        run_min = run_from if run_from is not None else 0
+        run_max = run_to if run_to is not None else sys.maxsize
+
         try:
-            table = g.tdb.select_values(val_names=req_conditions_values, search_str=search_query, run_min=run_from,
-                                        run_max=run_to, sort_desc=True)
+            table = g.tdb.select_values(val_names=req_conditions_values, search_str=search_query, run_min=run_min,
+                                        run_max=run_max, sort_desc=True)
         except Exception as err:
             flash("Error in performing request: {}".format(err), 'danger')
             return redirect(url_for('select_values.index'))

{rcdb-2.3.1 → rcdb-2.3.2}/rcdb/web/templates/select_values/index.html

@@ -10,7 +10,7 @@
 <div class="container">
 
     <div class="blog-header"><h3 class="blog-title">Custom table</h3></div>
-    <div class="hidden-table">
+    <div class="hidden-table hidden">
         <form id="condition-form">
             <table class="table condition-table">
                 <tr>
@@ -33,7 +33,12 @@
     </div>
     <div class="row">
         <div class="col-md-4">
-            <table class="table">
+            {% if table %}
+            <button id="export-csv-btn" type="button" class="btn btn-default btn-sm" style="margin-bottom: 10px;">
+                <span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Export to CSV
+            </button>
+            {% endif %}
+            <table id="results-table" class="table">
                 <thead>
                     <tr>
                         <th>Run</th>
@@ -113,7 +118,50 @@
             });
         });
 
-        
+        // Wrap a CSV field in quotes when it contains a comma, quote or newline
+        function csvEscape(value) {
+            value = (value === null || value === undefined) ? '' : String(value);
+            if (/[",\n\r]/.test(value)) {
+                value = '"' + value.replace(/"/g, '""') + '"';
+            }
+            return value;
+        }
+
+        function tableToCsv(table) {
+            var lines = [];
+            var rows = table.querySelectorAll('tr');
+            for (var i = 0; i < rows.length; i++) {
+                var cells = rows[i].querySelectorAll('th, td');
+                var fields = [];
+                for (var j = 0; j < cells.length; j++) {
+                    fields.push(csvEscape(cells[j].textContent.trim()));
+                }
+                lines.push(fields.join(','));
+            }
+            return lines.join('\r\n');
+        }
+
+        function exportCsv() {
+            var table = document.getElementById('results-table');
+            if (!table) return;
+
+            var csv = tableToCsv(table);
+            var blob = new Blob([csv], {type: 'text/csv;charset=utf-8;'});
+            var url = URL.createObjectURL(blob);
+
+            var link = document.createElement('a');
+            link.href = url;
+            link.download = 'rcdb_select_values.csv';
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            URL.revokeObjectURL(url);
+        }
+
+        var exportBtn = document.getElementById('export-csv-btn');
+        if (exportBtn) {
+            exportBtn.addEventListener('click', exportCsv);
+        }
 
     </script>
     {{ search_box.run_search_box_scripts(condition_types, run_periods) }}

{rcdb-2.3.1 → rcdb-2.3.2/rcdb.egg-info}/PKG-INFO

@@ -1,9 +1,12 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.3.1
+Version: 2.3.2
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT
+Project-URL: Homepage, https://github.com/JeffersonLab/rcdb
+Project-URL: Documentation, https://jeffersonlab.github.io/rcdb
+Project-URL: Repository, https://github.com/JeffersonLab/rcdb.git
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9