Chore: Format code

Author: amotl

pyproject.toml

@@ -1,35 +1,3 @@
-[tool.pytest.ini_options]
-minversion = "2.0"
-addopts = """
-  -rfsEX -p pytester --strict-markers --verbosity=3
-  --cov --cov-report=term-missing --cov-report=xml
-  --capture=no
-  """
-log_level = "DEBUG"
-log_cli_level = "DEBUG"
-testpaths = ["tests"]
-xfail_strict = true
-markers = [
-]
-
-[tool.coverage.run]
-branch = false
-source = ["tsdg", "tsperf", "tsqt"]
-omit = [
-    "tests/*",
-    "tsperf/write/cli.py",
-    "tsperf/read/cli.py",
-]
-
-[tool.coverage.report]
-fail_under = 0
-show_missing = true
-omit = [
-    "tests/*",
-    "tsperf/write/cli.py",
-    "tsperf/read/cli.py",
-]
-
 [tool.ruff]
 line-length = 120
 
@@ -70,15 +38,57 @@ lint.extend-ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "tests/*" = [
-  # Use of `assert` detected.
+  # Use of `assert` detected
   "S101",
+  # Possible hardcoded password assigned to: "password"
+  "S105",
+  # Possible hardcoded password assigned to argument: "password"
+  "S106",
+  # Standard pseudo-random generators are not suitable for cryptographic purposes
+  "S311",
+]
+"tsperf/util/float_simulator/__init__.py" = [
+  # Standard pseudo-random generators are not suitable for cryptographic purposes
+  "S311",
 ]
 
 
 # ===================
 # Tasks configuration
 # ===================
 
+[tool.pytest.ini_options]
+minversion = "2.0"
+addopts = """
+  -rfsEX -p pytester --strict-markers --verbosity=3
+  --cov --cov-report=term-missing --cov-report=xml
+  --capture=no
+  """
+log_level = "DEBUG"
+log_cli_level = "DEBUG"
+testpaths = ["tests"]
+xfail_strict = true
+markers = [
+]
+
+[tool.coverage.run]
+branch = false
+source = ["tsdg", "tsperf", "tsqt"]
+omit = [
+    "tests/*",
+    "tsperf/write/cli.py",
+    "tsperf/read/cli.py",
+]
+
+[tool.coverage.report]
+fail_under = 0
+show_missing = true
+omit = [
+    "tests/*",
+    "tsperf/write/cli.py",
+    "tsperf/read/cli.py",
+]
+
 [tool.poe.tasks]
 
 check = [

setup.py

@@ -18,22 +18,22 @@
     "dnspython<3",
     "numpy<1.27",
     "pgcopy<1.7",
-    #"pyodbc<5",
+    # "pyodbc<5",
     "tqdm<5",
     "cloup<1",
 ]
 
 develop_requires = [
-  "mypy<1.10",
-  "poethepoet<0.26",
-  "pyproject-fmt<1.8",
-  "ruff<0.5",
-  "validate-pyproject<0.17",
+    "mypy<1.10",
+    "poethepoet<0.26",
+    "pyproject-fmt<1.8",
+    "ruff<0.5",
+    "validate-pyproject<0.17",
 ]
 
 release_requires = [
-  "build<2",
-  "twine<6",
+    "build<2",
+    "twine<6",
 ]
 
 test_requires = [
@@ -76,7 +76,7 @@
         "Topic :: Utilities",
         "Operating System :: POSIX",
         "Operating System :: Unix",
-        "Operating System :: MacOS"
+        "Operating System :: MacOS",
     ],
     entry_points={
         "console_scripts": [

tests/adapter/test_cratedb.py

@@ -45,9 +45,7 @@ def test_close_connection(mock_connect):
         password="password",
     )
     db_writer = CrateDbAdapter(config=config, schema=test_schema1)
-    mock_connect.assert_called_with(
-        "localhost:4200", username="crate", password="password"
-    )
+    mock_connect.assert_called_with("localhost:4200", username="crate", password="password")
     # Test Case 1:
     db_writer.close_connection()
     conn.close.assert_called()
@@ -88,9 +86,7 @@ def test_prepare_database1(mock_connect):
     )
     db_writer = CrateDbAdapter(config=config, schema=test_schema1)
 
-    mock_connect.assert_called_with(
-        "localhost:8200", username="crate2", password="password2"
-    )
+    mock_connect.assert_called_with("localhost:8200", username="crate2", password="password2")
     # Test Case 1:
     db_writer.prepare_database()
     stmt = cursor.execute.call_args.args[0]
@@ -181,10 +177,7 @@ def test_insert_stmt(mock_connect, config):
     call_arguments = cursor.execute.call_args.args
     stmt = call_arguments[0]
     values = call_arguments[1]
