Merge pull request #1036 from openaps/dev

0.7.0 release from dev to master

Author: danamlewis

.eslintignore

@@ -0,0 +1,2 @@
+/tests
+/www

.eslintrc.js

@@ -0,0 +1,259 @@
+module.exports = {
+    "env": {
+        "commonjs": true,
+        "node": true,
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+    },
+    "parserOptions": {
+        "ecmaVersion": 5
+    },
+    "rules": {
+        "accessor-pairs": "error",
+        "array-bracket-newline": "off",
+        "array-bracket-spacing": "off",
+        "array-callback-return": "off",
+        "array-element-newline": "off",
+        "arrow-body-style": "error",
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "block-scoped-var": "off",
+        "block-spacing": "off",
+        "brace-style": "off",
+        "callback-return": "error",
+        "camelcase": "off",
+        "capitalized-comments": "off",
+        "class-methods-use-this": "error",
+        "comma-dangle": "off",
+        "comma-spacing": "off",
+        "comma-style": "off",
+        "complexity": "off",
+        "computed-property-spacing": [
+            "error",
+            "never"
+        ],
+        "consistent-return": "off",
+        "consistent-this": "off",
+        "curly": "off",
+        "default-case": "off",
+        "dot-location": [
+            "error",
+            "property"
+        ],
+        "dot-notation": "off",
+        "eol-last": "off",
+        "eqeqeq": "error",
+        "func-call-spacing": "off",
+        "func-name-matching": "error",
+        "func-names": "off",
+        "func-style": "off",
+        "function-paren-newline": "off",
+        "generator-star-spacing": "error",
+        "global-require": "off",
+        "guard-for-in": "off",
+        "handle-callback-err": "error",
+        "id-blacklist": "error",
+        "id-length": "off",
+        "id-match": "error",
+        "implicit-arrow-linebreak": "error",
+        "indent": "off",
+        "indent-legacy": "off",
+        "init-declarations": "off",
+        "jsx-quotes": "error",
+        "key-spacing": "off",
+        "keyword-spacing": "off",
+        "line-comment-position": "off",
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "lines-around-comment": "off",
+        "lines-around-directive": "off",
+        "lines-between-class-members": "error",
+        "max-depth": "off",
+        "max-len": "off",
+        "max-lines": "off",
+        "max-lines-per-function": "off",
+        "max-nested-callbacks": "error",
+        "max-params": "off",
+        "max-statements": "off",
+        "max-statements-per-line": "off",
+        "multiline-comment-style": "off",
+        "multiline-ternary": "off",
+        "new-parens": "off",
+        "newline-after-var": "off",
+        "newline-before-return": "off",
+        "newline-per-chained-call": "off",
+        "no-alert": "error",
+        "no-array-constructor": "error",
+        "no-await-in-loop": "error",
+        "no-bitwise": "off",
+        "no-buffer-constructor": "error",
+        "no-caller": "error",
+        "no-catch-shadow": "off",
+        "no-confusing-arrow": "error",
+        "no-console":"off",
+        "no-continue": "off",
+        "no-div-regex": "error",
+        "no-duplicate-imports": "error",
+        "no-else-return": "off",
+        "no-empty-function": "off",
+        "no-eq-null": "off",
+        "no-eval": "error",
+        "no-extend-native": "error",
+        "no-extra-bind": "error",
+        "no-extra-label": "error",
+        "no-extra-parens": "off",
+        "no-floating-decimal": "off",
+        "no-implicit-coercion": [
+            "error",
+            {
+                "boolean": false,
+                "number": false,
+                "string": false
+            }
+        ],
+        "no-implicit-globals": "off",
+        "no-implied-eval": "error",
+        "no-inline-comments": "off",
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-label-var": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "off",
+        "no-lonely-if": "off",
+        "no-loop-func": "off",
+        "no-magic-numbers": "off",
+        "no-mixed-operators": "off",
+        "no-mixed-requires": "error",
+        "no-multi-assign": "off",
+        "no-multi-spaces": "off",
+        "no-multi-str": "error",
+        "no-multiple-empty-lines": "off",
+        "no-native-reassign": "error",
+        "no-negated-condition": "off",
+        "no-negated-in-lhs": "error",
+        "no-nested-ternary": "off",
+        "no-new": "error",
+        "no-new-func": "error",
+        "no-new-object": "error",
+        "no-new-require": "error",
+        "no-new-wrappers": "error",
+        "no-octal-escape": "error",
+        "no-param-reassign": "off",
+        "no-path-concat": "error",
+        "no-plusplus": "off",
+        "no-process-env": "error",
+        "no-process-exit": "off",
+        "no-proto": "off",
+        "no-prototype-builtins": "off",
+        "no-restricted-globals": "error",
+        "no-restricted-imports": "error",
+        "no-restricted-modules": "error",
+        "no-restricted-properties": "error",
+        "no-restricted-syntax": "error",
+        "no-return-assign": "off",
+        "no-return-await": "error",
+        "no-script-url": "error",
+        "no-self-assign": [
+            "error",
+            {
+                "props": false
+            }
+        ],
+        "no-self-compare": "off",
+        "no-sequences": "off",
+        "no-shadow": "off",
+        "no-shadow-restricted-names": "error",
+        "no-spaced-func": "off",
+        "no-sync": "off",
+        "no-tabs": "off",
+        "no-template-curly-in-string": "error",
+        "no-ternary": "off",
+        "no-throw-literal": "off",
+        "no-trailing-spaces": "off",
+        "no-undef-init": "error",
+        "no-undefined": "off",
+        "no-underscore-dangle": "off",
+        "no-unmodified-loop-condition": "off",
+        "no-unneeded-ternary": "off",
+        "no-unused-expressions": "off",
+        "no-use-before-define": "off",
+        "no-useless-call": "off",
+        "no-useless-computed-key": "error",
+        "no-useless-concat": "off",
+        "no-useless-constructor": "error",
+        "no-useless-rename": "error",
+        "no-useless-return": "off",
+        "no-var": "off",
+        "no-void": "off",
+        "no-warning-comments": "off",
+        "no-whitespace-before-property": "error",
+        "no-with": "error",
+        "nonblock-statement-body-position": [
+            "error",
+            "any"
+        ],
+        "object-curly-newline": "off",
+        "object-curly-spacing": "off",
+        "object-property-newline": "off",
+        "object-shorthand": "off",
+        "one-var": "off",
+        "one-var-declaration-per-line": "off",
+        "operator-assignment": "off",
+        "operator-linebreak": "off",
+        "padded-blocks": "off",
+        "padding-line-between-statements": "error",
+        "prefer-arrow-callback": "off",
+        "prefer-const": "error",
+        "prefer-destructuring": "off",
+        "prefer-numeric-literals": "error",
+        "prefer-object-spread": "off",
+        "prefer-promise-reject-errors": "error",
+        "prefer-reflect": "off",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
+        "prefer-template": "off",
+        "quote-props": "off",
+        "quotes": "off",
+        "radix": "off",
+        "require-await": "error",
+        "require-jsdoc": "off",
+        "require-unicode-regexp": "off",
+        "rest-spread-spacing": "error",
+        "semi": "off",
+        "semi-spacing": "off",
+        "semi-style": "off",
+        "sort-imports": "error",
+        "sort-keys": "off",
+        "sort-vars": "off",
+        "space-before-blocks": "off",
+        "space-before-function-paren": "off",
+        "space-in-parens": "off",
+        "space-infix-ops": "off",
+        "space-unary-ops": "off",
+        "spaced-comment": "off",
+        "strict": "off",
+        "switch-colon-spacing": "off",
+        "symbol-description": "error",
+        "template-curly-spacing": "error",
+        "template-tag-spacing": "error",
+        "unicode-bom": [
+            "error",
+            "never"
+        ],
+        "valid-jsdoc": "off",
+        "valid-typeof": [
+            "error",
+            {
+                "requireStringLiterals": false
+            }
+        ],
+        "vars-on-top": "off",
+        "wrap-iife": "off",
+        "wrap-regex": "off",
+        "yield-star-spacing": "error",
+        "yoda": "off"
+    }
+};

