From 5d732a45ec0b8474c983c05665970e27a50b2851 Mon Sep 17 00:00:00 2001 From: Meng Li <34143965+Meng6@users.noreply.github.com> Date: Fri, 16 Apr 2021 15:25:33 -0400 Subject: [PATCH] Revert tests module's sleep config --- tests/settings/mtz_event_config.yaml | 25 ++++++++++++------------ tests/settings/mtz_frequency_config.yaml | 25 ++++++++++++------------ tests/settings/mtz_periodic_config.yaml | 25 ++++++++++++------------ tests/settings/stz_event_config.yaml | 25 ++++++++++++------------ tests/settings/stz_frequency_config.yaml | 25 ++++++++++++------------ tests/settings/stz_periodic_config.yaml | 25 ++++++++++++------------ 6 files changed, 78 insertions(+), 72 deletions(-) diff --git a/tests/settings/mtz_event_config.yaml b/tests/settings/mtz_event_config.yaml index a0639a24..d6a0d779 100644 --- a/tests/settings/mtz_event_config.yaml +++ b/tests/settings/mtz_event_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/ diff --git a/tests/settings/mtz_frequency_config.yaml b/tests/settings/mtz_frequency_config.yaml index b4636cf6..a3b3e376 100644 --- a/tests/settings/mtz_frequency_config.yaml +++ b/tests/settings/mtz_frequency_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/ diff --git a/tests/settings/mtz_periodic_config.yaml b/tests/settings/mtz_periodic_config.yaml index a57b7a3b..3374b849 100644 --- a/tests/settings/mtz_periodic_config.yaml +++ b/tests/settings/mtz_periodic_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/ diff --git a/tests/settings/stz_event_config.yaml b/tests/settings/stz_event_config.yaml index f05eda69..15eccb97 100644 --- a/tests/settings/stz_event_config.yaml +++ b/tests/settings/stz_event_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/ diff --git a/tests/settings/stz_frequency_config.yaml b/tests/settings/stz_frequency_config.yaml index 63be8702..4a8bf1f2 100644 --- a/tests/settings/stz_frequency_config.yaml +++ b/tests/settings/stz_frequency_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/ diff --git a/tests/settings/stz_periodic_config.yaml b/tests/settings/stz_periodic_config.yaml index 8ebc2bcc..5b4de209 100644 --- a/tests/settings/stz_periodic_config.yaml +++ b/tests/settings/stz_periodic_config.yaml @@ -324,19 +324,19 @@ FITBIT_DATA_STREAMS: # AVAILABLE: fitbitjson_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_mysql: DATABASE_GROUP: MY_GROUP - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitjson_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. fitbitparsed_csv: FOLDER: data/external/fitbit_csv - SLEEP_SUMMARY_LAST_NIGHT_END: 660 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight. By default, 660 (11:00). + SLEEP_SUMMARY_EPISODE_DAY_ANCHOR: end # summary sleep episodes are considered as events based on either the start timestamp or end timestamp. # Sensors ------ @@ -375,7 +375,7 @@ FITBIT_SLEEP_SUMMARY: PROVIDERS: RAPIDS: COMPUTE: False - FEATURES: ["firstwaketime", "lastwaketime", "firstbedtime", "lastbedtime", "countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] + FEATURES: ["countepisode", "avgefficiency", "sumdurationafterwakeup", "sumdurationasleep", "sumdurationawake", "sumdurationtofallasleep", "sumdurationinbed", "avgdurationafterwakeup", "avgdurationasleep", "avgdurationawake", "avgdurationtofallasleep", "avgdurationinbed"] SLEEP_TYPES: ["main", "nap", "all"] SRC_SCRIPT: src/features/fitbit_sleep_summary/rapids/main.py @@ -386,30 +386,31 @@ FITBIT_SLEEP_INTRADAY: RAPIDS: COMPUTE: False FEATURES: + LEVELS_AND_TYPES_COMBINING_ALL: True LEVELS_AND_TYPES: [countepisode, sumduration, maxduration, minduration, avgduration, medianduration, stdduration] RATIOS_TYPE: [count, duration] RATIOS_SCOPE: [ACROSS_LEVELS, ACROSS_TYPES, WITHIN_LEVELS, WITHIN_TYPES] ROUTINE: [starttimefirstmainsleep, endtimelastmainsleep, starttimefirstnap, endtimelastnap] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] - SLEEP_TYPES: [main, nap, all] - LAST_NIGHT_END: 0 # a number ranged from 0 (midnight) to 1439 (23:59) which denotes number of minutes after the midnight - ROUTINE_REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" + SLEEP_TYPES: [main, nap] + INCLUDE_SLEEP_LATER_THAN: 0 # a number ranged from 0 (midnight) to 1439 (23:59) + REFERENCE_TIME: MIDNIGHT # chosen from "MIDNIGHT" and "START_OF_THE_SEGMENT" SRC_SCRIPT: src/features/fitbit_sleep_intraday/rapids/main.py PRICE: COMPUTE: False - FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, stdstarttimeofepisodemain, stdendtimeofepisodemain, stdmidpointofepisodemain, socialjetlag, rmssdmeanstarttimeofepisodemain, rmssdmeanendtimeofepisodemain, rmssdmeanmidpointofepisodemain, rmssdmedianstarttimeofepisodemain, rmssdmedianendtimeofepisodemain, rmssdmedianmidpointofepisodemain] + FEATURES: [avgduration, avgratioduration, avgstarttimeofepisodemain, avgendtimeofepisodemain, avgmidpointofepisodemain, "stdstarttimeofepisodemain", "stdendtimeofepisodemain", "stdmidpointofepisodemain", socialjetlag, meanssdstarttimeofepisodemain, meanssdendtimeofepisodemain, meanssdmidpointofepisodemain, medianssdstarttimeofepisodemain, medianssdendtimeofepisodemain, medianssdmidpointofepisodemain] SLEEP_LEVELS: - INCLUDE_ALL_GROUPS: True CLASSIC: [awake, restless, asleep] STAGES: [wake, deep, light, rem] UNIFIED: [awake, asleep] DAY_TYPES: [WEEKEND, WEEK, ALL] - LAST_NIGHT_END: 660 # number of minutes after the midnight (11:00) 11*60 + GROUP_EPISODES_WITHIN: # by default: today's 6pm to tomorrow's noon + START_TIME: 1080 # number of minutes after the midnight (18:00) 18*60 + LENGTH: 1080 # in minutes (18 hours) 18*60 SRC_SCRIPT: src/features/fitbit_sleep_intraday/price/main.py # See https://www.rapids.science/latest/features/fitbit-steps-summary/