fix typing

Signed-off-by: Marc Schöchlin <[email protected]>

Author: Marc Schöchlin

src/openstack_workload_generator/__main__.py

@@ -12,7 +12,7 @@
 from openstack.config import loader
 
 from .entities import WorkloadGeneratorDomain
-from .entities.helpers import setup_logging, cloud_checker, item_checker, Config
+from .entities.helpers import setup_logging, cloud_checker, item_checker, Config, iso_timestamp, deep_merge_dict
 
 LOGGER = logging.getLogger()
 
@@ -182,12 +182,19 @@ def establish_connection():
             LOGGER.info(f"Creating a a clouds yaml : {args.generate_clouds_yaml}")
             clouds_yaml_data_new = {"clouds": clouds_yaml_data}
             if os.path.exists(args.generate_clouds_yaml):
-                with open(args.generate_clouds_yaml, 'r') as file:
+                with open(args.generate_clouds_yaml, "r") as file:
                     existing_data = yaml.safe_load(file)
-                backup_file=f"{args.generate_clouds_yaml}_{iso_timestamp()}"
-                logging.warning(f"File {args.generate_clouds_yaml}, making an backup to {backup_file} and adding the new values")
-                shutil.copy2(args.generate_clouds_yaml, f"{args.generate_clouds_yaml}_{iso_timestamp()}")
-                clouds_yaml_data_new = deep_merge_dict(existing_data,clouds_yaml_data_new)
+                backup_file = f"{args.generate_clouds_yaml}_{iso_timestamp()}"
+                logging.warning(
+                    f"File {args.generate_clouds_yaml}, making an backup to {backup_file} and adding the new values"
+                )
+                shutil.copy2(
+                    args.generate_clouds_yaml,
+                    f"{args.generate_clouds_yaml}_{iso_timestamp()}",
+                )
+                clouds_yaml_data_new = deep_merge_dict(
+                    existing_data, clouds_yaml_data_new
+                )
 
             with open(args.generate_clouds_yaml, "w") as file:
                 yaml.dump(

src/openstack_workload_generator/entities/helpers.py

@@ -3,7 +3,7 @@
 import os
 import sys
 from datetime import datetime
-from typing import Tuple
+from typing import Tuple, Any
 import coloredlogs
 
 import re
@@ -252,17 +252,15 @@ def item_checker(value: str) -> str:
         raise argparse.ArgumentTypeError("specify a valid name for an item")
     return value
 
+
 def iso_timestamp() -> str:
     return datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
 
-def deep_merge_dict(d1: dict, d2: dict) -> dict:
+
+def deep_merge_dict(d1: dict, d2: dict) -> dict[str, Any]:
     result = d1.copy()
     for key, value in d2.items():
-        if (
-            key in result
-            and isinstance(result[key], dict)
-            and isinstance(value, dict)
-        ):
+        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
             result[key] = deep_merge_dict(result[key], value)
         else:
             result[key] = value