#219 Optimizations for Upload (2)

Add option "only_upload_when_not_measuring"
tum-esm · May 16, 2024 · 9c592fd · 9c592fd
1 parent 3fd3f14
commit 9c592fd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/packages/core/threads/upload_thread.py b/packages/core/threads/upload_thread.py
@@ -44,10 +44,11 @@ def should_be_running(config: types.Config) -> bool:
             UploadThread.last_measurement_time = datetime.datetime.now()
 
         # don't upload if system has been measuring in the last 10 minutes
-        if UploadThread.last_measurement_time is not None:
-            if ((datetime.datetime.now() -
-                 UploadThread.last_measurement_time).total_seconds() < 600):
-                return False
+        if config.upload.only_upload_when_not_measuring:
+            if UploadThread.last_measurement_time is not None:
+                if ((datetime.datetime.now() -
+                    UploadThread.last_measurement_time).total_seconds() < 600):
+                    return False
 
         return True
 

diff --git a/packages/core/types/config.py b/packages/core/types/config.py
@@ -242,6 +242,7 @@ class UploadConfig(StricterBaseModel):
     user: str
     password: str
     only_upload_at_night: bool
+    only_upload_when_not_measuring: bool
     streams: list[UploadStreamConfig]
 
 
@@ -252,6 +253,7 @@ class PartialUploadConfig(StricterBaseModel):
     user: Optional[str] = None
     password: Optional[str] = None
     only_upload_at_night: Optional[bool] = None
+    only_upload_when_not_measuring: Optional[bool] = None
     streams: Optional[list[UploadStreamConfig]] = None
 
 

diff --git a/packages/ui/src/components/configuration/sections/config-section-upload.tsx b/packages/ui/src/components/configuration/sections/config-section-upload.tsx
@@ -138,6 +138,12 @@ export default function ConfigSectionUpload() {
                 setValue={(v: string) => setLocalConfigItem('upload.password', v)}
                 oldValue={centralSectionConfig !== null ? centralSectionConfig.password : 'null'}
             />
+            <configurationComponents.ConfigElementLine />
+            <configurationComponents.ConfigElementNote>
+                The upload only uploads data after the day of recording, so it works during active
+                measurements. However, you can use the following two options to reduce the load on
+                the PC during measurements.
+            </configurationComponents.ConfigElementNote>
             <configurationComponents.ConfigElementBooleanToggle
                 title="Only Upload At Night"
                 value={localSectionConfig.only_upload_at_night}
@@ -149,6 +155,17 @@ export default function ConfigSectionUpload() {
             <configurationComponents.ConfigElementNote>
                 At night = below 0° sun elevation
             </configurationComponents.ConfigElementNote>
+            <configurationComponents.ConfigElementBooleanToggle
+                title="Only Upload When Not Measuring"
+                value={localSectionConfig.only_upload_when_not_measuring}
+                setValue={(v: boolean) => setLocalConfigItem(`upload.only_upload_when_not_measuring`, v)}
+                oldValue={
+                    centralSectionConfig !== null ? centralSectionConfig.only_upload_when_not_measuring : null
+                }
+            />
+            <configurationComponents.ConfigElementNote>
+                Stops upload immediately 
+            </configurationComponents.ConfigElementNote>
             <configurationComponents.ConfigElementLine />
             {localSectionConfig.streams.map((stream, index) => (
                 <Fragment key={`${index}`}>

diff --git a/packages/ui/src/utils/zustand-utils/config-zustand.ts b/packages/ui/src/utils/zustand-utils/config-zustand.ts
@@ -87,6 +87,7 @@ export const configSchema = z.object({
             user: z.string(),
             password: z.string(),
             only_upload_at_night: z.boolean(),
+            only_upload_when_not_measuring: z.boolean(),
             streams: z.array(
                 z.object({
                     is_active: z.boolean(),