fameio 2.0.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

CHANGELOG.md

@@ -1,10 +1,33 @@
-<!-- SPDX-FileCopyrightText: 2023 German Aerospace Center <fame@dlr.de>
+<!-- SPDX-FileCopyrightText: 2024 German Aerospace Center <fame@dlr.de>
 
 SPDX-License-Identifier: CC0-1.0 -->
 
 # Changelog
+## [2.1.1](https://gitlab.com/fame-framework/fame-io/-/tags/v2.1.1) - 2024-05-28
+### Fixed
+- ConvertFameResults: Fix crash on complex column conversion if Agent has no simple columns #204 (@dlr_fn @dlr-cjs) 
+
+## [2.1.0](https://gitlab.com/fame-framework/fame-io/-/tags/v2.1.0) - 2024-05-11
+### Changed
+- Changed format of auto-created timeseries from constant values #196 (@dlr-cjs)
+- Changed default log level to "WARNING" #191 (@dlr_fn @dlr-cjs)
+- Adapted link-formatting in Changelog !155 (@dlr-cjs)
+
+### Added
+- Read java package names from Schema and write to input.pb #198 (@dlr-cjs)
+
+### Fixed
+- Fix docstrings in CLI `handle_args()` #190 (@dlr-cjs @dlr_fn)
+- Fix potential duplicates in logging #191 (@dlr_fn @dlr-cjs)
+
+## [2.0.1](https://gitlab.com/fame-framework/fame-io/-/tags/v2.0.1) - 2024-04-05
+### Fix
+- Fix potential missing columns when memory-saving-mode `-m` is enabled #194 (@dlr_fn @dlr-cjs) 
+
+### Remove
+- Remove convert results option `-cc MERGE` #194 (@dlr_fn @dlr-cjs)
 
-## [2.0.0 - 2024-04-03](https://gitlab.com/fame-framework/fame-io/-/tags/v2.0.0)
+## [2.0.0](https://gitlab.com/fame-framework/fame-io/-/tags/v2.0.0) - 2024-04-03
 ### Changed
 - **Breaking**: Removed support for `python==3.8` #163 (@dlr-cjs @dlr_fn)
 - **Breaking**: Signature of `run` functions in `make_config.py` and `convert_results.py` changed: the input file is now read from the configuration dictionary #163 (@dlr-cjs @dlr_fn)
@@ -45,11 +68,11 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Fix breaking tests in Pytest 8.0 #176 (@dlr-cjs)
 - Fix PyTests for Python 3.12 #182 (@dlr_fn)
 
-## [1.8.1 - 2023-05-04](https://gitlab.com/fame-framework/fame-io/-/tags/v1.8.1)
+## [1.8.1](https://gitlab.com/fame-framework/fame-io/-/tags/v1.8.1) - 2023-05-04
 ### Fixed
 - Fix fail of `ConvertFameResults` when `merge-times` was not specified
 
-## [1.8.0 - 2023-04-14](https://gitlab.com/fame-framework/fame-io/-/tags/v1.8)
+## [1.8.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.8) - 2023-04-14
 ### Changed
 - Update repository to be compliant to `REUSE` standard
 - Accept custom `date_format` (default: `"%Y-%m-%d_%H:%M:%S"`) for `FameTime.convert_fame_time_step_to_datetime()`
@@ -61,7 +84,7 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Add option to merge time steps in results with `convertFameResults`
 - Add pre-commit hooks enforcing high coding standards and reducing CI runner minutes during development
 
-## [1.7.0 - 2023-02-20](https://gitlab.com/fame-framework/fame-io/-/tags/v1.7)
+## [1.7.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.7) - 2023-02-20
 ### Added
 - Support dictionaries in Schema for field `Products` in elements of `AgentTypes`
 - Support dictionaries in Schema for field `Values` in elements of `Attributes`
@@ -73,15 +96,15 @@ SPDX-License-Identifier: CC0-1.0 -->
 ### Remove
 - **Breaking**: `Products` in Schema no longer support single non-list values
 
