powertrain-build 1.13.1__py3-none-any.whl → 1.13.3.dev3__py3-none-any.whl

powertrain_build/lib/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Volvo Car Corporation
-# Licensed under Apache 2.0.
-
-"""powertrain_build.lib."""
+# Copyright 2024 Volvo Car Corporation
+# Licensed under Apache 2.0.
+
+"""powertrain_build.lib."""

powertrain_build/lib/helper_functions.py

@@ -1,127 +1,127 @@
-# Copyright 2024 Volvo Car Corporation
-# Licensed under Apache 2.0.
-
-"""Module for various helper functions."""
-import json
-import collections
-from pathlib import Path
-from subprocess import getoutput
-
-
-def get_repo_root():
-    """ Return absolute path to repository where script is executed, regardless
-        of the current script's location.
-
-        Returns:
-            path (str): Absolute, canonical path to the top-level repository.
-                        if not a git repository, returns current working dir
-
-    """
-    try:
-        root = Path(getoutput('git rev-parse --show-toplevel')).resolve()
-    except (FileNotFoundError, OSError):
-        root = Path.cwd().resolve()
-    return str(root)
-
-
-def create_dir(path: Path):
-    """If the directory for a given directory path does not exist, create it.
-    Including parent directories.
-
-    Args:
-        path (Path): Path to directory.
-    Returns:
-        path (Path): Path to directory.
-    """
-    if not path.is_dir():
-        path.mkdir(parents=True)
-    return path
-
-
-def merge_dicts(dict1, dict2, handle_collision=lambda a, b: a, merge_recursively=False):
-    """Merge two dicts.
-
-    Args:
-        dict1 (dict): dict to merge
-        dict2 (dict): dict to merge
-        handle_collision (function(arg1, arg2)): function to resolve key collisions,
-            default keeps original value in dict1
-        merge_recursively (bool): if set to True it merges nested dicts recursively with handle_collision
-            resolving collisions with non-dict types.
-    Returns:
-        dict: the result of the two merged dicts
-    """
-    result = dict1.copy()
-    for key, value in dict2.items():
-        if key not in result:
-            result.update({key: value})
-        elif isinstance(result[key], dict) and \
-                isinstance(value, dict) and \
-                merge_recursively:
-            result[key] = merge_dicts(result[key], value, handle_collision, merge_recursively)
-        else:
-            result[key] = handle_collision(result[key], value)
-    return result
-
-
-def deep_dict_update(base, add):
-    """Recursively update a dict that may contain sub-dicts.
-
-    Args:
-        base (dict): The base dict will be updated with the contents
-                     of the add dict
-        add (dict): This dict will be added to the base dict
-
-    Returns:
-        dict: the updated base dict is returned
-
-    """
-    for key, value in add.items():
-        if key not in base:
-            base[key] = value
-        elif isinstance(value, dict):
-            deep_dict_update(base[key], value)
-    return base
-
-
-def deep_json_update(json_file, dict_to_merge):
-    """ Recursively update a json file with the content of a dict.
-
-    Args:
-        json_file (path): json file.
-        dict_to_merge (dict): Dictionary that will be merged into json file, overwriting values and adding keys.
-    """
-    with open(json_file, 'r', encoding="utf-8") as fle:
-        json_dict = json.load(fle)
-    merged_dict = merge_dicts(
-        json_dict,
-        dict_to_merge,
-        handle_collision=lambda a, b: b,
-        merge_recursively=True
-    )
-    with open(json_file, 'w', encoding="utf-8") as fle:
-        json.dump(merged_dict, fle, indent=2)
-
-
-def recursive_default_dict():
-    """Returns recursively defined default dict. This allows people to insert
-       arbitrarily complex nested data into the dict without getting KeyErrors.
-
-    Returns:
-        defaultdict(self): A new defaultdict instance, recursively defined.
-    """
-    return collections.defaultdict(recursive_default_dict)
-
-
-def to_normal_dict(weird_dict):
-    """Converts nested dict to normal, suitable for YAML/JSON dumping.
-
-    Args:
-        weird_dict (dict): Any dict-like item that can be converted to a dict.
-    Returns:
-        dict(nested): An identical nested dict structure, but using real dicts.
-    """
-    for key, value in weird_dict.items():
-        if isinstance(value, dict):
-            weird_dict[key] = to_normal_dict(value)
-    return dict(weird_dict)
+# Copyright 2024 Volvo Car Corporation
+# Licensed under Apache 2.0.
+
+"""Module for various helper functions."""
+import json
+import collections
+from pathlib import Path
+from subprocess import getoutput
+
+
+def get_repo_root():
+    """ Return absolute path to repository where script is executed, regardless
+        of the current script's location.
+
+        Returns:
+            path (str): Absolute, canonical path to the top-level repository.
+                        if not a git repository, returns current working dir
+
+    """
+    try:
+        root = Path(getoutput('git rev-parse --show-toplevel')).resolve()
+    except (FileNotFoundError, OSError):
+        root = Path.cwd().resolve()
+    return str(root)
+
+
+def create_dir(path: Path):
+    """If the directory for a given directory path does not exist, create it.
+    Including parent directories.
+
+    Args:
+        path (Path): Path to directory.
+    Returns:
+        path (Path): Path to directory.
+    """
+    if not path.is_dir():
+        path.mkdir(parents=True)
+    return path
+
+
+def merge_dicts(dict1, dict2, handle_collision=lambda a, b: a, merge_recursively=False):
+    """Merge two dicts.
+
+    Args:
+        dict1 (dict): dict to merge
+        dict2 (dict): dict to merge
+        handle_collision (function(arg1, arg2)): function to resolve key collisions,
+            default keeps original value in dict1
+        merge_recursively (bool): if set to True it merges nested dicts recursively with handle_collision
+            resolving collisions with non-dict types.
+    Returns:
+        dict: the result of the two merged dicts
+    """
+    result = dict1.copy()
+    for key, value in dict2.items():
+        if key not in result:
+            result.update({key: value})
+        elif isinstance(result[key], dict) and \
+                isinstance(value, dict) and \
+                merge_recursively:
+            result[key] = merge_dicts(result[key], value, handle_collision, merge_recursively)
+        else:
+            result[key] = handle_collision(result[key], value)
+    return result
+
+
+def deep_dict_update(base, add):
+    """Recursively update a dict that may contain sub-dicts.
+
+    Args:
+        base (dict): The base dict will be updated with the contents
+                     of the add dict
+        add (dict): This dict will be added to the base dict
+
+    Returns:
+        dict: the updated base dict is returned
+
+    """
+    for key, value in add.items():
+        if key not in base:
+            base[key] = value
+        elif isinstance(value, dict):
+            deep_dict_update(base[key], value)
+    return base
+
+
+def deep_json_update(json_file, dict_to_merge):
+    """ Recursively update a json file with the content of a dict.
+
+    Args:
+        json_file (path): json file.
+        dict_to_merge (dict): Dictionary that will be merged into json file, overwriting values and adding keys.
+    """
+    with open(json_file, 'r', encoding="utf-8") as fle:
+        json_dict = json.load(fle)
+    merged_dict = merge_dicts(
+        json_dict,
+        dict_to_merge,
+        handle_collision=lambda a, b: b,
+        merge_recursively=True
+    )
+    with open(json_file, 'w', encoding="utf-8") as fle:
+        json.dump(merged_dict, fle, indent=2)
+
+
+def recursive_default_dict():
+    """Returns recursively defined default dict. This allows people to insert
+       arbitrarily complex nested data into the dict without getting KeyErrors.
+
+    Returns:
+        defaultdict(self): A new defaultdict instance, recursively defined.
+    """
+    return collections.defaultdict(recursive_default_dict)
+
+
+def to_normal_dict(weird_dict):
+    """Converts nested dict to normal, suitable for YAML/JSON dumping.
+
+    Args:
+        weird_dict (dict): Any dict-like item that can be converted to a dict.
+    Returns:
+        dict(nested): An identical nested dict structure, but using real dicts.
+    """
+    for key, value in weird_dict.items():
+        if isinstance(value, dict):
+            weird_dict[key] = to_normal_dict(value)
+    return dict(weird_dict)

