Cloud Sync

.github/workflows/build_backend.yml

@@ -8,7 +8,11 @@ on: push
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: coderbot/coderbot-ci:3.9-bullseye-slim
+    container: 
+      image: ghcr.io/coderbotorg/coderbot-ci:stub-latest
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GHCR_READ }}
     steps:
     - uses: actions/checkout@v3 # Checking out the repo
     - run: pip install -r docker/stub/requirements.txt
@@ -21,13 +25,16 @@ jobs:
         echo "test complete" 
     - run: |
         export PYTHONPATH=./stub:./coderbot:./test
+        export CODERBOT_CLOUD_API_ENDPOINT=http://localhost:5000
         python3 coderbot/main.py > coderbot.log &
-        sleep 30
+        sleep 60
+        cat coderbot.log
+        curl http://localhost:5000/api/v1/openapi.json
         apt-get install -y python3-venv
         mkdir -p schemathesis
         python3 -m venv schemathesis
         . schemathesis/bin/activate
-        pip install schemathesis 
+        pip install schemathesis==3.24.3
         st run --endpoint 'activities' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json
         #st run --endpoint 'media' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json
         st run --endpoint 'control/speak' --hypothesis-max-examples=10 --request-timeout=20 http://localhost:5000/api/v1/openapi.json

coderbot/activity.py

@@ -1,6 +1,16 @@
+import logging
+import uuid
 from tinydb import TinyDB, Query
 from threading import Lock
+from datetime import datetime
 # Programs and Activities databases
+
+ACTIVITY_STATUS_DELETED = "deleted"
+ACTIVITY_STATUS_ACTIVE = "active"
+ACTIVITY_KIND_STOCK = "stock"
+ACTIVITY_KIND_USER = "user"
+
+
 class Activities():
     _instance = None
 
@@ -14,11 +24,16 @@ def __init__(self):
         self.activities = TinyDB("data/activities.json")
         self.query = Query()
         self.lock = Lock()
+        self.permanentlyRemoveDeletedActivities()
 
-    def load(self, name, default):
+    def load(self, id, default, active_only=True):
         with self.lock: 
-            if name and default is None:
-                activities = self.activities.search(self.query.name == name)
+            if id and default is None:
+                activities = []
+                if active_only:
+                    activities = self.activities.search((self.query.id == id) & (self.query.status == ACTIVITY_STATUS_ACTIVE))
+                else:
+                    activities = self.activities.search(self.query.id == id)
                 if len(activities) > 0:
                     return activities[0]
             elif default is not None:
@@ -27,25 +42,45 @@ def load(self, name, default):
                 return None
             return None
 
-    def save(self, name, activity):
+    def save(self, activity):
+        if activity.get("id") is None:
+            activity["id"] = str(uuid.uuid4())
         with self.lock: 
             # if saved activity is "default", reset existing default activity to "non-default"
             if activity.get("default", False) is True:
                 self.activities.update({'default': False})
-            if self.activities.search(self.query.name == name) == []:
+            if self.activities.search(self.query.id == activity.get("id")) == []:
                 self.activities.insert(activity)
             else:
-                self.activities.update(activity, self.query.name == activity["name"])
+                self.activities.update(activity, self.query.id == activity.get("id"))
+        activity = self.activities.search(self.query.id == activity.get("id"))[0]
+        logging.info("updating/creating activity - id: %s, name: %s", str(activity.get("id")), str(activity.get("name")))
+        return activity
 
-    def delete(self, name):
+    def delete(self, id, logical = True):
         with self.lock: 
-            activities = self.activities.search(self.query.name == name)
+            activities = self.activities.search(self.query.id == id)
             if len(activities) > 0:
                 activity = activities[0]
                 if activity.get("default", False) is True:
-                    self.activities.update({'default': True}, self.query.stock == True)
-                self.activities.remove(self.query.name == activity["name"])
+                    self.activities.update({'default': True}, self.query.kind == ACTIVITY_KIND_STOCK)
+                if logical:
+                    activity["status"] = ACTIVITY_STATUS_DELETED
+                    activity["modified"] = datetime.now().isoformat()
+                    self.activities.update(activity, self.query.id == id)
+                else:
+                    self.activities.remove(self.query.id == id)
 
-    def list(self):
+    def permanentlyRemoveDeletedActivities(self):
+        for a in self.list(active_only=False):
+            logging.info("checking: " + a["id"])
+            if a["status"] == ACTIVITY_STATUS_DELETED:
+                logging.info("deleting: " + a["name"])
+                self.delete(a["id"], logical=False)
+
+    def list(self, active_only = True):
         with self.lock: 
-            return self.activities.all()
+            if active_only:
+                return self.activities.search(self.query.status == ACTIVITY_STATUS_ACTIVE)
+            else:
+                return self.activities.all()