Integration of 4.1.0

.github/workflows/test-python-codebase-on-main.yml

@@ -1,75 +1,72 @@
-name: 'test-python-codebase-on-main'
+name: "test-python-codebase-on-main"
 on:
-    push:
-        branches:
-            - main
-        paths-ignore:
-            - 'packages/core/ui/**'
-            - 'packages/core/docs/**'
-            - '.gitignore'
-            - 'README.md'
-            - 'LICENSE.md'
-            - 'netlify.toml'
-            - '.github/workflows/*.yml'
-            - '!.github/workflows/test-python-codebase-on-main.yml'
-    pull_request:
-        branches:
-            - main
-        paths-ignore:
-            - 'packages/core/ui/**'
-            - 'packages/core/docs/**'
-            - '.gitignore'
-            - 'README.md'
-            - 'LICENSE.md'
-            - 'netlify.toml'
-            - '.github/workflows/*.yml'
-            - '!.github/workflows/test-python-codebase-on-main.yml'
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - "packages/core/ui/**"
+      - "packages/core/docs/**"
+      - ".gitignore"
+      - "README.md"
+      - "LICENSE.md"
+      - "netlify.toml"
+      - ".github/workflows/*.yml"
+      - "!.github/workflows/test-python-codebase-on-main.yml"
+  pull_request:
+    branches:
+      - main
+      - integration-*
+    paths-ignore:
+      - "packages/core/ui/**"
+      - "packages/core/docs/**"
+      - ".gitignore"
+      - "README.md"
+      - "LICENSE.md"
+      - "netlify.toml"
+      - ".github/workflows/*.yml"
+      - "!.github/workflows/test-python-codebase-on-main.yml"
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        steps:
-            # check-out repo and set-up python
-            - name: Check out repository
-              uses: actions/checkout@v3
-            - name: Set up Python 3.10.6
-              uses: actions/setup-python@v4
-              with:
-                  python-version: 3.10.6
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      # check-out repo and set-up python
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set up Python 3.10.6
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.10.6
 
-            # load caches (dependencies and poetry binaries)
-            - name: Load cached venv
-              id: cached-poetry-dependencies
-              uses: actions/cache@v3
-              with:
-                  path: .venv
-                  key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-            - name: Load cached .local
-              uses: actions/cache@v3
-              with:
-                  path: ~/.local
-                  key: dotlocal-${{ runner.os }}-${{ hashFiles('.github/workflows/test-python-codebase-on-main.yml') }}
+      # load caches (dependencies and poetry binaries)
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v3
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+      - name: Load cached .local
+        uses: actions/cache@v3
+        with:
+          path: ~/.local
+          key: dotlocal-${{ runner.os }}-${{ hashFiles('.github/workflows/test-python-codebase-on-main.yml') }}
 
-            # install poetry (will be quick after it has been cached)
-            - name: Install Poetry
-              uses: snok/install-poetry@v1
-              with:
-                  version: 1.3.2
-                  virtualenvs-create: true
-                  virtualenvs-in-project: true
-                  installer-parallel: true
+      # install poetry (will be quick after it has been cached)
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.3.2
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
 
-            # install dependencies if cache does not exist
-            - name: Install dependencies
-              if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-              run: poetry install
+      # install dependencies if cache does not exist
+      - name: Install dependencies
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install
 
-            # run test suite
-            - name: Run mypy static type analysis
-              run: |
-                  source .venv/bin/activate
-                  bash scripts/check_static_types.sh
-            - name: Run pytest tests
-              run: |
-                  source .venv/bin/activate
-                  pytest -m "ci" --cov=packages tests
-                  coverage report
+      # run test suite
+      - name: Run pytests
+        run: |
+          source .venv/bin/activate
+          pytest -m "ci" --cov=packages tests
+          coverage report

.github/workflows/test-typescript-codebase-on-main.yml

@@ -1,36 +1,37 @@
-name: 'test-typescript-codebase-on-main'
+name: "test-typescript-codebase-on-main"
 on:
-    push:
-        branches:
-            - main
-        paths:
-            - 'packages/ui/**'
-            - '.github/workflows/test-typescript-codebase-on-main.yml'
-    pull_request:
-        branches:
-            - main
-        paths:
-            - 'packages/ui/**'
-            - '.github/workflows/test-typescript-codebase-on-main.yml'
+  push:
+    branches:
+      - main
+    paths:
+      - "packages/ui/**"
+      - ".github/workflows/test-typescript-codebase-on-main.yml"
+  pull_request:
+    branches:
+      - main
+      - integration-*
+    paths:
+      - "packages/ui/**"
+      - ".github/workflows/test-typescript-codebase-on-main.yml"
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Check out repository
-              uses: actions/checkout@v3
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
 
-            - name: Set up NodeJS with Yarn
-              uses: actions/setup-node@v3
-              with:
-                  node-version: '14'
-                  cache: 'yarn'
-                  cache-dependency-path: packages/ui/yarn.lock
+      - name: Set up NodeJS with Yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          cache: "yarn"
+          cache-dependency-path: packages/ui/yarn.lock
 
-            - name: Install dependencies
-              run: yarn install --frozen-lockfile
-              working-directory: packages/ui
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile
+        working-directory: packages/ui
 
-            - name: Build frontend
-              run: yarn build
-              working-directory: packages/ui
+      - name: Build frontend
+        run: yarn build
+        working-directory: packages/ui

.gitignore

@@ -5,6 +5,7 @@ test-tmp/
 .idea
 hidden/
 packages/docs/docs/api-reference/ui