powertrain_build/lib/logger.py

@@ -1,55 +1,55 @@
-# Copyright 2024 Volvo Car Corporation
-# Licensed under Apache 2.0.
-
-"""Module for logging."""
-import os
-import sys
-import logging
-
-LEVEL_NOTSET = 'NOTSET'
-LEVEL_DEBUG = 'DEBUG'
-LEVEL_INFO = 'INFO'
-LEVEL_WARNING = 'WARNING'
-LEVEL_ERROR = 'ERROR'
-LEVEL_CRITICAL = 'CRITICAL'
-
-LEVELS = {
-    LEVEL_NOTSET: logging.NOTSET,
-    LEVEL_DEBUG: logging.DEBUG,
-    LEVEL_INFO: logging.INFO,
-    LEVEL_WARNING: logging.WARNING,
-    LEVEL_ERROR: logging.ERROR,
-    LEVEL_CRITICAL: logging.CRITICAL
-}
-
-
-def parse_log_level(log_level_name):
-    """Convert textual log_level_name to numerical ones defined in logging module."""
-    level = log_level_name.upper()
-    if level not in LEVELS:
-        print(f'Log level "{log_level_name}" invalid, valid list: {", ".join(LEVELS.keys())}', file=sys.stderr)
-        level = LEVEL_DEBUG
-    return LEVELS[level]
-
-
-def create_logger(name, handler=None, log_format=None):
-    """Create a logger.
-
-    If the handler already have a log format, it will be replaced.
-
-    Args:
-        name (str): Name of the logger
-        handler (obj): Handler for the logger. Default used if not supplied.
-        log_format (str): Format for the handler. Default used if not supplied.'
-    Returns:
-        logger (obj): A logger with a handler and log format
-    """
-    new_logger = logging.getLogger(name)
-    new_logger.setLevel(parse_log_level(os.getenv('LOG_LEVEL', LEVEL_INFO)))
-    if handler is None:
-        handler = logging.StreamHandler(sys.stdout)
-    if log_format is None:
-        log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-    handler.setFormatter(logging.Formatter(log_format))
-    new_logger.addHandler(handler)
-    return new_logger
+# Copyright 2024 Volvo Car Corporation
+# Licensed under Apache 2.0.
+
+"""Module for logging."""
+import os
+import sys
+import logging
+
+LEVEL_NOTSET = 'NOTSET'
+LEVEL_DEBUG = 'DEBUG'
+LEVEL_INFO = 'INFO'
+LEVEL_WARNING = 'WARNING'
+LEVEL_ERROR = 'ERROR'
+LEVEL_CRITICAL = 'CRITICAL'
+
+LEVELS = {
+    LEVEL_NOTSET: logging.NOTSET,
+    LEVEL_DEBUG: logging.DEBUG,
+    LEVEL_INFO: logging.INFO,
+    LEVEL_WARNING: logging.WARNING,
+    LEVEL_ERROR: logging.ERROR,
+    LEVEL_CRITICAL: logging.CRITICAL
+}
+
+
+def parse_log_level(log_level_name):
+    """Convert textual log_level_name to numerical ones defined in logging module."""
+    level = log_level_name.upper()
+    if level not in LEVELS:
+        print(f'Log level "{log_level_name}" invalid, valid list: {", ".join(LEVELS.keys())}', file=sys.stderr)
+        level = LEVEL_DEBUG
+    return LEVELS[level]
+
+
+def create_logger(name, handler=None, log_format=None):
+    """Create a logger.
+
+    If the handler already have a log format, it will be replaced.
+
+    Args:
+        name (str): Name of the logger
+        handler (obj): Handler for the logger. Default used if not supplied.
+        log_format (str): Format for the handler. Default used if not supplied.'
+    Returns:
+        logger (obj): A logger with a handler and log format
+    """
+    new_logger = logging.getLogger(name)
+    new_logger.setLevel(parse_log_level(os.getenv('LOG_LEVEL', LEVEL_INFO)))
+    if handler is None:
+        handler = logging.StreamHandler(sys.stdout)
+    if log_format is None:
+        log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    handler.setFormatter(logging.Formatter(log_format))
+    new_logger.addHandler(handler)
+    return new_logger

