rcdb 2.2.6__tar.gz → 2.2.8__tar.gz

{rcdb-2.2.6/rcdb.egg-info → rcdb-2.2.8}/PKG-INFO

@@ -1,16 +1,22 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.6
+Version: 2.2.8
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 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
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Database
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: markupsafe>=3.0
@@ -20,6 +26,7 @@ Requires-Dist: mako>=1.3
 Requires-Dist: click>=8
 Requires-Dist: sqlalchemy>=2
 Requires-Dist: flask>=3.1.0
+Requires-Dist: rich
 
 ## RCDB
 

{rcdb-2.2.6 → rcdb-2.2.8}/pyproject.toml

@@ -19,13 +19,19 @@ authors = [
     { name="Dmitry Romanov", email="romanov@jlab.org" }
 ]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13"
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Topic :: Scientific/Engineering :: Physics",
+    "Topic :: Database"
 ]
 requires-python = ">=3.9"
 dependencies = [
@@ -35,7 +41,8 @@ dependencies = [
     "mako>=1.3",
     "click>=8",
     "sqlalchemy>=2",
-    "flask>=3.1.0"
+    "flask>=3.1.0",
+    "rich"
 ]
 
 # If you want a console script, define it in [project.scripts]

rcdb-2.2.8/rcdb/cli/app.py

@@ -0,0 +1,66 @@
+import os
+import sys
+import posixpath
+import click
+from click import Command
+
+from rcdb.app_context import RcdbApplicationContext, parse_run_range
+from rcdb import RCDBProvider
+from rcdb.model import ConfigurationFile
+from rcdb.version import version as rcdb_version
+
+from .ls import ls_command
+from .repair import repair_command
+from .db import db_command
+from .rp import rp_command
+from .web import web_command
+from .info import info_command
+
+
+pass_rcdb_context = click.make_pass_decorator(RcdbApplicationContext)
+
+
+def get_default_config_path():
+    return os.path.join(os.path.expanduser('~'), '.rcdb_user')
+
+
+@click.group(invoke_without_command=True)
+@click.option('--user-config', envvar='RCDB_USER_CONFIG', default=get_default_config_path, metavar='PATH', help='Changes the user config location.')
+@click.option('--connection', '-c', envvar='RCDB_CONNECTION', help='Database connection string', default=None, required=False)
+@click.option('--config', nargs=2, multiple=True, metavar='KEY VALUE', help='Overrides a config key/value pair.')
+@click.option('--verbose', '-v', is_flag=True, help='Enables verbose mode.')
+@click.version_option(rcdb_version)
+@click.pass_context
+def rcdb_cli(ctx, user_config, connection, config, verbose):
+    """'rcdb' is a RCDB (run conditions database) command line tool
+    This tool allows to select runs and get values as well as manage RCDB values
+
+    RCDB CLI needs a DB connection string which could be provided via:
+    - RCDB_CONNECTION environment variable
+    - -c/--connection flag
+    """
+
+    # Create a rcdb_app_context object and remember it as the context object.  From
+    # this point onwards other commands can refer to it by using the
+    # @pass_rcdb_context decorator.
+    if not connection:
+        print("(!)WARNING no connection provided! "
+              "Provide DB connection string via --connection/-c or RCDB_CONNECTION environment variable.")
+    ctx.obj = RcdbApplicationContext(os.path.abspath(user_config), connection)
+    ctx.obj.verbose = verbose
+    for key, value in config:
+        ctx.obj.set_config(key, value)
+
+    if ctx.invoked_subcommand is None:
+        "No command was specified"
+        click.echo(ctx.get_help())
+
+
+# Add commands to application
+rcdb_cli.add_command(ls_command)
+rcdb_cli.add_command(repair_command)
+rcdb_cli.add_command(db_command)
+rcdb_cli.add_command(rp_command)
+rcdb_cli.add_command(web_command)
+rcdb_cli.add_command(info_command)
+

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/context.py

@@ -2,4 +2,4 @@
 import click
 from rcdb.app_context import RcdbApplicationContext
 
-pass_rcdb_context = click.make_pass_decorator(RcdbApplicationContext)
+pass_rcdb_context = click.make_pass_decorator(RcdbApplicationContext)

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/db.py

@@ -10,9 +10,9 @@ from rcdb.cli.context import pass_rcdb_context
 from rcdb.provider import stamp_schema_version
 
 
-@click.group(invoke_without_command=True)
+@click.group(name="db", invoke_without_command=True)
 @click.pass_context
-def db(ctx):
+def db_command(ctx):
     """Database management commands."""
     if ctx.invoked_subcommand is None:
         connection_str = ctx.obj.connection_str
@@ -29,7 +29,7 @@ def db(ctx):
         print("Schema version: {} - '{}'".format(schema_version.version, schema_version.comment))
 
 
-@db.command()
+@db_command.command()
 @pass_rcdb_context
 def update(context):
     provider = RCDBProvider(context.connection_str, check_version=False)
@@ -102,7 +102,7 @@ def update(context):
     print("Stamped schema version: {} - '{}'".format(version.version, version.comment))
 
 
-@db.command()
+@db_command.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')

rcdb-2.2.8/rcdb/cli/info.py

@@ -0,0 +1,53 @@
+import click
+import datetime
+from .context import pass_rcdb_context
+from rcdb.model import Condition, Run, ConfigurationFile, RunPeriod
+
+
+@click.command("info", help="Prints summary info about RCDB contents")
+@pass_rcdb_context
+def info_command(context):
+    """
+    Shows various summary information about the RCDB database contents.
+    """
+    db = context.db
+
+    # Number of conditions
+    cnd_count = db.session.query(Condition).count()
+
+    # Date-time of the last condition added:
+    last_cnd = db.session.query(Condition).order_by(Condition.id.desc()).first()
+    cnd_last_time = last_cnd.created if (last_cnd and hasattr(last_cnd, 'created')) else None
+
+    # Number of runs saved
+    run_count = db.session.query(Run).count()
+
+    # Number of files saved
+    file_count = db.session.query(ConfigurationFile).count()
+
+    # The last 5 runs saved (by run_number DESC)
+    last_5_runs = db.session.query(Run).order_by(Run.number.desc()).limit(5).all()
+
+    # The number of run periods saved
+    rp_count = db.session.query(RunPeriod).count()
+
+    # 6. The last run period (by ID DESC, or whichever logic you prefer)
+    last_rp = db.session.query(RunPeriod).order_by(RunPeriod.id.desc()).first()
+
+    # Print it all
+    click.echo(f"Number of conditions: {cnd_count}")
+    click.echo(f"Last condition date/time: {cnd_last_time}")
+    click.echo(f"Number of runs: {run_count}")
+    click.echo(f"Number of files: {file_count}")
+    click.echo("Last 5 runs saved: " +
+               ", ".join(str(r.number) for r in last_5_runs) if last_5_runs else "No runs")
+    click.echo(f"Number of run periods: {rp_count}")
+    if last_rp:
+        click.echo(f"Last run period: {last_rp.name} (ID={last_rp.id})")
+    else:
+        click.echo("No run periods found.")
+
+    # Finally, show all possible commands (help):
+    ctx = click.get_current_context()
+    click.echo("\n==== Available commands ====")
+    click.echo(ctx.parent.get_help())

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/ls.py

@@ -4,12 +4,12 @@ from rcdb.provider import RCDBProvider
 from .context import pass_rcdb_context
 
 
-@click.command()
+@click.command(name="ls")
 @click.argument('search', required=False)
 @click.option('--long', '-l', 'is_long', is_flag=True, help='Prints condition full information')
 @pass_rcdb_context
-def ls(context, search, is_long):
-    """Lists conditions"""
+def ls_command(context, search, is_long):
+    """List conditions"""
 
     db = context.db
     assert isinstance(db, RCDBProvider)

rcdb-2.2.8/rcdb/cli/repair/__init__.py

@@ -0,0 +1,12 @@
+import click
+from .evio_files import evio_files_command
+
+
+@click.group(name="repair")
+def repair_command():
+    """ Group of commands that help repair and consolidate RCDB """
+    pass
+
+
+repair_command.add_command(evio_files_command)
+

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/repair/evio_files.py

@@ -8,6 +8,7 @@ from rcdb.provider import  RCDBProvider
 from rcdb.cli.context import pass_rcdb_context
 import json
 
+
 def sizeof_fmt(num, suffix="B"):
     for unit in ["", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
         if abs(num) < 1024.0:
@@ -15,6 +16,7 @@ def sizeof_fmt(num, suffix="B"):
         num /= 1024.0
     return f"{num:.1f}Yi{suffix}"
 
+
 def read_run_directories(mask, run_min, run_max):
     run_dirs = glob.glob(mask)
 
@@ -46,14 +48,14 @@ def read_run_directories(mask, run_min, run_max):
 
     return run_files
 
-@click.command()
+@click.command(name="evio-files")
 @click.option('--run-range', required=False, default=None)
 @click.option('--mask', required=False, default="/gluex/data/rawdata/all/Run*111*")
 @click.option('--save-list', required=False, default=None, help="Save found evio files to json file with this name")
 @click.option('--load-list', required=False, default=None, help="Instead of scanning, load eviofiles from a list")
 @click.option('--execute', is_flag=True, required=False, default=False, help="Instead of scanning, load eviofiles from a list")
 @pass_rcdb_context
-def evio_files(ctx, run_range, mask, save_list, load_list, execute):
+def evio_files_command(ctx, run_range, mask, save_list, load_list, execute):
     """ 
     Example of usage: 
       # search /mss and save evio files to a json file list

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/rp.py

@@ -9,9 +9,10 @@ from rcdb import RCDBProvider
 from rcdb.model import RunPeriod
 from rcdb.cli.context import pass_rcdb_context
 
-@click.group(invoke_without_command=True)
+
+@click.group(name="rp", invoke_without_command=True)
 @click.pass_context
-def rp(context):
+def rp_command(context):
     """
     Run Periods management commands.
 
@@ -38,7 +39,7 @@ def rp(context):
     print_run_periods(run_periods)
 
 
-@rp.command()
+@rp_command.command()
 @click.option('--name', required=True, help="Name of the run period, e.g. RunPeriod-2025-01.")
 @click.option('--description', default='', help="Description of the run period.")
 @click.option('--run-min', 'run_min', required=True, type=int, help="Minimum run number in the period.")
@@ -90,7 +91,8 @@ def add(context, name, description, run_min, run_max, start_date, end_date):
 
     print(f"Added new run period: {new_period}")
 
-@rp.command()
+
+@rp_command.command()
 @click.argument('period_id', type=int)
 @click.option('--yes', is_flag=True, help="Skip prompt confirmation and remove directly.")
 @pass_rcdb_context
@@ -122,7 +124,8 @@ def rm(context, period_id, yes):
     session.commit()
     print(f"Removed run period ID={period_id} ({rp_item.name}).")
 
-@rp.command()
+
+@rp_command.command()
 @click.argument('period_id', type=int)
 @click.option('--name', default=None, help="New name of the run period.")
 @click.option('--description', default=None, help="New description of the run period.")
@@ -166,6 +169,7 @@ def update(context, period_id, name, description, run_min, run_max, start_date,
     session.commit()
     print(f"Updated run period ID={period_id}: {rp_item}")
 
+
 def print_run_periods(run_periods):
     # 1) Gather data strings and compute column widths
     # ------------------------------------------------

rcdb-2.2.8/rcdb/cli/select.py

@@ -0,0 +1,84 @@
+import sys
+import click
+
+from rcdb.app_context import parse_run_range
+from rcdb import RCDBProvider
+from rcdb.cli.context import pass_rcdb_context
+
+
+def _process_sel_args(args):
+    """
+    Process the argument list and extract a run range string, query and view.
+    :param args: list of user arguments.
+    :return: (run_range_str, query, view)
+    """
+    run_range_str = ''
+    for arg in args:
+        if '-' in arg:
+            run_range_str = arg
+            args = [a for a in args if a != arg]
+            break
+
+    if len(args) == 0:
+        return run_range_str, None, None
+    if len(args) == 1:
+        return run_range_str, args[0], None
+
+    return run_range_str, args[0], args[1]
+
+
+@click.command(name="select")
+@click.argument('query', required=False)
+@click.argument('views_or_runs', nargs=-1)
+@click.option('--dump', '-d', 'is_dump_view', is_flag=True,
+              help='Display results in export-friendly format without borders or extra formatting')
+@click.option('--desc/--asc', '-d/-a', 'is_descending', default=False,
+              help="Sort order of run number descending or ascending")
+@pass_rcdb_context
+def select_command(rcdb_context, query, views_or_runs, is_dump_view, is_descending):
+    """Select runs and get their values."""
+    assert isinstance(rcdb_context.db, RCDBProvider)
+    args = []
+    if query is not None:
+        args.append(str(query))
+    args.extend([str(v) for v in views_or_runs])
+    run_range_str, query, view = _process_sel_args(args)
+
+    run_periods = rcdb_context.db.get_run_periods()
+    run_min, run_max = parse_run_range(run_range_str, run_periods)
+
+    if run_min is None:
+        run_min = 0
+    if run_max is None:
+        run_max = sys.maxsize  # Use sys.maxsize in Python 3 instead of sys.maxint
+
+    if query == '@' or query is None:
+        query = ''
+
+    if not view:
+        view = "event_count run_config"
+
+    conditions_to_show = view.split()
+
+    values = rcdb_context.db.select_values([], query, run_min, run_max)
+
+    if not is_dump_view:
+
+        from rich.table import Table
+        from rich.console import Console
+
+        console = Console()
+        table = Table(show_header=True, header_style="bold magenta")
+        table.add_column("run_num")
+        for cond in conditions_to_show:
+            table.add_column(cond)
+        for row in values:
+            table.add_row(*[str(item) for item in row])
+        console.print(table)
+        return
+
+    # Dump view (export-friendly)
+    header = " ".join(["run_num"] + conditions_to_show)
+    click.echo("#! " + header)
+    for row in values:
+        click.echo(" ".join(map(str, row)))

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/cli/web.py

@@ -1,20 +1,22 @@
 import os
 import click
 
-from rcdb import web as rcdb_web
+from rcdb import web as rcdb_web, RCDBProvider
 from .context import pass_rcdb_context
 
 
 @click.command("web")
 @pass_rcdb_context
-def web(context):
+def web_command(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
+    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
     elif "RCDB_CONNECTION" in os.environ:
         # Otherwise check the environment variable
         rcdb_web.app.config["SQL_CONNECTION_STRING"] = os.environ["RCDB_CONNECTION"]

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb/version.py

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

{rcdb-2.2.6 → rcdb-2.2.8/rcdb.egg-info}/PKG-INFO

@@ -1,16 +1,22 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.6
+Version: 2.2.8
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 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
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Database
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: markupsafe>=3.0
@@ -20,6 +26,7 @@ Requires-Dist: mako>=1.3
 Requires-Dist: click>=8
 Requires-Dist: sqlalchemy>=2
 Requires-Dist: flask>=3.1.0
+Requires-Dist: rich
 
 ## RCDB
 

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ pyproject.toml
 ../README.md
 rcdb/__init__.py
 rcdb/__main__.py
-rcdb/admin_cmd.py
 rcdb/alias.py
 rcdb/app_context.py
 rcdb/coda_parser.py
@@ -32,10 +31,11 @@ rcdb/cli/__main__.py
 rcdb/cli/app.py
 rcdb/cli/context.py
 rcdb/cli/db.py
+rcdb/cli/info.py
 rcdb/cli/ls.py
-rcdb/cli/mkdb.py
 rcdb/cli/rp.py
 rcdb/cli/run.py
+rcdb/cli/select.py
 rcdb/cli/web.py
 rcdb/cli/repair/__init__.py
 rcdb/cli/repair/evio_files.py

{rcdb-2.2.6 → rcdb-2.2.8}/rcdb.egg-info/requires.txt

@@ -5,3 +5,4 @@ mako>=1.3
 click>=8
 sqlalchemy>=2
 flask>=3.1.0
+rich

rcdb-2.2.6/rcdb/admin_cmd.py

@@ -1,83 +0,0 @@
-import os
-import sys
-import posixpath
-
-import click
-
-from rcdb.app_context import RcdbApplicationContext, parse_run_range
-from rcdb import RCDBProvider
-
-pass_rcdb_context = click.make_pass_decorator(RcdbApplicationContext)
-
-
-def get_default_config_path():
-    return os.path.join(os.path.expanduser('~'), '.rcdb_user')
-
-
-@click.group()
-@click.option('--user-config', envvar='RCDB_USER_CONFIG', default=get_default_config_path, metavar='PATH', help='Changes the user config location.')
-@click.option('--connection', '-c', envvar='RCDB_CONNECTION', help='Database connection string', default=None, required=True)
-@click.option('--config', nargs=2, multiple=True, metavar='KEY VALUE', help='Overrides a config key/value pair.')
-@click.option('--verbose', '-v', is_flag=True, help='Enables verbose mode.')
-@click.version_option('1.0')
-@click.pass_context
-def cli(ctx, user_config, connection, config, verbose):
-    """'rcdb' is a RCDB (run conditions database) command line tool
-
-    This tool allows to select runs and get values as well as manage RCDB values
-    """
-
-    # Create a rcdb_app_context object and remember it as as the context object.  From
-    # this point onwards other commands can refer to it by using the
-    # @pass_rcdb_context decorator.
-    ctx.obj = RcdbApplicationContext(os.path.abspath(user_config), connection)
-    ctx.obj.verbose = verbose
-    for key, value in config:
-        ctx.obj.set_config(key, value)
-
-
-@cli.command(help="")
-@click.argument('search', required=False)
-@click.option('--long', '-l', 'is_long', is_flag=True, help='Prints condition full information')
-@pass_rcdb_context
-def walk(context, search, is_long):
-    """Lists condition
-
-
-    """
-    db = context.db
-    assert isinstance(db, RCDBProvider)
-    cnd_types = db.get_condition_types_by_name()
-    names = sorted(cnd_types.keys())
-    if search:
-        names = [n for n in names if search in n]
-
-    longest_len = len(max(names, key=len))
-    for name in names:
-        cnd_type = cnd_types[name]
-        click.echo("{0:<{1}}   {2}".format(name, longest_len, cnd_type.description))
-
-@cli.command()
-@click.argument('search', required=False)
-@click.option('--long', '-l', 'is_long', is_flag=True, help='Prints condition full information')
-@pass_rcdb_context
-def ls(context, search, is_long):
-    """Lists condition
-
-
-    """
-    db = context.db
-    assert isinstance(db, RCDBProvider)
-    cnd_types = db.get_condition_types_by_name()
-    names = sorted(cnd_types.keys())
-    if search:
-        names = [n for n in names if search in n]
-
-    longest_len = len(max(names, key=len))
-    for name in names:
-        cnd_type = cnd_types[name]
-        click.echo("{0:<{1}}   {2}".format(name, longest_len, cnd_type.description))
-
-
-if __name__ == '__main__':
-    cli(prog_name="rcdb")