rcdb 2.2.5__tar.gz → 2.2.7__tar.gz

{rcdb-2.2.5/rcdb.egg-info → rcdb-2.2.7}/PKG-INFO

@@ -1,17 +1,20 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.5
+Version: 2.2.7
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
-License: MIT
+License-Expression: 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
+Classifier: Intended Audience :: Science/Research
+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
@@ -21,6 +24,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.5 → rcdb-2.2.7}/pyproject.toml

@@ -14,19 +14,22 @@ readme = "README.md"
 # If you'd like to keep version in rcdb.version.py, see "Dynamic version" section below.
 # Otherwise, put a fixed version here, e.g. version = "1.0.0"
 dynamic = ["version"]
-license = { text = "MIT" }
+license = "MIT"
 authors = [
     { name="Dmitry Romanov", email="romanov@jlab.org" }
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
-    "License :: OSI Approved :: MIT License",
     "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",
+    "Intended Audience :: Science/Research",
+    "Operating System :: OS Independent",
+    "Topic :: Scientific/Engineering :: Physics",
+    "Topic :: Database"
 ]
 requires-python = ">=3.9"
 dependencies = [
@@ -36,16 +39,27 @@ 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]
 [project.scripts]
-rcdb = "rcdb.cli.app.rcdb_cli"
+rcdb = "rcdb.cli.app:rcdb_cli"
 
 # Tell setuptools how to find your packages if needed:
 [tool.setuptools.packages.find]
-include = ["rcdb"]
+include = ["rcdb*"]
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-data]
+# Recursively include everything under rcdb/web/static/ and rcdb/web/templates/
+rcdb = [
+    "web/static/**/*.*",
+    "web/templates/**/*.*"
+]
 
 [tool.setuptools.dynamic]
 version = { attr = "rcdb.version.version" }

{rcdb-2.2.5 → rcdb-2.2.7}/rcdb/cli/app.py

@@ -104,78 +104,3 @@ def cat():
 def dump():
     pass
 
-
-def _process_sel_args(args, ):
-    """
-
-    :param args: list of user arguments
-    :param run_periods: db.get_run_periods() assumed
-    :return: ((run_min, run_max), 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]
-
-
-
-@rcdb_cli.command()
-@click.argument('query', required=None)
-@click.argument('views_or_runs',  nargs=-1)
-@click.option('--dump', '-d', 'is_dump_view', is_flag=True,
-              help='Display results as to export to file. No borders, "#" comments')
-@click.option('--desc/--asc', '-d/-a', 'is_descending', default=False,
-              help="Sort order of run number descending or ascending")
-@pass_rcdb_context
-def sel(rcdb_context, query, views_or_runs, is_dump_view, is_descending):
-    """ Command allows to select runs and get values from it"""
-    assert isinstance(rcdb_context.db, RCDBProvider)
-    args = [str(query)]
-    args.extend([str(v) for v in views_or_runs])
-    run_range_str, query, view = _process_sel_args(args)
-
-    (run_min, run_max) = parse_run_range(run_range_str, rcdb_context.db.get_run_periods())
-
-    if run_min is None:
-        run_min = 0
-
-    if run_max is None:
-        run_max = 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:
-        try:
-            from prettytable import PrettyTable
-
-            table = PrettyTable(["run_num"] + conditions_to_show)
-            for row in values:
-                table.add_row(row)
-            click.echo(table)
-            return
-        except ImportError:
-            click.echo("# (!) no prettytable module is installed. Using regular table")
-            is_dump_view = True
-
-    click.echo("#! {}".format(" ".join(["run_num"].extend(conditions_to_show))))
-    for row in values:
-        click.echo(" ".join(row))

{rcdb-2.2.5 → rcdb-2.2.7}/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.5 → rcdb-2.2.7}/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)
 

rcdb-2.2.7/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.5 → rcdb-2.2.7}/rcdb/cli/web.py

@@ -1,7 +1,7 @@
 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
 
 
@@ -13,8 +13,10 @@ def web(context):
     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.5 → rcdb-2.2.7}/rcdb/version.py

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

{rcdb-2.2.5 → rcdb-2.2.7/rcdb.egg-info}/PKG-INFO

@@ -1,17 +1,20 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.5
+Version: 2.2.7
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
-License: MIT
+License-Expression: 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
+Classifier: Intended Audience :: Science/Research
+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
@@ -21,6 +24,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.5 → rcdb-2.2.7}/rcdb.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ 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.7/rcdb.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+rcdb = rcdb.cli.app:rcdb_cli

{rcdb-2.2.5 → rcdb-2.2.7}/rcdb.egg-info/requires.txt

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

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

@@ -1,2 +0,0 @@
-[console_scripts]
-rcdb = rcdb.cli.app.rcdb_cli