.travis.yml

@@ -1,7 +1,26 @@
-language: node_js
-sudo: false
-node_js:
-  - "0.10"
-  - "0.12"
-script: make travis
-after_script: make report
+node_js-steps: &node_js-steps
+  language: node_js
+  script: make travis
+  after_script: make report
+
+python-steps: &python-steps
+  language: python
+  install: pip install flake8
+  script:
+    # stop the build if there are Python syntax errors or undefined names
+    - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+    - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
+matrix:
+  include:
+    - node_js: "8"
+      <<: *node_js-steps
+    - node_js: "10"
+      <<: *node_js-steps
+    - node_js: "node"  # current version of Node.js on Travis CI
+      <<: *node_js-steps
+    - python: "2.7"
+      <<: *python-steps
+    - python: "3.8"
+      <<: *python-steps

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 OpenAPS Contributors
+Copyright (c) 2015-2019 OpenAPS Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -31,7 +31,6 @@ Valid commands:
   oref0 ifttt-notify
   oref0 get-profile
   oref0 calculate-iob
-  oref0 determine-basal
   oref0 help - this message
 ```
 

bin/all-autosens-history.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+
+oref0_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+interval=${1:-96}
+allowedload=${2:-5}
+
+main() {
+    ls | while read participant; do
+        (
+            echo "Processing participant $participant"
+            cd $participant/direct-sharing-31/ || die "$participant/direct-sharing-31/ not found"
+            gunzip *.gz 2>/dev/null
+            mkdir -p parts || die "Couldn't mkdir parts"
+            rm parts/treatments*.json 2>/dev/null
+            echo Checking / waiting for system load to be below $allowedload before continuing
+            while highload; do
+                sleep 30
+            done
+            # this assumes that there are always fewer treatment records than entries, so the treatments will finish first
+            # (or at least finish before the oref0-autosens-history.js job for that month starts)
+            cat treatments*.json | jq -cn --stream 'fromstream(1|truncate_stream(inputs))' | while read line; do
+                date=$(echo $line | jq .created_at)
+                year=$(echo $date | cut -b 2,3,4,5)
+                month=$(echo $date | cut -b 7,8)
+                echo "Processing participant $participant treatments for $year $month"
+                echo $line >> parts/treatments-$year-$month.json
+            done | uniq &
+            rm parts/entries*.json
+            cat entries*.json | jq -cn --stream 'fromstream(1|truncate_stream(inputs))' | while read line; do
+                date=$(echo $line | jq .dateString)
+                year=$(echo $date | cut -b 2,3,4,5)
+                month=$(echo $date | cut -b 7,8)
+                if [[ $year =~ 201. ]]; then
+                    echo "Processing participant $participant entries for $year $month"
+                    echo $line >> parts/entries-$year-$month.json
+                fi
+            done | uniq
+            for year in 2019 2018 2017 2016; do
+                for month in 12 11 10 09 08 07 06 05 04 03 02 01; do
+                    if [ -f parts/entries-$year-$month.json ]; then
+                        cat parts/entries-$year-$month.json | jq -s . > $year-$month-entries.json
+                        if [ -f parts/treatments-$year-$month.json ]; then
+                            cat parts/treatments-$year-$month.json | jq -s . > $year-$month-treatments.json
+                            echo Checking / waiting for system load to be below $allowedload before continuing
+                            while highload; do
+                                sleep 30
+                            done
+                            echo "running $oref0_dir/bin/oref0-autosens-history.js $year-$month-entries.json $year-$month-treatments.json profile*.json 12 isf-$year-$month.json 2> $year-$month.out &"
+                            $oref0_dir/oref0-autosens-history.js $year-$month-entries.json $year-$month-treatments.json profile*.json 12 isf-$year-$month.json 2> $year-$month.out &
+                            sleep 5
+                        fi
+                    fi
+                done  # for month
+            done # for year
+            cd ../../
+        ) &
+        echo Checking / waiting for system load to be below $allowedload before continuing
+        while highload; do
+            sleep 30
+        done
+        echo "Waiting 10 seconds before processing next participant"
+        sleep 10
+    done # while read participant
+
+    # tailing the .out to help see that the script is done
+    sleep 30
+    tail */direct-sharing-31/*.out
+    echo "All participants have now been started. Above is the output generated so far. Review for any errors - if errors exist...there's an error. Remaining participants may still be running."
+
+}
+
+function highload {
+    # check whether system load average is high
+    uptime | tr -d ',' | awk "\$(NF-2) > $allowedload" | grep load
+}
+
+die() {
+    echo "$@"
+    exit 1
+}
+
+main "$@"