8690265637

Committed 15 Apr 2024 01:45PM UTC coverage: 74.79% (+7.3%) from 67.499%

Build # 8690265637

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #60 from ninahakansson/pps2021_refactor

PPS 2021 refactor

Run Details

219 of 371 branches covered (59.03%)

Branch coverage included in aggregate %.

338 of 371 new or added lines in 15 files covered. (91.11%)

8 existing lines in 5 files now uncovered.

1383 of 1771 relevant lines covered (78.09%)

3.12 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.36

/nwcsafpps_runner/config.py

#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright (c) 2018 - 2021 Pytroll Developers

# Author(s):

#   Adam.Dybbroe <Firstname.Lastname at smhi.se>

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

"""Reading configuration settings for NWCSAF/PPS runner(s)."""

import os
import socket

import yaml


def load_config_from_file(filepath):
    """Load the yaml config from file, given the file-path."""
    with open(filepath, 'r') as fp_:
        config = yaml.load(fp_, Loader=yaml.FullLoader)
    return config


def move_service_dict_attributes_to_top_level(options, service):
    """Mover attributes in dict service to top level."""
    if service in options and isinstance(options[service], dict):
        service_config = options.pop(service)
        for key in service_config:
            options[key] = service_config[key]


def get_config(configfile, add_defaults=False, service=None):
    """Get configuration from the config file."""
    filetype = os.path.splitext(configfile)[1]
    if filetype != '.yaml':
        raise ValueError("Configfile {:s} should be of type .yaml, not {:s}".format(configfile,
                                                                                    filetype))
    options = load_config_from_file(configfile)
    modify_config_vars(options)
    if add_defaults:
        add_some_default_vars(options)
    if service is not None:
        move_service_dict_attributes_to_top_level(options, service)
    return options


def modify_config_vars(options):
    """Modify some config options."""
    if isinstance(options.get('subscribe_topics'), str):
        subscribe_topics = options.get('subscribe_topics').split(',')
        for item in subscribe_topics:
            if len(item) == 0:
                subscribe_topics.remove(item)
        options['subscribe_topics'] = subscribe_topics


def add_some_default_vars(options):
    """Add some default vars."""
    # service = '', probably no items are '' so this is the same as:
    options['number_of_threads'] = int(options.get('number_of_threads', 5))
    options['maximum_pps_processing_time_in_minutes'] = int(options.get('maximum_pps_processing_time_in_minutes', 20))
    options['servername'] = options.get('servername', socket.gethostname())
    options['station'] = options.get('station', 'unknown')
    options['run_cmask_prob'] = options.get('run_cmask_prob', True)

1	#!/usr/bin/env python
2	# -- coding: utf-8 --
3
4	# Copyright (c) 2018 - 2021 Pytroll Developers
5
6	# Author(s):
7
8	# Adam.Dybbroe <Firstname.Lastname at smhi.se>
9
10	# This program is free software: you can redistribute it and/or modify
11	# it under the terms of the GNU General Public License as published by
12	# the Free Software Foundation, either version 3 of the License, or
13	# (at your option) any later version.
14
15	# This program is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU General Public License for more details.
19
20	# You should have received a copy of the GNU General Public License
21	# along with this program. If not, see <http://www.gnu.org/licenses/>.
22
23	"""Reading configuration settings for NWCSAF/PPS runner(s)."""	4✔
24
25	import os	4✔
26	import socket	4✔
27
28	import yaml	4✔
29
30
31	def load_config_from_file(filepath):	4✔
32	"""Load the yaml config from file, given the file-path."""
33	with open(filepath, 'r') as fp_:	4✔
34	config = yaml.load(fp_, Loader=yaml.FullLoader)	4✔
35	return config	4✔
36
37
38	def move_service_dict_attributes_to_top_level(options, service):	4✔
39	"""Mover attributes in dict service to top level."""
40	if service in options and isinstance(options[service], dict):	4!
41	service_config = options.pop(service)	4✔
42	for key in service_config:	4✔
43	options[key] = service_config[key]	4✔
44
45
46	def get_config(configfile, add_defaults=False, service=None):	4✔
47	"""Get configuration from the config file."""
48	filetype = os.path.splitext(configfile)[1]	4✔
49	if filetype != '.yaml':	4!
NEW 50	raise ValueError("Configfile {:s} should be of type .yaml, not {:s}".format(configfile,	×
51	filetype))
52	options = load_config_from_file(configfile)	4✔
53	modify_config_vars(options)	4✔
54	if add_defaults:	4✔
55	add_some_default_vars(options)	4✔
56	if service is not None:	4✔
57	move_service_dict_attributes_to_top_level(options, service)	4✔
58	return options	4✔
59
60
61	def modify_config_vars(options):	4✔
62	"""Modify some config options."""
63	if isinstance(options.get('subscribe_topics'), str):	4!
64	subscribe_topics = options.get('subscribe_topics').split(',')	×
65	for item in subscribe_topics:	×
66	if len(item) == 0:	×
67	subscribe_topics.remove(item)	×
68	options['subscribe_topics'] = subscribe_topics	×
69
70
71	def add_some_default_vars(options):	4✔
72	"""Add some default vars."""
73	# service = '', probably no items are '' so this is the same as:
74	options['number_of_threads'] = int(options.get('number_of_threads', 5))	4✔
75	options['maximum_pps_processing_time_in_minutes'] = int(options.get('maximum_pps_processing_time_in_minutes', 20))	4✔
76	options['servername'] = options.get('servername', socket.gethostname())	4✔
77	options['station'] = options.get('station', 'unknown')	4✔
78	options['run_cmask_prob'] = options.get('run_cmask_prob', True)	4✔

pytroll / pytroll-pps-runner / 8690265637

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous