From cc0b02b8db86f19492c71d3070885c3815f77d32 Mon Sep 17 00:00:00 2001 From: Stuart McAlpine Date: Fri, 17 Nov 2023 14:16:51 +0100 Subject: [PATCH] Reformat --- src/cli/cli.py | 9 +++++++-- src/cli/register.py | 2 +- src/dataregistry/DataRegistry.py | 9 +++++---- src/dataregistry/exceptions.py | 1 - src/dataregistry/query.py | 6 +++++- src/dataregistry/registrar.py | 6 +++++- src/dataregistry/registrar_util.py | 18 +++++++++--------- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/cli/cli.py b/src/cli/cli.py index f1a5cd93..27c0bf8d 100644 --- a/src/cli/cli.py +++ b/src/cli/cli.py @@ -129,10 +129,15 @@ action="store_true", ) arg_register_dataset.add_argument( - "--schema", default=f"{SCHEMA_VERSION}", help="Which schema to connect to", + "--schema", + default=f"{SCHEMA_VERSION}", + help="Which schema to connect to", ) arg_register_dataset.add_argument( - "--locale", help="Location where dataset was produced", type=str, default="NERSC", + "--locale", + help="Location where dataset was produced", + type=str, + default="NERSC", ) arg_register_dataset.add_argument( "--owner", help="Owner of dataset. Defaults to $USER." diff --git a/src/cli/register.py b/src/cli/register.py index 8cc3531d..a8d00fa3 100644 --- a/src/cli/register.py +++ b/src/cli/register.py @@ -31,7 +31,7 @@ def register_dataset(args): execution_start=args.execution_start, execution_locale=args.execution_locale, execution_configuration=args.execution_configuration, - input_datasets=args.input_datasets + input_datasets=args.input_datasets, ) print(f"Created dataset entry with id {new_id}") diff --git a/src/dataregistry/DataRegistry.py b/src/dataregistry/DataRegistry.py index 3493c75f..13aaa800 100644 --- a/src/dataregistry/DataRegistry.py +++ b/src/dataregistry/DataRegistry.py @@ -42,16 +42,17 @@ def __init__( True for more output. """ # Establish connection to database - self.db_connection = DbConnection( - config_file, schema=schema, verbose=verbose - ) + self.db_connection = DbConnection(config_file, schema=schema, verbose=verbose) # Create query object self.Query = Query(self.db_connection) # Create registrar object self.Registrar = Registrar( - self.db_connection, owner=owner, owner_type=owner_type, root_dir=root_dir, + self.db_connection, + owner=owner, + owner_type=owner_type, + root_dir=root_dir, ) # Create query object diff --git a/src/dataregistry/exceptions.py b/src/dataregistry/exceptions.py index 39b90401..58a3b8ee 100644 --- a/src/dataregistry/exceptions.py +++ b/src/dataregistry/exceptions.py @@ -7,7 +7,6 @@ class DataRegistryException(Exception): class DataRegistryNYI(DataRegistryException): def __init__(self, feature=""): - msg = f"Feature {feature} not yet implemented" self.msg = msg super().__init__(self.msg) diff --git a/src/dataregistry/query.py b/src/dataregistry/query.py index 4fcc566b..a3bda538 100644 --- a/src/dataregistry/query.py +++ b/src/dataregistry/query.py @@ -272,7 +272,11 @@ def get_db_versioning(self): ) def find_datasets( - self, property_names=None, filters=[], verbose=False, return_format="property_dict" + self, + property_names=None, + filters=[], + verbose=False, + return_format="property_dict", ): """ Get specified properties for datasets satisfying all filters diff --git a/src/dataregistry/registrar.py b/src/dataregistry/registrar.py index fe4c35ef..9109b5ba 100644 --- a/src/dataregistry/registrar.py +++ b/src/dataregistry/registrar.py @@ -29,7 +29,11 @@ class Registrar: def __init__( - self, db_connection, owner=None, owner_type=None, root_dir=None, + self, + db_connection, + owner=None, + owner_type=None, + root_dir=None, ): """ Class to register new datasets, executions and alias names. diff --git a/src/dataregistry/registrar_util.py b/src/dataregistry/registrar_util.py index a6d7b63c..4488c414 100644 --- a/src/dataregistry/registrar_util.py +++ b/src/dataregistry/registrar_util.py @@ -181,17 +181,17 @@ def _name_from_relpath(relative_path): We use this when the dataset name is not explicitly defined, and we take it from the final directory if path. - e.g, /root/to/dataset/dir would return "dir" + e.g, /root/to/dataset/dir would return "dir" - Parameters - ---------- - relative_path : str - Path to dataset (can be relative or absolute) + Parameters + ---------- + relative_path : str + Path to dataset (can be relative or absolute) - Returns - ------- - name : str - Scraped name of dataset + Returns + ------- + name : str + Scraped name of dataset """ relpath = relative_path