Use jobs file to transfer data between threads

selfprivacy_api/graphql/common_types/service.py

@@ -33,6 +33,7 @@ class StorageVolume:
     model: typing.Optional[str]
     serial: typing.Optional[str]
     type: str
+
     @strawberry.field
     def usages(self) -> list["StorageUsageInterface"]:
         """Get usages of a volume"""
@@ -92,11 +93,13 @@ class Service:
     status: ServiceStatusEnum
     url: typing.Optional[str]
     dns_records: typing.Optional[typing.List[DnsRecord]]
+
     @strawberry.field
     def storage_usage(self) -> ServiceStorageUsage:
         """Get storage usage for a service"""
         return get_storage_usage(self)
 
+
 def service_to_graphql_service(service: ServiceInterface) -> Service:
     """Convert service to graphql service"""
     return Service(

selfprivacy_api/jobs/__init__.py

@@ -16,6 +16,7 @@ A job is a dictionary with the following keys:
 """
 import typing
 import datetime
+from uuid import UUID
 import asyncio
 import json
 import os
@@ -23,6 +24,10 @@ import time
 import uuid
 from enum import Enum
 
+from pydantic import BaseModel
+
+from selfprivacy_api.utils import ReadUserData, UserDataFiles, WriteUserData
+
 
 class JobStatus(Enum):
     """
@@ -35,47 +40,22 @@ class JobStatus(Enum):
     ERROR = "ERROR"
 
 
-class Job:
+class Job(BaseModel):
     """
     Job class.
     """
 
-    def __init__(
+    uid: UUID = uuid.uuid4()
-        self,
+    name: str
-        name: str,
+    description: str
-        description: str,
+    status: JobStatus
-        status: JobStatus,
+    status_text: typing.Optional[str]
-        status_text: typing.Optional[str],
+    progress: typing.Optional[int]
-        progress: typing.Optional[int],
+    created_at: datetime.datetime
-        created_at: datetime.datetime,
+    updated_at: datetime.datetime
-        updated_at: datetime.datetime,
+    finished_at: typing.Optional[datetime.datetime]
-        finished_at: typing.Optional[datetime.datetime],
+    error: typing.Optional[str]
-        error: typing.Optional[str],
+    result: typing.Optional[str]
-        result: typing.Optional[str],
-    ):
-        self.id = str(uuid.uuid4())
-        self.name = name
-        self.description = description
-        self.status = status
-        self.status_text = status_text or ""
-        self.progress = progress or 0
-        self.created_at = created_at
-        self.updated_at = updated_at
-        self.finished_at = finished_at
-        self.error = error
-        self.result = result
-
-    def __str__(self) -> str:
-        """
-        Convert the job to a string.
-        """
-        return f"{self.name} - {self.status}"
-
-    def __repr__(self) -> str:
-        """
-        Convert the job to a string.
-        """
-        return f"{self.name} - {self.status}"
 
 
 class Jobs:
@@ -95,7 +75,6 @@ class Jobs:
             if Jobs.__instance is None:
                 raise Exception("Couldn't init Jobs singleton!")
             return Jobs.__instance
-        else:
         return Jobs.__instance
 
     def __init__(self):
@@ -106,43 +85,13 @@ class Jobs:
             raise Exception("This class is a singleton!")
         else:
             Jobs.__instance = self
-        self.jobs = [
-            Job(
-                name="Init job",
-                description="Initial job",
-                status=JobStatus.FINISHED,
-                status_text="",
-                progress=100,
-                created_at=datetime.datetime.now(),
-                updated_at=datetime.datetime.now(),
-                finished_at=datetime.datetime.now(),
-                error=None,
-                result=None,
-            )
-        ]
-        # Observers of the jobs list.
-        self.observers = []
 
-    def add_observer(self, observer: typing.Callable[[typing.List[Job]], None]) -> None:
+    def reset(self) -> None:
         """
-        Add an observer to the jobs list.
+        Reset the jobs list.
         """
-        self.observers.append(observer)
+        with WriteUserData(UserDataFiles.JOBS) as user_data:
-
+            user_data = []
-    def remove_observer(
-        self, observer: typing.Callable[[typing.List[Job]], None]
-    ) -> None:
-        """
-        Remove an observer from the jobs list.
-        """
-        self.observers.remove(observer)
-
-    def _notify_observers(self) -> None:
-        """
-        Notify the observers of the jobs list.
-        """
-        for observer in self.observers:
-            observer(self.jobs)
 
     def add(
         self,
@@ -167,19 +116,20 @@ class Jobs:
             error=None,
             result=None,
         )
-        self.jobs.append(job)
+        with WriteUserData(UserDataFiles.JOBS) as user_data:
-        # Notify the observers.
+            try:
-        self._notify_observers()
+                user_data.append(job.dict())
-
+            except json.decoder.JSONDecodeError:
+                user_data = []
+                user_data.append(job.dict())
         return job
 
     def remove(self, job: Job) -> None:
         """
         Remove a job from the jobs list.
         """
-        self.jobs.remove(job)
+        with WriteUserData(UserDataFiles.JOBS) as user_data:
-        # Notify the observers.
+            user_data = [x for x in user_data if x["uid"] != job.uid]
-        self._notify_observers()
 
     def update(
         self,
@@ -207,11 +157,12 @@ class Jobs:
         job.updated_at = datetime.datetime.now()
         job.error = error
         job.result = result
-        if status == JobStatus.FINISHED or status == JobStatus.ERROR:
+        if status in (JobStatus.FINISHED, JobStatus.ERROR):
             job.finished_at = datetime.datetime.now()
 
-        # Notify the observers.
+        with WriteUserData(UserDataFiles.JOBS) as user_data:
-        self._notify_observers()
+            user_data = [x for x in user_data if x["uid"] != job.uid]
+            user_data.append(job.dict())
 
         return job
 
@@ -219,13 +170,18 @@ class Jobs:
         """
         Get a job from the jobs list.
         """
-        for job in self.jobs:
+        with ReadUserData(UserDataFiles.JOBS) as user_data:
-            if job.id == id:
+            for job in user_data:
-                return job
+                if job["uid"] == id:
+                    return Job(**job)
         return None
 
     def get_jobs(self) -> typing.List[Job]:
         """
         Get the jobs list.
         """
-        return self.jobs
+        with ReadUserData(UserDataFiles.JOBS) as user_data:
+            try:
+                return [Job(**job) for job in user_data]
+            except json.decoder.JSONDecodeError:
+                return []

selfprivacy_api/utils/__init__.py

@@ -10,6 +10,7 @@ import portalocker
 
 USERDATA_FILE = "/etc/nixos/userdata/userdata.json"
 TOKENS_FILE = "/etc/nixos/userdata/tokens.json"
+JOBS_FILE = "/etc/nixos/userdata/jobs.json"
 DOMAIN_FILE = "/var/domain"
 
 
@@ -18,6 +19,7 @@ class UserDataFiles(Enum):
 
     USERDATA = 0
     TOKENS = 1
+    JOBS = 2
 
 
 def get_domain():
@@ -35,6 +37,12 @@ class WriteUserData(object):
             self.userdata_file = open(USERDATA_FILE, "r+", encoding="utf-8")
         elif file_type == UserDataFiles.TOKENS:
             self.userdata_file = open(TOKENS_FILE, "r+", encoding="utf-8")
+        elif file_type == UserDataFiles.JOBS:
+            # Make sure file exists
+            if not os.path.isfile(JOBS_FILE):
+                with open(JOBS_FILE, "w", encoding="utf-8") as jobs_file:
+                    jobs_file.write("[]")
+            self.userdata_file = open(JOBS_FILE, "r+", encoding="utf-8")
         else:
             raise ValueError("Unknown file type")
         portalocker.lock(self.userdata_file, portalocker.LOCK_EX)
@@ -60,6 +68,8 @@ class ReadUserData(object):
             self.userdata_file = open(USERDATA_FILE, "r", encoding="utf-8")
         elif file_type == UserDataFiles.TOKENS:
             self.userdata_file = open(TOKENS_FILE, "r", encoding="utf-8")
+        elif file_type == UserDataFiles.JOBS:
+            self.userdata_file = open(JOBS_FILE, "r", encoding="utf-8")
         else:
             raise ValueError("Unknown file type")
         portalocker.lock(self.userdata_file, portalocker.LOCK_SH)