+cli.sh
 
 # runtime data
 pids
@@ -20,8 +21,12 @@ pids
 runtime-data/
 config/**/*.json
 !config/**/*.default.json
-logs/**/*
+logs/**/*.json
+logs/**/*.log
+logs/**/*.png
+logs/**/*.jpg
 !logs/**/.gitkeep
+nohup.out
 
 
 # Created by https://www.toptal.com/developers/gitignore/api/linux,macos,opencv,python,windows,node
@@ -77,7 +82,6 @@ Temporary Items
 
 ### Node ###
 # Logs
-logs
 *.log
 npm-debug.log*
 yarn-debug.log*

config/config.default.json

@@ -1,54 +1,59 @@
 {
-    "general": {
-        "version": "4.0.8",
-        "seconds_per_core_interval": 30,
-        "test_mode": false,
-        "station_id": "...",
-        "min_sun_elevation": 11
+  "general": {
+    "version": "4.1.0",
+    "seconds_per_core_interval": 30,
+    "test_mode": false,
+    "station_id": "...",
+    "min_sun_elevation": 11
+  },
+  "opus": {
+    "em27_ip": "10.10.0.1",
+    "executable_path": "C:\\Program Files (x86)\\Bruker\\OPUS_7.8.44\\opus.exe",
+    "experiment_path": "C:\\Users\\Public\\Documents\\Bruker\\OPUS_7.8.44\\XPM\\experiment.xpm",
+    "macro_path": "C:\\Users\\Public\\Documents\\Bruker\\OPUS_7.8.44\\Macro\\macro.mtx",
+    "username": "Default",
+    "password": "..."
+  },
+  "camtracker": {
+    "config_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\CamTrackerConfig.txt",
+    "executable_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\CamTracker_3_9.exe",
+    "learn_az_elev_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\LEARN_Az_Elev.dat",
+    "sun_intensity_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\SunIntensity.dat",
+    "motor_offset_threshold": 10,
+    "restart_if_logs_are_too_old": false,
+    "restart_if_cover_remains_closed": false
+  },
+  "error_email": {
+    "smtp_host": "smtp.gmail.com",
+    "smtp_port": 587,
+    "smtp_username": "technical-user@domain.com",
+    "smtp_password": "...",
+    "sender_address": "technical-user@domain.com",
+    "notify_recipients": true,
+    "recipients": "your@mail.com"
+  },
+  "measurement_decision": {
+    "mode": "automatic",
+    "manual_decision_result": false,
+    "cli_decision_result": false
+  },
+  "measurement_triggers": {
+    "consider_time": true,
+    "consider_sun_elevation": true,
+    "consider_helios": false,
+    "start_time": {
+      "hour": 7,
+      "minute": 0,
+      "second": 0
     },
-    "opus": {
-        "em27_ip": "10.10.0.1",
-        "executable_path": "C:\\Program Files (x86)\\Bruker\\OPUS_7.8.44\\opus.exe",
-        "experiment_path": "C:\\Users\\Public\\Documents\\Bruker\\OPUS_7.8.44\\XPM\\experiment.xpm",
-        "macro_path": "C:\\Users\\Public\\Documents\\Bruker\\OPUS_7.8.44\\Macro\\macro.mtx",
-        "username": "Default",
-        "password": "..."
+    "stop_time": {
+      "hour": 21,
+      "minute": 0,
+      "second": 0
     },
-    "camtracker": {
-        "config_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\CamTrackerConfig.txt",
-        "executable_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\CamTracker_3_9.exe",
-        "learn_az_elev_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\LEARN_Az_Elev.dat",
-        "sun_intensity_path": "C:\\Users\\Public\\Documents\\Bruker\\camtracker_3_9_1_0\\SunIntensity.dat",
-        "motor_offset_threshold": 10
-    },
-    "error_email": {
-        "sender_address": "technical-user@domain.com",
-        "sender_password": "...",
-        "notify_recipients": true,
-        "recipients": "your@mail.com"
-    },
-    "measurement_decision": {
-        "mode": "automatic",
-        "manual_decision_result": false,
-        "cli_decision_result": false
-    },
-    "measurement_triggers": {
-        "consider_time": true,
-        "consider_sun_elevation": true,
-        "consider_helios": false,
-        "start_time": {
-            "hour": 7,
-            "minute": 0,
-            "second": 0
-        },
-        "stop_time": {
-            "hour": 21,
-            "minute": 0,
-            "second": 0
-        },
-        "min_sun_elevation": 0
-    },
-    "tum_plc": null,
-    "helios": null,
-    "upload": null
+    "min_sun_elevation": 0
+  },
+  "tum_plc": null,
+  "helios": null,
+  "upload": null
 }

config/helios.config.default.json

@@ -1,7 +1,11 @@
 {
-    "camera_id": 0,
-    "evaluation_size": 15,
-    "seconds_per_interval": 6,
-    "edge_detection_threshold": 0.01,
-    "save_images": false
+  "camera_id": 0,
+  "evaluation_size": 15,
+  "seconds_per_interval": 6,
+  "min_seconds_between_state_changes": 180,
+  "edge_pixel_threshold": 1,
+  "edge_color_threshold": 40,
+  "target_pixel_brightness": 50,
+  "save_images_to_archive": false,
+  "save_current_image": false
 }

config/tum_plc.config.default.json

@@ -1,5 +1,5 @@
 {
-    "ip": "10.0.0.4",
-    "version": 1,
-    "controlled_by_user": false
+  "ip": "10.0.0.4",
+  "version": 1,
+  "controlled_by_user": false
 }