Update demo (#9)

* update skyportal and kowalski

* update K and SP

doc/data/filter_examples/fritz_filter_01.json

@@ -0,0 +1,84 @@
+[
+  {
+    "$project": {
+      "cutoutScience": 0,
+      "cutoutTemplate": 0,
+      "cutoutDifference": 0
+    }
+  },
+  {
+    "$lookup": {
+      "from": "ZTF_alerts_aux",
+      "localField": "objectId",
+      "foreignField": "_id",
+      "as": "aux"
+    }
+  },
+  {
+    "$replaceRoot": {
+      "newRoot": {
+        "$mergeObjects": [
+          {
+            "$arrayElemAt": [
+              "$aux",
+              0
+            ]
+          },
+          "$$ROOT"
+        ]
+      }
+    }
+  },
+  {
+    "$project": {
+      "cross_matches": 1,
+      "prv_candidates": {
+        "$filter": {
+          "input": "$prv_candidates",
+          "as": "item",
+          "cond": {
+            "$in": [
+              "$$item.programid",
+              [
+                1
+              ]
+            ]
+          }
+        }
+      },
+      "schemavsn": 1,
+      "publisher": 1,
+      "objectId": 1,
+      "candid": 1,
+      "candidate": 1,
+      "classifications": 1,
+      "coordinates": 1
+    }
+  },
+  {
+    "$match": {
+      "candidate.drb": {
+        "$gt": 0.9999999
+      },
+      "cross_matches.CLU_20190625.0": {
+        "$exists": false
+      }
+    }
+  },
+  {
+    "$addFields": {
+      "annotations.author": "dd",
+      "annotations.mean_rb": {
+        "$avg": "$prv_candidates.rb"
+      }
+    }
+  },
+  {
+    "$project": {
+      "_id": 0,
+      "candid": 1,
+      "objectId": 1,
+      "annotations": 1
+    }
+  }
+]

doc/data/filter_examples/fritz_filter_02.json

@@ -0,0 +1,79 @@
+[
+  {
+    "$project": {
+      "cutoutScience": 0,
+      "cutoutTemplate": 0,
+      "cutoutDifference": 0
+    }
+  },
+  {
+    "$lookup": {
+      "from": "ZTF_alerts_aux",
+      "localField": "objectId",
+      "foreignField": "_id",
+      "as": "aux"
+    }
+  },
+  {
+    "$project": {
+      "cross_matches": {
+        "$arrayElemAt": [
+          "$aux.cross_matches",
+          0
+        ]
+      },
+      "prv_candidates": {
+        "$filter": {
+          "input": {
+            "$arrayElemAt": [
+              "$aux.prv_candidates",
+              0
+            ]
+          },
+          "as": "item",
+          "cond": {
+            "$in": [
+              "$$item.programid",
+              [
+                1
+              ]
+            ]
+          }
+        }
+      },
+      "schemavsn": 1,
+      "publisher": 1,
+      "objectId": 1,
+      "candid": 1,
+      "candidate": 1,
+      "classifications": 1,
+      "coordinates": 1
+    }
+  },
+  {
+    "$match": {
+      "candidate.drb": {
+        "$gt": 0.9999999
+      },
+      "cross_matches.CLU_20190625.0": {
+        "$exists": false
+      }
+    }
+  },
+  {
+    "$addFields": {
+      "annotations.author": "dd",
+      "annotations.mean_rb": {
+        "$avg": "$prv_candidates.rb"
+      }
+    }
+  },
+  {
+    "$project": {
+      "_id": 0,
+      "candid": 1,
+      "objectId": 1,
+      "annotations": 1
+    }
+  }
+]

fritz

@@ -57,7 +57,7 @@ def generate_skyportal_token():
          """from skyportal.models import init_db; """
          """from skyportal.model_util import create_token; """
          """conn = init_db(**load_config(['config.yaml'])['database']); """
-         """print(create_token(['Upload data', 'Manage sources'], 1, 'kowalski'))" """
+         """print(create_token(['Upload data', 'Manage sources', 'Manage groups'], 1, 'kowalski'))" """
          ],
         cwd="skyportal",
         capture_output=True,
@@ -90,7 +90,7 @@ def check_config(cfg='fritz.defaults.yaml', yes=False):
         user_id=config['kowalski']['server']['admin_username'],
         jwt_secret=config['kowalski']['server']['JWT_SECRET_KEY'],
     )
-    config['app']['kowalski_token'] = kowalski_token
+    config['app']['kowalski']['token'] = kowalski_token
 
     with open(c, 'w') as cyaml:
         yaml.dump(config, cyaml)  # default_flow_style=False

fritz.defaults.yaml

@@ -28,7 +28,11 @@ app:
     - path: "/user/:id"
       component: UserInfo
 
-  kowalski_token:
+  kowalski:
+    protocol: "http"
+    host: "kowalski_api_1"
+    port: 4000
+    token:
 
 database:
   database: skyportal
@@ -54,6 +58,14 @@ server:
 services:
   dask: False
 
+misc:
+  days_to_keep_unsaved_candidates: 7
+
+cron:
+  - interval: 1440
+    script: jobs/delete_unsaved_candidates.py
+    limit: ["01:00", "02:00"]
+
 
 kowalski:
   server: