Merge pull request #619 from roflcoopter/feature/storage-component

24/7 recordings
roflcoopter · Mar 25, 2024 · a675a1c · a675a1c
2 parents 69abb07 + b2b8091
commit a675a1c
Show file tree

Hide file tree

Showing 238 changed files with 21,855 additions and 17,962 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -18,6 +18,10 @@
       "onAutoForward": "silent"
     }
   },
+  "mounts": [
+    "source=${localWorkspaceFolder}/config,target=/config,type=bind,consistency=cached"
+  ],
+  "userEnvProbe": "loginInteractiveShell",
   "runArgs": ["-e", "GIT_EDITOR=code --wait"],
   "customizations": {
     "vscode": {
@@ -26,6 +30,9 @@
         "ms-python.vscode-pylance",
         "ms-python.isort",
         "ms-python.flake8",
+        "ms-python.black-formatter",
+        "ms-python.pylint",
+        "ms-python.mypy-type-checker",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
         "GitHub.vscode-pull-request-github",
@@ -34,29 +41,26 @@
         "eamodio.gitlens",
         "dbaeumer.vscode-eslint",
         "ms-azuretools.vscode-docker",
-        "unifiedjs.vscode-mdx"
+        "unifiedjs.vscode-mdx",
+        "ckolkman.vscode-postgres"
       ],
       "settings": {
         "python.pythonPath": "/usr/local/bin/python",
-        "python.linting.enabled": true,
-        "python.linting.pylintEnabled": true,
-        "python.linting.pylintPath": "/usr/local/bin/pylint",
-        "python.linting.flake8Enabled": true,
-        "python.linting.flake8Path": "/usr/local/bin/flake8",
-        "python.linting.pycodestylePath": "/usr/local/bin/pycodestyle",
-        "python.linting.pydocstylePath": "/usr/local/bin/pydocstyle",
-        "python.formatting.blackPath": "/usr/local/bin/black",
-        "python.formatting.provider": "black",
         "python.testing.pytestArgs": ["--no-cov"],
-        "python.linting.mypyEnabled": true,
-        "python.linting.mypyPath": "/usr/local/bin/mypy",
+        "isort.check": true,
         "editor.rulers": [80],
         "[python]": {
+          "editor.defaultFormatter": "ms-python.black-formatter",
           "editor.rulers": [88],
           "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
           }
         },
+        "mypy-type-checker.importStrategy": "fromEnvironment",
+        "pylint.importStrategy": "fromEnvironment",
+        "black-formatter.importStrategy": "fromEnvironment",
+        "flake8.importStrategy": "fromEnvironment",
+        "isort.importStrategy": "fromEnvironment",
         "editor.formatOnPaste": false,
         "editor.formatOnSave": true,
         "editor.formatOnType": true,

diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -25,7 +25,7 @@ do
     sed -i "s/$FILE=true/$FILE=false/g" $HOME/.bashrc
 done
 
-# Symlink config
+# Create default config if it is missing
 cd $WORKSPACE_DIR
 mkdir -p $WORKSPACE_DIR/config
 FILE=$WORKSPACE_DIR/config/config.yaml
@@ -35,7 +35,15 @@ else
     echo "Creating default config"
     python3 -c "import viseron.config; viseron.config.create_default_config('$FILE')"
 fi
-ln -s $WORKSPACE_DIR/config/config.yaml /config/config.yaml
+
+# Create symlink to config file
+FILE=/config/config.yaml
+if test -f "$FILE"; then
+    echo "Config symlink already exists"
+else
+    echo "Creating config symlink"
+    ln -s $WORKSPACE_DIR/config/config.yaml /config/config.yaml
+fi
 
 # Create .env.local
 FILE=$WORKSPACE_DIR/frontend/.env.local
@@ -45,3 +53,6 @@ else
     echo "Creating frontend .env.local"
     echo "VITE_PROXY_HOST=localhost:8888" > $FILE
 fi
+
+# Generate locale
+locale-gen
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,7 +49,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends libgirepository1.0-dev
-          python3 -m venv venv
+          python3 -m venv --system-site-packages venv
       - name: Install requirements into Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         uses: ./.github/templates/run_in_venv
@@ -422,7 +422,11 @@ jobs:
           docker-compose --file azure-pipelines/docker-compose-build.yaml --env-file azure-pipelines/.env build --build-arg BUILDKIT_INLINE_CACHE=1 amd64-viseron-tests
       - name: Run pytest
         run: |
-          docker-compose --file azure-pipelines/docker-compose-build.yaml --env-file azure-pipelines/.env up amd64-viseron-tests
+          if docker-compose --file azure-pipelines/docker-compose-build.yaml --env-file azure-pipelines/.env up amd64-viseron-tests; then
+            exit 0
+          else
+            exit 1
+          fi
       - name: Copy .coverage to host
         run: |
           docker cp amd64-viseron-tests:/src/coverage.xml coverage.xml

diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,8 @@
 !/tests/*
 !/tests/components
 !/tests/components/**
+!/tests/domains
+!/tests/domains/**
 !/tests/helpers
 !/tests/helpers/*
 
@@ -81,7 +83,7 @@
 !/frontend/src/**
 !/frontend/tests
 !/frontend/tests/**
-!/frontend/.eslintrc.js
+!/frontend/.eslintrc.cjs
 !/frontend/.prettierrc.json
 !/frontend/404.html
 !/frontend/index.html

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,9 @@ repos:
     rev: v3.2.2
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args:
+          - --py38-plus
+          - --keep-runtime-typing
         files: ^(viseron|tests)/.+\.py$
   - repo: https://github.com/PyCQA/autoflake
     rev: v2.0.0
@@ -88,4 +90,4 @@ repos:
           if [ -n "$test" ]; then echo "Found null description in config.json:"; echo "$test"; false; fi
           '
         pass_filenames: false
-        always_run: true
+        always_run: true
diff --git a/.pylintrc b/.pylintrc
@@ -82,7 +82,8 @@ disable=format,
       too-many-statements,
       too-many-boolean-expressions,
       consider-using-with,
-      consider-using-f-string
+      consider-using-f-string,
+      consider-using-dict-items
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -191,7 +192,7 @@ contextmanager-decorators=contextlib.contextmanager
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E1101 when accessed. Python regular
 # expressions are accepted.
-generated-members=cv2.*
+generated-members=cv2.*,alembic.*
 
 # Tells whether missing members accessed in mixin class should be ignored. A
 # mixin class is detected if its name ends with "mixin" (case insensitive).
@@ -214,7 +215,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
+ignored-modules=alembic.context,alembic.op
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.
@@ -309,6 +310,8 @@ good-names=i,
            x2,
            y1,
            y2,
+           mb,
+           gb,
            Run,
            _,
            T

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,14 +1,18 @@
 {
-    "recommendations": [
-        "ms-python.python",
-        "ms-python.vscode-pylance",
-        "ms-python.isort",
-        "ms-python.flake8",
-        "redhat.vscode-yaml",
-        "esbenp.prettier-vscode",
-        "eamodio.gitlens",
-        "dbaeumer.vscode-eslint",
-        "ms-azuretools.vscode-docker",
-        "unifiedjs.vscode-mdx"
-    ]
-  }
+  "recommendations": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "ms-python.isort",
+    "ms-python.flake8",
+    "ms-python.black-formatter",
+    "ms-python.pylint",
+    "ms-python.mypy-type-checker",
+    "redhat.vscode-yaml",
+    "esbenp.prettier-vscode",
+    "eamodio.gitlens",
+    "dbaeumer.vscode-eslint",
+    "ms-azuretools.vscode-docker",
+    "unifiedjs.vscode-mdx",
+    "ckolkman.vscode-postgres"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,15 @@
   "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yaml"],
   "python.testing.pytestArgs": ["tests/"],
   "python.testing.unittestEnabled": false,
-  "python.testing.pytestEnabled": true
+  "python.testing.pytestEnabled": true,
+  "pylint.severity": {
+    "convention": "Warning"
+  },
+  "[python]": {
+    "editor.rulers": [88],
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    },
+    "editor.defaultFormatter": "ms-python.black-formatter"
+  }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -8,7 +8,7 @@
       "group": "test",
       "presentation": {
         "reveal": "always",
-        "panel": "new"
+        "panel": "dedicated"
       },
       "problemMatcher": []
     },
@@ -92,6 +92,23 @@
       },
       "problemMatcher": []
     },
+    {
+      "label": "Python: Generate database migration",
+      "detail": "Generates a new revision file for the database.",
+      "type": "shell",
+      "command": "alembic revision --autogenerate -m '${input:revision_message}'",
+      "options": {
+        "cwd": "${workspaceFolder}/viseron/components/storage"
+      },
+      "group": {
+        "kind": "build"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    },
     // Frontend tasks
     {
       "label": "Frontend: Build",
@@ -274,5 +291,9 @@
       "type": "promptString",
       "description": "The component to generate docs for",
     },
+    {
+      "id": "revision_message",
+      "type": "promptString",
+      "description": "Revision message (should end with a period)",}
   ]
 }
diff --git a/azure-pipelines/docker-compose-build.yaml b/azure-pipelines/docker-compose-build.yaml
@@ -120,6 +120,7 @@ services:
         WHEELS_VERSION: "$WHEELS_VERSION"
         S6_OVERLAY_ARCH: amd64
         S6_OVERLAY_VERSION: "$S6_OVERLAY_VERSION"
+        UBUNTU_VERSION: "$UBUNTU_VERSION"
       cache_from:
         - roflcoopter/amd64-viseron:dev
     image: roflcoopter/amd64-viseron:dev
@@ -133,14 +134,20 @@ services:
         VISERON_VERSION: dev
     image: roflcoopter/amd64-viseron-tests:dev
     container_name: amd64-viseron-tests
-    entrypoint: ""
+    environment:
+      - PGID=1000
+      - PUID=1000
     command: >
-      bash -c "pytest --cov=viseron/ --cov-report term-missing -s tests
-      && coverage xml"
-
+      bash -c "
+        chown -R abc:abc /src &&
+        su abc -c '
+          cd /src &&
+          pytest --cov=viseron/ --cov-report term-missing -s tests &&
+          coverage xml
+        '
+      "
   amd64-viseron-tests-tox:
     <<: *amd64-viseron-tests
-    entrypoint: pytest
 
   amd64-viseron-vulture:
     <<: *amd64-viseron-tests
@@ -247,6 +254,7 @@ services:
         WHEELS_VERSION: "$WHEELS_VERSION"
         S6_OVERLAY_ARCH: amd64
         S6_OVERLAY_VERSION: "$S6_OVERLAY_VERSION"
+        UBUNTU_VERSION: "$UBUNTU_VERSION"
       cache_from:
         - roflcoopter/amd64-cuda-viseron:dev
     image: roflcoopter/amd64-cuda-viseron:dev
@@ -343,6 +351,7 @@ services:
         WHEELS_VERSION: "$WHEELS_VERSION"
         S6_OVERLAY_ARCH: armhf
         S6_OVERLAY_VERSION: "$S6_OVERLAY_VERSION"
+        UBUNTU_VERSION: "$UBUNTU_VERSION"
       cache_from:
         - roflcoopter/rpi3-viseron:dev
     image: roflcoopter/rpi3-viseron:dev
@@ -430,6 +439,7 @@ services:
         WHEELS_VERSION: "$WHEELS_VERSION"
         S6_OVERLAY_ARCH: aarch64
         S6_OVERLAY_VERSION: "$S6_OVERLAY_VERSION"
+        UBUNTU_VERSION: "$UBUNTU_VERSION"
       cache_from:
         - roflcoopter/aarch64-viseron:dev
     image: roflcoopter/aarch64-viseron:dev
@@ -568,6 +578,7 @@ services:
         WHEELS_VERSION: "$WHEELS_VERSION"
         S6_OVERLAY_ARCH: aarch64
         S6_OVERLAY_VERSION: "$S6_OVERLAY_VERSION"
+        UBUNTU_VERSION: "$UBUNTU_VERSION"
       cache_from:
         - roflcoopter/jetson-nano-viseron:dev
     image: roflcoopter/jetson-nano-viseron:dev