From a57d7f45a8d2059c34af8ed9966286057502744e Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Sun, 7 Feb 2021 10:35:49 +0200
Subject: [PATCH 01/24] new rule dialog almost finished

---
 frontend/package-lock.json                 |  44 ++++++++-
 frontend/package.json                      |   5 +-
 frontend/src/components/NewRuleDialog.vue  |  94 ++++++++++++++++++
 frontend/src/components/SettingRules.vue   | 105 +++++++++++++++------
 frontend/src/main.js                       |   6 +-
 frontend/src/plugins/vuetify.js            |  20 +++-
 frontend/src/views/ConfigurationsTable.vue |   3 +-
 7 files changed, 242 insertions(+), 35 deletions(-)
 create mode 100644 frontend/src/components/NewRuleDialog.vue

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 63610c0..a4cf4fa 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -10,7 +10,10 @@
       "dependencies": {
         "core-js": "^3.6.5",
         "vue": "^2.6.11",
-        "vuetify": "^2.4.0"
+        "vue-confirm-dialog": "^1.0.2",
+        "vue-router": "^3.5.1",
+        "vuetify": "^2.4.0",
+        "vuetify-toast-snackbar-ng": "^0.7.3"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",
@@ -13452,6 +13455,14 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "node_modules/vue-confirm-dialog": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/vue-confirm-dialog/-/vue-confirm-dialog-1.0.2.tgz",
+      "integrity": "sha512-gTo1bMDWOLd/6ihmWv8VlPxhc9QaKoE5YqlsKydUOfrrQ3Q3taljF6yI+1TMtAtJLrvZ8DYrePhgBhY1VCJzbQ==",
+      "peerDependencies": {
+        "vue": "^2.6.10"
+      }
+    },
     "node_modules/vue-eslint-parser": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz",
@@ -13616,6 +13627,11 @@
       "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
       "dev": true
     },
+    "node_modules/vue-router": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
+      "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw=="
+    },
     "node_modules/vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -13728,6 +13744,15 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/vuetify-toast-snackbar-ng": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/vuetify-toast-snackbar-ng/-/vuetify-toast-snackbar-ng-0.7.3.tgz",
+      "integrity": "sha512-o+bDDQ7eu6X4BKH/HzJA5NOA9ghIoiimdYjs0Kr1SktJ6FGHV5umkXxhLjaXQXhOmLVx3ig8mkOETqj5P0CJrA==",
+      "peerDependencies": {
+        "vue": "*",
+        "vuetify": "*"
+      }
+    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -25979,6 +26004,12 @@
         }
       }
     },
+    "vue-confirm-dialog": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/vue-confirm-dialog/-/vue-confirm-dialog-1.0.2.tgz",
+      "integrity": "sha512-gTo1bMDWOLd/6ihmWv8VlPxhc9QaKoE5YqlsKydUOfrrQ3Q3taljF6yI+1TMtAtJLrvZ8DYrePhgBhY1VCJzbQ==",
+      "requires": {}
+    },
     "vue-eslint-parser": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz",
@@ -26101,6 +26132,11 @@
         }
       }
     },
+    "vue-router": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz",
+      "integrity": "sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw=="
+    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -26186,6 +26222,12 @@
         }
       }
     },
