12092559060

Committed 21 Oct 2024 02:54PM UTC coverage: 77.902% (+7.8%) from 70.092%

Build # 12092559060

Build Type

push

github

Committed by

web-flow

Commit Message

Update for new API (#31)

* Update for new API

* Update readme

* Update ci

* Fix test

* Update test

Run Details

139 of 228 branches covered (60.96%)

Branch coverage included in aggregate %.

12 of 16 new or added lines in 4 files covered. (75.0%)

3 existing lines in 2 files now uncovered.

626 of 754 relevant lines covered (83.02%)

4.98 hits per line

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

72.41

/src/c3s_sm/const.py

import os

from pathlib import Path
from datetime import datetime

# This can be overridden in the .cdsapirc file
cds_api_url = "https://cds.climate.copernicus.eu/api"

# CDSAPI_RC variable must be set or we use home dir
dotrc = os.environ.get('CDSAPI_RC', os.path.join(Path.home(), '.cdsapirc'))


def check_api_read() -> bool:
    if not os.path.isfile(dotrc):
        key = os.environ.get('CDSAPI_KEY')
        if "CDSAPI_URL" not in os.environ:
            os.environ['CDSAPI_URL'] = cds_api_url

        if key is None:
            raise ValueError(
                'Neither CDSAPI_KEY variable nor .cdsapirc file found, '
                'download will not work! '
                'Please create a .cdsapirc file with your API key. '
                'See: https://cds.climate.copernicus.eu/how-to-api'
            )
        else:
            api_ready = True
    else:
        if "CDSAPI_URL" in os.environ:
            os.environ.pop("CDSAPI_URL")   # Use URL from file
        api_ready = True

    return api_ready


variable_lut = {
    'combined': {
        'variable': 'volumetric_surface_soil_moisture',
        'type_of_sensor': 'combined_passive_and_active'
    },
    'passive': {
        'variable': 'volumetric_surface_soil_moisture',
        'type_of_sensor': 'passive'
    },
    'active': {
        'variable': 'soil_moisture_saturation',
        'type_of_sensor': 'active'
    }
}

freq_lut = {
    'daily': 'day_average',
    'dekadal': '10_day_average',
    'monthly': 'month_average'
}

startdates = {
    'combined': datetime(1978, 11, 1),
    'passive': datetime(1978, 11, 1),
    'active': datetime(1991, 8, 5)
}

fntempl = "C3S-SOILMOISTURE-L3S-SSM{unit}-{product}-{freq}-{datetime}-{record}-{version}.{subversion}.nc"

1	import os	6✔
2
3	from pathlib import Path	6✔
4	from datetime import datetime	6✔
5
6	# This can be overridden in the .cdsapirc file
7	cds_api_url = "https://cds.climate.copernicus.eu/api"	6✔
8
9	# CDSAPI_RC variable must be set or we use home dir
10	dotrc = os.environ.get('CDSAPI_RC', os.path.join(Path.home(), '.cdsapirc'))	6✔
11
12
13	def check_api_read() -> bool:	6✔
14	if not os.path.isfile(dotrc):	6!
15	key = os.environ.get('CDSAPI_KEY')	6✔
16	if "CDSAPI_URL" not in os.environ:	6✔
17	os.environ['CDSAPI_URL'] = cds_api_url	6✔
18
19	if key is None:	6!
UNCOV 20	raise ValueError(	×
21	'Neither CDSAPI_KEY variable nor .cdsapirc file found, '
22	'download will not work! '
23	'Please create a .cdsapirc file with your API key. '
24	'See: https://cds.climate.copernicus.eu/how-to-api'
25	)
26	else:
27	api_ready = True	6✔
28	else:
NEW 29	if "CDSAPI_URL" in os.environ:	×
NEW 30	os.environ.pop("CDSAPI_URL") # Use URL from file	×
31	api_ready = True	×
32
33	return api_ready	6✔
34
35
36	variable_lut = {	6✔
37	'combined': {
38	'variable': 'volumetric_surface_soil_moisture',
39	'type_of_sensor': 'combined_passive_and_active'
40	},
41	'passive': {
42	'variable': 'volumetric_surface_soil_moisture',
43	'type_of_sensor': 'passive'
44	},
45	'active': {
46	'variable': 'soil_moisture_saturation',
47	'type_of_sensor': 'active'
48	}
49	}
50
51	freq_lut = {	6✔
52	'daily': 'day_average',
53	'dekadal': '10_day_average',
54	'monthly': 'month_average'
55	}
56
57	startdates = {	6✔
58	'combined': datetime(1978, 11, 1),
59	'passive': datetime(1978, 11, 1),
60	'active': datetime(1991, 8, 5)
61	}
62
63	fntempl = "C3S-SOILMOISTURE-L3S-SSM{unit}-{product}-{freq}-{datetime}-{record}-{version}.{subversion}.nc"	6✔

TUW-GEO / c3s_sm / 12092559060

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