powertrain_build/matlab_scripts/CodeGen/BuildAutomationPyBuild.m

@@ -1,78 +1,78 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Author: Henrik Wahlqvist
-% Date: 31-01-2019
-% Purpose: This is for automatically generating c-files from MATLAB models.
-% This program can also be used as daily PyBuild code generation.
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-function BuildAutomationPyBuild(mode, exitOnFailure, modelList)
-    try
-        addpath(genpath([pwd '/Projects']));
-        addpath(genpath([pwd '/matlab-scripts']));
-
-        initFile = 'Init_PyBuild(false);';
-        disp(['Running init file: ' initFile])
-        evalin('base', initFile);
-
-        %Update all models unless a list is provided:
-        if ~exist('modelList', 'var')
-            disp('Updating all models...');
-            modelList = gatherAllModels();
-        end
-
-        updateModels(mode, pwd, modelList);
-        disp('Done.');
-
-    catch err
-        disp(getReport(err))
-        if exitOnFailure
-            quit force;
-        end
-    end
-    if exitOnFailure
-        exit;
-    end
-    bdclose Vcc_Lib;
-end
-
-function models = gatherAllModels()
-% Function for gathering all models in the repo.
-    startdir = pwd;
-    models = {};
-    modelsFolder = [startdir '/Models/'];
-    env_ssp = getenv('SSP');
-    if isempty(env_ssp)
-        disp('ALL models')
-        ssps = dir([modelsFolder '*']);
-    else
-        ssp_dir = [modelsFolder env_ssp '*']
-        disp(['All models in ' ssp_dir])
-        ssps = dir(ssp_dir);
-    end
-
-    for i=1:length(ssps)
-        if ~ssps(i).isdir
-            continue;
-        end
-        ssp = ssps(i).name;
-        currSspFolder = [modelsFolder ssp '/'];
-        cd(currSspFolder)
-        modelsInSsp = dir('Vc*');
-        for j=1:length(modelsInSsp)
-            % Make sure it is a directory
-            if ~modelsInSsp(j).isdir
-                continue;
-            end
-            model = modelsInSsp(j).name;
-            % Make sure the directory contains an .mdl file
-            if isfile([model '/' model '.mdl'])
-                models = [models ['Models/' ssp '/' model '/' model '.mdl']];
-            end
-        end
-        cd(startdir);
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Author: Henrik Wahlqvist
+% Date: 31-01-2019
+% Purpose: This is for automatically generating c-files from MATLAB models.
+% This program can also be used as daily PyBuild code generation.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+function BuildAutomationPyBuild(mode, exitOnFailure, modelList)
+    try
+        addpath(genpath([pwd '/Projects']));
+        addpath(genpath([pwd '/matlab-scripts']));
+
+        initFile = 'Init_PyBuild(false);';
+        disp(['Running init file: ' initFile])
+        evalin('base', initFile);
+
+        %Update all models unless a list is provided:
+        if ~exist('modelList', 'var')
+            disp('Updating all models...');
+            modelList = gatherAllModels();
+        end
+
+        updateModels(mode, pwd, modelList);
+        disp('Done.');
+
+    catch err
+        disp(getReport(err))
+        if exitOnFailure
+            quit force;
+        end
+    end
+    if exitOnFailure
+        exit;
+    end
+    bdclose Vcc_Lib;
+end
+
+function models = gatherAllModels()
+% Function for gathering all models in the repo.
+    startdir = pwd;
+    models = {};
+    modelsFolder = [startdir '/Models/'];
+    env_ssp = getenv('SSP');
+    if isempty(env_ssp)
+        disp('ALL models')
+        ssps = dir([modelsFolder '*']);
+    else
+        ssp_dir = [modelsFolder env_ssp '*']
+        disp(['All models in ' ssp_dir])
+        ssps = dir(ssp_dir);
+    end
+
+    for i=1:length(ssps)
+        if ~ssps(i).isdir
+            continue;
+        end
+        ssp = ssps(i).name;
+        currSspFolder = [modelsFolder ssp '/'];
+        cd(currSspFolder)
+        modelsInSsp = dir('Vc*');
+        for j=1:length(modelsInSsp)
+            % Make sure it is a directory
+            if ~modelsInSsp(j).isdir
+                continue;
+            end
+            model = modelsInSsp(j).name;
+            % Make sure the directory contains an .mdl file
+            if isfile([model '/' model '.mdl'])
+                models = [models ['Models/' ssp '/' model '/' model '.mdl']];
+            end
+        end
+        cd(startdir);
+    end
+end