-## [1.6.3 - 2022-11-04](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6.3)
+## [1.6.3](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6.3) - 2022-11-04
 ### Added
 - Allow parsing `Help` for `Attributes` in `schema`
 
-## [1.6.1 - 2022-11-02](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6.1)
+## [1.6.1](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6.1) - 2022-11-02
 ### Changed
 - Use existing logger if already set up to avoid duplicates when `fameio` is used as dependency in third party workflows
 
-## [1.6.0 - 2022-07-08](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6)
+## [1.6.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.6) - 2022-07-08
 ### Added
 - Add option to enable memory saving mode using the flag `-m` or `--memory-saving`
 - Add options to deal with complex indexed output columns using the flag `-cc` or `--complex-column` with
@@ -94,23 +117,23 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Reduce memory profile for `convertFameResults`
 - Extract `source` scripts relevant for `convertFameResults` to be hosted in subpackage `results`
 
-## [1.5.4 - 2022-06-01](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.4)
+## [1.5.4](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.4) - 2022-06-01
 ### Changed
 - Limit `protobuf` dependency to `>=3.19,<4.0`
 
-## [1.5.3 - 2022-03-18](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.3)
+## [1.5.3](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.3) - 2022-03-18
 ### Changed
 - Harmonize interface with `famegui`
 - Return `None` on failure of `resolve_series_file_path` instead of raising a `FileNotFoundError`
 