-    assert (
-        stmt
-        == "INSERT INTO temperature (ts, payload) (SELECT col1, col2 FROM UNNEST(?,?))"
-    )
+    assert stmt == "INSERT INTO temperature (ts, payload) (SELECT col1, col2 FROM UNNEST(?,?))"
     assert values == (
         [1586327807000],
         [{"plant": 1, "line": 1, "sensor_id": 1, "value": 6.7, "button_press": False}],

tests/adapter/test_cratedbpg.py

@@ -192,10 +192,7 @@ def test_insert_stmt(mock_connect, config):
     call_arguments = cursor.execute.call_args.args
     stmt = call_arguments[0]
     values = call_arguments[1]
-    assert (
-        stmt
-        == "INSERT INTO temperature (ts, payload) (SELECT col1, col2 FROM UNNEST(?,?))"
-    )
+    assert stmt == "INSERT INTO temperature (ts, payload) (SELECT col1, col2 FROM UNNEST(?,?))"
     assert values == (
         [1586327807000],
         [{"plant": 1, "line": 1, "sensor_id": 1, "value": 6.7, "button_press": False}],

tests/adapter/test_timestream.py

@@ -12,7 +12,7 @@
 def config():
     config = DatabaseConnectionConfiguration(
         adapter=DatabaseInterfaceType.Timestream,
-        # address="ingest-cell1.timestream.us-west-2.amazonaws.com",
+        # TODO: address="ingest-cell1.timestream.us-west-2.amazonaws.com",
     )
     return config
 
@@ -33,16 +33,14 @@ def test_close_connection(mock_boto, config):
 
     config = DatabaseConnectionConfiguration(
         adapter=DatabaseInterfaceType.Timestream,
-        # address="ingest-cell1.timestream.us-west-2.amazonaws.com",
+        # TODO: address="ingest-cell1.timestream.us-west-2.amazonaws.com",
         aws_access_key_id="foobar",
         aws_secret_access_key="bazqux",
         aws_region_name="us-west-2",
     )
     _ = AmazonTimestreamAdapter(config=config, schema=test_schema1)
 
-    mock_boto.session.Session.assert_called_with(
-        "foobar", aws_secret_access_key="bazqux", region_name="us-west-2"
-    )
+    mock_boto.session.Session.assert_called_with("foobar", aws_secret_access_key="bazqux", region_name="us-west-2")
 
 
 @mock.patch("tsperf.adapter.timestream.boto3", autospec=True)

tests/read/test_tsqt_cli.py

@@ -17,7 +17,7 @@ def test_read_cli():
         catch_exceptions=False,
     )
     assert result.exit_code == 0
-    # assert result.output == 'Hello Peter!\n'
+    assert result.output == "Hello Peter!\n"
 
 
 def test_read_cli_dryrun():

tests/read/test_tsqt_core.py

@@ -17,7 +17,6 @@ def config() -> QueryTimerConfig:
 @pytest.mark.parametrize("adapter", list(DatabaseInterfaceType))
 @mock.patch("tsperf.adapter.AdapterManager.create", autospec=True)
 def test_get_database_adapter(factory_mock, adapter, config):
-
     config.adapter = adapter
     engine = TsPerfEngine(config=config)
     engine.bootstrap()
@@ -52,7 +51,6 @@ def test_percentage_to_rgb():
 
 @mock.patch("tsperf.read.core.engine", autospec=True)
 def test_start_query_run(mock_engine, config):
-
     mock_db_writer = mock.MagicMock()
     mock_db_writer.execute_query.side_effect = [[1, 2, 3], Exception("mocked failure")]
     mock_engine.create_adapter.return_value = mock_db_writer

tests/test_cli.py

@@ -8,7 +8,7 @@
 def test_schema_list():
     runner = CliRunner()
     result = runner.invoke(
-        tsperf.cli.schema_list,
+        tsperf.cli.schema,
         [
             "--list",
         ],

tests/util/test_batch_size_automator.py

@@ -115,16 +115,10 @@ def test_insert_batch_time_normal():
         batch_size_automator.insert_batch_time(duration)
 
     assert batch_size_automator.batch_times["best"]["avg_time"] == duration
-    assert (
-        batch_size_automator.batch_times["best"]["batch_per_second"]
-        == initial_batch_size / duration
-    )
+    assert batch_size_automator.batch_times["best"]["batch_per_second"] == initial_batch_size / duration
     # because for the next iteration batch_size is increased by 500
     initial_step_size = 500
-    assert (
-        batch_size_automator.get_next_batch_size()
-        == initial_batch_size + initial_step_size
-    )
+    assert batch_size_automator.get_next_batch_size() == initial_batch_size + initial_step_size
 
     # Test Case 2:
     # five will be the first best time making 3000 the best batchsize
@@ -135,10 +129,7 @@ def test_insert_batch_time_normal():
     current_batch_per_second = current_batch_size / duration
 
     assert batch_size_automator.batch_times["best"]["avg_time"] == duration
-    assert (
-        batch_size_automator.batch_times["best"]["batch_per_second"]
-        == current_batch_per_second
-    )
+    assert batch_size_automator.batch_times["best"]["batch_per_second"] == current_batch_per_second
     batch_size = 3000 + batch_size_automator.step_size * batch_size_automator.alpha
     assert batch_size_automator.get_next_batch_size() == batch_size
 
@@ -149,14 +140,10 @@ def test_insert_batch_time_normal():
         batch_size_automator.insert_batch_time(duration)
 
     assert batch_size_automator.batch_times["best"]["avg_time"] == 5  # last duration
-    assert (
-        batch_size_automator.batch_times["best"]["batch_per_second"]
-        == current_batch_per_second
-    )
+    assert batch_size_automator.batch_times["best"]["batch_per_second"] == current_batch_per_second
     # batch_size is decreased this time because no better value was found and calculated based on best_size
     batch_size = (
-        batch_size_automator.batch_times["best"]["size"]
-        - batch_size_automator.step_size * batch_size_automator.alpha
+        batch_size_automator.batch_times["best"]["size"] - batch_size_automator.step_size * batch_size_automator.alpha
     )
     assert batch_size_automator.get_next_batch_size() == batch_size
 
@@ -172,9 +159,7 @@ def test_insert_batch_time_normal():
         == batch_size_automator.batch_times["best"]["size"] / duration
     )
     # batch_size is further decreased
-    batch_size = (
-        batch_size - batch_size_automator.step_size * batch_size_automator.alpha
-    )
+    batch_size = batch_size - batch_size_automator.step_size * batch_size_automator.alpha
     assert batch_size_automator.get_next_batch_size() == batch_size
 
     # Test Case 5:
@@ -233,16 +218,12 @@ def test_insert_batch_time_smallest_batch():
         batch_size_automator.insert_batch_time(worse_duration)
 
     # now we get better each time until we reach batch_size 1
-    duration = (
-        batch_size_automator.batch_size
-        / batch_size_automator.batch_times["best"]["batch_per_second"]
-    ) - 10
+    duration = (batch_size_automator.batch_size / batch_size_automator.batch_times["best"]["batch_per_second"]) - 10
     batch_size = batch_size_automator.batch_size
     while batch_size_automator.batch_size != 1:
         if batch_size != batch_size_automator.batch_size:
             duration = (
-                batch_size_automator.batch_size
-                / batch_size_automator.batch_times["best"]["batch_per_second"]
+                batch_size_automator.batch_size / batch_size_automator.batch_times["best"]["batch_per_second"]
             ) - 10
             batch_size = batch_size_automator.batch_size
         batch_size_automator.insert_batch_time(duration)
@@ -283,55 +264,39 @@ def test_step_size_is_default():
 def test_step_size_is_data_batch_size():
     default_step_size = 500
     data_batch_size = 1000
-    batch_size_automator = BatchSizeAutomator(
-        0, data_batch_size=data_batch_size, step_size=default_step_size
-    )
+    batch_size_automator = BatchSizeAutomator(0, data_batch_size=data_batch_size, step_size=default_step_size)
 
     assert batch_size_automator.step_size == data_batch_size
 
 
 def test_batch_size_is_multitude_of_data_batch_size():
     data_batch_size = 500
     batch_size = 700
-    batch_size_automator = BatchSizeAutomator(
-        batch_size, data_batch_size=data_batch_size
-    )
+    batch_size_automator = BatchSizeAutomator(batch_size, data_batch_size=data_batch_size)
 
     assert batch_size_automator.batch_size == 500
 
     data_batch_size = 500
     batch_size = 800
-    batch_size_automator = BatchSizeAutomator(
-        batch_size, data_batch_size=data_batch_size
-    )
+    batch_size_automator = BatchSizeAutomator(batch_size, data_batch_size=data_batch_size)
 
     assert batch_size_automator.batch_size == 1000
 
     data_batch_size = 500
     batch_size = 400
-    batch_size_automator = BatchSizeAutomator(
-        batch_size, data_batch_size=data_batch_size
-    )
+    batch_size_automator = BatchSizeAutomator(batch_size, data_batch_size=data_batch_size)
 
     assert batch_size_automator.batch_size == 500
 
 
 def test_batch_size_change_is_at_least_data_batch_size():
     data_batch_size = 500
     test_size = 1
-    batch_size_automator = BatchSizeAutomator(
-        0, data_batch_size=data_batch_size, test_size=test_size
-    )
+    batch_size_automator = BatchSizeAutomator(0, data_batch_size=data_batch_size, test_size=test_size)
 
     # initial test cycle:
     batch_size_automator.insert_batch_time(1)
-    assert (
-        batch_size_automator.get_next_batch_size() == 3000
-    )  # initially bath_size will go up
+    assert batch_size_automator.get_next_batch_size() == 3000  # initially bath_size will go up
     # second test cycle:
-    batch_size_automator.insert_batch_time(
-        2
-    )  # worse batch performance reduces alpha and leads to smaller step_size
-    assert (
-        batch_size_automator.get_next_batch_size() == 2000
-    )  # batch_size is changed by at least data_batch_size
+    batch_size_automator.insert_batch_time(2)  # worse batch performance reduces alpha and leads to smaller step_size
+    assert batch_size_automator.get_next_batch_size() == 2000  # batch_size is changed by at least data_batch_size