chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 09:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reformatted res2sqlite.py with black 23.12.1

Browse Source
This commit is contained in:
Chris Kerr
2024-01-20 21:57:14 +02:00
parent dee8af3a86
commit 239db97c69
1 changed files with 96 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
galvani/res2sqlite.py
View File

@@ -16,43 +16,43 @@ from copy import copy
# $ mdb-schema <result.res> oracle # $ mdb-schema <result.res> oracle
mdb_tables = [ mdb_tables = [
'Version_Table', "Version_Table",
'Global_Table', "Global_Table",
'Resume_Table', "Resume_Table",
'Channel_Normal_Table', "Channel_Normal_Table",
'Channel_Statistic_Table', "Channel_Statistic_Table",
'Auxiliary_Table', "Auxiliary_Table",
'Event_Table', "Event_Table",
'Smart_Battery_Info_Table', "Smart_Battery_Info_Table",
'Smart_Battery_Data_Table', "Smart_Battery_Data_Table",
] ]
mdb_5_23_tables = [ mdb_5_23_tables = [
'MCell_Aci_Data_Table', "MCell_Aci_Data_Table",
'Aux_Global_Data_Table', "Aux_Global_Data_Table",
'Smart_Battery_Clock_Stretch_Table', "Smart_Battery_Clock_Stretch_Table",
] ]
mdb_5_26_tables = [ mdb_5_26_tables = [
'Can_BMS_Info_Table', "Can_BMS_Info_Table",
'Can_BMS_Data_Table', "Can_BMS_Data_Table",
] ]
mdb_tables_text = { mdb_tables_text = {
'Version_Table', "Version_Table",
'Global_Table', "Global_Table",
'Event_Table', "Event_Table",
'Smart_Battery_Info_Table', "Smart_Battery_Info_Table",
'Can_BMS_Info_Table', "Can_BMS_Info_Table",
} }
mdb_tables_numeric = { mdb_tables_numeric = {
'Resume_Table', "Resume_Table",
'Channel_Normal_Table', "Channel_Normal_Table",
'Channel_Statistic_Table', "Channel_Statistic_Table",
'Auxiliary_Table', "Auxiliary_Table",
'Smart_Battery_Data_Table', "Smart_Battery_Data_Table",
'MCell_Aci_Data_Table', "MCell_Aci_Data_Table",
'Aux_Global_Data_Table', "Aux_Global_Data_Table",
'Smart_Battery_Clock_Stretch_Table', "Smart_Battery_Clock_Stretch_Table",
'Can_BMS_Data_Table', "Can_BMS_Data_Table",
} }
mdb_create_scripts = { mdb_create_scripts = {
@@ -271,7 +271,7 @@ CREATE TABLE Smart_Battery_Data_Table
REFERENCES Channel_Normal_Table (Test_ID, Data_Point) REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
); """, ); """,
# The following tables are not present in version 1.14, but are in 5.23 # The following tables are not present in version 1.14, but are in 5.23
'MCell_Aci_Data_Table': """ "MCell_Aci_Data_Table": """
CREATE TABLE MCell_Aci_Data_Table CREATE TABLE MCell_Aci_Data_Table
( (
Test_ID INTEGER, Test_ID INTEGER,
@@ -285,7 +285,7 @@ CREATE TABLE MCell_Aci_Data_Table
FOREIGN KEY (Test_ID, Data_Point) FOREIGN KEY (Test_ID, Data_Point)
REFERENCES Channel_Normal_Table (Test_ID, Data_Point) REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
);""", );""",
'Aux_Global_Data_Table': """ "Aux_Global_Data_Table": """
CREATE TABLE Aux_Global_Data_Table CREATE TABLE Aux_Global_Data_Table
( (
Channel_Index INTEGER, Channel_Index INTEGER,
@@ -295,7 +295,7 @@ CREATE TABLE Aux_Global_Data_Table
Unit TEXT, Unit TEXT,
PRIMARY KEY (Channel_Index, Auxiliary_Index, Data_Type) PRIMARY KEY (Channel_Index, Auxiliary_Index, Data_Type)
);""", );""",
'Smart_Battery_Clock_Stretch_Table': """ "Smart_Battery_Clock_Stretch_Table": """
CREATE TABLE Smart_Battery_Clock_Stretch_Table CREATE TABLE Smart_Battery_Clock_Stretch_Table
( (
Test_ID INTEGER, Test_ID INTEGER,
@@ -344,7 +344,7 @@ CREATE TABLE Smart_Battery_Clock_Stretch_Table
REFERENCES Channel_Normal_Table (Test_ID, Data_Point) REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
);""", );""",
# The following tables are not present in version 5.23, but are in 5.26 # The following tables are not present in version 5.23, but are in 5.26
'Can_BMS_Info_Table': """ "Can_BMS_Info_Table": """
CREATE TABLE "Can_BMS_Info_Table" CREATE TABLE "Can_BMS_Info_Table"
( (
Channel_Index INTEGER PRIMARY KEY, Channel_Index INTEGER PRIMARY KEY,
@@ -352,7 +352,7 @@ CREATE TABLE "Can_BMS_Info_Table"
CAN_Configuration TEXT CAN_Configuration TEXT
); );
""", """,
'Can_BMS_Data_Table': """ "Can_BMS_Data_Table": """
CREATE TABLE "Can_BMS_Data_Table" CREATE TABLE "Can_BMS_Data_Table"
( (
Test_ID INTEGER, Test_ID INTEGER,
@@ -371,7 +371,8 @@ mdb_create_indices = {
CREATE UNIQUE INDEX data_point_index ON Channel_Normal_Table (Test_ID, Data_Point); CREATE UNIQUE INDEX data_point_index ON Channel_Normal_Table (Test_ID, Data_Point);
CREATE INDEX voltage_index ON Channel_Normal_Table (Test_ID, Voltage); CREATE INDEX voltage_index ON Channel_Normal_Table (Test_ID, Voltage);
CREATE INDEX test_time_index ON Channel_Normal_Table (Test_ID, Test_Time); CREATE INDEX test_time_index ON Channel_Normal_Table (Test_ID, Test_Time);
"""} """
}
helper_table_script = """ helper_table_script = """
CREATE TEMPORARY TABLE capacity_helper( CREATE TEMPORARY TABLE capacity_helper(
@@ -438,17 +439,19 @@ CREATE VIEW IF NOT EXISTS Capacity_View
def mdb_get_data_text(s3db, filename, table): def mdb_get_data_text(s3db, filename, table):
print("Reading %s..." % table) print("Reading %s..." % table)
insert_pattern = re.compile( insert_pattern = re.compile(
r'INSERT INTO "\w+" \([^)]+?\) VALUES \(("[^"]*"|[^")])+?\);\n', r'INSERT INTO "\w+" \([^)]+?\) VALUES \(("[^"]*"|[^")])+?\);\n', re.IGNORECASE
re.IGNORECASE
) )
try: try:
# Initialize values to avoid NameError in except clause # Initialize values to avoid NameError in except clause
mdb_output = '' mdb_output = ""
insert_match = None insert_match = None
with sp.Popen(['mdb-export', '-I', 'postgres', filename, table], with sp.Popen(
bufsize=-1, stdin=sp.DEVNULL, stdout=sp.PIPE, ["mdb-export", "-I", "postgres", filename, table],
universal_newlines=True) as mdb_sql: bufsize=-1,
stdin=sp.DEVNULL,
stdout=sp.PIPE,
universal_newlines=True,
) as mdb_sql:
mdb_output = mdb_sql.stdout.read() mdb_output = mdb_sql.stdout.read()
while len(mdb_output) > 0: while len(mdb_output) > 0:
insert_match = insert_pattern.match(mdb_output) insert_match = insert_pattern.match(mdb_output)
@@ -459,8 +462,10 @@ def mdb_get_data_text(s3db, filename, table):
except OSError as e: except OSError as e:
if e.errno == 2: if e.errno == 2:
raise RuntimeError('Could not locate the `mdb-export` executable. ' raise RuntimeError(
'Check that mdbtools is properly installed.') "Could not locate the `mdb-export` executable. "
"Check that mdbtools is properly installed."
)
else: else:
raise raise
except BaseException: except BaseException:
@@ -475,14 +480,18 @@ def mdb_get_data_text(s3db, filename, table):
def mdb_get_data_numeric(s3db, filename, table): def mdb_get_data_numeric(s3db, filename, table):
print("Reading %s..." % table) print("Reading %s..." % table)
try: try:
with sp.Popen(['mdb-export', filename, table], with sp.Popen(
bufsize=-1, stdin=sp.DEVNULL, stdout=sp.PIPE, ["mdb-export", filename, table],
universal_newlines=True) as mdb_sql: bufsize=-1,
stdin=sp.DEVNULL,
stdout=sp.PIPE,
universal_newlines=True,
) as mdb_sql:
mdb_csv = csv.reader(mdb_sql.stdout) mdb_csv = csv.reader(mdb_sql.stdout)
mdb_headers = next(mdb_csv) mdb_headers = next(mdb_csv)
quoted_headers = ['"%s"' % h for h in mdb_headers] quoted_headers = ['"%s"' % h for h in mdb_headers]
joined_headers = ', '.join(quoted_headers) joined_headers = ", ".join(quoted_headers)
joined_placemarks = ', '.join(['?' for h in mdb_headers]) joined_placemarks = ", ".join(["?" for h in mdb_headers])
insert_stmt = 'INSERT INTO "{0}" ({1}) VALUES ({2});'.format( insert_stmt = 'INSERT INTO "{0}" ({1}) VALUES ({2});'.format(
table, table,
joined_headers, joined_headers,
@@ -492,8 +501,10 @@ def mdb_get_data_numeric(s3db, filename, table):
s3db.commit() s3db.commit()
except OSError as e: except OSError as e:
if e.errno == 2: if e.errno == 2:
raise RuntimeError('Could not locate the `mdb-export` executable. ' raise RuntimeError(
'Check that mdbtools is properly installed.') "Could not locate the `mdb-export` executable. "
"Check that mdbtools is properly installed."
)
else: else:
raise raise
@@ -504,7 +515,9 @@ def mdb_get_data(s3db, filename, table):
elif table in mdb_tables_numeric: elif table in mdb_tables_numeric:
mdb_get_data_numeric(s3db, filename, table) mdb_get_data_numeric(s3db, filename, table)
else: else:
raise ValueError("'%s' is in neither mdb_tables_text nor mdb_tables_numeric" % table) raise ValueError(
"'%s' is in neither mdb_tables_text nor mdb_tables_numeric" % table
)
def mdb_get_version(filename): def mdb_get_version(filename):
@@ -514,9 +527,13 @@ def mdb_get_version(filename):
""" """
print("Reading version number...") print("Reading version number...")
try: try:
with sp.Popen(['mdb-export', filename, 'Version_Table'], with sp.Popen(
bufsize=-1, stdin=sp.DEVNULL, stdout=sp.PIPE, ["mdb-export", filename, "Version_Table"],
universal_newlines=True) as mdb_sql: bufsize=-1,
stdin=sp.DEVNULL,
stdout=sp.PIPE,
universal_newlines=True,
) as mdb_sql:
mdb_csv = csv.reader(mdb_sql.stdout) mdb_csv = csv.reader(mdb_sql.stdout)
mdb_headers = next(mdb_csv) mdb_headers = next(mdb_csv)
mdb_values = next(mdb_csv) mdb_values = next(mdb_csv)
@@ -525,23 +542,31 @@ def mdb_get_version(filename):
except StopIteration: except StopIteration:
pass pass
else: else:
raise ValueError('Version_Table of %s lists multiple versions' % filename) raise ValueError(
"Version_Table of %s lists multiple versions" % filename
)
except OSError as e: except OSError as e:
if e.errno == 2: if e.errno == 2:
raise RuntimeError('Could not locate the `mdb-export` executable. ' raise RuntimeError(
'Check that mdbtools is properly installed.') "Could not locate the `mdb-export` executable. "
"Check that mdbtools is properly installed."
)
else: else:
raise raise
if 'Version_Schema_Field' not in mdb_headers: if "Version_Schema_Field" not in mdb_headers:
raise ValueError('Version_Table of %s does not contain a Version_Schema_Field column' raise ValueError(
% filename) "Version_Table of %s does not contain a Version_Schema_Field column"
% filename
)
version_fields = dict(zip(mdb_headers, mdb_values)) version_fields = dict(zip(mdb_headers, mdb_values))
version_text = version_fields['Version_Schema_Field'] version_text = version_fields["Version_Schema_Field"]
version_match = re.fullmatch('Results File ([.0-9]+)', version_text) version_match = re.fullmatch("Results File ([.0-9]+)", version_text)
if not version_match: if not version_match:
raise ValueError('File version "%s" did not match expected format' % version_text) raise ValueError(
'File version "%s" did not match expected format' % version_text
)
version_string = version_match.group(1) version_string = version_match.group(1)
version_tuple = tuple(map(int, version_string.split('.'))) version_tuple = tuple(map(int, version_string.split(".")))
return version_tuple return version_tuple
@@ -581,12 +606,14 @@ def main(argv=None):
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Convert Arbin .res files to sqlite3 databases using mdb-export", description="Convert Arbin .res files to sqlite3 databases using mdb-export",
) )
parser.add_argument('input_file', type=str) # need file name to pass to sp.Popen parser.add_argument("input_file", type=str) # need file name to pass to sp.Popen
parser.add_argument('output_file', type=str) # need file name to pass to sqlite3.connect parser.add_argument(
"output_file", type=str
) # need file name to pass to sqlite3.connect
args = parser.parse_args(argv) args = parser.parse_args(argv)
convert_arbin_to_sqlite(args.input_file, args.output_file) convert_arbin_to_sqlite(args.input_file, args.output_file)
if __name__ == '__main__': if __name__ == "__main__":
main() main()