-## [1.5.2 - 2022-03-10](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.2)
+## [1.5.2](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.2) - 2022-03-10
 ### Changed
 - Allow interfacing of `famegui` with `scenario` (e.g. serialization, error handling)
 - Move `scenario` validation to `validator.py`
 - Extract `path_resolver.py`
 - Increase test coverage by incorporating [AMIRIS examples](https://gitlab.com/dlr-ve/esy/amiris/examples)
 
-## [1.5.1 - 2022-01-10](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.1)
+## [1.5.1](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5.1) - 2022-01-10
 ### Added
 - Provide documentation on installation using `pipx`
 - Add optional argument `-se`/`--singleexport` for exporting individual files for each agent
@@ -120,7 +143,7 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Refactor `scenario.py`
 - Ensure code formatting using `black`
 
-## [1.5.0 - 2021-06-30](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5)
+## [1.5.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.5) - 2021-06-30
 ### Added
 - Support specifying an output folder in command line interface of `convert_results.py`
 
@@ -128,7 +151,7 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Update to latest protobuf package
 - Refactor code
 
-## [1.4.0 - 2021-06-10](https://gitlab.com/fame-framework/fame-io/-/tags/v1.4)
+## [1.4.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.4) - 2021-06-10
 ### Added
 - Enable "Default" values for Attributes - these are used in case a mandatory attribute is not specified in the Scenario
 - Allow "List" Attributes with multiple values
@@ -145,7 +168,7 @@ SPDX-License-Identifier: CC0-1.0 -->
 ### Fixed
 - Fixed minor bugs
 
-## [1.3.0 - 2021-04-13](https://gitlab.com/fame-framework/fame-io/-/tags/v1.3)
+## [1.3.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.3) - 2021-04-13
 ### Added
 - Enable `Attributes` in agents (formerly known as `Fields`) to be structured in complex tree-like data dictionaries
 - Allow contracts to support `Attributes` of type `int`, `float`, `enum` or `dict`
@@ -160,26 +183,26 @@ SPDX-License-Identifier: CC0-1.0 -->
 - Raise critical error when trying to convert empty protobuf output file
 - Check if `product` in `contract` is valid according to `schema.yaml`
 
-## [1.2.4 - 2021-02-26](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.4)
+## [1.2.4](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.4) - 2021-02-26
 ### Changed
 - Move `is_compatible` function to class `AttributeType`
 
-## [1.2.3 - 2021-02-24](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.3)
+## [1.2.3](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.3) - 2021-02-24
 ### Fixed
 - Fix file prefix `IGNORE_` (used when loading a set of contract files with the !include argument) is now working consistently
 
-## [1.2.2 - 2021-02-18](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.2)
+## [1.2.2](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.2) - 2021-02-18
 ### Changed
 - **Breaking**: Rename `fieldtype` to `attributetype` in `schema.yaml`
 - Derive protobuf imports from `fameprotobuf` package
 - Improve handling of cases for keys in `scenario.yaml`
 - Improve handling of time stamp strings
 
-## [1.2.1 - 2021-02-10](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.1)
+## [1.2.1](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2.1) - 2021-02-10
 ### Changed
 - Improve key handling for contracts which are now case-insensitive
 
-## [1.2.0 - 2021-02-04](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2)
+## [1.2.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.2) - 2021-02-04
 ### Added
 - Add `!include` command to yaml loading to allow integrating additional yaml files
 
@@ -192,7 +215,7 @@ SPDX-License-Identifier: CC0-1.0 -->
 ### Fixed
 - Fix bugs
 
-## [1.1.0 - 2020-12-09](https://gitlab.com/fame-framework/fame-io/-/tags/v1.1)
+## [1.1.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.1) - 2020-12-09
 ### Added
 - Package to PyPI
 - Provide executables for calling `makeFameRunConfig` and `convertFameResults`
@@ -200,5 +223,5 @@ SPDX-License-Identifier: CC0-1.0 -->
 ### Changed
 - Improve documentation
 
-## [1.0.0 - 2020-11-17](https://gitlab.com/fame-framework/fame-io/-/tags/v1.0)
+## [1.0.0](https://gitlab.com/fame-framework/fame-io/-/tags/v1.0) - 2020-11-17
 _Initial release of `famepy`_

fameio/scripts/convert_results.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from fameio.source.cli.convert_results import handle_args, CLI_DEFAULTS as DEFAULT_CONFIG
 from fameio.source.cli.options import Options
 from fameio.source.cli.parser import update_default_config
-from fameio.source.logs import log_and_raise_critical, set_up_logger, logger
+from fameio.source.logs import log_and_raise_critical, fameio_logger, log
 from fameio.source.results.agent_type import AgentTypeLog
 from fameio.source.results.conversion import apply_time_option, apply_time_merging
 from fameio.source.results.csv_writer import CsvWriter
@@ -23,16 +23,16 @@ ERR_MEMORY_SEVERE = "Out of memory despite memory-saving mode. Reduce output int
 def run(config: dict = None) -> None:
     """Reads file in protobuf format for configures FILE and extracts its content to .csv file(s)"""
     config = update_default_config(config, DEFAULT_CONFIG)
-    set_up_logger(level_name=config[Options.LOG_LEVEL], file_name=config[Options.LOG_FILE])
+    fameio_logger(log_level_name=config[Options.LOG_LEVEL], file_name=config[Options.LOG_FILE])
 
     file_path = config[Options.FILE]
     output_writer = CsvWriter(config[Options.OUTPUT], Path(file_path), config[Options.SINGLE_AGENT_EXPORT])
     file_stream = open(Path(file_path), "rb")
 
     if config[Options.MEMORY_SAVING]:
-        logger().info("Memory saving mode enabled: Disable on conversion of small files for performance improvements.")
+        log().info("Memory saving mode enabled: Disable on conversion of small files for performance improvements.")
 
-    logger().info("Reading and extracting data...")
+    log().info("Reading and extracting data...")
     reader = Reader.get_reader(file=file_stream, read_single=config[Options.MEMORY_SAVING])
     agent_type_log = AgentTypeLog(requested_agents=config[Options.AGENT_LIST])
     data_transformer = DataTransformer.build(config[Options.RESOLVE_COMPLEX_FIELD])
@@ -43,27 +43,27 @@ def run(config: dict = None) -> None:
                 input_dao.store_inputs(data_storages)
             output = OutputDAO(data_storages, agent_type_log)
             for agent_name in output.get_sorted_agents_to_extract():
-                logger().debug(f"Extracting data for {agent_name}...")
+                log().debug(f"Extracting data for {agent_name}...")
                 data_frames = output.get_agent_data(agent_name, data_transformer)
                 apply_time_merging(data_frames, config[Options.TIME_MERGING])
                 apply_time_option(data_frames, config[Options.TIME])
-                logger().debug(f"Writing data for {agent_name}...")
+                log().debug(f"Writing data for {agent_name}...")
                 output_writer.write_to_files(agent_name, data_frames)
 
         if config[Options.INPUT_RECOVERY]:
-            logger().info("Recovering inputs...")
+            log().info("Recovering inputs...")
             timeseries, scenario = input_dao.recover_inputs()
             series_writer = CsvWriter(Path(config[Options.OUTPUT], "./recovered"), Path("./"), False)
             series_writer.write_time_series_to_disk(timeseries)
             data_to_yaml_file(scenario.to_dict(), Path(config[Options.OUTPUT], "./recovered/scenario.yaml"))
 
-        logger().info("Data conversion completed.")
+        log().info("Data conversion completed.")
     except MemoryError:
         log_and_raise_critical(ERR_MEMORY_SEVERE if Options.MEMORY_SAVING else ERR_MEMORY_ERROR)
 
     file_stream.close()
     if not agent_type_log.has_any_agent_type():
-        logger().error("Provided file did not contain any output data.")
+        log().error("Provided file did not contain any output data.")
 
 
 if __name__ == "__main__":

fameio/scripts/make_config.py

@@ -6,7 +6,7 @@ from fameio.source.cli.make_config import handle_args, CLI_DEFAULTS as DEFAULT_C
 from fameio.source.cli.options import Options
 from fameio.source.cli.parser import update_default_config
 from fameio.source.loader import load_yaml, check_for_yaml_file_type
-from fameio.source.logs import set_up_logger, logger
+from fameio.source.logs import fameio_logger, log
 from fameio.source.scenario import Scenario
 from fameio.source.validator import SchemaValidator
 from fameio.source.writer import ProtoWriter
@@ -15,7 +15,7 @@ from fameio.source.writer import ProtoWriter
 def run(config: dict = None) -> None:
     """Executes the main workflow for the building of a FAME configuration file"""
     config = update_default_config(config, DEFAULT_CONFIG)
-    set_up_logger(level_name=config[Options.LOG_LEVEL], file_name=config[Options.LOG_FILE])
+    fameio_logger(log_level_name=config[Options.LOG_LEVEL], file_name=config[Options.LOG_FILE])
 
     file = config[Options.FILE]
     check_for_yaml_file_type(Path(file))
@@ -26,7 +26,7 @@ def run(config: dict = None) -> None:
     writer = ProtoWriter(config[Options.OUTPUT], timeseries_manager)
     writer.write_validated_scenario(scenario)
 
-    logger().info("Configuration completed.")
+    log().info("Configuration completed.")
 
 
 if __name__ == "__main__":

fameio/source/cli/convert_results.py

@@ -22,7 +22,7 @@ from fameio.source.cli.parser import (
 
 CLI_DEFAULTS = {
     Options.FILE: None,
-    Options.LOG_LEVEL: "info",
+    Options.LOG_LEVEL: "WARN",
     Options.LOG_FILE: None,
     Options.AGENT_LIST: None,
     Options.OUTPUT: None,
@@ -39,7 +39,16 @@ _OUTFILE_PATH_HELP = "Provide path to folder to store output .csv files"
 
 
 def handle_args(args: List[str], defaults: Optional[Dict[Options, Any]] = None) -> Dict[Options, Any]:
-    """Handles command line arguments and returns `input_file` and `run_config` for convert_results script"""
+    """
+    Handles command line arguments and returns `run_config` for convert_results script
+
+    Args:
+        args: list of (command line) arguments, e.g., ['-f', 'my_file']; arg values take precedence over defaults
+        defaults: optional default values used for unspecified parameters; missing defaults are replaced by CLI defaults
+
+    Returns:
+        final configuration compiled from (given) `defaults` and given `args`
+    """
     parser = _prepare_parser(defaults)
     parsed = parser.parse_args(args)
     return map_namespace_to_options_dict(parsed)

fameio/source/cli/make_config.py

@@ -16,7 +16,7 @@ from fameio.source.cli.parser import (
 
 CLI_DEFAULTS = {
     Options.FILE: None,
-    Options.LOG_LEVEL: "info",
+    Options.LOG_LEVEL: "WARN",
     Options.LOG_FILE: None,
     Options.OUTPUT: Path("config.pb"),
 }
@@ -34,7 +34,7 @@ def handle_args(args: List[str], defaults: Optional[Dict[Options, Any]] = None)
         defaults: optional default values used for unspecified parameters; missing defaults are replaced by CLI defaults
 
     Returns:
-        final configuration compiled from (given) defaults and
+        final configuration compiled from (given) `defaults` and given `args`
     """
     parser = _prepare_parser(defaults)
     parsed = parser.parse_args(args)

fameio/source/cli/options.py

@@ -48,7 +48,6 @@ class ResolveOptions(ParsableEnum, Enum):
 
     IGNORE = auto()
     SPLIT = auto()
-    MERGE = auto()
 
 
 class MergingOptions(Enum):

fameio/source/cli/parser.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import Optional, Dict, Any, List, Union
 
 from fameio.source.cli.options import MergingOptions, TimeOptions, ResolveOptions, Options
-from fameio.source.logs import LOG_LEVELS
+from fameio.source.logs import LogLevel
 
 _ERR_NEGATIVE_INT = "Given value `{}` is not a non-negative int."
 
@@ -74,8 +74,8 @@ def add_log_level_argument(parser: ArgumentParser, default_value: str) -> None:
         "-l",
         "--log",
         default=default_value,
-        choices=list(LOG_LEVELS.keys()),
-        type=str.lower,
+        choices=[level.name for level in LogLevel if level not in [LogLevel.PRINT, LogLevel.WARN]],
+        type=str.upper,
         help=help_text,
     )
 

fameio/source/loader.py

@@ -8,7 +8,7 @@ from fnmatch import fnmatch
 from typing import IO, Any, Callable
 
 import yaml
-from fameio.source.logs import log_and_raise_critical, logger
+from fameio.source.logs import log_and_raise_critical, log
 from fameio.source.path_resolver import PathResolver
 
 DISABLING_YAML_FILE_PREFIX = "IGNORE_"
@@ -28,7 +28,7 @@ def read_args(loader, args):
     file_string = None
     if isinstance(args, yaml.nodes.ScalarNode):
         file_string = loader.construct_scalar(args)
-        logger().debug("Found instance `ScalarNode` in {}".format(file_string))
+        log().debug("Found instance `ScalarNode` in {}".format(file_string))
     elif isinstance(args, yaml.nodes.SequenceNode):
         argument_list = loader.construct_sequence(args)
         if len(argument_list) not in [1, 2]:
@@ -36,7 +36,7 @@ def read_args(loader, args):
         elif len(argument_list) == 2:
             node_string = argument_list[1]
         file_string = argument_list[0]
-        logger().debug("Found instance `SequenceNode` in {}".format(file_string))
+        log().debug("Found instance `SequenceNode` in {}".format(file_string))
     elif isinstance(args, yaml.nodes.MappingNode):
         argument_map = loader.construct_mapping(args)
         for key, value in argument_map.items():
@@ -55,7 +55,7 @@ def read_args(loader, args):
 
 def split_nodes(node_string):
     """Returns a list of nodes created from the given `node_string`"""
-    logger().debug("Splitting given node_string `{}`".format(node_string))
+    log().debug("Splitting given node_string `{}`".format(node_string))
     return node_string.split(":")
 
 
@@ -63,7 +63,7 @@ class FameYamlLoader(yaml.SafeLoader):
     """Custom YAML Loader for `!include` constructor"""
 
     def __init__(self, stream: IO, path_resolver=PathResolver()) -> None:
-        logger().debug("Initialize custom YAML loader")
+        log().debug("Initialize custom YAML loader")
         self._path_resolver = path_resolver
         try:
             self._root_path = os.path.split(stream.name)[0]
@@ -99,12 +99,12 @@ def resolve_imported_path(loader: FameYamlLoader, included_path: str):
     cleaned_file_list = []
     for file in file_list:
         if fnmatch(file, ignore_filter):
-            logger().debug("Ignoring file {} due to prefix {}".format(file, DISABLING_YAML_FILE_PREFIX))
+            log().debug("Ignoring file {} due to prefix {}".format(file, DISABLING_YAML_FILE_PREFIX))
         else:
             cleaned_file_list.append(file)
     if not cleaned_file_list:
         log_and_raise_critical("Failed to find any file matching the `!include` directive `{}`".format(included_path))
-    logger().debug("Collected file(s) `{}` from given included path `{}`".format(cleaned_file_list, included_path))
+    log().debug("Collected file(s) `{}` from given included path `{}`".format(cleaned_file_list, included_path))
     return cleaned_file_list
 
 
@@ -117,7 +117,7 @@ def read_data_from_file(file, node_address, path_resolver: PathResolver):
                 data = data[node]
             except KeyError:
                 log_and_raise_critical("'!include_node [{}, {}]': Cannot find '{}'.".format(file, node_address, node))
-    logger().debug("Searched file `{}` for node `{}`".format(file, node_address))
+    log().debug("Searched file `{}` for node `{}`".format(file, node_address))
     return data
 
 
@@ -156,7 +156,7 @@ def construct_include(loader: FameYamlLoader, args: yaml.Node) -> Any:
         with open(file_name, "r") as open_file:
             data = read_data_from_file(open_file, nodes, loader.path_resolver)
             joined_data = join_data(data, joined_data)
-    logger().debug("Joined all files `{}` to joined data `{}`".format(files, joined_data))
+    log().debug("Joined all files `{}` to joined data `{}`".format(files, joined_data))
     return joined_data
 
 
@@ -165,7 +165,7 @@ FameYamlLoader.add_constructor("!include", construct_include)
 
 def load_yaml(yaml_file_path: Path, path_resolver=PathResolver()):
     """Loads the yaml file from given `yaml_file_path` and returns its content"""
-    logger().info("Loading yaml from {}".format(yaml_file_path))
+    log().info("Loading yaml from {}".format(yaml_file_path))
     with open(yaml_file_path, "r") as configfile:
         data = yaml.load(configfile, make_yaml_loader_builder(path_resolver))
     return data

fameio/source/logs.py

@@ -1,72 +1,102 @@
-# SPDX-FileCopyrightText: 2023 German Aerospace Center <fame@dlr.de>
+# SPDX-FileCopyrightText: 2024 German Aerospace Center <fame@dlr.de>
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import logging as log
+import logging as pylog
+from enum import Enum
 from pathlib import Path
 from typing import NoReturn, Optional, List
 
-LOG_LEVELS = {
-    "critical": log.CRITICAL,
-    "error": log.ERROR,
-    "warn": log.WARNING,
-    "warning": log.WARNING,
-    "info": log.INFO,
-    "debug": log.DEBUG,
-}
 
-_loggers: List[log.Logger] = []
+class LogLevel(Enum):
+    """Levels for Logging"""
+
+    PRINT = 100
+    CRITICAL = pylog.CRITICAL
+    ERROR = pylog.ERROR
+    WARN = pylog.WARNING
+    WARNING = pylog.WARNING
+    INFO = pylog.INFO
+    DEBUG = pylog.DEBUG
+
+
+_loggers: List[pylog.Logger] = []
+_handlers: List[pylog.Handler] = []
 
 _FORMAT_NORMAL = "%(asctime)s — %(levelname)s — %(message)s"  # noqa
 _FORMAT_DETAILLED = "%(asctime)s.%(msecs)03d — %(levelname)s — %(module)s:%(funcName)s:%(lineno)d — %(message)s"  # noqa
 _TIME_FORMAT = "%H:%M:%S"
 
-_WARN_ALREADY_INITIALIZED = "Cannot set up new FAMEIO logger: using existing logger with previous settings."
-_WARN_NOT_INITIALIZED = "Logger not initialised for FAMEIO - using default root logger"
+_INFO_UPDATING_LOG_LEVEL = "Updating fameio log level to: {}"
+_WARN_NOT_INITIALIZED = "Logger for fameio not initialised: using default log level `WARNING`"
 
 LOGGER_NAME = "fameio"
+DEFAULT_LOG_LEVEL = LogLevel.WARNING
 
 
-def logger() -> log.Logger:
-    """Returns already set up FAME-Io's logger or - if not set up - a new logger with level `INFO`"""
+def log() -> pylog.Logger:
+    """Returns already set up FAME-Io's logger or - if not set up - a new logger with `WARNING`"""
     if not _loggers:
-        set_up_logger("info")
-        log.warning(_WARN_NOT_INITIALIZED)
+        fameio_logger(DEFAULT_LOG_LEVEL.name)
+        pylog.warning(_WARN_NOT_INITIALIZED)
     return _loggers[0]
 
 
 def log_and_raise_critical(message: str) -> NoReturn:
     """Raises a critical error and logs with given `error_message`"""
-    logger().critical(message)
+    log().critical(message)
     raise Exception(message)
 
 
 def log_error_and_raise(exception: Exception) -> NoReturn:
     """Raises the specified `exception` and logs an error with the same `message`"""
-    logger().error(str(exception))
+    log().error(str(exception))
     raise exception
 
 
-def set_up_logger(level_name: str, file_name: Optional[Path] = None) -> None:
-    """Uses existing logger or sets up logger"""
-    if not _loggers:
-        _loggers.append(log.getLogger(LOGGER_NAME))
-        level = LOG_LEVELS.get(level_name.lower())
-        _set_log_level(level)
-        formatter = _get_formatter(level)
-        _add_handler(log.StreamHandler(), formatter)
-        if file_name:
-            _add_handler(log.FileHandler(file_name, mode="w"), formatter)
+def fameio_logger(log_level_name: str, file_name: Optional[Path] = None) -> None:
+    """
+    Ensures a logger for fameio is present and uses the specified options
+
+    Args:
+        log_level_name: one of Python's official logging level names, e.g. "INFO"
+        file_name: if present, logs are also written to the specified file path
+    """
+    log_level = LogLevel[log_level_name.upper()]
+    logger = _get_logger(log_level)
+
+    formatter = _get_formatter(log_level)
+    _add_handler(logger, pylog.StreamHandler(), formatter)
+    if file_name:
+        _add_handler(logger, pylog.FileHandler(file_name, mode="w"), formatter)
+
+    if _loggers:
+        pylog.info(_INFO_UPDATING_LOG_LEVEL.format(log_level_name))
+        _loggers[0] = logger
     else:
-        log.warning(_WARN_ALREADY_INITIALIZED)
+        _loggers.append(logger)
+
+
+def _get_logger(level: LogLevel) -> pylog.Logger:
+    """
+    Returns fameio logger with given log level without any handler and, not propagating to parent
 
+    Args:
+        level: integer representing the log level
 
-def _set_log_level(level: int) -> None:
-    """Set the global log level to given `level`"""
-    logger().setLevel(level)
+    Returns:
+        logger for fameio with specified level
+    """
+    logger = pylog.getLogger(LOGGER_NAME)
+    logger.setLevel(level.value)
+    logger.propagate = False
+    for handler in _handlers:
+        logger.removeHandler(handler)
+    _handlers.clear()
+    return logger
 
 
-def _get_formatter(level: int) -> log.Formatter:
+def _get_formatter(level: LogLevel) -> pylog.Formatter:
     """
     Returns a log formatter depending on the given log `level`
     Args:
@@ -74,10 +104,11 @@ def _get_formatter(level: int) -> log.Formatter:
     Returns:
         new log formatter
     """
-    return log.Formatter(_FORMAT_DETAILLED if level is log.DEBUG else _FORMAT_NORMAL, _TIME_FORMAT)
+    return pylog.Formatter(_FORMAT_DETAILLED if level is LogLevel.DEBUG else _FORMAT_NORMAL, _TIME_FORMAT)
 
 
-def _add_handler(handler: log.Handler, formatter: log.Formatter) -> None:
-    """Adds given `handler` to root logger using the specified `formatter`"""
+def _add_handler(logger: pylog.Logger, handler: pylog.Handler, formatter: pylog.Formatter) -> None:
+    """Adds given `handler` using the specified `formatter` to given `logger` and `_handlers` list"""
     handler.setFormatter(formatter)
-    logger().addHandler(handler)
+    _handlers.append(handler)
+    logger.addHandler(handler)

fameio/source/results/conversion.py

@@ -9,7 +9,7 @@ import pandas as pd
 
 from fameio.source import FameTime
 from fameio.source.cli.options import TimeOptions, MergingOptions
-from fameio.source.logs import log_error_and_raise, logger
+from fameio.source.logs import log_error_and_raise, log
 from fameio.source.time import ConversionException
 
 _ERR_UNIMPLEMENTED = "Time conversion mode '{}' not implemented."
@@ -27,7 +27,7 @@ def apply_time_merging(data: Dict[Optional[str], pd.DataFrame], config: Optional
         Nothing - data is modified inplace
     """
     if config:
-        logger().debug(f"Grouping TimeSteps...")
+        log().debug(f"Grouping TimeSteps...")
         offset = config[MergingOptions.STEPS_BEFORE]
         period = config[MergingOptions.STEPS_AFTER] + config[MergingOptions.STEPS_BEFORE] + 1
         first_positive_focal_point = config[MergingOptions.FOCAL_POINT] % period
@@ -67,7 +67,7 @@ def apply_time_option(data: Dict[Optional[str], pd.DataFrame], mode: TimeOptions
         Nothing - data is modified inplace
     """
     if mode == TimeOptions.INT:
-        logger().debug("No time conversion...")
+        log().debug("No time conversion...")
     elif mode == TimeOptions.UTC:
         _convert_time_index(data, "%Y-%m-%d %H:%M:%S")
     elif mode == TimeOptions.FAME:
@@ -88,7 +88,7 @@ def _convert_time_index(data: Dict[Optional[str], pd.DataFrame], datetime_format
     Returns:
         Nothing - data is modified inplace
     """
-    logger().debug(f"Converting TimeStep to format '{datetime_format}'...")
+    log().debug(f"Converting TimeStep to format '{datetime_format}'...")
     for _, df in data.items():
         index_columns = df.index.names
         df.reset_index(inplace=True)

fameio/source/results/csv_writer.py

@@ -7,7 +7,7 @@ from typing import Dict, Union
 
 import pandas as pd
 
-from fameio.source.logs import logger
+from fameio.source.logs import log
 from fameio.source.results.data_transformer import INDEX
 from fameio.source.series import TimeSeriesManager
 from fameio.source.tools import ensure_path_exists
@@ -30,15 +30,15 @@ class CsvWriter:
         """Returns name of the output folder derived either from the specified `config_output` or `input_file_path`"""
         if config_output:
             output_folder_name = config_output
-            logger().info(CsvWriter._INFO_USING_PATH.format(config_output))
+            log().info(CsvWriter._INFO_USING_PATH.format(config_output))
         else:
             output_folder_name = input_file_path.stem
-            logger().info(CsvWriter._INFO_USING_DERIVED_PATH.format(output_folder_name))
+            log().info(CsvWriter._INFO_USING_DERIVED_PATH.format(output_folder_name))
         return Path(output_folder_name)
 
     def _create_output_folder(self) -> None:
         """Creates output folder if not yet present"""
-        logger().debug("Creating output folder if required...")
+        log().debug("Creating output folder if required...")
         if not self._output_folder.is_dir():
             self._output_folder.mkdir(parents=True)