rcdb 2.1.1__tar.gz → 2.2.2__tar.gz

{rcdb-2.1.1/rcdb.egg-info → rcdb-2.2.2}/PKG-INFO

@@ -1,47 +1,50 @@
-Metadata-Version: 2.2
-Name: rcdb
-Version: 2.1.1
-Summary: RCDB - Run Conditions DataBase
-Author-email: Dmitry Romanov <romanov@jlab.org>
-License: MIT
-Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-Requires-Dist: markupsafe>=3.0
-Requires-Dist: pymysql>=1.1
-Requires-Dist: ply>=3.11
-Requires-Dist: mako>=1.3
-Requires-Dist: click>=8
-Requires-Dist: sqlalchemy>=2
-Requires-Dist: flask>=3.1.0
-
-## RCDB
-
-![Python tests](https://github.com/JeffersonLab/rcdb/actions/workflows/python-tests.yml/badge.svg)
-
-Run Configuration/Conditions Database (RCDB) stores run related information and conditions. It uses MySQL or SQLite databases to store information about runs and provides interfaces to search runs, manage data, automatic CODA integration, etc. 
-
-The interfaces available are:  
-- Web site
-- Command line interface (CLI)
-- Python API
-- C++ API
-- Possibly JAVA API
-
-#### Documentation:
-https://github.com/JeffersonLab/rcdb/wiki
-
-#### Web site:
-One can visit HallD RCDB Web site as demo:  
-https://halldweb.jlab.org/rcdb/
-
-#### SQLite db:
-Daily updated SQLite database is available here:  
-https://halldweb.jlab.org/dist/rcdb.sqlite
+Metadata-Version: 2.4
+Name: rcdb
+Version: 2.2.2
+Summary: RCDB - Run Conditions DataBase
+Author-email: Dmitry Romanov <romanov@jlab.org>
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+Requires-Dist: markupsafe>=3.0
+Requires-Dist: pymysql>=1.1
+Requires-Dist: ply>=3.11
+Requires-Dist: mako>=1.3
+Requires-Dist: click>=8
+Requires-Dist: sqlalchemy>=2
+Requires-Dist: flask>=3.1.0
+
+## RCDB
+
+![Python tests](https://github.com/JeffersonLab/rcdb/actions/workflows/python-tests.yml/badge.svg)
+[![Python examples work](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml/badge.svg)](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml)
+
+Run Configuration/Conditions Database (RCDB) stores run related information and conditions. It uses MySQL or SQLite databases to store information about runs and provides interfaces to search runs, manage data, automatic CODA integration, etc. 
+
+The interfaces available are:  
+- Web site
+- Command line interface (CLI)
+- Python API
+- C++ API
+- Possibly JAVA API
+
+#### Documentation:
+
+https://jeffersonlab.github.io/rcdb/
+
+#### Demo website:
+One can visit HallD RCDB Web site as demo:  
+https://halldweb.jlab.org/rcdb/
+
+
+#### SQLite db:
+Daily updated SQLite database is available here:  
+https://halldweb.jlab.org/dist/rcdb2.sqlite

{rcdb-2.1.1 → rcdb-2.2.2}/README.md

@@ -1,6 +1,7 @@
 ## RCDB
 
 ![Python tests](https://github.com/JeffersonLab/rcdb/actions/workflows/python-tests.yml/badge.svg)
+[![Python examples work](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml/badge.svg)](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml)
 
 Run Configuration/Conditions Database (RCDB) stores run related information and conditions. It uses MySQL or SQLite databases to store information about runs and provides interfaces to search runs, manage data, automatic CODA integration, etc. 
 
@@ -12,12 +13,14 @@ The interfaces available are:
 - Possibly JAVA API
 
 #### Documentation:
-https://github.com/JeffersonLab/rcdb/wiki
 
-#### Web site:
+https://jeffersonlab.github.io/rcdb/
+
+#### Demo website:
 One can visit HallD RCDB Web site as demo:  
 https://halldweb.jlab.org/rcdb/
 
+
 #### SQLite db:
 Daily updated SQLite database is available here:  
-https://halldweb.jlab.org/dist/rcdb.sqlite
+https://halldweb.jlab.org/dist/rcdb2.sqlite

{rcdb-2.1.1 → rcdb-2.2.2}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
 
 # If you want a console script, define it in [project.scripts]
 [project.scripts]
-rcdb = "rcdb:run_rcdb_cli"
+rcdb = "rcdb"
 
 # Tell setuptools how to find your packages if needed:
 [tool.setuptools.packages.find]

{rcdb-2.1.1 → rcdb-2.2.2}/rcdb/__init__.py

@@ -1,7 +1,6 @@
 from .model import ConditionType
 from .provider import RCDBProvider
 from .provider import ConfigurationProvider
-from .rcdb_cli.app import rcdb_cli as run_rcdb_cli
 from .errors import *
 
 # This thing separates cells in data blob

rcdb-2.2.2/rcdb/__main__.py

@@ -0,0 +1,7 @@
+# This is the same as rcdb.cli.api:rcdb_cli
+# The logic to have it here, is that if one uses:
+# python -m rcdb - it works like 'rcdb' command
+
+from rcdb.cli.app import rcdb_cli
+
+rcdb_cli(prog_name="rcdb")

{rcdb-2.1.1 → rcdb-2.2.2}/rcdb/admin_cmd.py

@@ -79,10 +79,5 @@ def ls(context, search, is_long):
         click.echo("{0:<{1}}   {2}".format(name, longest_len, cnd_type.description))
 
 
-
-
-
-
-
 if __name__ == '__main__':
     cli(prog_name="rcdb")

rcdb-2.2.2/rcdb/cli/__main__.py

@@ -0,0 +1,3 @@
+from rcdb.cli.app import rcdb_cli
+
+rcdb_cli(prog_name="rcdb")

{rcdb-2.1.1/rcdb/rcdb_cli → rcdb-2.2.2/rcdb/cli}/app.py

@@ -12,6 +12,7 @@ from .ls import ls as ls_cmd
 from .repair import repair as repair_grp
 from .db import db as db_grp
 from .rp import rp as rp_grp
+from .web import web as web_cmd
 
 
 pass_rcdb_context = click.make_pass_decorator(RcdbApplicationContext)
@@ -72,6 +73,9 @@ rcdb_cli.add_command(db_grp)
 # noinspection PyTypeChecker
 rcdb_cli.add_command(rp_grp)
 
+# Add 'web' group of commands
+# noinspection PyTypeChecker
+rcdb_cli.add_command(web_cmd)
 
 
 @rcdb_cli.command()

{rcdb-2.1.1/rcdb/rcdb_cli → rcdb-2.2.2/rcdb/cli}/db.py

@@ -6,7 +6,7 @@ from sqlalchemy.exc import OperationalError
 import rcdb
 from rcdb import RCDBProvider
 from rcdb.model import SchemaVersion, Alias, RunPeriod
-from rcdb.rcdb_cli.context import pass_rcdb_context
+from rcdb.cli.context import pass_rcdb_context
 from rcdb.provider import stamp_schema_version
 
 
@@ -29,7 +29,6 @@ def db(ctx):
         print("Schema version: {} - '{}'".format(schema_version.version, schema_version.comment))
 
 
-# add a command to the 'db' group
 @db.command()
 @pass_rcdb_context
 def update(context):
@@ -37,14 +36,14 @@ def update(context):
 
     # Check something exists
     if not sqlalchemy.inspect(provider.engine).has_table(SchemaVersion.__tablename__):
-        print('The schema version table does not exists. It looks like RCDB v1.')
+        print('The schema version table does not exist. It looks like RCDB v1.')
         current_version = 1
     else:
         print('Found schema version table')
         # Check schema version
         current_version = provider.get_schema_version()
 
-    if current_version !=1:
+    if current_version != 1:
         print(f"Can't update schema version. Current version is: {current_version.version}. This command can update:")
         print(f"   DB v1 --> v2")
         return
@@ -62,8 +61,6 @@ def update(context):
     if not click.confirm('Do you really want to continue?'):
         return
 
-    # TODO move next it to provider, create schema_update_v1_v2 function !!!
-
     # That we will need for DB
     metadata = rcdb.model.Base.metadata
     provider = RCDBProvider(context.connection_str, check_version=False)
@@ -74,21 +71,31 @@ def update(context):
     # Create run periods table
     RunPeriod.__table__.create(provider.engine)
 
-    with provider.engine.connect() as conn:
-        conn.execute("""
-            DROP TABLE IF EXISTS `trigger_thresholds` ;
-            DROP TABLE IF EXISTS `trigger_masks` ;
-            DROP TABLE IF EXISTS `readout_thresholds` ;
-            DROP TABLE IF EXISTS `readout_masks` ;
-            DROP TABLE IF EXISTS `dac_presets` ;
-            DROP TABLE IF EXISTS `crates` ;
-            DROP TABLE IF EXISTS `boards` ;
-            DROP TABLE IF EXISTS `board_installations_have_runs` ;
-            DROP TABLE IF EXISTS `board_installations` ;
-            DROP TABLE IF EXISTS `board_configurations_have_runs` ;
-            DROP TABLE IF EXISTS `board_configurations` ;
-            DROP TABLE IF EXISTS `alembic_version` ;
-        """)
+    # List of old tables to drop
+    tables_to_drop = [
+        'trigger_thresholds',
+        'trigger_masks',
+        'readout_thresholds',
+        'readout_masks',
+        'dac_presets',
+        'crates',
+        'boards',
+        'board_installations_have_runs',
+        'board_installations',
+        'board_configurations_have_runs',
+        'board_configurations',
+        'alembic_version'
+    ]
+
+    with provider.engine.begin() as conn:
+        inspector = sqlalchemy.inspect(conn)
+        existing_tables = inspector.get_table_names()
+
+        # Drop each table if it is present
+        for t in tables_to_drop:
+            if t in existing_tables:
+                print(f"Dropping table '{t}'")
+                conn.execute(sqlalchemy.text(f"DROP TABLE {t}"))
 
     # Set correct version
     version = stamp_schema_version(provider)
@@ -98,8 +105,9 @@ def update(context):
 @db.command()
 @click.option('--no-defaults', is_flag=True, help="Don't create default condition types")
 @click.option('--drop-all', is_flag=True, help='Drops existing RCDB data if exists')
+@click.option('--confirm', is_flag=True, help='For CI automation and tests')
 @pass_rcdb_context
-def init(context, drop_all, no_defaults):
+def init(context, drop_all, no_defaults, confirm):
     """Database management commands."""
 
     # PRINTOUT PART
@@ -112,7 +120,7 @@ def init(context, drop_all, no_defaults):
     print("\nDB: {}\n".format(context.connection_str))
 
     # Double check user knows what will happen
-    if not click.confirm('Do you really want to continue?'):
+    if not confirm and not click.confirm('Do you really want to continue?'):
         return
 
     # That we will need for DB

{rcdb-2.1.1/rcdb/rcdb_cli → rcdb-2.2.2/rcdb/cli}/repair/evio_files.py

@@ -5,7 +5,7 @@ import click
 import glob
 from rcdb.app_context import minmax_run_range, parse_run_range
 from rcdb.provider import  RCDBProvider
-from rcdb.rcdb_cli.context import pass_rcdb_context
+from rcdb.cli.context import pass_rcdb_context
 import json
 
 def sizeof_fmt(num, suffix="B"):

{rcdb-2.1.1/rcdb/rcdb_cli → rcdb-2.2.2/rcdb/cli}/rp.py

@@ -7,7 +7,7 @@ from sqlalchemy.exc import OperationalError
 import rcdb
 from rcdb import RCDBProvider
 from rcdb.model import RunPeriod
-from rcdb.rcdb_cli.context import pass_rcdb_context
+from rcdb.cli.context import pass_rcdb_context
 
 @click.group(invoke_without_command=True)
 @click.pass_context

rcdb-2.2.2/rcdb/cli/web.py

@@ -0,0 +1,27 @@
+import os
+import click
+
+from rcdb import web as rcdb_web
+from .context import pass_rcdb_context
+
+
+@click.command("web")
+@pass_rcdb_context
+def web(context):
+    """
+    Runs the local RCDB web application using the connection string from
+    either the CLI context or the RCDB_CONNECTION environment variable.
+    """
+    # If user provided --connection on the CLI, context.db.connection_str is set:
+    if context.db and context.db.connect_str:
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = context.db.connect_str
+    elif "RCDB_CONNECTION" in os.environ:
+        # Otherwise check the environment variable
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = os.environ["RCDB_CONNECTION"]
+    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)
+
+    # Start the Flask dev server
+    rcdb_web.app.run()

{rcdb-2.1.1 → rcdb-2.2.2}/rcdb/version.py

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

{rcdb-2.1.1 → rcdb-2.2.2/rcdb.egg-info}/PKG-INFO

@@ -1,47 +1,50 @@
-Metadata-Version: 2.2
-Name: rcdb
-Version: 2.1.1
-Summary: RCDB - Run Conditions DataBase
-Author-email: Dmitry Romanov <romanov@jlab.org>
-License: MIT
-Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-Requires-Dist: markupsafe>=3.0
-Requires-Dist: pymysql>=1.1
-Requires-Dist: ply>=3.11
-Requires-Dist: mako>=1.3
-Requires-Dist: click>=8
-Requires-Dist: sqlalchemy>=2
-Requires-Dist: flask>=3.1.0
-
-## RCDB
-
-![Python tests](https://github.com/JeffersonLab/rcdb/actions/workflows/python-tests.yml/badge.svg)
-
-Run Configuration/Conditions Database (RCDB) stores run related information and conditions. It uses MySQL or SQLite databases to store information about runs and provides interfaces to search runs, manage data, automatic CODA integration, etc. 
-
-The interfaces available are:  
-- Web site
-- Command line interface (CLI)
-- Python API
-- C++ API
-- Possibly JAVA API
-
-#### Documentation:
-https://github.com/JeffersonLab/rcdb/wiki
-
-#### Web site:
-One can visit HallD RCDB Web site as demo:  
-https://halldweb.jlab.org/rcdb/
-
-#### SQLite db:
-Daily updated SQLite database is available here:  
-https://halldweb.jlab.org/dist/rcdb.sqlite
+Metadata-Version: 2.4
+Name: rcdb
+Version: 2.2.2
+Summary: RCDB - Run Conditions DataBase
+Author-email: Dmitry Romanov <romanov@jlab.org>
+License: MIT
+Classifier: Development Status :: 4 - Beta
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+Requires-Dist: markupsafe>=3.0
+Requires-Dist: pymysql>=1.1
+Requires-Dist: ply>=3.11
+Requires-Dist: mako>=1.3
+Requires-Dist: click>=8
+Requires-Dist: sqlalchemy>=2
+Requires-Dist: flask>=3.1.0
+
+## RCDB
+
+![Python tests](https://github.com/JeffersonLab/rcdb/actions/workflows/python-tests.yml/badge.svg)
+[![Python examples work](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml/badge.svg)](https://github.com/JeffersonLab/rcdb/actions/workflows/python-examples.yml)
+
+Run Configuration/Conditions Database (RCDB) stores run related information and conditions. It uses MySQL or SQLite databases to store information about runs and provides interfaces to search runs, manage data, automatic CODA integration, etc. 
+
+The interfaces available are:  
+- Web site
+- Command line interface (CLI)
+- Python API
+- C++ API
+- Possibly JAVA API
+
+#### Documentation:
+
+https://jeffersonlab.github.io/rcdb/
+
+#### Demo website:
+One can visit HallD RCDB Web site as demo:  
+https://halldweb.jlab.org/rcdb/
+
+
+#### SQLite db:
+Daily updated SQLite database is available here:  
+https://halldweb.jlab.org/dist/rcdb2.sqlite

{rcdb-2.1.1 → rcdb-2.2.2}/rcdb.egg-info/SOURCES.txt

@@ -27,17 +27,18 @@ rcdb.egg-info/dependency_links.txt
 rcdb.egg-info/entry_points.txt
 rcdb.egg-info/requires.txt
 rcdb.egg-info/top_level.txt
-rcdb/rcdb_cli/__init__.py
-rcdb/rcdb_cli/__main__.py
-rcdb/rcdb_cli/app.py
-rcdb/rcdb_cli/context.py
-rcdb/rcdb_cli/db.py
-rcdb/rcdb_cli/ls.py
-rcdb/rcdb_cli/mkdb.py
-rcdb/rcdb_cli/rp.py
-rcdb/rcdb_cli/run.py
-rcdb/rcdb_cli/repair/__init__.py
-rcdb/rcdb_cli/repair/evio_files.py
+rcdb/cli/__init__.py
+rcdb/cli/__main__.py
+rcdb/cli/app.py
+rcdb/cli/context.py
+rcdb/cli/db.py
+rcdb/cli/ls.py
+rcdb/cli/mkdb.py
+rcdb/cli/rp.py
+rcdb/cli/run.py
+rcdb/cli/web.py
+rcdb/cli/repair/__init__.py
+rcdb/cli/repair/evio_files.py
 rcdb/web/__init__.py
 rcdb/web/pagination.py
 rcdb/web/run_table.py

rcdb-2.2.2/rcdb.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+rcdb = rcdb

{rcdb-2.1.1 → rcdb-2.2.2}/setup.cfg

@@ -1,4 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+

rcdb-2.1.1/rcdb/__main__.py

@@ -1,3 +0,0 @@
-from rcdb.rcdb_cli.app import rcdb_cli
-
-rcdb_cli()

rcdb-2.1.1/rcdb/rcdb_cli/__main__.py

@@ -1,3 +0,0 @@
-from rcdb.rcdb_cli.app import rcdb_cli
-
-rcdb_cli(prog_name="rcdb")

rcdb-2.1.1/rcdb.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-rcdb = rcdb:run_rcdb_cli