rcdb 2.2.8__tar.gz → 2.2.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.8
+Version: 2.2.9
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT

{rcdb-2.2.8 → rcdb-2.2.9}/rcdb/cli/app.py

@@ -51,9 +51,15 @@ def rcdb_cli(ctx, user_config, connection, config, verbose):
     for key, value in config:
         ctx.obj.set_config(key, value)
 
+    # Bo commands given
     if ctx.invoked_subcommand is None:
-        "No command was specified"
-        click.echo(ctx.get_help())
+        # There is a connection but no subcommand
+        if connection:
+            # If user typed just `rcdb -c <db>`, call info() automatically:
+            ctx.invoke(info_command)        # => invoke the "info" command
+        else:
+            # No subcommand, no connection => show help
+            click.echo(ctx.get_help())
 
 
 # Add commands to application

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

@@ -1,6 +1,6 @@
 import click
 import sqlalchemy
-from sqlalchemy import create_engine, MetaData, Table, desc, select
+from sqlalchemy import create_engine, MetaData, Table, desc, select, text
 from sqlalchemy.exc import OperationalError
 
 import rcdb
@@ -28,6 +28,61 @@ def db_command(ctx):
         schema_version, = provider.session.execute(query).first()
         print("Schema version: {} - '{}'".format(schema_version.version, schema_version.comment))
 
+        if connection_str.startswith("mysql"):
+            _print_mysql_table_sizes(engine=provider.engine)
+        elif connection_str.startswith("sqlite"):
+            _print_sqlite_table_sizes(engine=provider.engine)
+        else:
+            click.echo("Table size info: not supported for this database dialect")
+
+def _print_mysql_table_sizes(engine):
+    """Query MySQL information_schema to print approximate table sizes in MB."""
+    # Find which database/schema we are connected to
+    db_name = engine.url.database
+
+    sql = text(f"""
+        SELECT 
+            table_name AS tbl,
+            ROUND(((data_length + index_length) / 1024 / 1024), 2) AS size_mb
+        FROM information_schema.tables
+        WHERE table_schema = :db
+        ORDER BY size_mb DESC
+    """)
+
+    with engine.connect() as conn:
+        results = conn.execute(sql, {"db": db_name}).fetchall()
+
+    click.echo("\nTable sizes in MB (MySQL):")
+    for row in results:
+        table, size_mb = row
+        click.echo(f"  {table:30} {size_mb} MB")
+
+def _print_sqlite_table_sizes(engine):
+    """Use 'dbstat' virtual table (if available) to estimate table sizes."""
+    try:
+        with engine.connect() as conn:
+            # Enable the dbstat extension if needed
+            # conn.execute("SELECT load_extension('dbstat')")
+            # (Only if your SQLite requires explicit load_extension calls)
+
+            # dbstat vtable can be queried like this:
+            rows = conn.execute(text("""
+                SELECT
+                    name AS table_name,
+                    SUM(pgsize) as total_bytes
+                FROM dbstat
+                GROUP BY name
+                ORDER BY total_bytes DESC
+            """)).fetchall()
+
+        click.echo("\nApproximate per-table sizes (SQLite dbstat):")
+        for table_name, total_bytes in rows:
+            size_mb = round(total_bytes / 1024 / 1024, 2)
+            click.echo(f"  {table_name:30} {size_mb} MB")
+
+    except Exception as ex:
+        click.echo("\n No table size info: sqlite dbstat extension is not installed. Use sqlite3_analyzer to get table sizes")
+
 
 @db_command.command()
 @pass_rcdb_context

{rcdb-2.2.8 → rcdb-2.2.9}/rcdb/cli/info.py

@@ -2,6 +2,7 @@ import click
 import datetime
 from .context import pass_rcdb_context
 from rcdb.model import Condition, Run, ConfigurationFile, RunPeriod
+from .. import ConditionType
 
 
 @click.command("info", help="Prints summary info about RCDB contents")
@@ -12,6 +13,9 @@ def info_command(context):
     """
     db = context.db
 
+    # Number of condition types
+    cnd_type_count = db.session.query(ConditionType).count()
+
     # Number of conditions
     cnd_count = db.session.query(Condition).count()
 
@@ -35,19 +39,22 @@ def info_command(context):
     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"Num, condition types: {cnd_type_count}")
+    click.echo(f"Num. condition values: {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("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.")
+        click.echo(f"Last Run Period:")
+        click.echo(f"  Name:        {last_rp.name}")
+        click.echo(f"  Description: {last_rp.name}")
+        click.echo(f"  Run Range:   {last_rp.run_min} - {last_rp.run_max}")
+        click.echo(f"  Start Date:  {last_rp.start_date}")
+        click.echo(f"  End Date:    {last_rp.end_date}")
 
     # Finally, show all possible commands (help):
     ctx = click.get_current_context()
-    click.echo("\n==== Available commands ====")
-    click.echo(ctx.parent.get_help())
+    click.echo("\nrun 'rcdb --help' for the list of available commands")
+

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

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

{rcdb-2.2.8 → rcdb-2.2.9}/rcdb/web/__init__.py

@@ -24,7 +24,7 @@ SQL_CONNECTION_STRING = "mysql+pymysql://rcdb@127.0.0.1/rcdb"
 # Get the current directory
 current_directory = os.path.dirname(os.path.abspath(__file__))
 template_folder=os.path.join(current_directory, 'templates')
-print(f"template_folder={template_folder}")
+
 # Create Flask app with custom template folder
 app = Flask(__name__, template_folder=template_folder)
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rcdb
-Version: 2.2.8
+Version: 2.2.9
 Summary: RCDB - Run Conditions DataBase
 Author-email: Dmitry Romanov <romanov@jlab.org>
 License-Expression: MIT