+    "vuetify-toast-snackbar-ng": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/vuetify-toast-snackbar-ng/-/vuetify-toast-snackbar-ng-0.7.3.tgz",
+      "integrity": "sha512-o+bDDQ7eu6X4BKH/HzJA5NOA9ghIoiimdYjs0Kr1SktJ6FGHV5umkXxhLjaXQXhOmLVx3ig8mkOETqj5P0CJrA==",
+      "requires": {}
+    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 7b6aa8e..3838552 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,7 +10,10 @@
   "dependencies": {
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
-    "vuetify": "^2.4.0"
+    "vue-confirm-dialog": "^1.0.2",
+    "vue-router": "^3.5.1",
+    "vuetify": "^2.4.0",
+    "vuetify-toast-snackbar-ng": "^0.7.3"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
new file mode 100644
index 0000000..7b12025
--- /dev/null
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -0,0 +1,94 @@
+<template>
+<v-dialog v-model="show" width="50%">
+    <v-card>
+        <v-card-title>
+            <span class="headline">New Rule</span>
+        </v-card-title>
+        <v-card-text>
+            <v-form ref="form" v-model="valid">
+                <v-container>
+                    <v-row>
+                        <v-col v-for="context in setting.configurable_features" :key="context">
+                            <v-text-field :label="context" v-model="newRule['context_features'][context]" outlined :rules="[() => /^[a-z0-9]+$/i.test(newRule['context_features'][context]) || 'Alphanumeric only!']" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col>
+                            <v-text-field label="Information" v-model="newRule.information" outlined/>
+                        </v-col>
+                    </v-row>
+                </v-container>
+            </v-form>
+        </v-card-text>
+        <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="blue" text @click.prevent="show=false">
+                Cancel
+            </v-btn>
+            <v-btn color="blue" text @click="saveNewRule">
+                Save
+            </v-btn>
+        </v-card-actions>
+    </v-card>
+</v-dialog>
+</template>
+
+<script>
+export default {
+    components: {},
+    methods: {
+        async saveNewRule() {
+            this.$refs.form.validate();
+            var contextFeatureFound = false;
+            for (const value of Object.values(this.newRule.context_features)) {
+                if (value !== null) {
+                    contextFeatureFound = true;
+                    break;
+                }
+            }
+            if (!contextFeatureFound) {
+                this.$toast.error("Atleast one context feature must be configured.")
+                return;
+            }
+            if (!this.valid) {
+                return;
+            }
+            this.$emit('rule-saved', this.newRule);
+            this.show = false;
+        },
+        initializeRuleObject() {
+            let rule = {
+                information: ""
+
+            };
+            let contextFeatures = this.setting.configurable_features.reduce(
+                function (obj, currentValue) {
+                    obj[currentValue] = null;
+                    return obj;
+                }, {})
+            rule["context_features"] = contextFeatures;
+            return rule
+        }
+    },
+    computed: {
+        show: {
+            get() {
+                return this.value
+            },
+            set(value) {
+                this.newRule = this.initializeRuleObject();
+                this.$refs.form.reset();
+                this.$emit('input', value);
+            }
+        }
+    },
+    props: ['setting', 'value'],
+    data() {
+        return {
+            newRule: this.initializeRuleObject(),
+            newRuleDialog: false,
+            valid: true
+        }
+    }
+}
+</script>
diff --git a/frontend/src/components/SettingRules.vue b/frontend/src/components/SettingRules.vue
index 642f60a..bbe2e1b 100644
--- a/frontend/src/components/SettingRules.vue
+++ b/frontend/src/components/SettingRules.vue
@@ -1,30 +1,64 @@
 <template>
-  <v-card>
+<v-card>
+    <vue-confirm-dialog></vue-confirm-dialog>
     <v-card-title>
-      <v-text-field
-        v-model="search"
-        append-icon="mdi-magnify"
-        label="Search"
-        single-line
-        hide-details
-      ></v-text-field>
+        <v-text-field v-model="search" append-icon="mdi-magnify" label="Search" single-line hide-details></v-text-field>
+        <v-spacer />
+        <v-btn color=green @click.prevent="newRuleDialog=true">
+            <v-icon>mdi-plus</v-icon>
+        </v-btn>
+        <new-rule-dialog v-on:rule-saved="onNewRule" v-model="newRuleDialog" :setting="setting"/>
     </v-card-title>
-    <v-data-table
-      :headers="headers"
-      :items="rules"
-      :search="search"
-    ></v-data-table>
-  </v-card>
+    <v-card>
+
+    </v-card>
+    <v-data-table :headers="headers" :items="rules" :search="search">
+        <template v-slot:item.actions="{ item }">
+            <v-icon small @click="deleteConfirmDialog(item)">
+                mdi-delete
+            </v-icon>
+        </template>
+    </v-data-table>
+</v-card>
 </template>
 
 <script>
+import NewRuleDialog from './NewRuleDialog.vue';
+
 export default {
-    components: {},
-    methods: {},
+    components: {NewRuleDialog},
+    methods: {
+        async deleteConfirmDialog(rule) {
+            this.$confirm({
+                message: `Are you sure you want to delete ${rule.rule_id}`,
+                button: {
+                    yes: 'Yes',
+                    no: 'Cancel'
+                },
+                callback: confirm => {
+                    if (confirm) {
+                        this.deleteRule(rule);
+                    }
+                }
+            })
+        },
+        async deleteRule(rule) {
+            //TODO: add api logic
+            let index = this.rules.indexOf(rule);
+            this.rules.splice(index, 1);
+        },
+        closeNewDialog() {
+            this.newRuleDialog = false;
+        },
+        onNewRule(rule) {
+            console.log(rule);
+            this.rules.push(rule);
+        }
+    },
     computed: {
         headers: function () {
             let headers = this.setting.configurable_features.reduce(
-                function(accumulator, currentValue) {
+                function (accumulator, currentValue) {
                     accumulator.push({
                         text: currentValue,
                         value: `context_features[${currentValue}]`
@@ -34,36 +68,49 @@ export default {
             headers.push({
                 text: "value",
                 value: "value"
-            },
-            {
-                text:"Added by",
+            }, {
+                text: "Added by",
                 value: "metadata.addedBy"
-            },
-            {
-                text:"Date added",
+            }, {
+                text: "Date added",
                 value: "metadata.date"
-            },
-            {
-                text:"Information",
+            }, {
+                text: "Information",
                 value: "metadata.information"
-            },)
+            }, {
+                text: "Actions",
+                value: "actions"
+            }, )
             return headers;
         }
     },
     props: ['setting'],
     data() {
+        let newRule = {
+            information: ""
+
+        };
+        let contextFeatures = this.setting.configurable_features.reduce(
+                function (obj, currentValue) {
+                    obj[currentValue] = null;
+                    return obj;
+                }, [])
+        newRule[contextFeatures] = contextFeatures;
         return {
+            newRule: {},
+            newRuleDialog: false,
             search: "",
             rules: [{
                 "value": "aviramcake",
-                "context_features":{
+                "context_features": {
                     "env": "notyourtoy"
                 },
                 "metadata": {
                     "addedBy": "dudu topaz",
                     "information": "rip",
                     "date": "13/22/2022"
-                }
+                },
+                "rule_id": 1
             }]
         }
     }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index e9b5225..b708fd9 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import vuetify from './plugins/vuetify';
+import VueConfirmDialog from 'vue-confirm-dialog'
 
 Vue.config.productionTip = false
 
@@ -9,4 +10,7 @@ new Vue({
   vuetify,
   router,
   render: h => h(App)
-}).$mount('#app')
\ No newline at end of file
+}).$mount('#app')
+
+Vue.use(VueConfirmDialog)
+Vue.component('vue-confirm-dialog', VueConfirmDialog.default)
\ No newline at end of file
diff --git a/frontend/src/plugins/vuetify.js b/frontend/src/plugins/vuetify.js
index 5bdec19..ea02515 100644
--- a/frontend/src/plugins/vuetify.js
+++ b/frontend/src/plugins/vuetify.js
@@ -1,7 +1,23 @@
 import Vue from 'vue';
-import Vuetify from 'vuetify/lib/framework';
+import Vuetify, {VSnackbar, VBtn, VIcon} from 'vuetify/lib';
+import VuetifyToast from 'vuetify-toast-snackbar-ng';
 
-Vue.use(Vuetify);
+Vue.use(Vuetify, {
+    components: {
+        VSnackbar,
+        VBtn,
+        VIcon
+    }
+});
+
+Vue.use(VuetifyToast, {
+    x: 'center',
+    dismissable: true,
+    queueable: true,
+    closeText: 'Close',
+    showClose: true,
+    timeout: 10000
+});
 
 export default new Vuetify({
 });
diff --git a/frontend/src/views/ConfigurationsTable.vue b/frontend/src/views/ConfigurationsTable.vue
index 791708e..c690d6e 100644
--- a/frontend/src/views/ConfigurationsTable.vue
+++ b/frontend/src/views/ConfigurationsTable.vue
@@ -19,7 +19,8 @@
 import SettingsRule from '../components/SettingRules.vue'
 export default {
     components: {SettingsRule},
-    methods: {},
+    methods: {
+    },
     data() {
         return {
             expanded: [],

From 70cd9caa84e0ebbd159d4cbb195d501906a81e83 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Sun, 7 Feb 2021 12:36:57 +0200
Subject: [PATCH 02/24] done with primitive values, all aboard the hate train
 towards the more complicated types.

---
 frontend/src/components/NewRuleDialog.vue  |  28 +++-
 frontend/src/components/SettingRules.vue   |   5 +-
 frontend/src/views/ConfigurationsTable.vue | 177 ++++++++++++++++-----
 3 files changed, 159 insertions(+), 51 deletions(-)

diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index 7b12025..2645905 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -14,7 +14,15 @@
                     </v-row>
                     <v-row>
                         <v-col>
-                            <v-text-field label="Information" v-model="newRule.information" outlined/>
+                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-if="setting.type == 'int'" :rules="integerRules" />
+                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-else-if="setting.type == 'float'" />
+                            <v-switch required v-model="newRule.value" label="Value" v-else-if="setting.type == 'bool'" />
+                            <v-text-field required outlined v-model="newRule.value" label="Value" type="text" v-else-if="setting.type == 'str'" />
+                        </v-col>
+                    </v-row>
+                    <v-row>
+                        <v-col>
+                            <v-text-field label="Information" v-model="newRule.metadata.information" outlined />
                         </v-col>
                     </v-row>
                 </v-container>
@@ -53,12 +61,15 @@ export default {
             if (!this.valid) {
                 return;
             }
-            this.$emit('rule-saved', this.newRule);
+            this.$emit('rule-saved');
+            console.log(this.newRule);
             this.show = false;
         },
         initializeRuleObject() {
             let rule = {
-                information: ""
+                metadata: {
+                    information: ""
+                }
 
             };
             let contextFeatures = this.setting.configurable_features.reduce(
@@ -76,7 +87,6 @@ export default {
                 return this.value
             },
             set(value) {
-                this.newRule = this.initializeRuleObject();
                 this.$refs.form.reset();
                 this.$emit('input', value);
             }
@@ -87,7 +97,15 @@ export default {
         return {
             newRule: this.initializeRuleObject(),
             newRuleDialog: false,
-            valid: true
+            valid: true,
+            integerRules: [
+                (v) => {
+                    if (isNaN(v) || !Number.isInteger(v)) {
+                        return "Integer numbers only!";
+                    }
+                    return true;
+                }
+            ],
         }
     }
 }
diff --git a/frontend/src/components/SettingRules.vue b/frontend/src/components/SettingRules.vue
index bbe2e1b..2f07db7 100644
--- a/frontend/src/components/SettingRules.vue
+++ b/frontend/src/components/SettingRules.vue
@@ -50,9 +50,8 @@ export default {
         closeNewDialog() {
             this.newRuleDialog = false;
         },
-        onNewRule(rule) {
-            console.log(rule);
-            this.rules.push(rule);
+        onNewRule() {
+            console.log("refresh rules..");
         }
     },
     computed: {
diff --git a/frontend/src/views/ConfigurationsTable.vue b/frontend/src/views/ConfigurationsTable.vue
index c690d6e..94aa8ba 100644
--- a/frontend/src/views/ConfigurationsTable.vue
+++ b/frontend/src/views/ConfigurationsTable.vue
@@ -7,7 +7,7 @@
         <v-data-table :expanded.sync="expanded" :headers="headers" :items="configurations" :search="search" item-key="name" show-expand>
             <template v-slot:expanded-item="{ headers, item }">
                 <td :colspan="headers.length">
-                    <settings-rule :setting="item"/>
+                    <settings-rule :setting="item" />
                 </td>
             </template>
         </v-data-table>
@@ -18,78 +18,169 @@
 <script>
 import SettingsRule from '../components/SettingRules.vue'
 export default {
-    components: {SettingsRule},
-    methods: {
+    components: {
+        SettingsRule
     },
+    methods: {},
     data() {
         return {
             expanded: [],
             search: "",
             headers: [{
-                text: 'Name',
-                value: 'name'
-            },
-            {
-                text: 'Data Type',
-                value: 'type'
-            },
-            {
-               text: 'Default value',
-               value: 'default_value'
-            },
-            {
-               text: 'Description',
-               value: 'metadata.description'
-            },
+                    text: 'Name',
+                    value: 'name'
+                },
+                {
+                    text: 'Data Type',
+                    value: 'type'
+                },
+                {
+                    text: 'Default value',
+                    value: 'default_value'
+                },
+                {
+                    text: 'Description',
+                    value: 'metadata.description'
+                },
             ],
             configurations: [{
-                    name: "cake_cooking_temp",
-                    configurable_features: [
+                    "name": "cake_color",
+                    "configurable_features": [
+                        "env"
+                    ],
+                    "type": "Flags[\"blue\",\"green\",\"red\"]",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_cooking_temp",
+                    "configurable_features": [
                         "service"
                     ],
-                    type: "int",
-                    default_value: 30,
-                    metadata: {}
+                    "type": "int",
+                    "default_value": 30,
+                    "metadata": {}
                 },
                 {
-                    name: "cake_frosting",
-                    configurable_features: [
+                    "name": "cake_frosting",
+                    "configurable_features": [
                         "service",
                         "env",
                         "cid"
                     ],
-                    type: "Sequence<Enum[\"candies\",\"sprinkles\"]>",
-                    default_value: null,
-                    metadata: {'description': "What kind of frostings you'd like"}
+                    "type": "Sequence<Enum[\"candies\",\"sprinkles\"]>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_interest_rate",
+                    "configurable_features": [
+                        "env"
+                    ],
+                    "type": "float",
+                    "default_value": null,
+                    "metadata": {}
                 },
                 {
-                    name: "cake_name",
-                    configurable_features: [
+                    "name": "cake_name",
+                    "configurable_features": [
                         "env"
                     ],
-                    type: "str",
-                    default_value: "nice_cake",
-                    metadata: {}
+                    "type": "str",
+                    "default_value": "benben",
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_mapping_bool",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Mapping<bool>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_mapping_float",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Mapping<float>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_mapping_int",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Mapping<int>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_mapping_str",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Mapping<str>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_sequence_bool",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Sequence<bool>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_sequence_float",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Sequence<float>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_sequence_int",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Sequence<int>",
+                    "default_value": null,
+                    "metadata": {}
+                },
+                {
+                    "name": "cake_test_sequence_str",
+                    "configurable_features": [
+                        "service"
+                    ],
+                    "type": "Sequence<str>",
+                    "default_value": null,
+                    "metadata": {}
                 },
                 {
-                    name: "cake_type",
-                    configurable_features: [
+                    "name": "cake_type",
+                    "configurable_features": [
                         "cid"
                     ],
-                    type: "Enum[0,1,2]",
-                    default_value: 2,
-                    metadata: {}
+                    "type": "Enum[0,1,2]",
+                    "default_value": 2,
+                    "metadata": {}
                 },
                 {
-                    name: "is_cake_enabled",
-                    configurable_features: [
+                    "name": "is_cake_enabled",
+                    "configurable_features": [
                         "service",
                         "env",
                         "cid"
                     ],
-                    type: "bool",
-                    default_value: false,
-                    metadata: {}
+                    "type": "bool",
+                    "default_value": false,
+                    "metadata": {}
                 }
             ]
         }

From 7b1f855201ded4f856f1930fb4fde5c89c316916 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Sun, 7 Feb 2021 13:18:27 +0200
Subject: [PATCH 03/24] Enum and Flags adding seems to be OK

---
 frontend/src/components/NewRuleDialog.vue | 26 +++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index 2645905..b4b9c78 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -14,10 +14,11 @@
                     </v-row>
                     <v-row>
                         <v-col>
-                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-if="setting.type == 'int'" :rules="integerRules" />
-                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-else-if="setting.type == 'float'" />
-                            <v-switch required v-model="newRule.value" label="Value" v-else-if="setting.type == 'bool'" />
-                            <v-text-field required outlined v-model="newRule.value" label="Value" type="text" v-else-if="setting.type == 'str'" />
+                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-if="settingType == 'int'" :rules="integerRules" />
+                            <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-else-if="settingType == 'float'" />
+                            <v-switch required v-model="newRule.value" label="Value" v-else-if="settingType == 'bool'" />
+                            <v-text-field required outlined v-model="newRule.value" label="Value" type="text" v-else-if="settingType == 'str'" />
+                            <v-select v-else-if="['Enum', 'Flags'].includes(settingType)" :items="settingOptions" :multiple="'Flags' == settingType" />
                         </v-col>
                     </v-row>
                     <v-row>
@@ -82,6 +83,23 @@ export default {
         }
     },
     computed: {
+        settingType() {
+            if (['str', 'bool', 'float', 'int'].includes(this.setting.type)) {
+                return this.setting.type;
+            }
+            if (this.setting.type.startsWith("Enum")) {
+                return "Enum";
+            }
+            if (this.setting.type.startsWith("Flags")) {
+                return "Flags";
+            }
+            return "error";
+        },
+        settingOptions() {
+            let settingType = this.setting.type
+            // Flags and Enums options are parsable using JSON, so we remove the Flags/Enum part and just parse it
+            return JSON.parse(settingType.slice(settingType.indexOf("[")));
+        },
         show: {
             get() {
                 return this.value

From 15e604e6975db9ff371e0a6bd2c4f695d2fdd818 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Sun, 7 Feb 2021 19:01:22 +0200
Subject: [PATCH 04/24] new rule dialog complete?

---
 frontend/src/components/NewRuleDialog.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index b4b9c78..2bcc246 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -19,6 +19,7 @@
                             <v-switch required v-model="newRule.value" label="Value" v-else-if="settingType == 'bool'" />
                             <v-text-field required outlined v-model="newRule.value" label="Value" type="text" v-else-if="settingType == 'str'" />
                             <v-select v-else-if="['Enum', 'Flags'].includes(settingType)" :items="settingOptions" :multiple="'Flags' == settingType" />
+                            <v-textarea v-else v-model="newRule.value" label="Complex value type, use JSON for inserting value." auto-grow/>
                         </v-col>
                     </v-row>
                     <v-row>
@@ -62,6 +63,14 @@ export default {
             if (!this.valid) {
                 return;
             }
+            if (["Sequence", "Mapping"].includes(this.settingType)) {
+                try {
+                    this.newRule.value = JSON.parse(this.newRule.value);
+                } catch (err) {
+                    this.$toast.error("JSON Parse error " + err);
+                    return;
+                }
+            }
             this.$emit('rule-saved');
             console.log(this.newRule);
             this.show = false;
@@ -87,12 +96,18 @@ export default {
             if (['str', 'bool', 'float', 'int'].includes(this.setting.type)) {
                 return this.setting.type;
             }
-            if (this.setting.type.startsWith("Enum")) {
+            else if (this.setting.type.startsWith("Enum")) {
                 return "Enum";
             }
-            if (this.setting.type.startsWith("Flags")) {
+            else if (this.setting.type.startsWith("Flags")) {
                 return "Flags";
             }
+            else if (this.setting.type.startsWith("Sequence")) {
+                return "Sequence";
+            }
+            else if (this.setting.type.startsWith("Mapping")) {
+                return "Mapping";
+            }
             return "error";
         },
         settingOptions() {

From e8ec39d38120bfeb4beacecd46d273201d79e9ee Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 8 Feb 2021 18:30:07 +0200
Subject: [PATCH 05/24] first api implemented in backend and connected to front

---
 .gitignore                                 |   3 +
 backend/hekshermgmt/__init__.py            |   0
 backend/hekshermgmt/_version.py            |   1 +
 backend/hekshermgmt/api/__init__.py        |   0
 backend/hekshermgmt/api/v1/__init__.py     |   6 +
 backend/hekshermgmt/api/v1/settings.py     |  35 ++
 backend/hekshermgmt/api/v1/utils.py        |  19 ++
 backend/hekshermgmt/app.py                 |  69 ++++
 backend/hekshermgmt/context_vars.py        |   3 +
 backend/hekshermgmt/heksher_client.py      |  96 ++++++
 backend/hekshermgmt/main.py                |  42 +++
 backend/poetry.lock                        | 360 ++++++++++++++++++++-
 backend/pyproject.toml                     |   6 +
 backend/scripts/blackbox_test.sh           |   2 +
 backend/scripts/lint.sh                    |  13 +
 backend/scripts/test.sh                    |   2 +
 backend/scripts/unittest.sh                |   2 +
 frontend/package-lock.json                 |  21 +-
 frontend/package.json                      |   1 +
 frontend/src/main.js                       |   7 +
 frontend/src/views/ConfigurationsTable.vue | 158 +--------
 21 files changed, 696 insertions(+), 150 deletions(-)
 create mode 100644 backend/hekshermgmt/__init__.py
 create mode 100644 backend/hekshermgmt/_version.py
 create mode 100644 backend/hekshermgmt/api/__init__.py
 create mode 100644 backend/hekshermgmt/api/v1/__init__.py
 create mode 100644 backend/hekshermgmt/api/v1/settings.py
 create mode 100644 backend/hekshermgmt/api/v1/utils.py
 create mode 100644 backend/hekshermgmt/app.py
 create mode 100644 backend/hekshermgmt/context_vars.py
 create mode 100644 backend/hekshermgmt/heksher_client.py
 create mode 100644 backend/hekshermgmt/main.py
 create mode 100755 backend/scripts/blackbox_test.sh
 create mode 100755 backend/scripts/lint.sh
 create mode 100755 backend/scripts/test.sh
 create mode 100755 backend/scripts/unittest.sh

diff --git a/.gitignore b/.gitignore
index fd4f2b0..d167bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 node_modules
 .DS_Store
+.vscode
+backend/.env
+*__pycache__*
diff --git a/backend/hekshermgmt/__init__.py b/backend/hekshermgmt/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/hekshermgmt/_version.py b/backend/hekshermgmt/_version.py
new file mode 100644
index 0000000..62c779d
--- /dev/null
+++ b/backend/hekshermgmt/_version.py
@@ -0,0 +1 @@
+__version__ = ''  # Auto generated by Dockerfile
\ No newline at end of file
diff --git a/backend/hekshermgmt/api/__init__.py b/backend/hekshermgmt/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/hekshermgmt/api/v1/__init__.py b/backend/hekshermgmt/api/v1/__init__.py
new file mode 100644
index 0000000..b7fba16
--- /dev/null
+++ b/backend/hekshermgmt/api/v1/__init__.py
@@ -0,0 +1,6 @@
+from fastapi import APIRouter
+from hekshermgmt.api.v1.utils import get_user_name
+from hekshermgmt.api.v1.settings import router as settings
+
+router = APIRouter(prefix='/api/v1', dependencies=[get_user_name])
+router.include_router(settings)
\ No newline at end of file
diff --git a/backend/hekshermgmt/api/v1/settings.py b/backend/hekshermgmt/api/v1/settings.py
new file mode 100644
index 0000000..199459b
--- /dev/null
+++ b/backend/hekshermgmt/api/v1/settings.py
@@ -0,0 +1,35 @@
+from logging import getLogger
+from typing import Any, List, Optional
+
+from fastapi import APIRouter
+from pydantic import BaseModel, Field
+
+from hekshermgmt.app import HeksherManagement
+from hekshermgmt.api.v1.utils import application
+
+router = APIRouter(prefix='/settings')
+
+logger = getLogger(__name__)
+
+
+class Setting(BaseModel):
+    name: str = Field(description="The name of the setting")
+    configurable_features: List[str] = Field(
+        description="A list of the context features the setting can be configured"
+                    " by")
+    type: str = Field(description="The type of the setting")
+    default_value: Any = Field(description="The default value of the setting")
+    description: Optional[str] = Field(description="Configuration description (from metadata)")
+
+@router.get('', response_model=List[Setting])
+async def get_settings(app: HeksherManagement = application):
+    """
+    Get settings list
+    """
+    logger.info("user requested settings.")
+    settings = await app.heksher_client.get_settings()
+    return [Setting(name=setting['name'],
+            configurable_features=setting['configurable_features'],
+            type=setting['type'],
+            default_value=setting['default_value'],
+            description=setting['metadata'].get('description')) for setting in settings]
diff --git a/backend/hekshermgmt/api/v1/utils.py b/backend/hekshermgmt/api/v1/utils.py
new file mode 100644
index 0000000..fcee355
--- /dev/null
+++ b/backend/hekshermgmt/api/v1/utils.py
@@ -0,0 +1,19 @@
+from fastapi import Depends, Request, Header, HTTPException
+
+from hekshermgmt.context_vars import user
+
+
+@Depends
+def application(request: Request):
+    """
+    A helper dependancy to get the app instance
+    """
+    return request.app
+
+@Depends
+async def get_user_name(x_forwarded_email: str = Header(...)) -> str:
+    """
+    Extracts email from header and sets it into the context var.
+    """
+    user.set(x_forwarded_email)
+    return x_forwarded_email
\ No newline at end of file
diff --git a/backend/hekshermgmt/app.py b/backend/hekshermgmt/app.py
new file mode 100644
index 0000000..54b43dc
--- /dev/null
+++ b/backend/hekshermgmt/app.py
@@ -0,0 +1,69 @@
+import sentry_sdk
+import re
+
+from logging import getLogger, INFO
+
+from aiologstash import create_tcp_handler
+from contextfilter import ContextVarFilter
+from envolved import EnvVar, Schema
+from envolved.parsers import CollectionParser
+from fastapi import FastAPI
+
+from hekshermgmt.heksher_client import HeksherClient
+from hekshermgmt.context_vars import user
+
+logger = getLogger(__name__)
+
+
+class LogstashSettingSchema(Schema):
+    # todo remove explicit uppercase names when envolved is upgraded
+    host: str = EnvVar('HOST')
+    port: int = EnvVar('PORT')
+    level: int = EnvVar('LEVEL', default=INFO)
+    tags = EnvVar('TAGS', type=CollectionParser.pair_wise_delimited(re.compile(r'\s'), ':', str, str), default={})
+
+
+logstash_settings_env = EnvVar('HEKSHERMGMT_LOGSTASH_', default=None, type=LogstashSettingSchema)
+sentry_dsn_env = EnvVar('SENTRY_DSN', default='', type=str)
+
+
+class HeksherManagement(FastAPI):
+    """
+    The application class
+    """
+    heksher_client: HeksherClient
+
+    async def startup(self):
+        logstash_settings = logstash_settings_env.get()
+        if logstash_settings is not None:
+            handler = await create_tcp_handler(logstash_settings.host, logstash_settings.port, extra={
+                'hekshermgmt_version': __version__,
+                **logstash_settings.tags
+            })
+            _logger = getLogger('hekshermgmt')
+            _logger.addHandler(handler)
+            _logger.setLevel(logstash_settings.level)
+            _logger.addFilter(ContextVarFilter(user=user))
+
+        sentry_dsn = sentry_dsn_env.get()
+        if sentry_dsn:
+            try:
+                sentry_sdk.init(sentry_dsn, release=f"HeksherMgmt@{__version__}")
+            except Exception:
+                logger.exception("cannot start sentry")
+
+        self.heksher_client = HeksherClient.from_env()
+        await self.heksher_client.ping()
+
+    async def shutdown(self):
+        pass
+
+    async def is_healthy(self) -> bool:
+        """
+        Returns whether service is healthy or not. Depends on Heksher service health.
+        """
+        try:
+            await self.heksher_client.ping()
+        except Exception:
+            return False
+        return True
\ No newline at end of file
diff --git a/backend/hekshermgmt/context_vars.py b/backend/hekshermgmt/context_vars.py
new file mode 100644
index 0000000..6d3774d
--- /dev/null
+++ b/backend/hekshermgmt/context_vars.py
@@ -0,0 +1,3 @@
+from contextvars import ContextVar
+
+user: ContextVar[str] = ContextVar("user", default=None)
diff --git a/backend/hekshermgmt/heksher_client.py b/backend/hekshermgmt/heksher_client.py
new file mode 100644
index 0000000..2a12887
--- /dev/null
+++ b/backend/hekshermgmt/heksher_client.py
@@ -0,0 +1,96 @@
+from __future__ import annotations
+
+import re
+from logging import getLogger
+from typing import Any, Dict, List, Mapping, Optional
+from httpx import AsyncClient
+
+from envolved import EnvVar, Schema
+from envolved.parsers import CollectionParser
+
+
+logger = getLogger(__name__)
+
+
+class HeksherClientSettingSchema(Schema):
+    url: str = EnvVar('URL')
+    """ URL Of the Heksher Server """
+    headers = EnvVar('HEADERS', type=CollectionParser.pair_wise_delimited(re.compile(r'\s'), ':', str, str), default={})
+    """ Headers to send as part of the HTTP requests """
+
+heksher_settings_env = EnvVar('HEKSHERMGMT_HEKSHER_', type=HeksherClientSettingSchema)
+
+class HeksherClient:
+    http_client: AsyncClient
+
+    def __init__(self, host: str, headers: Optional[Dict[str, str]] = None):
+        self.http_client = AsyncClient(base_url=host, headers=headers)
+
+    @classmethod
+    def from_env(cls) -> "HeksherClient":
+        settings = heksher_settings_env.get()
+        return HeksherClient(settings.url, settings.headers)
+
+    async def ping(self) -> None:
+        """
+        Check the health of the Heksher server
+        Raises: httpx.HTTPError, if an error occurs
+        """
+        response = await self.http_client.get('/api/health')
+        response.raise_for_status()
+
+    async def get_settings(self) -> List[Dict[str, Any]]:
+        """
+        Get all settings in the Heksher system
+        Returns:
+            List of settings.
+        Raises:
+            Can raise httpx.Error in case of error from server.
+        """
+        response = await self.http_client.get('/api/v1/settings', params={"include_additional_data": True})
+        response.raise_for_status()
+        result = response.json()
+        return result["settings"]
+
+    async def get_settings_rules(self, setting_name: str) -> List[Dict[str, Any]]:
+        """
+        Get rules of a specific setting by name
+        Args:
+            setting_name - Name of setting
+        Returns:
+            List of rules
+        Raises:
+            Can raise httpx.Error in case of error from server.
+        """
+        request_json = {
+            "setting_names": [setting_name],
+            "context_features_options": "*",
+            "include_metadata": True
+        }
+        response = await self.http_client.post('/api/v1/rules/query',
+                                                json=request_json)
+        response.raise_for_status()
+        result = response.json()
+        return result["rules"][setting_name]
+
+    async def add_rule(self, setting_name: str, feature_values: Dict[str, str], value: Any, metadata: Dict[str, Any]):
+        """
+        Adds a new rule to Heksher.
+        Args:
+            setting_name - Name of setting.
+            feature_values - Dictionary of keys and required values for rule to evaluate.
+            value - The output value in case of match.
+            metadata - Additional data to store.
+        Returns:
+            None
+        Raises:
+            Can raise httpx.Error in case of error from server.
+        """
+        request_json = {
+            "setting": setting_name,
+            "feature_values": feature_values,
+            "value": value,
+            "metadata": metadata
+        }
+        response = await self.http_client.post('/api/v1/rules', json=request_json)
+        response.raise_for_status()
\ No newline at end of file
diff --git a/backend/hekshermgmt/main.py b/backend/hekshermgmt/main.py
new file mode 100644
index 0000000..862612e
--- /dev/null
+++ b/backend/hekshermgmt/main.py
@@ -0,0 +1,42 @@
+from starlette.middleware import Middleware
+from fastapi.middleware.cors import CORSMiddleware
+
+from hekshermgmt._version import __version__
+from hekshermgmt.app import HeksherManagement
+from hekshermgmt.api.v1 import router as v1_router
+
+middleware = []
+if __debug__:
+    middleware.append(Middleware(CORSMiddleware, allow_origins=['*'], allow_methods=["*"], allow_headers=["*"]))
+app = HeksherManagement(title="HeksherManagement", version=__version__ or "0.0.1", middleware=middleware)
+
+app.include_router(v1_router)
+
+@app.on_event('startup')
+async def startup():
+    await app.startup()
+
+
+@app.on_event('shutdown')
+async def shutdown():
+    await app.shutdown()
+
+@app.get('/api/health')
+async def health_check():
+    """
+    Check the health of the connections to the service
+    """
+    is_healthy = await app.is_healthy()
+    if not is_healthy:
+        return JSONResponse({'version': __version__}, status_code=500)
+    return {'version': __version__}
+
+
+def main():
+    import uvicorn
+
+    uvicorn.run(app, debug=True, host="0.0.0.0", port=8888)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
diff --git a/backend/poetry.lock b/backend/poetry.lock
index dd81950..7296618 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -1,3 +1,23 @@
+[[package]]
+name = "aiologstash"
+version = "2.0.0"
+description = "asyncio-compatible logstash logging handler."
+category = "main"
+optional = false
+python-versions = ">=3.6.0"
+
+[package.dependencies]
+async-timeout = "*"
+python-logstash = "*"
+
+[[package]]
+name = "async-timeout"
+version = "3.0.1"
+description = "Timeout context manager for asyncio programs"
+category = "main"
+optional = false
+python-versions = ">=3.5.3"
+
 [[package]]
 name = "atomicwrites"
 version = "1.4.0"
@@ -24,7 +44,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 name = "certifi"
 version = "2020.12.5"
 description = "Python package for providing Mozilla's CA Bundle."
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"
 
@@ -36,14 +56,30 @@ category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
+[[package]]
+name = "click"
+version = "7.1.2"
+description = "Composable command line interface toolkit"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
 [[package]]
 name = "colorama"
 version = "0.4.4"
 description = "Cross-platform colored terminal text."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
+[[package]]
+name = "contextfilter"
+version = "0.3.0"
+description = "ContextVars Filter for easily enriching log records"
+category = "main"
+optional = false
+python-versions = ">=3.7,<4.0"
+
 [[package]]
 name = "docker"
 version = "4.4.1"
@@ -62,6 +98,14 @@ websocket-client = ">=0.32.0"
 ssh = ["paramiko (>=2.4.2)"]
 tls = ["pyOpenSSL (>=17.5.0)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"]
 
+[[package]]
+name = "envolved"
+version = "0.3.0"
+description = ""
+category = "main"
+optional = false
+python-versions = ">=3.7,<4.0"
+
 [[package]]
 name = "fastapi"
 version = "0.63.0"
@@ -80,11 +124,63 @@ dev = ["python-jose[cryptography] (>=3.1.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<
 doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=6.1.4,<7.0.0)", "markdown-include (>=0.5.1,<0.6.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.9,<0.0.10)", "pyyaml (>=5.3.1,<6.0.0)"]
 test = ["pytest (5.4.3)", "pytest-cov (2.10.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (0.790)", "flake8 (>=3.8.3,<4.0.0)", "black (20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<2.0.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"]
 
+[[package]]
+name = "h11"
+version = "0.12.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "httpcore"
+version = "0.12.3"
+description = "A minimal low-level HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+h11 = "<1.0.0"
+sniffio = ">=1.0.0,<2.0.0"
+
+[package.extras]
+http2 = ["h2 (>=3,<5)"]
+
+[[package]]
+name = "httptools"
+version = "0.1.1"
+description = "A collection of framework independent HTTP protocol utils."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.extras]
+test = ["Cython (0.29.14)"]
+
+[[package]]
+name = "httpx"
+version = "0.16.1"
+description = "The next generation HTTP client."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+certifi = "*"
+httpcore = ">=0.12.0,<0.13.0"
+rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]}
+sniffio = "*"
+
+[package.extras]
+brotli = ["brotlipy (>=0.7.0,<0.8.0)"]
+http2 = ["h2 (>=3.0.0,<4.0.0)"]
+
 [[package]]
 name = "idna"
 version = "2.10"
 description = "Internationalized Domain Names in Applications (IDNA)"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
@@ -176,6 +272,25 @@ toml = "*"
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
 
+[[package]]
+name = "python-dotenv"
+version = "0.15.0"
+description = "Add .env support to your django/flask apps in development and deployments"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.extras]
+cli = ["click (>=5.0)"]
+
+[[package]]
+name = "python-logstash"
+version = "0.4.6"
+description = "Python logging handler for Logstash."
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pywin32"
 version = "227"
@@ -184,6 +299,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "pyyaml"
+version = "5.4.1"
+description = "YAML parser and emitter for Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
 [[package]]
 name = "requests"
 version = "2.25.1"
@@ -202,6 +325,48 @@ urllib3 = ">=1.21.1,<1.27"
 security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
 
+[[package]]
+name = "rfc3986"
+version = "1.4.0"
+description = "Validating URI References per RFC 3986"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+idna = {version = "*", optional = true, markers = "extra == \"idna2008\""}
+
+[package.extras]
+idna2008 = ["idna"]
+
+[[package]]
+name = "sentry-sdk"
+version = "0.19.5"
+description = "Python client for Sentry (https://sentry.io)"
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+certifi = "*"
+urllib3 = ">=1.10.0"
+
+[package.extras]
+aiohttp = ["aiohttp (>=3.5)"]
+beam = ["apache-beam (>=2.12)"]
+bottle = ["bottle (>=0.12.13)"]
+celery = ["celery (>=3)"]
+chalice = ["chalice (>=1.16.0)"]
+django = ["django (>=1.8)"]
+falcon = ["falcon (>=1.4)"]
+flask = ["flask (>=0.11)", "blinker (>=1.1)"]
+pure_eval = ["pure-eval", "executing", "asttokens"]
+pyspark = ["pyspark (>=2.4.4)"]
+rq = ["rq (>=0.6)"]
+sanic = ["sanic (>=0.8)"]
+sqlalchemy = ["sqlalchemy (>=1.2)"]
+tornado = ["tornado (>=5)"]
+
 [[package]]
 name = "six"
 version = "1.15.0"
@@ -210,6 +375,14 @@ category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 
+[[package]]
+name = "sniffio"
+version = "1.2.0"
+description = "Sniff out which async library your code is running under"
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
 [[package]]
 name = "sqlalchemy"
 version = "1.3.23"
@@ -253,7 +426,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 name = "urllib3"
 version = "1.26.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
 
@@ -262,6 +435,44 @@ brotli = ["brotlipy (>=0.6.0)"]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
 
+[[package]]
+name = "uvicorn"
+version = "0.13.3"
+description = "The lightning-fast ASGI server."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+click = ">=7.0.0,<8.0.0"
+colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""}
+h11 = ">=0.8"
+httptools = {version = ">=0.1.0,<0.2.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""}
+python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""}
+PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""}
+uvloop = {version = ">=0.14.0", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""}
+watchgod = {version = ">=0.6,<0.7", optional = true, markers = "extra == \"standard\""}
+websockets = {version = ">=8.0.0,<9.0.0", optional = true, markers = "extra == \"standard\""}
+
+[package.extras]
+standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6,<0.7)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "httptools (>=0.1.0,<0.2.0)", "uvloop (>=0.14.0)", "colorama (>=0.4)"]
+
+[[package]]
+name = "uvloop"
+version = "0.14.0"
+description = "Fast implementation of asyncio event loop on top of libuv"
+category = "main"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "watchgod"
+version = "0.6"
+description = "Simple, modern file watching and code reload in python."
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
 [[package]]
 name = "websocket-client"
 version = "0.57.0"
@@ -273,6 +484,14 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 [package.dependencies]
 six = "*"
 
+[[package]]
+name = "websockets"
+version = "8.1"
+description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"
+category = "main"
+optional = false
+python-versions = ">=3.6.1"
+
 [[package]]
 name = "yaspin"
 version = "1.3.0"
@@ -307,9 +526,17 @@ postgresql = ["sqlalchemy (>=1.3.0,<2.0.0)", "psycopg2 (>=2.8.6,<3.0.0)"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "9ae6c0f57d069143999f5700f74d9a10f699ecadffb60f76b1d6491e9ef45818"
+content-hash = "08bf25008e78622825da4e0aec50a87b67252ee5cb4de26206f81d8aaa83298f"
 
 [metadata.files]
+aiologstash = [
+    {file = "aiologstash-2.0.0-py3-none-any.whl", hash = "sha256:59c8bc1c37d73246847f370ca84d044a2f7d13f8030b82d2702b086d2cd2c651"},
+    {file = "aiologstash-2.0.0.tar.gz", hash = "sha256:698522126ffd4e905cd5f52a08092a0a78096c8f0e28bc1e303369873da71f78"},
+]
+async-timeout = [
+    {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"},
+    {file = "async_timeout-3.0.1-py3-none-any.whl", hash = "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"},
+]
 atomicwrites = [
     {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
     {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
@@ -326,17 +553,55 @@ chardet = [
     {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
     {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
 ]
+click = [
+    {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"},
+    {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"},
+]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
 ]
+contextfilter = [
+    {file = "contextfilter-0.3.0-py3-none-any.whl", hash = "sha256:7c68c4cf58a62230e27c13ab2717b2d7e93508934b62dce59661dbaada8261ec"},
+    {file = "contextfilter-0.3.0.tar.gz", hash = "sha256:8c0fb54ffb1eb5537979244a0a273ec9a870c326d674d7ad56237de400ac3f70"},
+]
 docker = [
     {file = "docker-4.4.1-py2.py3-none-any.whl", hash = "sha256:e455fa49aabd4f22da9f4e1c1f9d16308286adc60abaf64bf3e1feafaed81d06"},
     {file = "docker-4.4.1.tar.gz", hash = "sha256:0604a74719d5d2de438753934b755bfcda6f62f49b8e4b30969a4b0a2a8a1220"},
 ]
+envolved = [
+    {file = "envolved-0.3.0-py3-none-any.whl", hash = "sha256:cb7709b13de28061b294b08bba2dc21ca8a3fc06cab198f2a16d45ccf3a262ca"},
+    {file = "envolved-0.3.0.tar.gz", hash = "sha256:35e3e997b8cf159f5e76f5ddbe114de28f4f04ac7c81ec5c8e43d90a6532f8ba"},
+]
 fastapi = [
     {file = "fastapi-0.63.0-py3-none-any.whl", hash = "sha256:98d8ea9591d8512fdadf255d2a8fa56515cdd8624dca4af369da73727409508e"},
     {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"},
 ]
+h11 = [
+    {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
+    {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
+]
+httpcore = [
+    {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"},
+    {file = "httpcore-0.12.3.tar.gz", hash = "sha256:37ae835fb370049b2030c3290e12ed298bf1473c41bb72ca4aa78681eba9b7c9"},
+]
+httptools = [
+    {file = "httptools-0.1.1-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:a2719e1d7a84bb131c4f1e0cb79705034b48de6ae486eb5297a139d6a3296dce"},
+    {file = "httptools-0.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:fa3cd71e31436911a44620473e873a256851e1f53dee56669dae403ba41756a4"},
+    {file = "httptools-0.1.1-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:86c6acd66765a934e8730bf0e9dfaac6fdcf2a4334212bd4a0a1c78f16475ca6"},
+    {file = "httptools-0.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bc3114b9edbca5a1eb7ae7db698c669eb53eb8afbbebdde116c174925260849c"},
+    {file = "httptools-0.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:ac0aa11e99454b6a66989aa2d44bca41d4e0f968e395a0a8f164b401fefe359a"},
+    {file = "httptools-0.1.1-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:96da81e1992be8ac2fd5597bf0283d832287e20cb3cfde8996d2b00356d4e17f"},
+    {file = "httptools-0.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:56b6393c6ac7abe632f2294da53f30d279130a92e8ae39d8d14ee2e1b05ad1f2"},
+    {file = "httptools-0.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:96eb359252aeed57ea5c7b3d79839aaa0382c9d3149f7d24dd7172b1bcecb009"},
+    {file = "httptools-0.1.1-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:fea04e126014169384dee76a153d4573d90d0cbd1d12185da089f73c78390437"},
+    {file = "httptools-0.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3592e854424ec94bd17dc3e0c96a64e459ec4147e6d53c0a42d0ebcef9cb9c5d"},
+    {file = "httptools-0.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:0a4b1b2012b28e68306575ad14ad5e9120b34fccd02a81eb08838d7e3bbb48be"},
+    {file = "httptools-0.1.1.tar.gz", hash = "sha256:41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"},
+]
+httpx = [
+    {file = "httpx-0.16.1-py3-none-any.whl", hash = "sha256:9cffb8ba31fac6536f2c8cde30df859013f59e4bcc5b8d43901cb3654a8e0a5b"},
+    {file = "httpx-0.16.1.tar.gz", hash = "sha256:126424c279c842738805974687e0518a94c7ae8d140cd65b9c4f77ac46ffa537"},
+]
 idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
     {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
@@ -405,6 +670,13 @@ pytest = [
     {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"},
     {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"},
 ]
+python-dotenv = [
+    {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"},
+    {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"},
+]
+python-logstash = [
+    {file = "python-logstash-0.4.6.tar.gz", hash = "sha256:10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c"},
+]
 pywin32 = [
     {file = "pywin32-227-cp27-cp27m-win32.whl", hash = "sha256:371fcc39416d736401f0274dd64c2302728c9e034808e37381b5e1b22be4a6b0"},
     {file = "pywin32-227-cp27-cp27m-win_amd64.whl", hash = "sha256:4cdad3e84191194ea6d0dd1b1b9bdda574ff563177d2adf2b4efec2a244fa116"},
@@ -419,14 +691,49 @@ pywin32 = [
     {file = "pywin32-227-cp39-cp39-win32.whl", hash = "sha256:c054c52ba46e7eb6b7d7dfae4dbd987a1bb48ee86debe3f245a2884ece46e295"},
     {file = "pywin32-227-cp39-cp39-win_amd64.whl", hash = "sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c"},
 ]
+pyyaml = [
+    {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
+    {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
+    {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
+    {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
+    {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
+    {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
+    {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
+    {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
+    {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
+    {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
+    {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
+    {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
+    {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
+    {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
+    {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
+    {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
+    {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
+    {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
+    {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
+    {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
+    {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
+]
 requests = [
     {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},
     {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
 ]
+rfc3986 = [
+    {file = "rfc3986-1.4.0-py2.py3-none-any.whl", hash = "sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50"},
+    {file = "rfc3986-1.4.0.tar.gz", hash = "sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d"},
+]
+sentry-sdk = [
+    {file = "sentry-sdk-0.19.5.tar.gz", hash = "sha256:737a094e49a529dd0fdcaafa9e97cf7c3d5eb964bd229821d640bc77f3502b3f"},
+    {file = "sentry_sdk-0.19.5-py2.py3-none-any.whl", hash = "sha256:0a711ec952441c2ec89b8f5d226c33bc697914f46e876b44a4edd3e7864cf4d0"},
+]
 six = [
     {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
     {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"},
 ]
+sniffio = [
+    {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"},
+    {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"},
+]
 sqlalchemy = [
     {file = "SQLAlchemy-1.3.23-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:fd3b96f8c705af8e938eaa99cbd8fd1450f632d38cad55e7367c33b263bf98ec"},
     {file = "SQLAlchemy-1.3.23-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:29cccc9606750fe10c5d0e8bd847f17a97f3850b8682aef1f56f5d5e1a5a64b1"},
@@ -479,10 +786,53 @@ urllib3 = [
     {file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"},
     {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"},
 ]
+uvicorn = [
+    {file = "uvicorn-0.13.3-py3-none-any.whl", hash = "sha256:1079c50a06f6338095b4f203e7861dbff318dde5f22f3a324fc6e94c7654164c"},
+    {file = "uvicorn-0.13.3.tar.gz", hash = "sha256:ef1e0bb5f7941c6fe324e06443ddac0331e1632a776175f87891c7bd02694355"},
+]
+uvloop = [
+    {file = "uvloop-0.14.0-cp35-cp35m-macosx_10_11_x86_64.whl", hash = "sha256:08b109f0213af392150e2fe6f81d33261bb5ce968a288eb698aad4f46eb711bd"},
+    {file = "uvloop-0.14.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:4544dcf77d74f3a84f03dd6278174575c44c67d7165d4c42c71db3fdc3860726"},
+    {file = "uvloop-0.14.0-cp36-cp36m-macosx_10_11_x86_64.whl", hash = "sha256:b4f591aa4b3fa7f32fb51e2ee9fea1b495eb75b0b3c8d0ca52514ad675ae63f7"},
+    {file = "uvloop-0.14.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362"},
+    {file = "uvloop-0.14.0-cp37-cp37m-macosx_10_11_x86_64.whl", hash = "sha256:afd5513c0ae414ec71d24f6f123614a80f3d27ca655a4fcf6cabe50994cc1891"},
+    {file = "uvloop-0.14.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95"},
+    {file = "uvloop-0.14.0-cp38-cp38-macosx_10_11_x86_64.whl", hash = "sha256:bcac356d62edd330080aed082e78d4b580ff260a677508718f88016333e2c9c5"},
+    {file = "uvloop-0.14.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:4315d2ec3ca393dd5bc0b0089d23101276778c304d42faff5dc4579cb6caef09"},
+    {file = "uvloop-0.14.0.tar.gz", hash = "sha256:123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e"},
+]
+watchgod = [
+    {file = "watchgod-0.6-py35.py36.py37-none-any.whl", hash = "sha256:59700dab7445aa8e6067a5b94f37bae90fc367554549b1ed2e9d0f4f38a90d2a"},
+    {file = "watchgod-0.6.tar.gz", hash = "sha256:e9cca0ab9c63f17fc85df9fd8bd18156ff00aff04ebe5976cee473f4968c6858"},
+]
 websocket-client = [
     {file = "websocket_client-0.57.0-py2.py3-none-any.whl", hash = "sha256:0fc45c961324d79c781bab301359d5a1b00b13ad1b10415a4780229ef71a5549"},
     {file = "websocket_client-0.57.0.tar.gz", hash = "sha256:d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010"},
 ]
+websockets = [
+    {file = "websockets-8.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:3762791ab8b38948f0c4d281c8b2ddfa99b7e510e46bd8dfa942a5fff621068c"},
+    {file = "websockets-8.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:3db87421956f1b0779a7564915875ba774295cc86e81bc671631379371af1170"},
+    {file = "websockets-8.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4f9f7d28ce1d8f1295717c2c25b732c2bc0645db3215cf757551c392177d7cb8"},
+    {file = "websockets-8.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:295359a2cc78736737dd88c343cd0747546b2174b5e1adc223824bcaf3e164cb"},
+    {file = "websockets-8.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:1d3f1bf059d04a4e0eb4985a887d49195e15ebabc42364f4eb564b1d065793f5"},
+    {file = "websockets-8.1-cp36-cp36m-win32.whl", hash = "sha256:2db62a9142e88535038a6bcfea70ef9447696ea77891aebb730a333a51ed559a"},
+    {file = "websockets-8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:0e4fb4de42701340bd2353bb2eee45314651caa6ccee80dbd5f5d5978888fed5"},
+    {file = "websockets-8.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:9b248ba3dd8a03b1a10b19efe7d4f7fa41d158fdaa95e2cf65af5a7b95a4f989"},
+    {file = "websockets-8.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ce85b06a10fc65e6143518b96d3dca27b081a740bae261c2fb20375801a9d56d"},
+    {file = "websockets-8.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:965889d9f0e2a75edd81a07592d0ced54daa5b0785f57dc429c378edbcffe779"},
+    {file = "websockets-8.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:751a556205d8245ff94aeef23546a1113b1dd4f6e4d102ded66c39b99c2ce6c8"},
+    {file = "websockets-8.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:3ef56fcc7b1ff90de46ccd5a687bbd13a3180132268c4254fc0fa44ecf4fc422"},
+    {file = "websockets-8.1-cp37-cp37m-win32.whl", hash = "sha256:7ff46d441db78241f4c6c27b3868c9ae71473fe03341340d2dfdbe8d79310acc"},
+    {file = "websockets-8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:20891f0dddade307ffddf593c733a3fdb6b83e6f9eef85908113e628fa5a8308"},
+    {file = "websockets-8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c1ec8db4fac31850286b7cd3b9c0e1b944204668b8eb721674916d4e28744092"},
+    {file = "websockets-8.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:5c01fd846263a75bc8a2b9542606927cfad57e7282965d96b93c387622487485"},
+    {file = "websockets-8.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9bef37ee224e104a413f0780e29adb3e514a5b698aabe0d969a6ba426b8435d1"},
+    {file = "websockets-8.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d705f8aeecdf3262379644e4b55107a3b55860eb812b673b28d0fbc347a60c55"},
+    {file = "websockets-8.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:c8a116feafdb1f84607cb3b14aa1418424ae71fee131642fc568d21423b51824"},
+    {file = "websockets-8.1-cp38-cp38-win32.whl", hash = "sha256:e898a0863421650f0bebac8ba40840fc02258ef4714cb7e1fd76b6a6354bda36"},
+    {file = "websockets-8.1-cp38-cp38-win_amd64.whl", hash = "sha256:f8a7bff6e8664afc4e6c28b983845c5bc14965030e3fb98789734d416af77c4b"},
+    {file = "websockets-8.1.tar.gz", hash = "sha256:5c65d2da8c6bce0fca2528f69f44b2f977e06954c8512a952222cea50dad430f"},
+]
 yaspin = [
     {file = "yaspin-1.3.0-py2.py3-none-any.whl", hash = "sha256:3b84b4c506271b638e6b09b9cb3ffe9a5c2aef0bb19ce9128cdd9be936c8d8ba"},
     {file = "yaspin-1.3.0.tar.gz", hash = "sha256:cc37d35cc7f796dada6c37430b49e471ffa05d0686e6f8de36f83978b732df54"},
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index a989224..6076d3f 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -7,6 +7,12 @@ authors = ["Aviram Hassan <aviram.hassan@biocatch.com>"]
 [tool.poetry.dependencies]
 python = "^3.8"
 fastapi = "^0.63.0"
+aiologstash = "^2.0.0"
+envolved = "0.3.0"
+sentry-sdk = "^0.19.5"
+httpx = "^0.16.1"
+contextfilter = "^0.3.0"
+uvicorn = {version = "^0.13.3", extras = ["standard"]}
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.2"
diff --git a/backend/scripts/blackbox_test.sh b/backend/scripts/blackbox_test.sh
new file mode 100755
index 0000000..5a807ec
--- /dev/null
+++ b/backend/scripts/blackbox_test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+python -m pytest tests/blackbox -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/backend/scripts/lint.sh b/backend/scripts/lint.sh
new file mode 100755
index 0000000..50c9f21
--- /dev/null
+++ b/backend/scripts/lint.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# run various linters
+set -e
+poetry run flake8 --max-line-length 120 app tests
+set +e
+poetry run python -c "import sys; sys.exit(sys.version_info < (3,9,0))"
+res=$?
+set -e
+if [ "$res" -eq "0" ]; then
+  echo "pytype not run, please run in python 3.8 or lower"
+else
+  poetry run pytype --keep-going heksher
+fi
\ No newline at end of file
diff --git a/backend/scripts/test.sh b/backend/scripts/test.sh
new file mode 100755
index 0000000..0c2ff88
--- /dev/null
+++ b/backend/scripts/test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+python -m pytest tests -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/backend/scripts/unittest.sh b/backend/scripts/unittest.sh
new file mode 100755
index 0000000..93a961a
--- /dev/null
+++ b/backend/scripts/unittest.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+python -m pytest tests/unittests -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index a4cf4fa..5eab451 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,6 +8,7 @@
       "name": "hekshermgmt",
       "version": "0.1.0",
       "dependencies": {
+        "axios": "^0.21.0",
         "core-js": "^3.6.5",
         "vue": "^2.6.11",
         "vue-confirm-dialog": "^1.0.2",
@@ -2736,6 +2737,14 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
       "dev": true
     },
+    "node_modules/axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "dependencies": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
     "node_modules/babel-eslint": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
@@ -6393,7 +6402,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
       "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -17310,6 +17318,14 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
       "dev": true
     },
+    "axios": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+      "requires": {
+        "follow-redirects": "^1.10.0"
+      }
+    },
     "babel-eslint": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
@@ -20283,8 +20299,7 @@
     "follow-redirects": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
-      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
-      "dev": true
+      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="
     },
     "for-in": {
       "version": "1.0.2",
diff --git a/frontend/package.json b/frontend/package.json
index 3838552..bc4f8e7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -8,6 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "axios": "^0.21.0",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
     "vue-confirm-dialog": "^1.0.2",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index b708fd9..9e13132 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,9 +1,16 @@
+import axios from 'axios'
 import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import vuetify from './plugins/vuetify';
 import VueConfirmDialog from 'vue-confirm-dialog'
 
+Vue.prototype.$http = axios
+if (process.env.NODE_ENV == 'development') {
+  Vue.prototype.$http.defaults.baseURL = 'http://localhost:8000';
+  // The backend API requires X-Forwarded-Email header for all APIs
+  Vue.prototype.$http.defaults.headers.common['X-Forwarded-Email'] = 'shlomo@doron.com';
+}
 Vue.config.productionTip = false
 
 new Vue({
diff --git a/frontend/src/views/ConfigurationsTable.vue b/frontend/src/views/ConfigurationsTable.vue
index 94aa8ba..282fd3c 100644
--- a/frontend/src/views/ConfigurationsTable.vue
+++ b/frontend/src/views/ConfigurationsTable.vue
@@ -21,7 +21,20 @@ export default {
     components: {
         SettingsRule
     },
-    methods: {},
+    methods: {
+        async getSettings() {
+            try {
+                var response = await this.$http.get("/api/v1/settings")
+            } catch (error) {
+                this.$toast.error(error);
+                return;
+            }
+            this.configurations = response.data;
+        }
+    },
+    async mounted() {
+        await this.getSettings();
+    },
     data() {
         return {
             expanded: [],
@@ -40,149 +53,10 @@ export default {
                 },
                 {
                     text: 'Description',
-                    value: 'metadata.description'
+                    value: 'description'
                 },
             ],
-            configurations: [{
-                    "name": "cake_color",
-                    "configurable_features": [
-                        "env"
-                    ],
-                    "type": "Flags[\"blue\",\"green\",\"red\"]",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_cooking_temp",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "int",
-                    "default_value": 30,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_frosting",
-                    "configurable_features": [
-                        "service",
-                        "env",
-                        "cid"
-                    ],
-                    "type": "Sequence<Enum[\"candies\",\"sprinkles\"]>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_interest_rate",
-                    "configurable_features": [
-                        "env"
-                    ],
-                    "type": "float",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_name",
-                    "configurable_features": [
-                        "env"
-                    ],
-                    "type": "str",
-                    "default_value": "benben",
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_mapping_bool",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Mapping<bool>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_mapping_float",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Mapping<float>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_mapping_int",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Mapping<int>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_mapping_str",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Mapping<str>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_sequence_bool",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Sequence<bool>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_sequence_float",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Sequence<float>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_sequence_int",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Sequence<int>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_test_sequence_str",
-                    "configurable_features": [
-                        "service"
-                    ],
-                    "type": "Sequence<str>",
-                    "default_value": null,
-                    "metadata": {}
-                },
-                {
-                    "name": "cake_type",
-                    "configurable_features": [
-                        "cid"
-                    ],
-                    "type": "Enum[0,1,2]",
-                    "default_value": 2,
-                    "metadata": {}
-                },
-                {
-                    "name": "is_cake_enabled",
-                    "configurable_features": [
-                        "service",
-                        "env",
-                        "cid"
-                    ],
-                    "type": "bool",
-                    "default_value": false,
-                    "metadata": {}
-                }
-            ]
+            configurations: []
         }
     },
 }

From 738b18a3b91ee635dbf537f65427fc386c3ae037 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Tue, 9 Feb 2021 18:05:46 +0200
Subject: [PATCH 06/24] all seems to work, bye bye

---
 backend/hekshermgmt/api/v1/__init__.py    |  4 +-
 backend/hekshermgmt/api/v1/rules.py       | 53 +++++++++++++++++++++
 backend/hekshermgmt/api/v1/settings.py    | 34 ++++++++++++-
 backend/hekshermgmt/heksher_client.py     | 36 ++++++++++++--
 backend/poetry.lock                       | 31 +++++++++++-
 backend/pyproject.toml                    |  1 +
 frontend/src/components/NewRuleDialog.vue | 39 ++++++++-------
 frontend/src/components/SettingRules.vue  | 58 +++++++++++++----------
 frontend/src/main.js                      |  3 ++
 9 files changed, 211 insertions(+), 48 deletions(-)
 create mode 100644 backend/hekshermgmt/api/v1/rules.py

diff --git a/backend/hekshermgmt/api/v1/__init__.py b/backend/hekshermgmt/api/v1/__init__.py
index b7fba16..7e78911 100644
--- a/backend/hekshermgmt/api/v1/__init__.py
+++ b/backend/hekshermgmt/api/v1/__init__.py
@@ -1,6 +1,8 @@
 from fastapi import APIRouter
 from hekshermgmt.api.v1.utils import get_user_name
 from hekshermgmt.api.v1.settings import router as settings
+from hekshermgmt.api.v1.rules import router as rules
 
 router = APIRouter(prefix='/api/v1', dependencies=[get_user_name])
-router.include_router(settings)
\ No newline at end of file
+router.include_router(settings)
+router.include_router(rules)
\ No newline at end of file
diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
new file mode 100644
index 0000000..836dc89
--- /dev/null
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -0,0 +1,53 @@
+import datetime
+from logging import getLogger
+from typing import Any, Dict, Optional
+
+import httpx
+
+from fastapi import APIRouter
+from pydantic import BaseModel, Field, validator
+from starlette.responses import Response
+
+from hekshermgmt.app import HeksherManagement
+from hekshermgmt.api.v1.utils import application
+from hekshermgmt.context_vars import user
+
+router = APIRouter(prefix='/rule')
+
+logger = getLogger(__name__)
+
+class RuleAddOutput(BaseModel):
+    rule_id: int = Field(description="ID of the newly created rule.")
+
+class RuleAddInput(BaseModel):
+    setting: str = Field(description="the setting name the rule should apply to")
+    feature_values: Dict[str, str] = Field(description="the exact-match conditions of the rule")
+    value: Any = Field(description="the value of the setting in contexts that match the rule")
+    information: Optional[str] = Field(description="information to store with the rule" , max_length=100)
+
+    @validator('feature_values')
+    @classmethod
+    def feature_values_not_empty(cls, v):
+        if not v:
+            raise ValueError('feature_values must not be empty')
+        return v
+
+
+@router.delete('/{rule_id}')
+async def delete_rule(rule_id: int, app: HeksherManagement = application):
+    """
+    Deletes a specific rule
+    """
+    rule = await app.heksher_client.get_rule_data(rule_id)
+    logger.info("Deleting rule.", extra={"rule_id": rule_id, "setting_name": rule["setting"], "value": rule["value"]})
+    await app.heksher_client.delete_rule(rule_id)
+
+@router.post('', response_model=RuleAddOutput)
+async def add_rule(rule: RuleAddInput, app: HeksherManagement = application):
+    metadata = {"added_by": user.get(), "information": rule.information, "date": str(datetime.datetime.now())}
+    try:
+        rule_id = await app.heksher_client.add_rule(rule.setting, rule.feature_values, rule.value, metadata)
+    except httpx.HTTPStatusError as exception:
+        return Response(exception.response.content, exception.response.status_code)
+    logger.info("Added rule.", extra={"rule_id": rule_id, "rule_value": rule.value,
+                                "feature_values": rule.feature_values, "setting_name": rule.setting})
\ No newline at end of file
diff --git a/backend/hekshermgmt/api/v1/settings.py b/backend/hekshermgmt/api/v1/settings.py
index 199459b..c703806 100644
--- a/backend/hekshermgmt/api/v1/settings.py
+++ b/backend/hekshermgmt/api/v1/settings.py
@@ -1,5 +1,7 @@
 from logging import getLogger
-from typing import Any, List, Optional
+from typing import Any, Dict, List, Optional
+
+import orjson
 
 from fastapi import APIRouter
 from pydantic import BaseModel, Field
@@ -21,15 +23,43 @@ class Setting(BaseModel):
     default_value: Any = Field(description="The default value of the setting")
     description: Optional[str] = Field(description="Configuration description (from metadata)")
 
+
+class Rule(BaseModel):
+    value: Any = Field(description="Value set by the rule.")
+    context_features: Dict[str, str] = Field(description="Context features for matching rule.")
+    rule_id: int
+    added_by: Optional[str] = Field(None, description="Creator of the rule.")
+    information: Optional[str] = Field(None, description="Information on this rule, what this tries to achieve.")
+    date: Optional[str] = Field(None, description="Date ruled was created")
+
+
 @router.get('', response_model=List[Setting])
 async def get_settings(app: HeksherManagement = application):
     """
     Get settings list
     """
-    logger.info("user requested settings.")
+    logger.debug("Getting settings request.")
     settings = await app.heksher_client.get_settings()
     return [Setting(name=setting['name'],
             configurable_features=setting['configurable_features'],
             type=setting['type'],
             default_value=setting['default_value'],
             description=setting['metadata'].get('description')) for setting in settings]
+
+@router.get('/{setting_name}/rules', response_model=List[Rule])
+async def get_setting_rules(setting_name: str, app: HeksherManagement = application):
+    """
+    Get setting's rules
+    """
+    logger.debug("Get setting's rules", extra={"setting_name": setting_name})
+    rules = await app.heksher_client.get_settings_rules(setting_name)
+
+    # Convert dictionary values into JSON for easier view.
+    return [Rule(value=orjson.dumps(rule["value"]) if isinstance(rule["value"], dict) else rule["value"],
+                 context_features=dict(rule["context_features"]),
+                 rule_id=rule["rule_id"],
+                 added_by=rule["metadata"].get("added_by"),
+                 information=rule["metadata"].get("information"),
+                 date=rule["metadata"].get("date")
+                 )
+            for rule in rules]
\ No newline at end of file
diff --git a/backend/hekshermgmt/heksher_client.py b/backend/hekshermgmt/heksher_client.py
index 2a12887..682d301 100644
--- a/backend/hekshermgmt/heksher_client.py
+++ b/backend/hekshermgmt/heksher_client.py
@@ -73,7 +73,8 @@ async def get_settings_rules(self, setting_name: str) -> List[Dict[str, Any]]:
         result = response.json()
         return result["rules"][setting_name]
 
-    async def add_rule(self, setting_name: str, feature_values: Dict[str, str], value: Any, metadata: Dict[str, Any]):
+    async def add_rule(self, setting_name: str, feature_values: Dict[str, str], value: Any,
+                       metadata: Dict[str, Any]) -> int:
         """
         Adds a new rule to Heksher.
         Args:
@@ -82,7 +83,7 @@ async def add_rule(self, setting_name: str, feature_values: Dict[str, str], valu
             value - The output value in case of match.
             metadata - Additional data to store.
         Returns:
-            None
+            Rule ID.
         Raises:
             Can raise httpx.Error in case of error from server.
         """
@@ -93,4 +94,33 @@ async def add_rule(self, setting_name: str, feature_values: Dict[str, str], valu
             "metadata": metadata
         }
         response = await self.http_client.post('/api/v1/rules', json=request_json)
-        response.raise_for_status()
\ No newline at end of file
+        response.raise_for_status()
+        return response.json()["rule_id"]
+
+    async def delete_rule(self, rule_id: int) -> None:
+        """
+        Deletes a rule from Heksher based on rule_id.
+        Args:
+            rule_id - Identifier of rule to remove.
+        Returns:
+            None
+        Raises:
+            Can raise httpx.Error in case of error from server.
+        """
+        response = await self.http_client.delete(f'/api/v1/rules/{rule_id}')
+        response.raise_for_status()
+
+    async def get_rule_data(self, rule_id: int) -> Dict[str, Any]:
+        """
+        Gets rule's data
+        Args:
+            rule_id - Identifier of rule to fetch.
+        Returns:
+            Rule as dict
+        Raises:
+            Can raise httpx.Error in case of error from server.
+        """
+        response = await self.http_client.get(f'/api/v1/rules/{rule_id}')
+        response.raise_for_status()
+
+        return response.json()
\ No newline at end of file
diff --git a/backend/poetry.lock b/backend/poetry.lock
index 7296618..dcd6e0d 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -192,6 +192,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "orjson"
+version = "3.4.8"
+description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "packaging"
 version = "20.9"
@@ -526,7 +534,7 @@ postgresql = ["sqlalchemy (>=1.3.0,<2.0.0)", "psycopg2 (>=2.8.6,<3.0.0)"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "08bf25008e78622825da4e0aec50a87b67252ee5cb4de26206f81d8aaa83298f"
+content-hash = "db92083ebb4391b79dffd68e8f12e6f0720a72251c5f12a14c9e7c0bb11e38ec"
 
 [metadata.files]
 aiologstash = [
@@ -609,6 +617,27 @@ idna = [
 iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
+orjson = [
+    {file = "orjson-3.4.8-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:3bf9cd593f48329d8356192b453c20850ecb135a92c70df42ccd652e0496c206"},
+    {file = "orjson-3.4.8-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:a2c6b0436f89a8393add5c8ea493176f4ff671257720e221eb52c6c51973c07b"},
+    {file = "orjson-3.4.8-cp36-cp36m-macosx_10_7_x86_64.whl", hash = "sha256:b7907822cc6cc4bfc3fe6dc8ed2ea98b4b36714812a9ac329b7dd740a7076e02"},
+    {file = "orjson-3.4.8-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:567c380acca015cdaf520d39853fea43e23c75c9ad7c49890464d2d509cf1025"},
+    {file = "orjson-3.4.8-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:ba9c05874d5eab35e5fe6e47cd4b9a1cf89eb9400efb11783f864e04747f298c"},
+    {file = "orjson-3.4.8-cp36-none-win_amd64.whl", hash = "sha256:bdbf4ec86a6a8a907a085933ecc4dd15177f1dab20063590bb6f7f0517c391eb"},
+    {file = "orjson-3.4.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:e4c0ba0b532ef82b992813b01ef896b8ebc3ed8a07f7001f37374184ff98e552"},
+    {file = "orjson-3.4.8-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:63cbf9602d79e55aafdb28afd6d5456a503f6ced99daf03d80411f7885970bd1"},
+    {file = "orjson-3.4.8-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:dd5c96427fea3a2ebbcf035494f6b291ec6eb9c29be75493cbbae5e7282fbbb4"},
+    {file = "orjson-3.4.8-cp37-none-win_amd64.whl", hash = "sha256:5a742382013466d79a2b0c81413fdd308059d094f432c0797ce721e5e549708d"},
+    {file = "orjson-3.4.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:d7069adfc5ddd1b264c06e86cea742445c5c2a9acaa2f72add98b3b5b2b6d1c9"},
+    {file = "orjson-3.4.8-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:e2d5cc1186e5bc9910ad96d8f241105a998d6e02d1374a3cbe9997838f30385a"},
+    {file = "orjson-3.4.8-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:bbe405d84c4ab14dafdb9fd08aa11b172803089094f9f8f2e9552a617d5bdcd2"},
+    {file = "orjson-3.4.8-cp38-none-win_amd64.whl", hash = "sha256:6d7c3edace4ac7314d3b98cee30191af38f1581fcad7b2c5be139b8bd3c45da8"},
+    {file = "orjson-3.4.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:0e4c4b7151b88f6d7deda26ce04880fbdf15e31b0e1af226e25134b10d1ba0b3"},
+    {file = "orjson-3.4.8-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:bb3bd703069127b899090c0ca24bc8ce5e5137f17e7d1a8d2080e0e3361c4ee3"},
+    {file = "orjson-3.4.8-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:2599ac12c5992dfb44870e71bd96ce6b0df7f7248a9548664810e889685b967b"},
+    {file = "orjson-3.4.8-cp39-none-win_amd64.whl", hash = "sha256:c7ddf86586810cffa37b24150f6f29c193d80322ad1d807be791cb2a1b8954e8"},
+    {file = "orjson-3.4.8.tar.gz", hash = "sha256:08ac106a4e67c7dd3010a948d336294a7549c62677bee9752011347c7688af37"},
+]
 packaging = [
     {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"},
     {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"},
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 6076d3f..5d2f04e 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -13,6 +13,7 @@ sentry-sdk = "^0.19.5"
 httpx = "^0.16.1"
 contextfilter = "^0.3.0"
 uvicorn = {version = "^0.13.3", extras = ["standard"]}
+orjson = "^3.4.8"
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.2"
diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index 2bcc246..c003207 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -9,7 +9,7 @@
                 <v-container>
                     <v-row>
                         <v-col v-for="context in setting.configurable_features" :key="context">
-                            <v-text-field :label="context" v-model="newRule['context_features'][context]" outlined :rules="[() => /^[a-z0-9]+$/i.test(newRule['context_features'][context]) || 'Alphanumeric only!']" />
+                            <v-text-field :label="context" v-model="newRule['feature_values'][context]" outlined :rules="[(v) => /^[a-z0-9]+$/i.test(v) || 'Alphanumeric only!']" />
                         </v-col>
                     </v-row>
                     <v-row>
@@ -18,13 +18,13 @@
                             <v-text-field required outlined v-model.number="newRule.value" label="Value" type="number" v-else-if="settingType == 'float'" />
                             <v-switch required v-model="newRule.value" label="Value" v-else-if="settingType == 'bool'" />
                             <v-text-field required outlined v-model="newRule.value" label="Value" type="text" v-else-if="settingType == 'str'" />
-                            <v-select v-else-if="['Enum', 'Flags'].includes(settingType)" :items="settingOptions" :multiple="'Flags' == settingType" />
+                            <v-select v-else-if="['Enum', 'Flags'].includes(settingType)" v-model="newRule.value" :items="settingOptions" :multiple="'Flags' == settingType" />
                             <v-textarea v-else v-model="newRule.value" label="Complex value type, use JSON for inserting value." auto-grow/>
                         </v-col>
                     </v-row>
                     <v-row>
                         <v-col>
-                            <v-text-field label="Information" v-model="newRule.metadata.information" outlined />
+                            <v-text-field label="Information" v-model="newRule.information" outlined />
                         </v-col>
                     </v-row>
                 </v-container>
@@ -49,45 +49,52 @@ export default {
     methods: {
         async saveNewRule() {
             this.$refs.form.validate();
-            var contextFeatureFound = false;
-            for (const value of Object.values(this.newRule.context_features)) {
+            var featureValueFound = false;
+            for (const value of Object.values(this.newRule.feature_values)) {
                 if (value !== null) {
-                    contextFeatureFound = true;
+                    featureValueFound = true;
                     break;
                 }
             }
-            if (!contextFeatureFound) {
+            if (!featureValueFound) {
                 this.$toast.error("Atleast one context feature must be configured.")
                 return;
             }
             if (!this.valid) {
                 return;
             }
+            var rule = JSON.parse(JSON.stringify(this.newRule))
             if (["Sequence", "Mapping"].includes(this.settingType)) {
                 try {
-                    this.newRule.value = JSON.parse(this.newRule.value);
+                    rule.value = JSON.parse(this.newRule.value);
                 } catch (err) {
                     this.$toast.error("JSON Parse error " + err);
                     return;
                 }
             }
+            var feature_values = rule.feature_values
+            for (var propName in feature_values) {
+                if (feature_values[propName] === null || feature_values[propName] === undefined) {
+                delete feature_values[propName];
+                }
+            }
+            try {
+                await this.$http.post("/api/v1/rule", rule);
+            } catch (error) {
+                this.$toast.error(`${error.response.status} ${error.response.data}`);
+                return;
+            }
             this.$emit('rule-saved');
-            console.log(this.newRule);
             this.show = false;
         },
         initializeRuleObject() {
-            let rule = {
-                metadata: {
-                    information: ""
-                }
-
-            };
+            let rule = {setting: this.setting.name};
             let contextFeatures = this.setting.configurable_features.reduce(
                 function (obj, currentValue) {
                     obj[currentValue] = null;
                     return obj;
                 }, {})
-            rule["context_features"] = contextFeatures;
+            rule.feature_values = contextFeatures;
             return rule
         }
     },
diff --git a/frontend/src/components/SettingRules.vue b/frontend/src/components/SettingRules.vue
index 2f07db7..3059ec7 100644
--- a/frontend/src/components/SettingRules.vue
+++ b/frontend/src/components/SettingRules.vue
@@ -7,7 +7,7 @@
         <v-btn color=green @click.prevent="newRuleDialog=true">
             <v-icon>mdi-plus</v-icon>
         </v-btn>
-        <new-rule-dialog v-on:rule-saved="onNewRule" v-model="newRuleDialog" :setting="setting"/>
+        <new-rule-dialog v-on:rule-saved="onNewRule" v-model="newRuleDialog" :setting="setting" />
     </v-card-title>
     <v-card>
 
@@ -26,7 +26,9 @@
 import NewRuleDialog from './NewRuleDialog.vue';
 
 export default {
-    components: {NewRuleDialog},
+    components: {
+        NewRuleDialog
+    },
     methods: {
         async deleteConfirmDialog(rule) {
             this.$confirm({
@@ -43,15 +45,29 @@ export default {
             })
         },
         async deleteRule(rule) {
-            //TODO: add api logic
+            try {
+                await this.$http.delete(`/api/v1/rule/${rule.rule_id}`)
+            } catch (error) {
+                this.$toast.error(error);
+                return;
+            }
             let index = this.rules.indexOf(rule);
             this.rules.splice(index, 1);
         },
         closeNewDialog() {
             this.newRuleDialog = false;
         },
-        onNewRule() {
-            console.log("refresh rules..");
+        async onNewRule() {
+            await this.getRules();
+        },
+        async getRules() {
+            try {
+                var response = await this.$http.get(`/api/v1/settings/${this.setting.name}/rules`)
+            } catch (error) {
+                this.$toast.error(error);
+                return;
+            }
+            this.rules = response.data;
         }
     },
     computed: {
@@ -69,13 +85,13 @@ export default {
                 value: "value"
             }, {
                 text: "Added by",
-                value: "metadata.addedBy"
+                value: "added_by"
             }, {
                 text: "Date added",
-                value: "metadata.date"
+                value: "date"
             }, {
-                text: "Information",
-                value: "metadata.information"
+            text: "Information",
+                value: "information"
             }, {
                 text: "Actions",
                 value: "actions"
@@ -84,33 +100,25 @@ export default {
         }
     },
     props: ['setting'],
+    async mounted() {
+        await this.getRules();
+    },
     data() {
         let newRule = {
             information: ""
 
         };
         let contextFeatures = this.setting.configurable_features.reduce(
-                function (obj, currentValue) {
-                    obj[currentValue] = null;
-                    return obj;
-                }, [])
+            function (obj, currentValue) {
+                obj[currentValue] = null;
+                return obj;
+            }, [])
         newRule[contextFeatures] = contextFeatures;
         return {
             newRule: {},
             newRuleDialog: false,
             search: "",
-            rules: [{
-                "value": "aviramcake",
-                "context_features": {
-                    "env": "notyourtoy"
-                },
-                "metadata": {
-                    "addedBy": "dudu topaz",
-                    "information": "rip",
-                    "date": "13/22/2022"
-                },
-                "rule_id": 1
-            }]
+            rules: []
         }
     }
 }
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 9e13132..87fba53 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -6,6 +6,9 @@ import vuetify from './plugins/vuetify';
 import VueConfirmDialog from 'vue-confirm-dialog'
 
 Vue.prototype.$http = axios
+Vue.prototype.$http.defaults.validateStatus = (status) => {
+  return (status >= 200) && (status < 300)
+};
 if (process.env.NODE_ENV == 'development') {
   Vue.prototype.$http.defaults.baseURL = 'http://localhost:8000';
   // The backend API requires X-Forwarded-Email header for all APIs

From a0910c975b1cf95c3ec35a28265965dfcc2e70e8 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Tue, 9 Feb 2021 18:51:26 +0200
Subject: [PATCH 07/24] linting, pytype

---
 backend/hekshermgmt/_version.py        |   2 +-
 backend/hekshermgmt/api/v1/__init__.py |   4 +-
 backend/hekshermgmt/api/v1/rules.py    |  57 +++++--
 backend/hekshermgmt/api/v1/settings.py |  61 +++++---
 backend/hekshermgmt/api/v1/utils.py    |   5 +-
 backend/hekshermgmt/app.py             |  33 +++--
 backend/hekshermgmt/heksher_client.py  |  44 ++++--
 backend/hekshermgmt/main.py            |  26 +++-
 backend/poetry.lock                    | 198 ++++++++++++++++++++++++-
 backend/pyproject.toml                 |   4 +-
 backend/scripts/lint.sh                |   4 +-
 11 files changed, 357 insertions(+), 81 deletions(-)

diff --git a/backend/hekshermgmt/_version.py b/backend/hekshermgmt/_version.py
index 62c779d..2f938aa 100644
--- a/backend/hekshermgmt/_version.py
+++ b/backend/hekshermgmt/_version.py
@@ -1 +1 @@
-__version__ = ''  # Auto generated by Dockerfile
\ No newline at end of file
+__version__ = ""  # Auto generated by Dockerfile
diff --git a/backend/hekshermgmt/api/v1/__init__.py b/backend/hekshermgmt/api/v1/__init__.py
index 7e78911..6bbc08d 100644
--- a/backend/hekshermgmt/api/v1/__init__.py
+++ b/backend/hekshermgmt/api/v1/__init__.py
@@ -3,6 +3,6 @@
 from hekshermgmt.api.v1.settings import router as settings
 from hekshermgmt.api.v1.rules import router as rules
 
-router = APIRouter(prefix='/api/v1', dependencies=[get_user_name])
+router = APIRouter(prefix="/api/v1", dependencies=[get_user_name])
 router.include_router(settings)
-router.include_router(rules)
\ No newline at end of file
+router.include_router(rules)
diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index 836dc89..3dca464 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -5,49 +5,78 @@
 import httpx
 
 from fastapi import APIRouter
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
 from starlette.responses import Response
 
 from hekshermgmt.app import HeksherManagement
 from hekshermgmt.api.v1.utils import application
 from hekshermgmt.context_vars import user
 
-router = APIRouter(prefix='/rule')
+router = APIRouter(prefix="/rule")
 
 logger = getLogger(__name__)
 
+
 class RuleAddOutput(BaseModel):
     rule_id: int = Field(description="ID of the newly created rule.")
 
+
 class RuleAddInput(BaseModel):
     setting: str = Field(description="the setting name the rule should apply to")
-    feature_values: Dict[str, str] = Field(description="the exact-match conditions of the rule")
-    value: Any = Field(description="the value of the setting in contexts that match the rule")
-    information: Optional[str] = Field(description="information to store with the rule" , max_length=100)
+    feature_values: Dict[str, str] = Field(
+        description="the exact-match conditions of the rule"
+    )
+    value: Any = Field(
+        description="the value of the setting in contexts that match the rule"
+    )
+    information: Optional[str] = Field(
+        description="information to store with the rule", max_length=100
+    )
 
-    @validator('feature_values')
+    @validator("feature_values")
     @classmethod
     def feature_values_not_empty(cls, v):
         if not v:
-            raise ValueError('feature_values must not be empty')
+            raise ValueError("feature_values must not be empty")
         return v
 
 
-@router.delete('/{rule_id}')
+@router.delete("/{rule_id}")
 async def delete_rule(rule_id: int, app: HeksherManagement = application):
     """
     Deletes a specific rule
     """
     rule = await app.heksher_client.get_rule_data(rule_id)
-    logger.info("Deleting rule.", extra={"rule_id": rule_id, "setting_name": rule["setting"], "value": rule["value"]})
+    logger.info(
+        "Deleting rule.",
+        extra={
+            "rule_id": rule_id,
+            "setting_name": rule["setting"],
+            "value": rule["value"],
+        },
+    )
     await app.heksher_client.delete_rule(rule_id)
 
-@router.post('', response_model=RuleAddOutput)
+
+@router.post("", response_model=RuleAddOutput)
 async def add_rule(rule: RuleAddInput, app: HeksherManagement = application):
-    metadata = {"added_by": user.get(), "information": rule.information, "date": str(datetime.datetime.now())}
+    metadata = {
+        "added_by": user.get(),
+        "information": rule.information,
+        "date": str(datetime.datetime.now()),
+    }
     try:
-        rule_id = await app.heksher_client.add_rule(rule.setting, rule.feature_values, rule.value, metadata)
+        rule_id = await app.heksher_client.add_rule(
+            rule.setting, rule.feature_values, rule.value, metadata
+        )
     except httpx.HTTPStatusError as exception:
         return Response(exception.response.content, exception.response.status_code)
-    logger.info("Added rule.", extra={"rule_id": rule_id, "rule_value": rule.value,
-                                "feature_values": rule.feature_values, "setting_name": rule.setting})
\ No newline at end of file
+    logger.info(
+        "Added rule.",
+        extra={
+            "rule_id": rule_id,
+            "rule_value": rule.value,
+            "feature_values": rule.feature_values,
+            "setting_name": rule.setting,
+        },
+    )
diff --git a/backend/hekshermgmt/api/v1/settings.py b/backend/hekshermgmt/api/v1/settings.py
index c703806..d5912e9 100644
--- a/backend/hekshermgmt/api/v1/settings.py
+++ b/backend/hekshermgmt/api/v1/settings.py
@@ -4,12 +4,12 @@
 import orjson
 
 from fastapi import APIRouter
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field  # pytype: disable=import-error
 
 from hekshermgmt.app import HeksherManagement
 from hekshermgmt.api.v1.utils import application
 
-router = APIRouter(prefix='/settings')
+router = APIRouter(prefix="/settings")
 
 logger = getLogger(__name__)
 
@@ -17,36 +17,48 @@
 class Setting(BaseModel):
     name: str = Field(description="The name of the setting")
     configurable_features: List[str] = Field(
-        description="A list of the context features the setting can be configured"
-                    " by")
+        description="A list of the context features the setting can be configured" " by"
+    )
     type: str = Field(description="The type of the setting")
     default_value: Any = Field(description="The default value of the setting")
-    description: Optional[str] = Field(description="Configuration description (from metadata)")
+    description: Optional[str] = Field(
+        description="Configuration description (from metadata)"
+    )
 
 
 class Rule(BaseModel):
     value: Any = Field(description="Value set by the rule.")
-    context_features: Dict[str, str] = Field(description="Context features for matching rule.")
+    context_features: Dict[str, str] = Field(
+        description="Context features for matching rule."
+    )
     rule_id: int
     added_by: Optional[str] = Field(None, description="Creator of the rule.")
-    information: Optional[str] = Field(None, description="Information on this rule, what this tries to achieve.")
+    information: Optional[str] = Field(
+        None, description="Information on this rule, what this tries to achieve."
+    )
     date: Optional[str] = Field(None, description="Date ruled was created")
 
 
-@router.get('', response_model=List[Setting])
+@router.get("", response_model=List[Setting])
 async def get_settings(app: HeksherManagement = application):
     """
     Get settings list
     """
     logger.debug("Getting settings request.")
     settings = await app.heksher_client.get_settings()
-    return [Setting(name=setting['name'],
-            configurable_features=setting['configurable_features'],
-            type=setting['type'],
-            default_value=setting['default_value'],
-            description=setting['metadata'].get('description')) for setting in settings]
+    return [
+        Setting(
+            name=setting["name"],
+            configurable_features=setting["configurable_features"],
+            type=setting["type"],
+            default_value=setting["default_value"],
+            description=setting["metadata"].get("description"),
+        )
+        for setting in settings
+    ]
 
-@router.get('/{setting_name}/rules', response_model=List[Rule])
+
+@router.get("/{setting_name}/rules", response_model=List[Rule])
 async def get_setting_rules(setting_name: str, app: HeksherManagement = application):
     """
     Get setting's rules
@@ -55,11 +67,16 @@ async def get_setting_rules(setting_name: str, app: HeksherManagement = applicat
     rules = await app.heksher_client.get_settings_rules(setting_name)
 
     # Convert dictionary values into JSON for easier view.
-    return [Rule(value=orjson.dumps(rule["value"]) if isinstance(rule["value"], dict) else rule["value"],
-                 context_features=dict(rule["context_features"]),
-                 rule_id=rule["rule_id"],
-                 added_by=rule["metadata"].get("added_by"),
-                 information=rule["metadata"].get("information"),
-                 date=rule["metadata"].get("date")
-                 )
-            for rule in rules]
\ No newline at end of file
+    return [
+        Rule(
+            value=orjson.dumps(rule["value"])
+            if isinstance(rule["value"], dict)
+            else rule["value"],
+            context_features=dict(rule["context_features"]),
+            rule_id=rule["rule_id"],
+            added_by=rule["metadata"].get("added_by"),
+            information=rule["metadata"].get("information"),
+            date=rule["metadata"].get("date"),
+        )
+        for rule in rules
+    ]
diff --git a/backend/hekshermgmt/api/v1/utils.py b/backend/hekshermgmt/api/v1/utils.py
index fcee355..13094fb 100644
--- a/backend/hekshermgmt/api/v1/utils.py
+++ b/backend/hekshermgmt/api/v1/utils.py
@@ -1,4 +1,4 @@
-from fastapi import Depends, Request, Header, HTTPException
+from fastapi import Depends, Request, Header
 
 from hekshermgmt.context_vars import user
 
@@ -10,10 +10,11 @@ def application(request: Request):
     """
     return request.app
 
+
 @Depends
 async def get_user_name(x_forwarded_email: str = Header(...)) -> str:
     """
     Extracts email from header and sets it into the context var.
     """
     user.set(x_forwarded_email)
-    return x_forwarded_email
\ No newline at end of file
+    return x_forwarded_email
diff --git a/backend/hekshermgmt/app.py b/backend/hekshermgmt/app.py
index 54b43dc..233cbd0 100644
--- a/backend/hekshermgmt/app.py
+++ b/backend/hekshermgmt/app.py
@@ -11,36 +11,45 @@
 
 from hekshermgmt.heksher_client import HeksherClient
 from hekshermgmt.context_vars import user
+from hekshermgmt._version import __version__
 
 logger = getLogger(__name__)
 
 
 class LogstashSettingSchema(Schema):
     # todo remove explicit uppercase names when envolved is upgraded
-    host: str = EnvVar('HOST')
-    port: int = EnvVar('PORT')
-    level: int = EnvVar('LEVEL', default=INFO)
-    tags = EnvVar('TAGS', type=CollectionParser.pair_wise_delimited(re.compile(r'\s'), ':', str, str), default={})
+    host: str = EnvVar("HOST")
+    port: int = EnvVar("PORT")
+    level: int = EnvVar("LEVEL", default=INFO)
+    tags = EnvVar(
+        "TAGS",
+        type=CollectionParser.pair_wise_delimited(re.compile(r"\s"), ":", str, str),
+        default={},
+    )
 
 
-logstash_settings_env = EnvVar('HEKSHERMGMT_LOGSTASH_', default=None, type=LogstashSettingSchema)
-sentry_dsn_env = EnvVar('SENTRY_DSN', default='', type=str)
+logstash_settings_env = EnvVar(
+    "HEKSHERMGMT_LOGSTASH_", default=None, type=LogstashSettingSchema
+)
+sentry_dsn_env = EnvVar("SENTRY_DSN", default="", type=str)
 
 
 class HeksherManagement(FastAPI):
     """
     The application class
     """
+
     heksher_client: HeksherClient
 
     async def startup(self):
         logstash_settings = logstash_settings_env.get()
         if logstash_settings is not None:
-            handler = await create_tcp_handler(logstash_settings.host, logstash_settings.port, extra={
-                'hekshermgmt_version': __version__,
-                **logstash_settings.tags
-            })
-            _logger = getLogger('hekshermgmt')
+            handler = await create_tcp_handler(
+                logstash_settings.host,
+                logstash_settings.port,
+                extra={"hekshermgmt_version": __version__, **logstash_settings.tags},
+            )
+            _logger = getLogger("hekshermgmt")
             _logger.addHandler(handler)
             _logger.setLevel(logstash_settings.level)
             _logger.addFilter(ContextVarFilter(user=user))
@@ -66,4 +75,4 @@ async def is_healthy(self) -> bool:
             await self.heksher_client.ping()
         except Exception:
             return False
-        return True
\ No newline at end of file
+        return True
diff --git a/backend/hekshermgmt/heksher_client.py b/backend/hekshermgmt/heksher_client.py
index 682d301..2ec5918 100644
--- a/backend/hekshermgmt/heksher_client.py
+++ b/backend/hekshermgmt/heksher_client.py
@@ -2,7 +2,7 @@
 
 import re
 from logging import getLogger
-from typing import Any, Dict, List, Mapping, Optional
+from typing import Any, Dict, List, Optional
 from httpx import AsyncClient
 
 from envolved import EnvVar, Schema
@@ -13,12 +13,18 @@
 
 
 class HeksherClientSettingSchema(Schema):
-    url: str = EnvVar('URL')
+    url: str = EnvVar("URL")
     """ URL Of the Heksher Server """
-    headers = EnvVar('HEADERS', type=CollectionParser.pair_wise_delimited(re.compile(r'\s'), ':', str, str), default={})
+    headers = EnvVar(
+        "HEADERS",
+        type=CollectionParser.pair_wise_delimited(re.compile(r"\s"), ":", str, str),
+        default={},
+    )
     """ Headers to send as part of the HTTP requests """
 
-heksher_settings_env = EnvVar('HEKSHERMGMT_HEKSHER_', type=HeksherClientSettingSchema)
+
+heksher_settings_env = EnvVar("HEKSHERMGMT_HEKSHER_", type=HeksherClientSettingSchema)
+
 
 class HeksherClient:
     http_client: AsyncClient
@@ -36,7 +42,7 @@ async def ping(self) -> None:
         Check the health of the Heksher server
         Raises: httpx.HTTPError, if an error occurs
         """
-        response = await self.http_client.get('/api/health')
+        response = await self.http_client.get("/api/health")
         response.raise_for_status()
 
     async def get_settings(self) -> List[Dict[str, Any]]:
@@ -47,7 +53,9 @@ async def get_settings(self) -> List[Dict[str, Any]]:
         Raises:
             Can raise httpx.Error in case of error from server.
         """
-        response = await self.http_client.get('/api/v1/settings', params={"include_additional_data": True})
+        response = await self.http_client.get(
+            "/api/v1/settings", params={"include_additional_data": True}
+        )
         response.raise_for_status()
         result = response.json()
         return result["settings"]
@@ -65,16 +73,20 @@ async def get_settings_rules(self, setting_name: str) -> List[Dict[str, Any]]:
         request_json = {
             "setting_names": [setting_name],
             "context_features_options": "*",
-            "include_metadata": True
+            "include_metadata": True,
         }
-        response = await self.http_client.post('/api/v1/rules/query',
-                                                json=request_json)
+        response = await self.http_client.post("/api/v1/rules/query", json=request_json)
         response.raise_for_status()
         result = response.json()
         return result["rules"][setting_name]
 
-    async def add_rule(self, setting_name: str, feature_values: Dict[str, str], value: Any,
-                       metadata: Dict[str, Any]) -> int:
+    async def add_rule(
+        self,
+        setting_name: str,
+        feature_values: Dict[str, str],
+        value: Any,
+        metadata: Dict[str, Any],
+    ) -> int:
         """
         Adds a new rule to Heksher.
         Args:
@@ -91,9 +103,9 @@ async def add_rule(self, setting_name: str, feature_values: Dict[str, str], valu
             "setting": setting_name,
             "feature_values": feature_values,
             "value": value,
-            "metadata": metadata
+            "metadata": metadata,
         }
-        response = await self.http_client.post('/api/v1/rules', json=request_json)
+        response = await self.http_client.post("/api/v1/rules", json=request_json)
         response.raise_for_status()
         return response.json()["rule_id"]
 
@@ -107,7 +119,7 @@ async def delete_rule(self, rule_id: int) -> None:
         Raises:
             Can raise httpx.Error in case of error from server.
         """
-        response = await self.http_client.delete(f'/api/v1/rules/{rule_id}')
+        response = await self.http_client.delete(f"/api/v1/rules/{rule_id}")
         response.raise_for_status()
 
     async def get_rule_data(self, rule_id: int) -> Dict[str, Any]:
@@ -120,7 +132,7 @@ async def get_rule_data(self, rule_id: int) -> Dict[str, Any]:
         Raises:
             Can raise httpx.Error in case of error from server.
         """
-        response = await self.http_client.get(f'/api/v1/rules/{rule_id}')
+        response = await self.http_client.get(f"/api/v1/rules/{rule_id}")
         response.raise_for_status()
 
-        return response.json()
\ No newline at end of file
+        return response.json()
diff --git a/backend/hekshermgmt/main.py b/backend/hekshermgmt/main.py
index 862612e..72a69b9 100644
--- a/backend/hekshermgmt/main.py
+++ b/backend/hekshermgmt/main.py
@@ -1,3 +1,4 @@
+from starlette.responses import JSONResponse
 from starlette.middleware import Middleware
 from fastapi.middleware.cors import CORSMiddleware
 
@@ -7,29 +8,40 @@
 
 middleware = []
 if __debug__:
-    middleware.append(Middleware(CORSMiddleware, allow_origins=['*'], allow_methods=["*"], allow_headers=["*"]))
-app = HeksherManagement(title="HeksherManagement", version=__version__ or "0.0.1", middleware=middleware)
+    middleware.append(
+        Middleware(
+            CORSMiddleware,
+            allow_origins=["*"],
+            allow_methods=["*"],
+            allow_headers=["*"],
+        )
+    )
+app = HeksherManagement(
+    title="HeksherManagement", version=__version__ or "0.0.1", middleware=middleware
+)
 
 app.include_router(v1_router)
 
-@app.on_event('startup')
+
+@app.on_event("startup")
 async def startup():
     await app.startup()
 
 
-@app.on_event('shutdown')
+@app.on_event("shutdown")
 async def shutdown():
     await app.shutdown()
 
-@app.get('/api/health')
+
+@app.get("/api/health")
 async def health_check():
     """
     Check the health of the connections to the service
     """
     is_healthy = await app.is_healthy()
     if not is_healthy:
-        return JSONResponse({'version': __version__}, status_code=500)
-    return {'version': __version__}
+        return JSONResponse({"version": __version__}, status_code=500)
+    return {"version": __version__}
 
 
 def main():
diff --git a/backend/poetry.lock b/backend/poetry.lock
index dcd6e0d..f798f40 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -80,6 +80,14 @@ category = "main"
 optional = false
 python-versions = ">=3.7,<4.0"
 
+[[package]]
+name = "decorator"
+version = "4.4.2"
+description = "Decorators for Humans"
+category = "dev"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*"
+
 [[package]]
 name = "docker"
 version = "4.4.1"
@@ -124,6 +132,19 @@ dev = ["python-jose[cryptography] (>=3.1.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<
 doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=6.1.4,<7.0.0)", "markdown-include (>=0.5.1,<0.6.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.9,<0.0.10)", "pyyaml (>=5.3.1,<6.0.0)"]
 test = ["pytest (5.4.3)", "pytest-cov (2.10.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (0.790)", "flake8 (>=3.8.3,<4.0.0)", "black (20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<2.0.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"]
 
+[[package]]
+name = "flake8"
+version = "3.8.4"
+description = "the modular source code checker: pep8 pyflakes and co"
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+
+[package.dependencies]
+mccabe = ">=0.6.0,<0.7.0"
+pycodestyle = ">=2.6.0a1,<2.7.0"
+pyflakes = ">=2.2.0,<2.3.0"
+
 [[package]]
 name = "h11"
 version = "0.12.0"
@@ -184,6 +205,17 @@ category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
+[[package]]
+name = "importlab"
+version = "0.6.1"
+description = "A library to calculate python dependency graphs."
+category = "dev"
+optional = false
+python-versions = ">=3.6.0"
+
+[package.dependencies]
+networkx = ">=2"
+
 [[package]]
 name = "iniconfig"
 version = "1.1.1"
@@ -192,6 +224,46 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "mccabe"
+version = "0.6.1"
+description = "McCabe checker, plugin for flake8"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "networkx"
+version = "2.5"
+description = "Python package for creating and manipulating graphs and networks"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+decorator = ">=4.3.0"
+
+[package.extras]
+all = ["numpy", "scipy", "pandas", "matplotlib", "pygraphviz", "pydot", "pyyaml", "lxml", "pytest"]
+gdal = ["gdal"]
+lxml = ["lxml"]
+matplotlib = ["matplotlib"]
+numpy = ["numpy"]
+pandas = ["pandas"]
+pydot = ["pydot"]
+pygraphviz = ["pygraphviz"]
+pytest = ["pytest"]
+pyyaml = ["pyyaml"]
+scipy = ["scipy"]
+
+[[package]]
+name = "ninja"
+version = "1.10.0.post2"
+description = "Ninja is a small build system with a focus on speed"
+category = "dev"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "orjson"
 version = "3.4.8"
@@ -238,6 +310,14 @@ category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
+[[package]]
+name = "pycodestyle"
+version = "2.6.0"
+description = "Python style guide checker"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
 [[package]]
 name = "pydantic"
 version = "1.7.3"
@@ -251,6 +331,14 @@ dotenv = ["python-dotenv (>=0.10.4)"]
 email = ["email-validator (>=1.0.3)"]
 typing_extensions = ["typing-extensions (>=3.7.2)"]
 
+[[package]]
+name = "pyflakes"
+version = "2.2.0"
+description = "passive checker of Python programs"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
 [[package]]
 name = "pyparsing"
 version = "2.4.7"
@@ -299,6 +387,23 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "pytype"
+version = "2021.1.28"
+description = "Python type inferencer"
+category = "dev"
+optional = false
+python-versions = "<3.9,>=3.6"
+
+[package.dependencies]
+attrs = "*"
+importlab = ">=0.6.1"
+ninja = ">=1.10.0.post2"
+pyyaml = ">=3.11"
+six = "*"
+toml = "*"
+typed_ast = "*"
+
 [[package]]
 name = "pywin32"
 version = "227"
@@ -430,6 +535,14 @@ category = "dev"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
+[[package]]
+name = "typed-ast"
+version = "1.4.2"
+description = "a fork of Python 2 and 3 ast modules with type comment support"
+category = "dev"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "urllib3"
 version = "1.26.3"
@@ -533,8 +646,8 @@ postgresql = ["sqlalchemy (>=1.3.0,<2.0.0)", "psycopg2 (>=2.8.6,<3.0.0)"]
 
 [metadata]
 lock-version = "1.1"
-python-versions = "^3.8"
-content-hash = "db92083ebb4391b79dffd68e8f12e6f0720a72251c5f12a14c9e7c0bb11e38ec"
+python-versions = ">=3.8,<3.9"
+content-hash = "4142c355471dacf76ae264578b29f3e6e246f764239a72a658ea5423c825c8d3"
 
 [metadata.files]
 aiologstash = [
@@ -572,6 +685,10 @@ contextfilter = [
     {file = "contextfilter-0.3.0-py3-none-any.whl", hash = "sha256:7c68c4cf58a62230e27c13ab2717b2d7e93508934b62dce59661dbaada8261ec"},
     {file = "contextfilter-0.3.0.tar.gz", hash = "sha256:8c0fb54ffb1eb5537979244a0a273ec9a870c326d674d7ad56237de400ac3f70"},
 ]
+decorator = [
+    {file = "decorator-4.4.2-py2.py3-none-any.whl", hash = "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760"},
+    {file = "decorator-4.4.2.tar.gz", hash = "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"},
+]
 docker = [
     {file = "docker-4.4.1-py2.py3-none-any.whl", hash = "sha256:e455fa49aabd4f22da9f4e1c1f9d16308286adc60abaf64bf3e1feafaed81d06"},
     {file = "docker-4.4.1.tar.gz", hash = "sha256:0604a74719d5d2de438753934b755bfcda6f62f49b8e4b30969a4b0a2a8a1220"},
@@ -584,6 +701,10 @@ fastapi = [
     {file = "fastapi-0.63.0-py3-none-any.whl", hash = "sha256:98d8ea9591d8512fdadf255d2a8fa56515cdd8624dca4af369da73727409508e"},
     {file = "fastapi-0.63.0.tar.gz", hash = "sha256:63c4592f5ef3edf30afa9a44fa7c6b7ccb20e0d3f68cd9eba07b44d552058dcb"},
 ]
+flake8 = [
+    {file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"},
+    {file = "flake8-3.8.4.tar.gz", hash = "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"},
+]
 h11 = [
     {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
     {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
@@ -614,9 +735,33 @@ idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
     {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
 ]
+importlab = [
+    {file = "importlab-0.6.1.tar.gz", hash = "sha256:056503329df1ba8f6291a4b548042aa18620ad91d39388ba58044f0fd44ff83e"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
+mccabe = [
+    {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"},
+    {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"},
+]
+networkx = [
+    {file = "networkx-2.5-py3-none-any.whl", hash = "sha256:8c5812e9f798d37c50570d15c4a69d5710a18d77bafc903ee9c5fba7454c616c"},
+    {file = "networkx-2.5.tar.gz", hash = "sha256:7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602"},
+]
+ninja = [
+    {file = "ninja-1.10.0.post2-py2-none-macosx_10_6_x86_64.whl", hash = "sha256:a1a9d9455623a3f45557fff6eb5abb3e70910dde28cfb9239e3ca14249149f55"},
+    {file = "ninja-1.10.0.post2-py2-none-manylinux1_i686.whl", hash = "sha256:99c6102ae9a8981afe4d06f92508dbeab1e28ec89783fb703411166f4e13c9ee"},
+    {file = "ninja-1.10.0.post2-py2-none-manylinux1_x86_64.whl", hash = "sha256:4252ce532304841e47478bb61710fcf9940cf2c91731303490762b6e4f23fd2b"},
+    {file = "ninja-1.10.0.post2-py2-none-win32.whl", hash = "sha256:24acc95359308d11243386cf9f076bdc95f438ef6a4e0e357e7c122c5e02816d"},
+    {file = "ninja-1.10.0.post2-py2-none-win_amd64.whl", hash = "sha256:16fc1bea52a36a91a0e80c3b221d2c1bc9bcf04d0564da9344e349b8c5efd5c6"},
+    {file = "ninja-1.10.0.post2-py3-none-macosx_10_6_x86_64.whl", hash = "sha256:1d9ed3b5fdeb646516f54bec92453dcb3000d6771c2fea56451444c988a23e29"},
+    {file = "ninja-1.10.0.post2-py3-none-manylinux1_i686.whl", hash = "sha256:5c3a8cb54aaaf5d4f692d65121ef47b3e43dea123a6563153d9d97631c0adf4f"},
+    {file = "ninja-1.10.0.post2-py3-none-manylinux1_x86_64.whl", hash = "sha256:fb1ae96811a9b73773014b8a21d710b89d7d5f765427a5e2541e7fb9d530fdd5"},
+    {file = "ninja-1.10.0.post2-py3-none-win32.whl", hash = "sha256:06a72090f5c5516e57f12699644179504a77585bed6d5f8be9e67219a398ec80"},
+    {file = "ninja-1.10.0.post2-py3-none-win_amd64.whl", hash = "sha256:c6059bd04ad235e2326b39bc71bb7989de8d565084b5f269557704747b2910fa"},
+    {file = "ninja-1.10.0.post2.tar.gz", hash = "sha256:621fd73513a9bef0cb82e8c531a29ef96580b4d6e797f833cce167054ad812f8"},
+]
 orjson = [
     {file = "orjson-3.4.8-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:3bf9cd593f48329d8356192b453c20850ecb135a92c70df42ccd652e0496c206"},
     {file = "orjson-3.4.8-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:a2c6b0436f89a8393add5c8ea493176f4ff671257720e221eb52c6c51973c07b"},
@@ -667,6 +812,10 @@ py = [
     {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"},
     {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
 ]
+pycodestyle = [
+    {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"},
+    {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"},
+]
 pydantic = [
     {file = "pydantic-1.7.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c59ea046aea25be14dc22d69c97bee629e6d48d2b2ecb724d7fe8806bf5f61cd"},
     {file = "pydantic-1.7.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a4143c8d0c456a093387b96e0f5ee941a950992904d88bc816b4f0e72c9a0009"},
@@ -691,6 +840,10 @@ pydantic = [
     {file = "pydantic-1.7.3-py3-none-any.whl", hash = "sha256:38be427ea01a78206bcaf9a56f835784afcba9e5b88fbdce33bbbfbcd7841229"},
     {file = "pydantic-1.7.3.tar.gz", hash = "sha256:213125b7e9e64713d16d988d10997dabc6a1f73f3991e1ff8e35ebb1409c7dc9"},
 ]
+pyflakes = [
+    {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"},
+    {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"},
+]
 pyparsing = [
     {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
@@ -706,6 +859,15 @@ python-dotenv = [
 python-logstash = [
     {file = "python-logstash-0.4.6.tar.gz", hash = "sha256:10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c"},
 ]
+pytype = [
+    {file = "pytype-2021.1.28-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:be764b1a8e8bc77aaee6b665302614435c00256c9914423c7cb0db8345502f7b"},
+    {file = "pytype-2021.1.28-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:76fd1c8c9677596463f4f06a7b78726caccf1a4cf793d3afb08465800e4015af"},
+    {file = "pytype-2021.1.28-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:df0b1a002fa92b20978a3ec8f09be9e92c64cfdeb9798399d25cf8b90cb6e80a"},
+    {file = "pytype-2021.1.28-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:5121cf6a5439a875fcb8dd4b7847c556767f0bb495c75e091069dd2b20121d41"},
+    {file = "pytype-2021.1.28-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:fc00cbd1c186ac536f444c2e743d650e59e05011a532266d778b544736cf4da3"},
+    {file = "pytype-2021.1.28-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:fa805000a3d09c5cbc85d2fc6ed9e0c5dcac19d63658604ebb7771526bf8160b"},
+    {file = "pytype-2021.1.28.tar.gz", hash = "sha256:69ffaf8ffdb29cfa69aec8c1bbdc6052a8ab87f24278635884f61253a21c7a90"},
+]
 pywin32 = [
     {file = "pywin32-227-cp27-cp27m-win32.whl", hash = "sha256:371fcc39416d736401f0274dd64c2302728c9e034808e37381b5e1b22be4a6b0"},
     {file = "pywin32-227-cp27-cp27m-win_amd64.whl", hash = "sha256:4cdad3e84191194ea6d0dd1b1b9bdda574ff563177d2adf2b4efec2a244fa116"},
@@ -811,6 +973,38 @@ toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
+typed-ast = [
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c9aadc4924d4b5799112837b226160428524a9a45f830e0d0f184b19e4090487"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:9ec45db0c766f196ae629e509f059ff05fc3148f9ffd28f3cfe75d4afb485412"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-win32.whl", hash = "sha256:85f95aa97a35bdb2f2f7d10ec5bbdac0aeb9dafdaf88e17492da0504de2e6400"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-win_amd64.whl", hash = "sha256:9044ef2df88d7f33692ae3f18d3be63dec69c4fb1b5a4a9ac950f9b4ba571606"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c1c876fd795b36126f773db9cbb393f19808edd2637e00fd6caba0e25f2c7b64"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5dcfc2e264bd8a1db8b11a892bd1647154ce03eeba94b461effe68790d8b8e07"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8db0e856712f79c45956da0c9a40ca4246abc3485ae0d7ecc86a20f5e4c09abc"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:d003156bb6a59cda9050e983441b7fa2487f7800d76bdc065566b7d728b4581a"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-win32.whl", hash = "sha256:4c790331247081ea7c632a76d5b2a265e6d325ecd3179d06e9cf8d46d90dd151"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d175297e9533d8d37437abc14e8a83cbc68af93cc9c1c59c2c292ec59a0697a3"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf54cfa843f297991b7388c281cb3855d911137223c6b6d2dd82a47ae5125a41"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:b4fcdcfa302538f70929eb7b392f536a237cbe2ed9cba88e3bf5027b39f5f77f"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:987f15737aba2ab5f3928c617ccf1ce412e2e321c77ab16ca5a293e7bbffd581"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:37f48d46d733d57cc70fd5f30572d11ab8ed92da6e6b28e024e4a3edfb456e37"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-win32.whl", hash = "sha256:36d829b31ab67d6fcb30e185ec996e1f72b892255a745d3a82138c97d21ed1cd"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8368f83e93c7156ccd40e49a783a6a6850ca25b556c0fa0240ed0f659d2fe496"},
+    {file = "typed_ast-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:963c80b583b0661918718b095e02303d8078950b26cc00b5e5ea9ababe0de1fc"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e683e409e5c45d5c9082dc1daf13f6374300806240719f95dc783d1fc942af10"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:84aa6223d71012c68d577c83f4e7db50d11d6b1399a9c779046d75e24bed74ea"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:a38878a223bdd37c9709d07cd357bb79f4c760b29210e14ad0fb395294583787"},
+    {file = "typed_ast-1.4.2-cp38-cp38-win32.whl", hash = "sha256:a2c927c49f2029291fbabd673d51a2180038f8cd5a5b2f290f78c4516be48be2"},
+    {file = "typed_ast-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:c0c74e5579af4b977c8b932f40a5464764b2f86681327410aa028a22d2f54937"},
+    {file = "typed_ast-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:07d49388d5bf7e863f7fa2f124b1b1d89d8aa0e2f7812faff0a5658c01c59aa1"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:240296b27397e4e37874abb1df2a608a92df85cf3e2a04d0d4d61055c8305ba6"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:d746a437cdbca200622385305aedd9aef68e8a645e385cc483bdc5e488f07166"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:14bf1522cdee369e8f5581238edac09150c765ec1cb33615855889cf33dcb92d"},
+    {file = "typed_ast-1.4.2-cp39-cp39-win32.whl", hash = "sha256:cc7b98bf58167b7f2db91a4327da24fb93368838eb84a44c472283778fc2446b"},
+    {file = "typed_ast-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:7147e2a76c75f0f64c4319886e7639e490fee87c9d25cb1d4faef1d8cf83a440"},
+    {file = "typed_ast-1.4.2.tar.gz", hash = "sha256:9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a"},
+]
 urllib3 = [
     {file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"},
     {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"},
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index 5d2f04e..d9163d5 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -5,7 +5,7 @@ description = ""
 authors = ["Aviram Hassan <aviram.hassan@biocatch.com>"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = ">=3.8,<3.9"
 fastapi = "^0.63.0"
 aiologstash = "^2.0.0"
 envolved = "0.3.0"
@@ -18,6 +18,8 @@ orjson = "^3.4.8"
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.2"
 yellowbox = {extras = ["postgresql"], version = "^0.5.0"}
+flake8 = "^3.8.4"
+pytype = "^2021.1.28"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/backend/scripts/lint.sh b/backend/scripts/lint.sh
index 50c9f21..602aad8 100755
--- a/backend/scripts/lint.sh
+++ b/backend/scripts/lint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # run various linters
 set -e
-poetry run flake8 --max-line-length 120 app tests
+poetry run flake8 --max-line-length 120 hekshermgmt tests
 set +e
 poetry run python -c "import sys; sys.exit(sys.version_info < (3,9,0))"
 res=$?
@@ -9,5 +9,5 @@ set -e
 if [ "$res" -eq "0" ]; then
   echo "pytype not run, please run in python 3.8 or lower"
 else
-  poetry run pytype --keep-going heksher
+  poetry run pytype --keep-going hekshermgmt
 fi
\ No newline at end of file

From 686c27f28f3dfd904fc1a035496b6e5245d8fa75 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Wed, 10 Feb 2021 08:05:50 +0200
Subject: [PATCH 08/24] cr fixes

---
 backend/hekshermgmt/api/v1/rules.py   | 16 +++++++++++++---
 backend/hekshermgmt/app.py            |  2 +-
 backend/hekshermgmt/context_vars.py   |  1 +
 backend/hekshermgmt/heksher_client.py | 14 ++++++++++----
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index 3dca464..04a4781 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -7,7 +7,11 @@
 from fastapi import APIRouter
 from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
 from starlette.responses import Response
-
+from starlette.status import (
+    HTTP_400_BAD_REQUEST,
+    HTTP_422_UNPROCESSABLE_ENTITY,
+    HTTP_500_INTERNAL_SERVER_ERROR,
+)
 from hekshermgmt.app import HeksherManagement
 from hekshermgmt.api.v1.utils import application
 from hekshermgmt.context_vars import user
@@ -63,14 +67,20 @@ async def add_rule(rule: RuleAddInput, app: HeksherManagement = application):
     metadata = {
         "added_by": user.get(),
         "information": rule.information,
-        "date": str(datetime.datetime.now()),
+        "date": datetime.datetime.now().isoformat(),
     }
     try:
         rule_id = await app.heksher_client.add_rule(
             rule.setting, rule.feature_values, rule.value, metadata
         )
     except httpx.HTTPStatusError as exception:
-        return Response(exception.response.content, exception.response.status_code)
+        resp_status = exception.response.status_code
+        status_code = (
+            resp_status
+            if resp_status in (HTTP_400_BAD_REQUEST, HTTP_422_UNPROCESSABLE_ENTITY)
+            else HTTP_500_INTERNAL_SERVER_ERROR
+        )
+        return Response(exception.response.content, status_code)
     logger.info(
         "Added rule.",
         extra={
diff --git a/backend/hekshermgmt/app.py b/backend/hekshermgmt/app.py
index 233cbd0..91df3ac 100644
--- a/backend/hekshermgmt/app.py
+++ b/backend/hekshermgmt/app.py
@@ -65,7 +65,7 @@ async def startup(self):
         await self.heksher_client.ping()
 
     async def shutdown(self):
-        pass
+        await self.heksher_client.close()
 
     async def is_healthy(self) -> bool:
         """
diff --git a/backend/hekshermgmt/context_vars.py b/backend/hekshermgmt/context_vars.py
index 6d3774d..4221d5d 100644
--- a/backend/hekshermgmt/context_vars.py
+++ b/backend/hekshermgmt/context_vars.py
@@ -1,3 +1,4 @@
 from contextvars import ContextVar
 
 user: ContextVar[str] = ContextVar("user", default=None)
+""" Context variable of the user whom initiated the request, used for logging and monitoring """
diff --git a/backend/hekshermgmt/heksher_client.py b/backend/hekshermgmt/heksher_client.py
index 2ec5918..9fd7d69 100644
--- a/backend/hekshermgmt/heksher_client.py
+++ b/backend/hekshermgmt/heksher_client.py
@@ -70,12 +70,12 @@ async def get_settings_rules(self, setting_name: str) -> List[Dict[str, Any]]:
         Raises:
             Can raise httpx.Error in case of error from server.
         """
-        request_json = {
+        request_data = {
             "setting_names": [setting_name],
             "context_features_options": "*",
             "include_metadata": True,
         }
-        response = await self.http_client.post("/api/v1/rules/query", json=request_json)
+        response = await self.http_client.post("/api/v1/rules/query", json=request_data)
         response.raise_for_status()
         result = response.json()
         return result["rules"][setting_name]
@@ -99,13 +99,13 @@ async def add_rule(
         Raises:
             Can raise httpx.Error in case of error from server.
         """
-        request_json = {
+        request_data = {
             "setting": setting_name,
             "feature_values": feature_values,
             "value": value,
             "metadata": metadata,
         }
-        response = await self.http_client.post("/api/v1/rules", json=request_json)
+        response = await self.http_client.post("/api/v1/rules", json=request_data)
         response.raise_for_status()
         return response.json()["rule_id"]
 
@@ -136,3 +136,9 @@ async def get_rule_data(self, rule_id: int) -> Dict[str, Any]:
         response.raise_for_status()
 
         return response.json()
+
+    async def close(self) -> None:
+        """
+        Closes the HTTP client. Instance isn't usable afterwards.
+        """
+        await self.http_client.aclose()

From 7c37a1beb42c747f38c30e5ed9fdecf3d8b17550 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Wed, 10 Feb 2021 09:24:38 +0200
Subject: [PATCH 09/24] add readme and license

---
 LICENSE   | 21 +++++++++++++++++++++
 README.md | 28 ++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3c20e95
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Biocatch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..345f2bc
--- /dev/null
+++ b/README.md
@@ -0,0 +1,28 @@
+# HeksherMgmt
+HeksherMgmt is a complimentary service for managing your Heksher instance. It provides an UI for checking settings,
+adding and deleting rules, and possibly more later on.
+HeksherMgmt is split into frontend ([Vue.js](https://vuejs.org/) and [Vuetify](https://vuetifyjs.com/en/)) and backend ([FastAPI](https://fastapi.tiangolo.com/)).
+
+## How does it work
+HeksherMgmt has it's own backend as Heksher API should be used internally only, and we don't want to expose it's internal API.
+The internal API is less suited for UI also, so the backend serves as some sort of convinient authorization layer.
+HeksherMgmt is a standalone docker image, containing both the front and backend, as splitting those currently feels too synthetic.
+
+## Running it
+The backend requires an user header (currently supports only `x-forwarded-email`) to be passed from the reverse proxy.
+When running locally, the frontend automatically sends this header, which is of course unsecure in real life environment.
+
+## Deploying
+Our recommended deployment is using a sidecar http authentication solution such as [OAuth2-Proxy](http://oauth2-proxy.github.io/oauth2-proxy/).
+The sidecar handles authentication, and then passes the authenticated user as a header to Heksher's backend.
+
+## Environment Variables
+* `HEKSHERMGMT_HEKSHER_URL`: (required) URL to the Heksher service.
+* `HEKSHERMGMT_HEKSHER_HEADERS`: (optional) Headers to send to Heksher service (authorization, api keys, etc). Example - `apitoken:abcd authorization:abcd`
+* `SENTRY_DSN`: (optional) Send errors to the given Sentry DSN.
+* `HEKSHERMGMT_LOGSTASH_HOST`, `HEKSHERMGMT_LOGSTASH_PORT`, `HEKSHERMGMT_LOGSTASH_LEVEL`, `HEKSHERMGMT_LOGSTASH_TAGS`: Optional values
+  to allow sending logs to a logstash server.
+
+
+## License
+HeksherMgmt is registered under the MIT public license.
\ No newline at end of file

From e02785ee85132dd7bce9633e4824cb42447cc9ed Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Wed, 10 Feb 2021 15:04:19 +0200
Subject: [PATCH 10/24] Added Dockerfile and all neccessary requirements for
 creating an image

---
 Dockerfile             | 125 +++++++++++++++++++++++++++++++++++++++++
 frontend/.dockerignore |   2 +
 image/README.md        |   2 +
 image/gunicorn_conf.py |  29 ++++++++++
 image/nginx.conf       |  65 +++++++++++++++++++++
 image/supervisord.ini  |  26 +++++++++
 6 files changed, 249 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 frontend/.dockerignore
 create mode 100644 image/README.md
 create mode 100644 image/gunicorn_conf.py
 create mode 100644 image/nginx.conf
 create mode 100644 image/supervisord.ini

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0008ae5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,125 @@
+FROM node:lts as build-stage
+WORKDIR /app
+COPY frontend/package*.json ./
+RUN npm install
+COPY frontend .
+RUN npm run build
+
+# production stage
+FROM python:3.8 as production-stage
+# Build nginx taken from https://github.com/nginxinc/docker-nginx/blob/master/mainline/debian/Dockerfile
+ENV NGINX_VERSION   1.19.6
+ENV NJS_VERSION     0.5.0
+ENV PKG_RELEASE     1~buster
+
+RUN set -x \
+# create nginx user/group first, to be consistent throughout docker variants
+    && addgroup --system --gid 102 nginx \
+    && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 102 nginx \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates \
+    && \
+    NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
+    found=''; \
+    for server in \
+        ha.pool.sks-keyservers.net \
+        hkp://keyserver.ubuntu.com:80 \
+        hkp://p80.pool.sks-keyservers.net:80 \
+        pgp.mit.edu \
+    ; do \
+        echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
+        apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
+    apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
+    && dpkgArch="$(dpkg --print-architecture)" \
+    && nginxPackages=" \
+        nginx=${NGINX_VERSION}-${PKG_RELEASE} \
+    " \
+    && case "$dpkgArch" in \
+        amd64|i386|arm64) \
+# arches officialy built by upstream
+            echo "deb https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            && apt-get update \
+            ;; \
+        *) \
+# we're on an architecture upstream doesn't officially build for
+# let's build binaries from the published source packages
+            echo "deb-src https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            \
+# new directory for storing sources and .deb files
+            && tempDir="$(mktemp -d)" \
+            && chmod 777 "$tempDir" \
+# (777 to ensure APT's "_apt" user can access it too)
+            \
+# save list of currently-installed packages so build dependencies can be cleanly removed later
+            && savedAptMark="$(apt-mark showmanual)" \
+            \
+# build .deb files from upstream's source packages (which are verified by apt-get)
+            && apt-get update \
+            && apt-get build-dep -y $nginxPackages \
+            && ( \
+                cd "$tempDir" \
+                && DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
+                    apt-get source --compile $nginxPackages \
+            ) \
+# we don't remove APT lists here because they get re-downloaded and removed later
+            \
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies)
+            && apt-mark showmanual | xargs apt-mark auto > /dev/null \
+            && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
+            \
+# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
+            && ls -lAFh "$tempDir" \
+            && ( cd "$tempDir" && dpkg-scanpackages . > Packages ) \
+            && grep '^Package: ' "$tempDir/Packages" \
+            && echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list \
+# work around the following APT issue by using "Acquire::GzipIndexes=false" (overriding "/etc/apt/apt.conf.d/docker-gzip-indexes")
+#   Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+#   ...
+#   E: Failed to fetch store:/var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages  Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+            && apt-get -o Acquire::GzipIndexes=false update \
+            ;; \
+    esac \
+    \
+    && apt-get install --no-install-recommends --no-install-suggests -y \
+                        $nginxPackages \
+                        gettext-base \
+                        curl \
+    && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+    \
+# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
+    && if [ -n "$tempDir" ]; then \
+        apt-get purge -y --auto-remove \
+        && rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
+    fi \
+# forward request and error logs to docker log collector
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+RUN pip install supervisor gunicorn
+COPY ./image/supervisord.ini /etc/supervisord.ini
+COPY ./image/nginx.conf /etc/nginx/conf.d/nginx.conf
+COPY ./image/gunicorn_conf.py /gunicorn_conf.py
+
+RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
+    cd /usr/local/bin && \
+    ln -s /opt/poetry/bin/poetry && \
+    poetry config virtualenvs.create false
+
+COPY ./backend /app
+RUN cd /app && poetry install --no-dev --no-root
+
+RUN cd /app \
+    && export APP_VERSION=$(poetry version | cut -d' ' -f2) \
+    && echo "__version__ = '$APP_VERSION'" > /app/hekshermgmt/_version.py
+
+
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+
+ENV PYTHONOPTIMIZE=1
+ENV WEB_CONCURRENCY=1
+ENV PYTHONPATH="/app"
+EXPOSE 80
+CMD ["supervisord", "-c", "/etc/supervisord.ini"]
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..569ce53
--- /dev/null
+++ b/frontend/.dockerignore
@@ -0,0 +1,2 @@
+**/node_modules
+**/dist
\ No newline at end of file
diff --git a/image/README.md b/image/README.md
new file mode 100644
index 0000000..a4f5f09
--- /dev/null
+++ b/image/README.md
@@ -0,0 +1,2 @@
+##
+Files related to the Docker image building.
\ No newline at end of file
diff --git a/image/gunicorn_conf.py b/image/gunicorn_conf.py
new file mode 100644
index 0000000..2d434c9
--- /dev/null
+++ b/image/gunicorn_conf.py
@@ -0,0 +1,29 @@
+import os
+
+web_concurrency_str = os.getenv('WEB_CONCURRENCY', 1)
+host = 'unix'
+port = '///tmp/asgi.sock'
+bind = f"{host}:{port}"
+use_loglevel = os.getenv('LOG_LEVEL', 'info')
+
+
+web_concurrency = int(web_concurrency_str)
+assert web_concurrency > 0
+
+accesslog_var = os.getenv("ACCESS_LOG", "-")
+use_accesslog = accesslog_var or None
+errorlog_var = os.getenv("ERROR_LOG", "-")
+use_errorlog = errorlog_var or None
+graceful_timeout_str = os.getenv("GRACEFUL_TIMEOUT", "120")
+timeout_str = os.getenv("TIMEOUT", "120")
+keepalive_str = os.getenv("KEEP_ALIVE", "5")
+
+# Gunicorn config variables
+loglevel = use_loglevel
+workers = web_concurrency
+errorlog = use_errorlog
+worker_tmp_dir = "/dev/shm"
+accesslog = use_accesslog
+graceful_timeout = int(graceful_timeout_str)
+timeout = int(timeout_str)
+keepalive = int(keepalive_str)
\ No newline at end of file
diff --git a/image/nginx.conf b/image/nginx.conf
new file mode 100644
index 0000000..a9f004d
--- /dev/null
+++ b/image/nginx.conf
@@ -0,0 +1,65 @@
+user nginx;
+daemon off;
+worker_processes  2;
+pid /var/run/nginx.pid;
+error_log  /var/log/nginx/nginx_error.log warn;
+
+worker_rlimit_nofile 16384;
+
+events {
+    worker_connections  10000;
+}
+
+http {
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+  access_log  /var/log/nginx/access.log  main buffer=128 flush=1m;
+  # faster than read() + write()
+  sendfile on;
+
+  # send headers in one piece, it is better than sending them one by one
+  tcp_nopush on;
+
+  # don't buffer data sent, good for small data bursts in real time
+  tcp_nodelay on;
+  upstream asgi {
+    # fail_timeout=0 means we always retry an upstream even if it failed
+    # to return a good HTTP response (in case the Unicorn master nukes a
+    # single worker for timing out).
+    server unix:/tmp/asgi.sock fail_timeout=0;
+  }
+
+  server {
+
+    server_name _;
+
+    location /api {
+        try_files $uri @app;
+    }
+
+    location @app {
+        client_max_body_size        5m;
+        client_body_buffer_size     128k;
+        proxy_ignore_client_abort on;
+        proxy_connect_timeout       300;
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
+        send_timeout                300;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_redirect off;
+        proxy_buffering off;
+        proxy_pass http://asgi;
+    }
+
+    location / {
+        root /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html;
+        include  /etc/nginx/mime.types;
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/image/supervisord.ini b/image/supervisord.ini
new file mode 100644
index 0000000..9d34293
--- /dev/null
+++ b/image/supervisord.ini
@@ -0,0 +1,26 @@
+[supervisord]
+nodaemon=true
+user = root ; User to run as
+
+[program:gunicorn]
+command=gunicorn -k uvicorn.workers.UvicornWorker -c /gunicorn_conf.py "app.hekshermgmt.main:app"
+user=root
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+priority=998
+environment=LANG=en_US.UTF-8,LC_ALL=en_US.UTF-8 ; Set UTF-8 as default encoding
+
+[program:nginx]
+command=/usr/sbin/nginx -c /etc/nginx/conf.d/nginx.conf
+user = root ; User to run as
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+priority=999
+# Graceful stop, see http://nginx.org/en/docs/control.html
+stopsignal=QUIT
\ No newline at end of file

From aab5f0aa3d6f139e6514e9b4376588082b34faac Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Wed, 10 Feb 2021 15:04:27 +0200
Subject: [PATCH 11/24] small cr fixes

---
 backend/hekshermgmt/api/v1/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/hekshermgmt/api/v1/settings.py b/backend/hekshermgmt/api/v1/settings.py
index d5912e9..c16451e 100644
--- a/backend/hekshermgmt/api/v1/settings.py
+++ b/backend/hekshermgmt/api/v1/settings.py
@@ -17,7 +17,7 @@
 class Setting(BaseModel):
     name: str = Field(description="The name of the setting")
     configurable_features: List[str] = Field(
-        description="A list of the context features the setting can be configured" " by"
+        description="A list of the context features the setting can be configured by"
     )
     type: str = Field(description="The type of the setting")
     default_value: Any = Field(description="The default value of the setting")

From 5bafe8d46072696222fe9313648f78dbdbce2904 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 15 Feb 2021 09:08:52 +0200
Subject: [PATCH 12/24] fix deleting rule dialog bug (frontend)

---
 frontend/src/components/SettingRules.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/SettingRules.vue b/frontend/src/components/SettingRules.vue
index 3059ec7..2f51a00 100644
--- a/frontend/src/components/SettingRules.vue
+++ b/frontend/src/components/SettingRules.vue
@@ -39,7 +39,7 @@ export default {
                 },
                 callback: confirm => {
                     if (confirm) {
-                        this.deleteRule(rule);
+                        this.deleteRule(rule).then();
                     }
                 }
             })

From 0d9f868e289f8905721135bfd02970d25b3db657 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 15 Feb 2021 09:09:06 +0200
Subject: [PATCH 13/24] add rule name to new rule dialog

---
 frontend/src/components/NewRuleDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index c003207..b59dea3 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -2,7 +2,7 @@
 <v-dialog v-model="show" width="50%">
     <v-card>
         <v-card-title>
-            <span class="headline">New Rule</span>
+            <span class="headline">New Rule - {{setting.name}}</span>
         </v-card-title>
         <v-card-text>
             <v-form ref="form" v-model="valid">

From 8ecb0bdb92ac6ab14099cdea7e5a094f61348797 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 15 Feb 2021 09:11:26 +0200
Subject: [PATCH 14/24] support underscores in context values

---
 frontend/src/components/NewRuleDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/NewRuleDialog.vue b/frontend/src/components/NewRuleDialog.vue
index b59dea3..96a2c90 100644
--- a/frontend/src/components/NewRuleDialog.vue
+++ b/frontend/src/components/NewRuleDialog.vue
@@ -9,7 +9,7 @@
                 <v-container>
                     <v-row>
                         <v-col v-for="context in setting.configurable_features" :key="context">
-                            <v-text-field :label="context" v-model="newRule['feature_values'][context]" outlined :rules="[(v) => /^[a-z0-9]+$/i.test(v) || 'Alphanumeric only!']" />
+                            <v-text-field :label="context" v-model="newRule['feature_values'][context]" outlined :rules="[(v) => /^[a-z_0-9]+$/i.test(v) || 'Alphanumeric only!']" />
                         </v-col>
                     </v-row>
                     <v-row>

From 69db687f6dc2192096f1b1f93731d29028af485e Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Tue, 16 Feb 2021 08:50:01 +0200
Subject: [PATCH 15/24] ignore coverage files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index d167bf6..5045401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ node_modules
 .vscode
 backend/.env
 *__pycache__*
+backend/.coverage
+backend/coverage.xml

From ab1272772074f6f43dade377f87d6c69a3760ee2 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Tue, 16 Feb 2021 08:50:31 +0200
Subject: [PATCH 16/24] health checks works, isort, black

---
 backend/hekshermgmt/api/v1/__init__.py    |   5 +-
 backend/hekshermgmt/api/v1/rules.py       |  30 +++---
 backend/hekshermgmt/api/v1/settings.py    |  10 +-
 backend/hekshermgmt/api/v1/utils.py       |   8 +-
 backend/hekshermgmt/app.py                |   9 +-
 backend/hekshermgmt/heksher_client.py     |   3 +-
 backend/hekshermgmt/main.py               |   6 +-
 backend/poetry.lock                       | 111 +++++++++++++++++++++-
 backend/pyproject.toml                    |   2 +
 backend/scripts/blackbox_test.sh          |   2 +-
 backend/scripts/test.sh                   |   2 +-
 backend/scripts/unittest.sh               |   2 +-
 backend/tests/blackbox/conftest.py        |  71 ++++++++++++++
 backend/tests/blackbox/test_health_api.py |   6 ++
 scripts/test.sh                           |   3 +
 15 files changed, 232 insertions(+), 38 deletions(-)
 create mode 100644 backend/tests/blackbox/conftest.py
 create mode 100644 backend/tests/blackbox/test_health_api.py
 create mode 100755 scripts/test.sh

diff --git a/backend/hekshermgmt/api/v1/__init__.py b/backend/hekshermgmt/api/v1/__init__.py
index 6bbc08d..0dcdebd 100644
--- a/backend/hekshermgmt/api/v1/__init__.py
+++ b/backend/hekshermgmt/api/v1/__init__.py
@@ -1,7 +1,8 @@
 from fastapi import APIRouter
-from hekshermgmt.api.v1.utils import get_user_name
-from hekshermgmt.api.v1.settings import router as settings
+
 from hekshermgmt.api.v1.rules import router as rules
+from hekshermgmt.api.v1.settings import router as settings
+from hekshermgmt.api.v1.utils import get_user_name
 
 router = APIRouter(prefix="/api/v1", dependencies=[get_user_name])
 router.include_router(settings)
diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index 04a4781..dfe0dcf 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -3,17 +3,12 @@
 from typing import Any, Dict, Optional
 
 import httpx
-
 from fastapi import APIRouter
-from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
-from starlette.responses import Response
-from starlette.status import (
-    HTTP_400_BAD_REQUEST,
-    HTTP_422_UNPROCESSABLE_ENTITY,
-    HTTP_500_INTERNAL_SERVER_ERROR,
-)
+from pydantic import (BaseModel, Field,  # pytype: disable=import-error
+                      validator)
+
+from hekshermgmt.api.v1.utils import application, httpx_error_to_response
 from hekshermgmt.app import HeksherManagement
-from hekshermgmt.api.v1.utils import application
 from hekshermgmt.context_vars import user
 
 router = APIRouter(prefix="/rule")
@@ -50,7 +45,11 @@ async def delete_rule(rule_id: int, app: HeksherManagement = application):
     """
     Deletes a specific rule
     """
-    rule = await app.heksher_client.get_rule_data(rule_id)
+    try:
+        rule = await app.heksher_client.get_rule_data(rule_id)
+    except httpx.HTTPStatusError as error:
+        logger.warning("Error from Heksher API when deleting rule.", exc_info=error)
+        return httpx_error_to_response(error)
     logger.info(
         "Deleting rule.",
         extra={
@@ -73,14 +72,9 @@ async def add_rule(rule: RuleAddInput, app: HeksherManagement = application):
         rule_id = await app.heksher_client.add_rule(
             rule.setting, rule.feature_values, rule.value, metadata
         )
-    except httpx.HTTPStatusError as exception:
-        resp_status = exception.response.status_code
-        status_code = (
-            resp_status
-            if resp_status in (HTTP_400_BAD_REQUEST, HTTP_422_UNPROCESSABLE_ENTITY)
-            else HTTP_500_INTERNAL_SERVER_ERROR
-        )
-        return Response(exception.response.content, status_code)
+    except httpx.HTTPStatusError as error:
+        logger.warning("Error from Heksher API when adding rule.", exc_info=error)
+        return httpx_error_to_response(error)
     logger.info(
         "Added rule.",
         extra={
diff --git a/backend/hekshermgmt/api/v1/settings.py b/backend/hekshermgmt/api/v1/settings.py
index c16451e..8b2a986 100644
--- a/backend/hekshermgmt/api/v1/settings.py
+++ b/backend/hekshermgmt/api/v1/settings.py
@@ -1,13 +1,13 @@
 from logging import getLogger
 from typing import Any, Dict, List, Optional
 
+import httpx
 import orjson
-
 from fastapi import APIRouter
 from pydantic import BaseModel, Field  # pytype: disable=import-error
 
+from hekshermgmt.api.v1.utils import application, httpx_error_to_response
 from hekshermgmt.app import HeksherManagement
-from hekshermgmt.api.v1.utils import application
 
 router = APIRouter(prefix="/settings")
 
@@ -45,7 +45,11 @@ async def get_settings(app: HeksherManagement = application):
     Get settings list
     """
     logger.debug("Getting settings request.")
-    settings = await app.heksher_client.get_settings()
+    try:
+        settings = await app.heksher_client.get_settings()
+    except httpx.HTTPStatusError as error:
+        logger.warning("Error from Heksher API when fetching settings.", exc_info=error)
+        return httpx_error_to_response(error)
     return [
         Setting(
             name=setting["name"],
diff --git a/backend/hekshermgmt/api/v1/utils.py b/backend/hekshermgmt/api/v1/utils.py
index 13094fb..4a05642 100644
--- a/backend/hekshermgmt/api/v1/utils.py
+++ b/backend/hekshermgmt/api/v1/utils.py
@@ -1,4 +1,6 @@
-from fastapi import Depends, Request, Header
+import httpx
+from fastapi import Depends, Header, Request
+from starlette.responses import Response
 
 from hekshermgmt.context_vars import user
 
@@ -18,3 +20,7 @@ async def get_user_name(x_forwarded_email: str = Header(...)) -> str:
     """
     user.set(x_forwarded_email)
     return x_forwarded_email
+
+
+def httpx_error_to_response(error: httpx.HTTPStatusError) -> Response:
+    return Response(error.response.content, status_code=error.response.status_code)
diff --git a/backend/hekshermgmt/app.py b/backend/hekshermgmt/app.py
index 91df3ac..5fd9916 100644
--- a/backend/hekshermgmt/app.py
+++ b/backend/hekshermgmt/app.py
@@ -1,17 +1,16 @@
-import sentry_sdk
 import re
+from logging import INFO, getLogger
 
-from logging import getLogger, INFO
-
+import sentry_sdk
 from aiologstash import create_tcp_handler
 from contextfilter import ContextVarFilter
 from envolved import EnvVar, Schema
 from envolved.parsers import CollectionParser
 from fastapi import FastAPI
 
-from hekshermgmt.heksher_client import HeksherClient
-from hekshermgmt.context_vars import user
 from hekshermgmt._version import __version__
+from hekshermgmt.context_vars import user
+from hekshermgmt.heksher_client import HeksherClient
 
 logger = getLogger(__name__)
 
diff --git a/backend/hekshermgmt/heksher_client.py b/backend/hekshermgmt/heksher_client.py
index 9fd7d69..ab899d7 100644
--- a/backend/hekshermgmt/heksher_client.py
+++ b/backend/hekshermgmt/heksher_client.py
@@ -3,11 +3,10 @@
 import re
 from logging import getLogger
 from typing import Any, Dict, List, Optional
-from httpx import AsyncClient
 
 from envolved import EnvVar, Schema
 from envolved.parsers import CollectionParser
-
+from httpx import AsyncClient
 
 logger = getLogger(__name__)
 
diff --git a/backend/hekshermgmt/main.py b/backend/hekshermgmt/main.py
index 72a69b9..1ffe96d 100644
--- a/backend/hekshermgmt/main.py
+++ b/backend/hekshermgmt/main.py
@@ -1,10 +1,10 @@
-from starlette.responses import JSONResponse
-from starlette.middleware import Middleware
 from fastapi.middleware.cors import CORSMiddleware
+from starlette.middleware import Middleware
+from starlette.responses import JSONResponse
 
 from hekshermgmt._version import __version__
-from hekshermgmt.app import HeksherManagement
 from hekshermgmt.api.v1 import router as v1_router
+from hekshermgmt.app import HeksherManagement
 
 middleware = []
 if __debug__:
diff --git a/backend/poetry.lock b/backend/poetry.lock
index f798f40..d394397 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -80,6 +80,17 @@ category = "main"
 optional = false
 python-versions = ">=3.7,<4.0"
 
+[[package]]
+name = "coverage"
+version = "5.4"
+description = "Code coverage measurement for Python"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+
+[package.extras]
+toml = ["toml"]
+
 [[package]]
 name = "decorator"
 version = "4.4.2"
@@ -153,6 +164,19 @@ category = "main"
 optional = false
 python-versions = ">=3.6"
 
+[[package]]
+name = "heksher"
+version = "0.1.0"
+description = ""
+category = "dev"
+optional = false
+python-versions = ">=3.7,<4.0"
+
+[package.dependencies]
+httpx = ">=0.16.0,<0.17.0"
+ordered-set = ">=4.0.0,<5.0.0"
+orjson = ">=3.0.0,<4.0.0"
+
 [[package]]
 name = "httpcore"
 version = "0.12.3"
@@ -264,6 +288,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "ordered-set"
+version = "4.0.2"
+description = "A set that remembers its order, and allows looking up its items by their index in that order."
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
 [[package]]
 name = "orjson"
 version = "3.4.8"
@@ -368,6 +400,21 @@ toml = "*"
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
 
+[[package]]
+name = "pytest-cov"
+version = "2.11.1"
+description = "Pytest plugin for measuring coverage."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+coverage = ">=5.2.1"
+pytest = ">=4.6"
+
+[package.extras]
+testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "pytest-xdist", "virtualenv"]
+
 [[package]]
 name = "python-dotenv"
 version = "0.15.0"
@@ -647,7 +694,7 @@ postgresql = ["sqlalchemy (>=1.3.0,<2.0.0)", "psycopg2 (>=2.8.6,<3.0.0)"]
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.8,<3.9"
-content-hash = "4142c355471dacf76ae264578b29f3e6e246f764239a72a658ea5423c825c8d3"
+content-hash = "b33a17820bdf9758653636c4843eddaa5b814402c82e606429287a85f6df728d"
 
 [metadata.files]
 aiologstash = [
@@ -685,6 +732,57 @@ contextfilter = [
     {file = "contextfilter-0.3.0-py3-none-any.whl", hash = "sha256:7c68c4cf58a62230e27c13ab2717b2d7e93508934b62dce59661dbaada8261ec"},
     {file = "contextfilter-0.3.0.tar.gz", hash = "sha256:8c0fb54ffb1eb5537979244a0a273ec9a870c326d674d7ad56237de400ac3f70"},
 ]
+coverage = [
+    {file = "coverage-5.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:6d9c88b787638a451f41f97446a1c9fd416e669b4d9717ae4615bd29de1ac135"},
+    {file = "coverage-5.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:66a5aae8233d766a877c5ef293ec5ab9520929c2578fd2069308a98b7374ea8c"},
+    {file = "coverage-5.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9754a5c265f991317de2bac0c70a746efc2b695cf4d49f5d2cddeac36544fb44"},
+    {file = "coverage-5.4-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:fbb17c0d0822684b7d6c09915677a32319f16ff1115df5ec05bdcaaee40b35f3"},
+    {file = "coverage-5.4-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b7f7421841f8db443855d2854e25914a79a1ff48ae92f70d0a5c2f8907ab98c9"},
+    {file = "coverage-5.4-cp27-cp27m-win32.whl", hash = "sha256:4a780807e80479f281d47ee4af2eb2df3e4ccf4723484f77da0bb49d027e40a1"},
+    {file = "coverage-5.4-cp27-cp27m-win_amd64.whl", hash = "sha256:87c4b38288f71acd2106f5d94f575bc2136ea2887fdb5dfe18003c881fa6b370"},
+    {file = "coverage-5.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c6809ebcbf6c1049002b9ac09c127ae43929042ec1f1dbd8bb1615f7cd9f70a0"},
+    {file = "coverage-5.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ba7ca81b6d60a9f7a0b4b4e175dcc38e8fef4992673d9d6e6879fd6de00dd9b8"},
+    {file = "coverage-5.4-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:89fc12c6371bf963809abc46cced4a01ca4f99cba17be5e7d416ed7ef1245d19"},
+    {file = "coverage-5.4-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4a8eb7785bd23565b542b01fb39115a975fefb4a82f23d407503eee2c0106247"},
+    {file = "coverage-5.4-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:7e40d3f8eb472c1509b12ac2a7e24158ec352fc8567b77ab02c0db053927e339"},
+    {file = "coverage-5.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1ccae21a076d3d5f471700f6d30eb486da1626c380b23c70ae32ab823e453337"},
+    {file = "coverage-5.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:755c56beeacac6a24c8e1074f89f34f4373abce8b662470d3aa719ae304931f3"},
+    {file = "coverage-5.4-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:322549b880b2d746a7672bf6ff9ed3f895e9c9f108b714e7360292aa5c5d7cf4"},
+    {file = "coverage-5.4-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:60a3307a84ec60578accd35d7f0c71a3a971430ed7eca6567399d2b50ef37b8c"},
+    {file = "coverage-5.4-cp35-cp35m-win32.whl", hash = "sha256:1375bb8b88cb050a2d4e0da901001347a44302aeadb8ceb4b6e5aa373b8ea68f"},
+    {file = "coverage-5.4-cp35-cp35m-win_amd64.whl", hash = "sha256:16baa799ec09cc0dcb43a10680573269d407c159325972dd7114ee7649e56c66"},
+    {file = "coverage-5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2f2cf7a42d4b7654c9a67b9d091ec24374f7c58794858bff632a2039cb15984d"},
+    {file = "coverage-5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b62046592b44263fa7570f1117d372ae3f310222af1fc1407416f037fb3af21b"},
+    {file = "coverage-5.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:812eaf4939ef2284d29653bcfee9665f11f013724f07258928f849a2306ea9f9"},
+    {file = "coverage-5.4-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:859f0add98707b182b4867359e12bde806b82483fb12a9ae868a77880fc3b7af"},
+    {file = "coverage-5.4-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:04b14e45d6a8e159c9767ae57ecb34563ad93440fc1b26516a89ceb5b33c1ad5"},
+    {file = "coverage-5.4-cp36-cp36m-win32.whl", hash = "sha256:ebfa374067af240d079ef97b8064478f3bf71038b78b017eb6ec93ede1b6bcec"},
+    {file = "coverage-5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:84df004223fd0550d0ea7a37882e5c889f3c6d45535c639ce9802293b39cd5c9"},
+    {file = "coverage-5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:1b811662ecf72eb2d08872731636aee6559cae21862c36f74703be727b45df90"},
+    {file = "coverage-5.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6b588b5cf51dc0fd1c9e19f622457cc74b7d26fe295432e434525f1c0fae02bc"},
+    {file = "coverage-5.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:3fe50f1cac369b02d34ad904dfe0771acc483f82a1b54c5e93632916ba847b37"},
+    {file = "coverage-5.4-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:32ab83016c24c5cf3db2943286b85b0a172dae08c58d0f53875235219b676409"},
+    {file = "coverage-5.4-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:68fb816a5dd901c6aff352ce49e2a0ffadacdf9b6fae282a69e7a16a02dad5fb"},
+    {file = "coverage-5.4-cp37-cp37m-win32.whl", hash = "sha256:a636160680c6e526b84f85d304e2f0bb4e94f8284dd765a1911de9a40450b10a"},
+    {file = "coverage-5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:bb32ca14b4d04e172c541c69eec5f385f9a075b38fb22d765d8b0ce3af3a0c22"},
+    {file = "coverage-5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4d7165a4e8f41eca6b990c12ee7f44fef3932fac48ca32cecb3a1b2223c21f"},
+    {file = "coverage-5.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:a565f48c4aae72d1d3d3f8e8fb7218f5609c964e9c6f68604608e5958b9c60c3"},
+    {file = "coverage-5.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:fff1f3a586246110f34dc762098b5afd2de88de507559e63553d7da643053786"},
+    {file = "coverage-5.4-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:a839e25f07e428a87d17d857d9935dd743130e77ff46524abb992b962eb2076c"},
+    {file = "coverage-5.4-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:6625e52b6f346a283c3d563d1fd8bae8956daafc64bb5bbd2b8f8a07608e3994"},
+    {file = "coverage-5.4-cp38-cp38-win32.whl", hash = "sha256:5bee3970617b3d74759b2d2df2f6a327d372f9732f9ccbf03fa591b5f7581e39"},
+    {file = "coverage-5.4-cp38-cp38-win_amd64.whl", hash = "sha256:03ed2a641e412e42cc35c244508cf186015c217f0e4d496bf6d7078ebe837ae7"},
+    {file = "coverage-5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:14a9f1887591684fb59fdba8feef7123a0da2424b0652e1b58dd5b9a7bb1188c"},
+    {file = "coverage-5.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9564ac7eb1652c3701ac691ca72934dd3009997c81266807aef924012df2f4b3"},
+    {file = "coverage-5.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:0f48fc7dc82ee14aeaedb986e175a429d24129b7eada1b7e94a864e4f0644dde"},
+    {file = "coverage-5.4-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:107d327071061fd4f4a2587d14c389a27e4e5c93c7cba5f1f59987181903902f"},
+    {file = "coverage-5.4-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:0cdde51bfcf6b6bd862ee9be324521ec619b20590787d1655d005c3fb175005f"},
+    {file = "coverage-5.4-cp39-cp39-win32.whl", hash = "sha256:c67734cff78383a1f23ceba3b3239c7deefc62ac2b05fa6a47bcd565771e5880"},
+    {file = "coverage-5.4-cp39-cp39-win_amd64.whl", hash = "sha256:c669b440ce46ae3abe9b2d44a913b5fd86bb19eb14a8701e88e3918902ecd345"},
+    {file = "coverage-5.4-pp36-none-any.whl", hash = "sha256:c0ff1c1b4d13e2240821ef23c1efb1f009207cb3f56e16986f713c2b0e7cd37f"},
+    {file = "coverage-5.4-pp37-none-any.whl", hash = "sha256:cd601187476c6bed26a0398353212684c427e10a903aeafa6da40c63309d438b"},
+    {file = "coverage-5.4.tar.gz", hash = "sha256:6d2e262e5e8da6fa56e774fb8e2643417351427604c2b177f8e8c5f75fc928ca"},
+]
 decorator = [
     {file = "decorator-4.4.2-py2.py3-none-any.whl", hash = "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760"},
     {file = "decorator-4.4.2.tar.gz", hash = "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"},
@@ -709,6 +807,10 @@ h11 = [
     {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"},
     {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
 ]
+heksher = [
+    {file = "heksher-0.1.0-py3-none-any.whl", hash = "sha256:9a106fd009d96f5b900c618da1f59dd3d64f609effbc37ebf011bf3d8b71a5b8"},
+    {file = "heksher-0.1.0.tar.gz", hash = "sha256:bf6cd03d73b26618b2598112890fc26948655c9a637eb7f543d5317c841c4656"},
+]
 httpcore = [
     {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"},
     {file = "httpcore-0.12.3.tar.gz", hash = "sha256:37ae835fb370049b2030c3290e12ed298bf1473c41bb72ca4aa78681eba9b7c9"},
@@ -762,6 +864,9 @@ ninja = [
     {file = "ninja-1.10.0.post2-py3-none-win_amd64.whl", hash = "sha256:c6059bd04ad235e2326b39bc71bb7989de8d565084b5f269557704747b2910fa"},
     {file = "ninja-1.10.0.post2.tar.gz", hash = "sha256:621fd73513a9bef0cb82e8c531a29ef96580b4d6e797f833cce167054ad812f8"},
 ]
+ordered-set = [
+    {file = "ordered-set-4.0.2.tar.gz", hash = "sha256:ba93b2df055bca202116ec44b9bead3df33ea63a7d5827ff8e16738b97f33a95"},
+]
 orjson = [
     {file = "orjson-3.4.8-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:3bf9cd593f48329d8356192b453c20850ecb135a92c70df42ccd652e0496c206"},
     {file = "orjson-3.4.8-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:a2c6b0436f89a8393add5c8ea493176f4ff671257720e221eb52c6c51973c07b"},
@@ -852,6 +957,10 @@ pytest = [
     {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"},
     {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"},
 ]
+pytest-cov = [
+    {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"},
+    {file = "pytest_cov-2.11.1-py2.py3-none-any.whl", hash = "sha256:bdb9fdb0b85a7cc825269a4c56b48ccaa5c7e365054b6038772c32ddcdc969da"},
+]
 python-dotenv = [
     {file = "python-dotenv-0.15.0.tar.gz", hash = "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0"},
     {file = "python_dotenv-0.15.0-py2.py3-none-any.whl", hash = "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e"},
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index d9163d5..d922481 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -20,6 +20,8 @@ pytest = "^6.2.2"
 yellowbox = {extras = ["postgresql"], version = "^0.5.0"}
 flake8 = "^3.8.4"
 pytype = "^2021.1.28"
+heksher = "^0.1.0"
+pytest-cov = "^2.11.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/backend/scripts/blackbox_test.sh b/backend/scripts/blackbox_test.sh
index 5a807ec..471df14 100755
--- a/backend/scripts/blackbox_test.sh
+++ b/backend/scripts/blackbox_test.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python -m pytest tests/blackbox -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
+python -m pytest tests/blackbox -s -x --cov=hekshermgmt --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/backend/scripts/test.sh b/backend/scripts/test.sh
index 0c2ff88..1719650 100755
--- a/backend/scripts/test.sh
+++ b/backend/scripts/test.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python -m pytest tests -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
+poetry run pytest tests -s -x --cov=hekshermgmt --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/backend/scripts/unittest.sh b/backend/scripts/unittest.sh
index 93a961a..de8dfc1 100755
--- a/backend/scripts/unittest.sh
+++ b/backend/scripts/unittest.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-python -m pytest tests/unittests -s -x --cov=app --cov-report=xml --cov-report=term-missing
\ No newline at end of file
+python -m pytest tests/unittests -s -x --cov=hekshermgmt --cov-report=xml --cov-report=term-missing
\ No newline at end of file
diff --git a/backend/tests/blackbox/conftest.py b/backend/tests/blackbox/conftest.py
new file mode 100644
index 0000000..5818125
--- /dev/null
+++ b/backend/tests/blackbox/conftest.py
@@ -0,0 +1,71 @@
+from functools import partial
+from typing import Optional
+
+import httpx
+from docker import DockerClient
+from pytest import fixture
+from starlette.testclient import TestClient
+from yellowbox import SingleContainerService, connect, retry, temp_network
+from yellowbox.containers import create_and_pull, get_ports, killing
+from yellowbox.extras.postgresql import PostgreSQLService
+from yellowbox.retry import RetrySpec
+
+from hekshermgmt.main import app
+
+
+class HeksherService(SingleContainerService):
+    def __init__(self, docker_client: DockerClient, *, db_connection_string: str, context_features: str, **kwargs):
+        self.context_features = context_features
+        self.db_connection_string = db_connection_string
+        super().__init__(create_and_pull(docker_client, "biocatchltd/heksher:0.2.0", detach=True, publish_all_ports=True,
+        environment={'HEKSHER_DB_CONNECTION_STRING': db_connection_string,
+                     'HEKSHER_STARTUP_CONTEXT_FEATURES': context_features}))
+
+    def start(self, retry_spec: Optional[RetrySpec] = None, **kwargs):
+        super().start(**kwargs)
+        def health_check(client: httpx.Client):
+            client.get(f'http://localhost:{self.client_port()}/api/health').raise_for_status()
+        with httpx.Client() as client:
+            retry_spec = retry_spec or RetrySpec(attempts=10)
+            retry_spec.retry(partial(health_check, client), httpx.RequestError)
+
+
+
+    def stop(self, **kwargs):
+        super().stop(**kwargs)
+
+    def client_port(self):
+        return get_ports(self.container)[80]
+
+@fixture(scope='session')
+def docker_client():
+    # todo improve when yellowbox is upgraded
+    try:
+        ret = DockerClient.from_env()
+        ret.ping()
+    except Exception:
+        return DockerClient(base_url='tcp://localhost:2375')
+    else:
+        return ret
+
+@fixture(scope='session')
+def sql_service(docker_client):
+    service: PostgreSQLService
+    with PostgreSQLService.run(docker_client) as service:
+        yield service
+
+@fixture(scope='session')
+def heksher_service(sql_service, docker_client):
+    with temp_network(docker_client) as network, connect(network, sql_service) as sql_alias:
+        service = HeksherService(docker_client, db_connection_string=sql_service.container_connection_string(sql_alias[0]), context_features="user;trust;theme")
+        with connect(network, service):
+            service.start()
+            with killing(service.container):
+                yield service
+
+
+@fixture
+def app_client(monkeypatch, heksher_service):
+    monkeypatch.setenv('HEKSHERMGMT_HEKSHER_URL', f'http://localhost:{heksher_service.client_port()}/')
+    with TestClient(app) as app_client:
+        yield app_client
diff --git a/backend/tests/blackbox/test_health_api.py b/backend/tests/blackbox/test_health_api.py
new file mode 100644
index 0000000..544a9df
--- /dev/null
+++ b/backend/tests/blackbox/test_health_api.py
@@ -0,0 +1,6 @@
+def test_health(app_client):
+    app_client.get('/api/health').raise_for_status()
+
+
+def test_redoc(app_client):
+    app_client.get('/redoc').raise_for_status()
diff --git a/scripts/test.sh b/scripts/test.sh
new file mode 100755
index 0000000..1b533bc
--- /dev/null
+++ b/scripts/test.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+sh backend/scripts/test.sh
+(cd frontend; npm run lint)
\ No newline at end of file

From 530750b3be9c8a45e01b0071438841963e950cb6 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Wed, 17 Feb 2021 18:16:54 +0200
Subject: [PATCH 17/24] add tests

---
 backend/hekshermgmt/api/v1/rules.py         |   4 +-
 backend/poetry.lock                         |  54 +++++-----
 backend/tests/blackbox/conftest.py          |  77 ++++++++++---
 backend/tests/blackbox/test_health_api.py   |   4 +-
 backend/tests/blackbox/test_settings_api.py | 113 ++++++++++++++++++++
 5 files changed, 209 insertions(+), 43 deletions(-)
 create mode 100644 backend/tests/blackbox/test_settings_api.py

diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index dfe0dcf..0324304 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -4,8 +4,7 @@
 
 import httpx
 from fastapi import APIRouter
-from pydantic import (BaseModel, Field,  # pytype: disable=import-error
-                      validator)
+from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
 
 from hekshermgmt.api.v1.utils import application, httpx_error_to_response
 from hekshermgmt.app import HeksherManagement
@@ -84,3 +83,4 @@ async def add_rule(rule: RuleAddInput, app: HeksherManagement = application):
             "setting_name": rule.setting,
         },
     )
+    return RuleAddOutput(rule_id=rule_id)
diff --git a/backend/poetry.lock b/backend/poetry.lock
index d394397..1fabfc1 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -101,7 +101,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*"
 
 [[package]]
 name = "docker"
-version = "4.4.1"
+version = "4.4.2"
 description = "A Python library for the Docker Engine API."
 category = "dev"
 optional = false
@@ -166,7 +166,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "heksher"
-version = "0.1.0"
+version = "0.1.1"
 description = ""
 category = "dev"
 optional = false
@@ -436,7 +436,7 @@ python-versions = "*"
 
 [[package]]
 name = "pytype"
-version = "2021.1.28"
+version = "2021.2.9"
 description = "Python type inferencer"
 category = "dev"
 optional = false
@@ -627,12 +627,17 @@ standard = ["websockets (>=8.0.0,<9.0.0)", "watchgod (>=0.6,<0.7)", "python-dote
 
 [[package]]
 name = "uvloop"
-version = "0.14.0"
+version = "0.15.1"
 description = "Fast implementation of asyncio event loop on top of libuv"
 category = "main"
 optional = false
 python-versions = "*"
 
+[package.extras]
+dev = ["Cython (>=0.29.20,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx-rtd-theme (>=0.2.4,<0.3.0)", "aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"]
+docs = ["Sphinx (>=1.7.3,<1.8.0)", "sphinxcontrib-asyncio (>=0.2.0,<0.3.0)", "sphinx-rtd-theme (>=0.2.4,<0.3.0)"]
+test = ["aiohttp", "flake8 (>=3.8.4,<3.9.0)", "psutil", "pycodestyle (>=2.6.0,<2.7.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"]
+
 [[package]]
 name = "watchgod"
 version = "0.6"
@@ -788,8 +793,8 @@ decorator = [
     {file = "decorator-4.4.2.tar.gz", hash = "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"},
 ]
 docker = [
-    {file = "docker-4.4.1-py2.py3-none-any.whl", hash = "sha256:e455fa49aabd4f22da9f4e1c1f9d16308286adc60abaf64bf3e1feafaed81d06"},
-    {file = "docker-4.4.1.tar.gz", hash = "sha256:0604a74719d5d2de438753934b755bfcda6f62f49b8e4b30969a4b0a2a8a1220"},
+    {file = "docker-4.4.2-py2.py3-none-any.whl", hash = "sha256:20d71afc593486f2297bb7fb7406b03876f31894337e914a5062050c65085cab"},
+    {file = "docker-4.4.2.tar.gz", hash = "sha256:67f33d4cf95182db631a17eef7d666d2c91f624c1d3fbc4df6009cb2f2a4c604"},
 ]
 envolved = [
     {file = "envolved-0.3.0-py3-none-any.whl", hash = "sha256:cb7709b13de28061b294b08bba2dc21ca8a3fc06cab198f2a16d45ccf3a262ca"},
@@ -808,8 +813,8 @@ h11 = [
     {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
 ]
 heksher = [
-    {file = "heksher-0.1.0-py3-none-any.whl", hash = "sha256:9a106fd009d96f5b900c618da1f59dd3d64f609effbc37ebf011bf3d8b71a5b8"},
-    {file = "heksher-0.1.0.tar.gz", hash = "sha256:bf6cd03d73b26618b2598112890fc26948655c9a637eb7f543d5317c841c4656"},
+    {file = "heksher-0.1.1-py3-none-any.whl", hash = "sha256:486c86d4b1adc4fbf7892503822dc0902f735593f5aefd2c35e29c0d6dc86cca"},
+    {file = "heksher-0.1.1.tar.gz", hash = "sha256:9d6e94d96168d72bbcef9d0302a5d07d2d9129350ce1aa9d669a22998f961786"},
 ]
 httpcore = [
     {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"},
@@ -969,13 +974,13 @@ python-logstash = [
     {file = "python-logstash-0.4.6.tar.gz", hash = "sha256:10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c"},
 ]
 pytype = [
-    {file = "pytype-2021.1.28-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:be764b1a8e8bc77aaee6b665302614435c00256c9914423c7cb0db8345502f7b"},
-    {file = "pytype-2021.1.28-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:76fd1c8c9677596463f4f06a7b78726caccf1a4cf793d3afb08465800e4015af"},
-    {file = "pytype-2021.1.28-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:df0b1a002fa92b20978a3ec8f09be9e92c64cfdeb9798399d25cf8b90cb6e80a"},
-    {file = "pytype-2021.1.28-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:5121cf6a5439a875fcb8dd4b7847c556767f0bb495c75e091069dd2b20121d41"},
-    {file = "pytype-2021.1.28-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:fc00cbd1c186ac536f444c2e743d650e59e05011a532266d778b544736cf4da3"},
-    {file = "pytype-2021.1.28-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:fa805000a3d09c5cbc85d2fc6ed9e0c5dcac19d63658604ebb7771526bf8160b"},
-    {file = "pytype-2021.1.28.tar.gz", hash = "sha256:69ffaf8ffdb29cfa69aec8c1bbdc6052a8ab87f24278635884f61253a21c7a90"},
+    {file = "pytype-2021.2.9-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:f12c5760a15ef9e25897d98fb2dd7f779ea336fba5f946be9579cfbf4267aeb4"},
+    {file = "pytype-2021.2.9-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:72963e7053dbab7aec4aa31dbd5092a316268fa29191af4d174c603ad6feb5be"},
+    {file = "pytype-2021.2.9-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:37730cbc20799c46dfcb68e8692a22aa4b12fe429e97707773cc3045fd4d1729"},
+    {file = "pytype-2021.2.9-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:87dd1afad8c5126562d388b9ad761331b12e1b80aba0a144ec229243c6e95bd9"},
+    {file = "pytype-2021.2.9-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:f0dec3da27e6e1502ddafb118d8d699866abf8e6c9cc581551e10808179ff55c"},
+    {file = "pytype-2021.2.9-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:6527d82bc4101bec0e4f70b492f6812bac91b39474819a926f2e740f6e3cbb23"},
+    {file = "pytype-2021.2.9.tar.gz", hash = "sha256:e248ed107a4ec6e3b04d1bfdffab8d4d5c7c7aceed92e8b6c5240de0e2fa6dac"},
 ]
 pywin32 = [
     {file = "pywin32-227-cp27-cp27m-win32.whl", hash = "sha256:371fcc39416d736401f0274dd64c2302728c9e034808e37381b5e1b22be4a6b0"},
@@ -1123,15 +1128,16 @@ uvicorn = [
     {file = "uvicorn-0.13.3.tar.gz", hash = "sha256:ef1e0bb5f7941c6fe324e06443ddac0331e1632a776175f87891c7bd02694355"},
 ]
 uvloop = [
-    {file = "uvloop-0.14.0-cp35-cp35m-macosx_10_11_x86_64.whl", hash = "sha256:08b109f0213af392150e2fe6f81d33261bb5ce968a288eb698aad4f46eb711bd"},
-    {file = "uvloop-0.14.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:4544dcf77d74f3a84f03dd6278174575c44c67d7165d4c42c71db3fdc3860726"},
-    {file = "uvloop-0.14.0-cp36-cp36m-macosx_10_11_x86_64.whl", hash = "sha256:b4f591aa4b3fa7f32fb51e2ee9fea1b495eb75b0b3c8d0ca52514ad675ae63f7"},
-    {file = "uvloop-0.14.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:f07909cd9fc08c52d294b1570bba92186181ca01fe3dc9ffba68955273dd7362"},
-    {file = "uvloop-0.14.0-cp37-cp37m-macosx_10_11_x86_64.whl", hash = "sha256:afd5513c0ae414ec71d24f6f123614a80f3d27ca655a4fcf6cabe50994cc1891"},
-    {file = "uvloop-0.14.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e7514d7a48c063226b7d06617cbb12a14278d4323a065a8d46a7962686ce2e95"},
-    {file = "uvloop-0.14.0-cp38-cp38-macosx_10_11_x86_64.whl", hash = "sha256:bcac356d62edd330080aed082e78d4b580ff260a677508718f88016333e2c9c5"},
-    {file = "uvloop-0.14.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:4315d2ec3ca393dd5bc0b0089d23101276778c304d42faff5dc4579cb6caef09"},
-    {file = "uvloop-0.14.0.tar.gz", hash = "sha256:123ac9c0c7dd71464f58f1b4ee0bbd81285d96cdda8bc3519281b8973e3a461e"},
+    {file = "uvloop-0.15.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9541dc3f391941796ae95c9c3bb16b813acf9e3d4beebfd3b623f1acb22d318d"},
+    {file = "uvloop-0.15.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:e178c255622d928d464187e3ceba94db88465f6b17909c651483fb73af8d8b85"},
+    {file = "uvloop-0.15.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:47ec567151070ed770211d359ad9250b59368548c60212c7ef6dda3f5b1778f6"},
+    {file = "uvloop-0.15.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:66881fe8a2187334c4dd5010c56310bdf32fe426613f9ca727f090bc31280624"},
+    {file = "uvloop-0.15.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:e72779681f839b6a069d7e7a9f7962a1d1927612c5c2e33071415478bdc1b91b"},
+    {file = "uvloop-0.15.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:ed073d24e0c383c24d17d3a2bb209b999ff0a8130e89b7c3f033db9e0c3bd04f"},
+    {file = "uvloop-0.15.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:236a3c31096e0845029856f7bc07a938340c2cdb35d9d39b38c9253b672bf948"},
+    {file = "uvloop-0.15.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ca8a9e982f0bfbe331f41902cdd721c6e749e4685a403685e792b86a584f5969"},
+    {file = "uvloop-0.15.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1ae1ad731c8c0dcee80e0ecf06274f0f7293244d2cef81fa2747321a370a6aba"},
+    {file = "uvloop-0.15.1.tar.gz", hash = "sha256:7846828112bfb49abc5fdfc47d0e4dfd7402115c9fde3c14c31818cfbeeb63dc"},
 ]
 watchgod = [
     {file = "watchgod-0.6-py35.py36.py37-none-any.whl", hash = "sha256:59700dab7445aa8e6067a5b94f37bae90fc367554549b1ed2e9d0f4f38a90d2a"},
diff --git a/backend/tests/blackbox/conftest.py b/backend/tests/blackbox/conftest.py
index 5818125..2605cd9 100644
--- a/backend/tests/blackbox/conftest.py
+++ b/backend/tests/blackbox/conftest.py
@@ -1,5 +1,7 @@
 from functools import partial
-from typing import Optional
+from typing import Optional, Sequence
+import heksher
+from heksher.heksher_client import TemporaryClient
 
 import httpx
 from docker import DockerClient
@@ -9,55 +11,88 @@
 from yellowbox.containers import create_and_pull, get_ports, killing
 from yellowbox.extras.postgresql import PostgreSQLService
 from yellowbox.retry import RetrySpec
+from heksher import ThreadHeksherClient
 
 from hekshermgmt.main import app
 
+CONTEXT_FEATURES = ["user", "trust", "theme"]
+
 
 class HeksherService(SingleContainerService):
-    def __init__(self, docker_client: DockerClient, *, db_connection_string: str, context_features: str, **kwargs):
+    def __init__(
+        self,
+        docker_client: DockerClient,
+        *,
+        db_connection_string: str,
+        context_features: Sequence[str],
+        **kwargs,
+    ):
         self.context_features = context_features
         self.db_connection_string = db_connection_string
-        super().__init__(create_and_pull(docker_client, "biocatchltd/heksher:0.2.0", detach=True, publish_all_ports=True,
-        environment={'HEKSHER_DB_CONNECTION_STRING': db_connection_string,
-                     'HEKSHER_STARTUP_CONTEXT_FEATURES': context_features}))
+        super().__init__(
+            create_and_pull(
+                docker_client,
+                "biocatchltd/heksher:0.2.0",
+                detach=True,
+                publish_all_ports=True,
+                environment={
+                    "HEKSHER_DB_CONNECTION_STRING": db_connection_string,
+                    "HEKSHER_STARTUP_CONTEXT_FEATURES": ";".join(context_features),
+                },
+            )
+        )
 
     def start(self, retry_spec: Optional[RetrySpec] = None, **kwargs):
         super().start(**kwargs)
+
         def health_check(client: httpx.Client):
-            client.get(f'http://localhost:{self.client_port()}/api/health').raise_for_status()
+            client.get(
+                f"http://localhost:{self.client_port()}/api/health"
+            ).raise_for_status()
+
         with httpx.Client() as client:
             retry_spec = retry_spec or RetrySpec(attempts=10)
             retry_spec.retry(partial(health_check, client), httpx.RequestError)
 
-
-
     def stop(self, **kwargs):
         super().stop(**kwargs)
 
     def client_port(self):
         return get_ports(self.container)[80]
 
-@fixture(scope='session')
+    def client_url(self):
+        return f"http://localhost:{self.client_port()}/"
+
+
+@fixture(scope="session")
 def docker_client():
     # todo improve when yellowbox is upgraded
     try:
         ret = DockerClient.from_env()
         ret.ping()
     except Exception:
-        return DockerClient(base_url='tcp://localhost:2375')
+        return DockerClient(base_url="tcp://localhost:2375")
     else:
         return ret
 
-@fixture(scope='session')
+
+@fixture(scope="session")
 def sql_service(docker_client):
     service: PostgreSQLService
     with PostgreSQLService.run(docker_client) as service:
         yield service
 
-@fixture(scope='session')
+
+@fixture(scope="session")
 def heksher_service(sql_service, docker_client):
-    with temp_network(docker_client) as network, connect(network, sql_service) as sql_alias:
-        service = HeksherService(docker_client, db_connection_string=sql_service.container_connection_string(sql_alias[0]), context_features="user;trust;theme")
+    with temp_network(docker_client) as network, connect(
+        network, sql_service
+    ) as sql_alias:
+        service = HeksherService(
+            docker_client,
+            db_connection_string=sql_service.container_connection_string(sql_alias[0]),
+            context_features=CONTEXT_FEATURES,
+        )
         with connect(network, service):
             service.start()
             with killing(service.container):
@@ -66,6 +101,18 @@ def heksher_service(sql_service, docker_client):
 
 @fixture
 def app_client(monkeypatch, heksher_service):
-    monkeypatch.setenv('HEKSHERMGMT_HEKSHER_URL', f'http://localhost:{heksher_service.client_port()}/')
+    monkeypatch.setenv("HEKSHERMGMT_HEKSHER_URL", heksher_service.client_url())
     with TestClient(app) as app_client:
+        app_client.headers["X-FORWARDED-EMAIL"] = "eyal@shani.pita"
         yield app_client
+
+
+@fixture
+def heksher_client(heksher_service):
+    with ThreadHeksherClient(
+        heksher_service.client_url(),
+        update_interval=2000,
+        context_features=CONTEXT_FEATURES,
+    ) as client:
+        yield client
+    heksher.main_client.Main = TemporaryClient()
diff --git a/backend/tests/blackbox/test_health_api.py b/backend/tests/blackbox/test_health_api.py
index 544a9df..6a01f6b 100644
--- a/backend/tests/blackbox/test_health_api.py
+++ b/backend/tests/blackbox/test_health_api.py
@@ -1,6 +1,6 @@
 def test_health(app_client):
-    app_client.get('/api/health').raise_for_status()
+    app_client.get("/api/health").raise_for_status()
 
 
 def test_redoc(app_client):
-    app_client.get('/redoc').raise_for_status()
+    app_client.get("/redoc").raise_for_status()
diff --git a/backend/tests/blackbox/test_settings_api.py b/backend/tests/blackbox/test_settings_api.py
new file mode 100644
index 0000000..6587904
--- /dev/null
+++ b/backend/tests/blackbox/test_settings_api.py
@@ -0,0 +1,113 @@
+import string
+import random
+
+from pytest import fixture
+from heksher import Setting, ThreadHeksherClient
+
+
+def generate_setting_name() -> str:
+    return "".join(random.choice(string.ascii_letters) for i in range(10))
+
+
+def test_get_settings(app_client, heksher_client: ThreadHeksherClient):
+    setting_name_int = generate_setting_name()
+    setting_description_int = "me control cake temp"
+    setting_default_value_int = 5
+    setting_features_int = ["user"]
+    setting_name_str = generate_setting_name()
+    setting_description_str = "me control the universe"
+    setting_default_value_str = "just dance, gonna be alright!"
+    setting_features_str = ["user", "theme"]
+
+    int_setting = Setting(
+        setting_name_int,
+        int,
+        setting_features_int,
+        setting_default_value_int,
+        metadata={"description": setting_description_int},
+    )
+    str_setting = Setting(
+        setting_name_str,
+        str,
+        setting_features_str,
+        setting_default_value_str,
+        metadata={"description": setting_description_str},
+    )
+
+    heksher_client.reload()
+
+    response = app_client.get("/api/v1/settings")
+    response.raise_for_status()
+
+    result = response.json()
+    assert {
+        "name": setting_name_int,
+        "configurable_features": setting_features_int,
+        "type": "int",
+        "default_value": setting_default_value_int,
+        "description": setting_description_int,
+    } in result
+    assert {
+        "name": setting_name_str,
+        "configurable_features": setting_features_str,
+        "type": "str",
+        "default_value": setting_default_value_str,
+        "description": setting_description_str,
+    } in result
+
+
+
+def test_get_settings_rules(app_client, heksher_client: ThreadHeksherClient):
+    setting_name = generate_setting_name()
+    setting_description = "me control cake temp"
+    setting_default_value = 5
+    setting_features = ["user", "theme"]
+    int_setting = Setting(
+        setting_name,
+        int,
+        setting_features,
+        setting_default_value,
+        metadata={"description": setting_description},
+    )
+
+    heksher_client.reload()
+
+    rules = [{
+        'value': 30,
+        'feature_values': {'user': 'pita', 'theme': 'sabich'},
+        'setting': setting_name,
+        'information': 'funfun'
+    },
+    {
+        'value': 1,
+        'feature_values': {'user': 'pita', 'theme': 'iraqish'},
+        'setting': setting_name,
+        'information': 'funfun2'
+    }]
+    def create_rule(rule) -> int:
+        response = app_client.post("/api/v1/rule", json=rule)
+        response.raise_for_status()
+        return response.json()['rule_id']
+
+    for rule in rules:
+        rule['rule_id'] = create_rule(rule)
+
+
+    response = app_client.get(f"/api/v1/settings/{setting_name}/rules")
+    result_rules = response.json()
+    user = app_client.headers["X-FORWARDED-EMAIL"]
+
+    # Align input data to the expected result data.
+    for rule in rules:
+        rule.pop('setting')
+        rule['context_features'] = rule.pop('feature_values')
+    # Assert data generated by server, and remove it for easier comparison.
+    for rule in result_rules:
+        assert rule.pop('date')
+        assert rule.pop('added_by') == user
+
+
+    assert result_rules == rules
+
+
+

From e09b4231007c1cd01678c310600ed6dc6fe26345 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Thu, 18 Feb 2021 11:26:29 +0200
Subject: [PATCH 18/24] add wip tests

---
 backend/tests/blackbox/test_rules_api.py    | 61 +++++++++++++++++++++
 backend/tests/blackbox/test_settings_api.py |  7 +--
 backend/tests/blackbox/utils.py             |  5 ++
 3 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 backend/tests/blackbox/test_rules_api.py
 create mode 100644 backend/tests/blackbox/utils.py

diff --git a/backend/tests/blackbox/test_rules_api.py b/backend/tests/blackbox/test_rules_api.py
new file mode 100644
index 0000000..efa21d1
--- /dev/null
+++ b/backend/tests/blackbox/test_rules_api.py
@@ -0,0 +1,61 @@
+from heksher import Setting, ThreadHeksherClient, TRACK_ALL
+
+
+from utils import generate_setting_name
+
+
+def test_rule_add_delete(app_client, heksher_client: ThreadHeksherClient):
+    setting_name = generate_setting_name()
+    setting_description = "me control cake temp"
+    setting_default_value = 5
+    setting_features = ["user", "theme"]
+    int_setting = Setting(
+        setting_name,
+        int,
+        setting_features,
+        setting_default_value,
+        metadata={"description": setting_description},
+    )
+    heksher_client.track_contexts(user=TRACK_ALL, theme=TRACK_ALL)
+    heksher_client.reload()
+
+    rules = [{
+        'value': 30,
+        'feature_values': {'user': 'pita', 'theme': 'sabich'},
+        'setting': setting_name,
+        'information': 'funfun'
+    },
+    {
+        'value': 1,
+        'feature_values': {'user': 'pita', 'theme': 'iraqish'},
+        'setting': setting_name,
+        'information': 'funfun2'
+    }]
+    def create_rule(rule) -> int:
+        response = app_client.post("/api/v1/rule", json=rule)
+        response.raise_for_status()
+        return response.json()['rule_id']
+
+    rule_ids = []
+    for rule in rules:
+        rule_ids.append(create_rule(rule))
+
+    heksher_client.reload()
+    assert int_setting.get(user='pita', theme='sabich') == 30
+    assert int_setting.get(user='pita') == setting_default_value
+    assert int_setting.get(user='pita', theme='iraqish') == 1
+
+    def delete_rule(rule_id):
+        response = app_client.delete(f"/api/v1/rule/{rule_id}")
+        response.raise_for_status()
+
+    for rule in rule_ids:
+        delete_rule()
+
+    heksher_client.reload()
+
+    assert int_setting.get(user='pita', theme='sabich') == setting_default_value
+    assert int_setting.get(user='pita') == setting_default_value
+    assert int_setting.get(user='pita', theme='iraqish') == setting_default_value
+
+
diff --git a/backend/tests/blackbox/test_settings_api.py b/backend/tests/blackbox/test_settings_api.py
index 6587904..3a1e307 100644
--- a/backend/tests/blackbox/test_settings_api.py
+++ b/backend/tests/blackbox/test_settings_api.py
@@ -1,12 +1,7 @@
-import string
-import random
-
-from pytest import fixture
 from heksher import Setting, ThreadHeksherClient
 
 
-def generate_setting_name() -> str:
-    return "".join(random.choice(string.ascii_letters) for i in range(10))
+from utils import generate_setting_name
 
 
 def test_get_settings(app_client, heksher_client: ThreadHeksherClient):
diff --git a/backend/tests/blackbox/utils.py b/backend/tests/blackbox/utils.py
new file mode 100644
index 0000000..4f332a4
--- /dev/null
+++ b/backend/tests/blackbox/utils.py
@@ -0,0 +1,5 @@
+import string
+import random
+
+def generate_setting_name() -> str:
+    return "".join(random.choice(string.ascii_letters) for i in range(10))
\ No newline at end of file

From ff1af4d832e2a4a3e64d63b5ea687782509e0c18 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Thu, 18 Feb 2021 17:33:40 +0200
Subject: [PATCH 19/24] finish tests

---
 backend/hekshermgmt/api/v1/rules.py         |  3 +-
 backend/hekshermgmt/main.py                 |  2 +-
 backend/poetry.lock                         |  6 +-
 backend/tests/blackbox/conftest.py          | 10 ++--
 backend/tests/blackbox/test_rules_api.py    | 61 +++++++++++++--------
 backend/tests/blackbox/test_settings_api.py | 46 +++++++---------
 backend/tests/blackbox/utils.py             |  5 +-
 backend/tests/unittests/conftest.py         | 23 ++++++++
 backend/tests/unittests/test_rules.py       |  8 +++
 backend/tests/unittests/test_settings.py    |  8 +++
 10 files changed, 112 insertions(+), 60 deletions(-)
 create mode 100644 backend/tests/unittests/conftest.py
 create mode 100644 backend/tests/unittests/test_rules.py
 create mode 100644 backend/tests/unittests/test_settings.py

diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index 0324304..5721caa 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -4,7 +4,8 @@
 
 import httpx
 from fastapi import APIRouter
-from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
+from pydantic import (BaseModel, Field,  # pytype: disable=import-error
+                      validator)
 
 from hekshermgmt.api.v1.utils import application, httpx_error_to_response
 from hekshermgmt.app import HeksherManagement
diff --git a/backend/hekshermgmt/main.py b/backend/hekshermgmt/main.py
index 1ffe96d..aea5527 100644
--- a/backend/hekshermgmt/main.py
+++ b/backend/hekshermgmt/main.py
@@ -44,7 +44,7 @@ async def health_check():
     return {"version": __version__}
 
 
-def main():
+def main(): # pragma: no cover
     import uvicorn
 
     uvicorn.run(app, debug=True, host="0.0.0.0", port=8888)
diff --git a/backend/poetry.lock b/backend/poetry.lock
index 1fabfc1..1c78392 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -166,7 +166,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "heksher"
-version = "0.1.1"
+version = "0.1.2"
 description = ""
 category = "dev"
 optional = false
@@ -813,8 +813,8 @@ h11 = [
     {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"},
 ]
 heksher = [
-    {file = "heksher-0.1.1-py3-none-any.whl", hash = "sha256:486c86d4b1adc4fbf7892503822dc0902f735593f5aefd2c35e29c0d6dc86cca"},
-    {file = "heksher-0.1.1.tar.gz", hash = "sha256:9d6e94d96168d72bbcef9d0302a5d07d2d9129350ce1aa9d669a22998f961786"},
+    {file = "heksher-0.1.2-py3-none-any.whl", hash = "sha256:707db4c78dc7ddad76b2cccbaa21dbc5cacedfdffdae7f95ec045931a98db36f"},
+    {file = "heksher-0.1.2.tar.gz", hash = "sha256:709d0b5b082c5ae5a6249fd879075a57ffc0f47563db82891a616bf35e874e45"},
 ]
 httpcore = [
     {file = "httpcore-0.12.3-py3-none-any.whl", hash = "sha256:93e822cd16c32016b414b789aeff4e855d0ccbfc51df563ee34d4dbadbb3bcdc"},
diff --git a/backend/tests/blackbox/conftest.py b/backend/tests/blackbox/conftest.py
index 2605cd9..4d017b7 100644
--- a/backend/tests/blackbox/conftest.py
+++ b/backend/tests/blackbox/conftest.py
@@ -1,17 +1,17 @@
 from functools import partial
 from typing import Optional, Sequence
-import heksher
-from heksher.heksher_client import TemporaryClient
 
+import heksher
 import httpx
 from docker import DockerClient
+from heksher import ThreadHeksherClient
+from heksher.heksher_client import TemporaryClient
 from pytest import fixture
 from starlette.testclient import TestClient
-from yellowbox import SingleContainerService, connect, retry, temp_network
+from yellowbox import SingleContainerService, connect, temp_network
 from yellowbox.containers import create_and_pull, get_ports, killing
 from yellowbox.extras.postgresql import PostgreSQLService
 from yellowbox.retry import RetrySpec
-from heksher import ThreadHeksherClient
 
 from hekshermgmt.main import app
 
@@ -32,7 +32,7 @@ def __init__(
         super().__init__(
             create_and_pull(
                 docker_client,
-                "biocatchltd/heksher:0.2.0",
+                "biocatchltd/heksher:0.2.2",
                 detach=True,
                 publish_all_ports=True,
                 environment={
diff --git a/backend/tests/blackbox/test_rules_api.py b/backend/tests/blackbox/test_rules_api.py
index efa21d1..f949b35 100644
--- a/backend/tests/blackbox/test_rules_api.py
+++ b/backend/tests/blackbox/test_rules_api.py
@@ -1,5 +1,5 @@
-from heksher import Setting, ThreadHeksherClient, TRACK_ALL
-
+import time
+from heksher import TRACK_ALL, Setting, ThreadHeksherClient
 
 from utils import generate_setting_name
 
@@ -19,43 +19,58 @@ def test_rule_add_delete(app_client, heksher_client: ThreadHeksherClient):
     heksher_client.track_contexts(user=TRACK_ALL, theme=TRACK_ALL)
     heksher_client.reload()
 
-    rules = [{
-        'value': 30,
-        'feature_values': {'user': 'pita', 'theme': 'sabich'},
-        'setting': setting_name,
-        'information': 'funfun'
-    },
-    {
-        'value': 1,
-        'feature_values': {'user': 'pita', 'theme': 'iraqish'},
-        'setting': setting_name,
-        'information': 'funfun2'
-    }]
+    rules = [
+        {
+            "value": 30,
+            "feature_values": {"user": "pita", "theme": "sabich"},
+            "setting": setting_name,
+            "information": "funfun",
+        },
+        {
+            "value": 1,
+            "feature_values": {"user": "pita", "theme": "iraqish"},
+            "setting": setting_name,
+            "information": "funfun2",
+        },
+    ]
+
     def create_rule(rule) -> int:
         response = app_client.post("/api/v1/rule", json=rule)
         response.raise_for_status()
-        return response.json()['rule_id']
+        return response.json()["rule_id"]
 
     rule_ids = []
     for rule in rules:
         rule_ids.append(create_rule(rule))
 
     heksher_client.reload()
-    assert int_setting.get(user='pita', theme='sabich') == 30
-    assert int_setting.get(user='pita') == setting_default_value
-    assert int_setting.get(user='pita', theme='iraqish') == 1
+    assert int_setting.get(user="pita", theme="sabich") == 30
+    assert int_setting.get(user="pita", theme="fusion") == setting_default_value
+    assert int_setting.get(user="pita", theme="iraqish") == 1
 
     def delete_rule(rule_id):
         response = app_client.delete(f"/api/v1/rule/{rule_id}")
         response.raise_for_status()
 
-    for rule in rule_ids:
-        delete_rule()
+    for rule_id in rule_ids:
+        delete_rule(rule_id)
 
     heksher_client.reload()
 
-    assert int_setting.get(user='pita', theme='sabich') == setting_default_value
-    assert int_setting.get(user='pita') == setting_default_value
-    assert int_setting.get(user='pita', theme='iraqish') == setting_default_value
+    assert int_setting.get(user="pita", theme="sabich") == setting_default_value
+    assert int_setting.get(user="pita", theme="fusion") == setting_default_value
+    assert int_setting.get(user="pita", theme="iraqish") == setting_default_value
+
 
+def test_rule_delete_error(app_client):
+    response = app_client.delete("/api/v1/rule/30")
+    assert response.status_code == 404
 
+def test_rule_add_error(app_client):
+    response = app_client.post("/api/v1/rule", json={
+        "value": 1,
+        "feature_values": {"user": "pita"},
+        "setting": "idon'texist",
+        "information": "llll"
+    })
+    assert response.status_code == 422
\ No newline at end of file
diff --git a/backend/tests/blackbox/test_settings_api.py b/backend/tests/blackbox/test_settings_api.py
index 3a1e307..3b35016 100644
--- a/backend/tests/blackbox/test_settings_api.py
+++ b/backend/tests/blackbox/test_settings_api.py
@@ -1,6 +1,5 @@
 from heksher import Setting, ThreadHeksherClient
 
-
 from utils import generate_setting_name
 
 
@@ -51,7 +50,6 @@ def test_get_settings(app_client, heksher_client: ThreadHeksherClient):
     } in result
 
 
-
 def test_get_settings_rules(app_client, heksher_client: ThreadHeksherClient):
     setting_name = generate_setting_name()
     setting_description = "me control cake temp"
@@ -67,26 +65,28 @@ def test_get_settings_rules(app_client, heksher_client: ThreadHeksherClient):
 
     heksher_client.reload()
 
-    rules = [{
-        'value': 30,
-        'feature_values': {'user': 'pita', 'theme': 'sabich'},
-        'setting': setting_name,
-        'information': 'funfun'
-    },
-    {
-        'value': 1,
-        'feature_values': {'user': 'pita', 'theme': 'iraqish'},
-        'setting': setting_name,
-        'information': 'funfun2'
-    }]
+    rules = [
+        {
+            "value": 30,
+            "feature_values": {"user": "pita", "theme": "sabich"},
+            "setting": setting_name,
+            "information": "funfun",
+        },
+        {
+            "value": 1,
+            "feature_values": {"user": "pita", "theme": "iraqish"},
+            "setting": setting_name,
+            "information": "funfun2",
+        },
+    ]
+
     def create_rule(rule) -> int:
         response = app_client.post("/api/v1/rule", json=rule)
         response.raise_for_status()
-        return response.json()['rule_id']
+        return response.json()["rule_id"]
 
     for rule in rules:
-        rule['rule_id'] = create_rule(rule)
-
+        rule["rule_id"] = create_rule(rule)
 
     response = app_client.get(f"/api/v1/settings/{setting_name}/rules")
     result_rules = response.json()
@@ -94,15 +94,11 @@ def create_rule(rule) -> int:
 
     # Align input data to the expected result data.
     for rule in rules:
-        rule.pop('setting')
-        rule['context_features'] = rule.pop('feature_values')
+        rule.pop("setting")
+        rule["context_features"] = rule.pop("feature_values")
     # Assert data generated by server, and remove it for easier comparison.
     for rule in result_rules:
-        assert rule.pop('date')
-        assert rule.pop('added_by') == user
-
+        assert rule.pop("date")
+        assert rule.pop("added_by") == user
 
     assert result_rules == rules
-
-
-
diff --git a/backend/tests/blackbox/utils.py b/backend/tests/blackbox/utils.py
index 4f332a4..d347e1f 100644
--- a/backend/tests/blackbox/utils.py
+++ b/backend/tests/blackbox/utils.py
@@ -1,5 +1,6 @@
-import string
 import random
+import string
+
 
 def generate_setting_name() -> str:
-    return "".join(random.choice(string.ascii_letters) for i in range(10))
\ No newline at end of file
+    return "".join(random.choice(string.ascii_letters) for i in range(10))
diff --git a/backend/tests/unittests/conftest.py b/backend/tests/unittests/conftest.py
new file mode 100644
index 0000000..aa62f13
--- /dev/null
+++ b/backend/tests/unittests/conftest.py
@@ -0,0 +1,23 @@
+from unittest.mock import AsyncMock, patch
+
+from pytest import fixture
+from starlette.testclient import TestClient
+
+from hekshermgmt.main import app
+
+
+@fixture
+def heksher_client_mock():
+    return AsyncMock()
+
+
+@fixture
+def app_client(monkeypatch, heksher_client_mock):
+    monkeypatch.setenv('HEKSHER_DB_CONNECTION_STRING', 'dummy')
+    monkeypatch.setenv('HEKSHER_STARTUP_CONTEXT_FEATURES', '["A","B","C"]')
+
+    with patch("hekshermgmt.app.HeksherClient") as heksher_class_mock:
+        heksher_class_mock.from_env.return_value = heksher_client_mock
+        with TestClient(app) as app_client:
+            app_client.headers["X-FORWARDED-EMAIL"] = "eyal@shani.pita"
+            yield app_client
\ No newline at end of file
diff --git a/backend/tests/unittests/test_rules.py b/backend/tests/unittests/test_rules.py
new file mode 100644
index 0000000..bca056a
--- /dev/null
+++ b/backend/tests/unittests/test_rules.py
@@ -0,0 +1,8 @@
+def test_rule_add_failure(app_client):
+    response = app_client.post("/api/v1/rule", json={
+            "value": 1,
+            "feature_values": {},
+            "setting": "dummy",
+            "information": "funfun2",
+        })
+    assert response.status_code == 422
\ No newline at end of file
diff --git a/backend/tests/unittests/test_settings.py b/backend/tests/unittests/test_settings.py
new file mode 100644
index 0000000..8dc57ce
--- /dev/null
+++ b/backend/tests/unittests/test_settings.py
@@ -0,0 +1,8 @@
+from httpx import HTTPStatusError, Response, Request
+
+def test_rule_add_failure(app_client, heksher_client_mock):
+    heksher_client_mock.get_settings.side_effect = HTTPStatusError("?", request= Request("get", ".."),
+    response=Response(455, content="??"))
+    response = app_client.get("/api/v1/settings")
+    assert response.status_code == 455
+    assert response.content == b"??"
\ No newline at end of file

From a90cd78121d4eed380741eee2727b69d20ca8da5 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 22 Feb 2021 09:31:46 +0200
Subject: [PATCH 20/24] add gh actions

---
 .github/workflows/pull-requests.yml | 49 +++++++++++++++++++++++++++++
 .github/workflows/release-final.yml | 37 ++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 .github/workflows/pull-requests.yml
 create mode 100644 .github/workflows/release-final.yml

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
new file mode 100644
index 0000000..5950659
--- /dev/null
+++ b/.github/workflows/pull-requests.yml
@@ -0,0 +1,49 @@
+name: Blackbox Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  backend-lint-and-tests:
+    defaults:
+      run:
+        working-directory: backend
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Setup cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pypoetry
+        key: ${{ runner.os }}-pip
+    - name: Install poetry
+      run: pip install poetry
+    - name: Install dependencies
+      run: poetry install
+    - name: setup-docker
+      uses: docker-practice/actions-setup-docker@0.0.1
+    - name: Linting backend
+      run: poetry run sh scripts/lint.sh
+    - name: Run unittests
+      run: poetry run sh scripts/unittest.sh
+    - name: Run blackbox tests
+      run: poetry run sh scripts/blackbox_test.sh
+  frontend-lint:
+    defaults:
+      run:
+        working-directory: frontend
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        node-version: '12'
+    - run: npm install
+    - run: npm lint
\ No newline at end of file
diff --git a/.github/workflows/release-final.yml b/.github/workflows/release-final.yml
new file mode 100644
index 0000000..8d41855
--- /dev/null
+++ b/.github/workflows/release-final.yml
@@ -0,0 +1,37 @@
+name: Release
+on:
+  push:
+    tags:
+      - '*.*.*'
+
+
+jobs:
+  verify_version:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Version verification
+      working-directory: backend
+      run: |
+        python -m pip install --upgrade pip
+        pip install --pre poetry
+        [ $(cut -d' ' -f2 <<< $(poetry version)) == ${GITHUB_REF#refs/tags/} ]
+
+  build_release:
+    needs: [verify_version]
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        repository: biocatchltd/hekshermgmt
+        tag_with_ref: true
\ No newline at end of file

From c4dce3c005d0df64e72b40b805cc50385d374efa Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 22 Feb 2021 09:31:56 +0200
Subject: [PATCH 21/24] document && lint tests

---
 backend/tests/unittests/test_settings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/tests/unittests/test_settings.py b/backend/tests/unittests/test_settings.py
index 8dc57ce..252688e 100644
--- a/backend/tests/unittests/test_settings.py
+++ b/backend/tests/unittests/test_settings.py
@@ -1,8 +1,11 @@
 from httpx import HTTPStatusError, Response, Request
 
 def test_rule_add_failure(app_client, heksher_client_mock):
+    """
+    Test that response from upstream is returned to client as expected.
+    """
     heksher_client_mock.get_settings.side_effect = HTTPStatusError("?", request= Request("get", ".."),
-    response=Response(455, content="??"))
+    response = Response(455, content="??"))
     response = app_client.get("/api/v1/settings")
     assert response.status_code == 455
     assert response.content == b"??"
\ No newline at end of file

From 3059541095c951d3a163fc122871634ca20b209e Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 22 Feb 2021 09:34:04 +0200
Subject: [PATCH 22/24] gh action fix npm run lint

---
 .github/workflows/pull-requests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index 5950659..8e4a004 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -46,4 +46,4 @@ jobs:
       with:
         node-version: '12'
     - run: npm install
-    - run: npm lint
\ No newline at end of file
+    - run: npm run lint
\ No newline at end of file

From 3032385ab80a7f593af7bf2aafcc96b58b288e3a Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 22 Feb 2021 10:10:09 +0200
Subject: [PATCH 23/24] formatting

---
 backend/hekshermgmt/api/v1/rules.py      |  3 +--
 backend/hekshermgmt/main.py              |  2 +-
 backend/tests/blackbox/test_rules_api.py | 18 +++++++++++-------
 backend/tests/unittests/conftest.py      |  6 +++---
 backend/tests/unittests/test_rules.py    |  9 ++++++---
 backend/tests/unittests/test_settings.py |  8 +++++---
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/backend/hekshermgmt/api/v1/rules.py b/backend/hekshermgmt/api/v1/rules.py
index 5721caa..0324304 100644
--- a/backend/hekshermgmt/api/v1/rules.py
+++ b/backend/hekshermgmt/api/v1/rules.py
@@ -4,8 +4,7 @@
 
 import httpx
 from fastapi import APIRouter
-from pydantic import (BaseModel, Field,  # pytype: disable=import-error
-                      validator)
+from pydantic import BaseModel, Field, validator  # pytype: disable=import-error
 
 from hekshermgmt.api.v1.utils import application, httpx_error_to_response
 from hekshermgmt.app import HeksherManagement
diff --git a/backend/hekshermgmt/main.py b/backend/hekshermgmt/main.py
index aea5527..547a852 100644
--- a/backend/hekshermgmt/main.py
+++ b/backend/hekshermgmt/main.py
@@ -44,7 +44,7 @@ async def health_check():
     return {"version": __version__}
 
 
-def main(): # pragma: no cover
+def main():  # pragma: no cover
     import uvicorn
 
     uvicorn.run(app, debug=True, host="0.0.0.0", port=8888)
diff --git a/backend/tests/blackbox/test_rules_api.py b/backend/tests/blackbox/test_rules_api.py
index f949b35..ee298e6 100644
--- a/backend/tests/blackbox/test_rules_api.py
+++ b/backend/tests/blackbox/test_rules_api.py
@@ -66,11 +66,15 @@ def test_rule_delete_error(app_client):
     response = app_client.delete("/api/v1/rule/30")
     assert response.status_code == 404
 
+
 def test_rule_add_error(app_client):
-    response = app_client.post("/api/v1/rule", json={
-        "value": 1,
-        "feature_values": {"user": "pita"},
-        "setting": "idon'texist",
-        "information": "llll"
-    })
-    assert response.status_code == 422
\ No newline at end of file
+    response = app_client.post(
+        "/api/v1/rule",
+        json={
+            "value": 1,
+            "feature_values": {"user": "pita"},
+            "setting": "idon'texist",
+            "information": "llll",
+        },
+    )
+    assert response.status_code == 422
diff --git a/backend/tests/unittests/conftest.py b/backend/tests/unittests/conftest.py
index aa62f13..17b97cb 100644
--- a/backend/tests/unittests/conftest.py
+++ b/backend/tests/unittests/conftest.py
@@ -13,11 +13,11 @@ def heksher_client_mock():
 
 @fixture
 def app_client(monkeypatch, heksher_client_mock):
-    monkeypatch.setenv('HEKSHER_DB_CONNECTION_STRING', 'dummy')
-    monkeypatch.setenv('HEKSHER_STARTUP_CONTEXT_FEATURES', '["A","B","C"]')
+    monkeypatch.setenv("HEKSHER_DB_CONNECTION_STRING", "dummy")
+    monkeypatch.setenv("HEKSHER_STARTUP_CONTEXT_FEATURES", '["A","B","C"]')
 
     with patch("hekshermgmt.app.HeksherClient") as heksher_class_mock:
         heksher_class_mock.from_env.return_value = heksher_client_mock
         with TestClient(app) as app_client:
             app_client.headers["X-FORWARDED-EMAIL"] = "eyal@shani.pita"
-            yield app_client
\ No newline at end of file
+            yield app_client
diff --git a/backend/tests/unittests/test_rules.py b/backend/tests/unittests/test_rules.py
index bca056a..2bd8efd 100644
--- a/backend/tests/unittests/test_rules.py
+++ b/backend/tests/unittests/test_rules.py
@@ -1,8 +1,11 @@
 def test_rule_add_failure(app_client):
-    response = app_client.post("/api/v1/rule", json={
+    response = app_client.post(
+        "/api/v1/rule",
+        json={
             "value": 1,
             "feature_values": {},
             "setting": "dummy",
             "information": "funfun2",
-        })
-    assert response.status_code == 422
\ No newline at end of file
+        },
+    )
+    assert response.status_code == 422
diff --git a/backend/tests/unittests/test_settings.py b/backend/tests/unittests/test_settings.py
index 252688e..96b7351 100644
--- a/backend/tests/unittests/test_settings.py
+++ b/backend/tests/unittests/test_settings.py
@@ -1,11 +1,13 @@
 from httpx import HTTPStatusError, Response, Request
 
+
 def test_rule_add_failure(app_client, heksher_client_mock):
     """
     Test that response from upstream is returned to client as expected.
     """
-    heksher_client_mock.get_settings.side_effect = HTTPStatusError("?", request= Request("get", ".."),
-    response = Response(455, content="??"))
+    heksher_client_mock.get_settings.side_effect = HTTPStatusError(
+        "?", request=Request("get", ".."), response=Response(455, content="??")
+    )
     response = app_client.get("/api/v1/settings")
     assert response.status_code == 455
-    assert response.content == b"??"
\ No newline at end of file
+    assert response.content == b"??"

From 69822737ccb57da63e4de9b59b39a50851493a47 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram.hassan@biocatch.com>
Date: Mon, 22 Feb 2021 11:06:30 +0200
Subject: [PATCH 24/24] linting...

---
 backend/tests/blackbox/test_rules_api.py    | 1 -
 backend/tests/blackbox/test_settings_api.py | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/tests/blackbox/test_rules_api.py b/backend/tests/blackbox/test_rules_api.py
index ee298e6..093c5d9 100644
--- a/backend/tests/blackbox/test_rules_api.py
+++ b/backend/tests/blackbox/test_rules_api.py
@@ -1,4 +1,3 @@
-import time
 from heksher import TRACK_ALL, Setting, ThreadHeksherClient
 
 from utils import generate_setting_name
diff --git a/backend/tests/blackbox/test_settings_api.py b/backend/tests/blackbox/test_settings_api.py
index 3b35016..1d70cf8 100644
--- a/backend/tests/blackbox/test_settings_api.py
+++ b/backend/tests/blackbox/test_settings_api.py
@@ -13,14 +13,14 @@ def test_get_settings(app_client, heksher_client: ThreadHeksherClient):
     setting_default_value_str = "just dance, gonna be alright!"
     setting_features_str = ["user", "theme"]
 
-    int_setting = Setting(
+    Setting(
         setting_name_int,
         int,
         setting_features_int,
         setting_default_value_int,
         metadata={"description": setting_description_int},
     )
-    str_setting = Setting(
+    Setting(
         setting_name_str,
         str,
         setting_features_str,
@@ -55,7 +55,7 @@ def test_get_settings_rules(app_client, heksher_client: ThreadHeksherClient):
     setting_description = "me control cake temp"
     setting_default_value = 5
     setting_features = ["user", "theme"]
-    int_setting = Setting(
+    Setting(
         setting_name,
         int,
         setting_features,