fix: Batch production kWh imports per issue 607

.devcontainer/Dockerfile

@@ -19,4 +19,38 @@ ENV LANG ${LOCAL}
 RUN docker context use default
 RUN docker buildx use default
 
-WORKDIR /workspace
+ARG home=/home/vscode
+
+USER vscode
+
+COPY ./ /workspace
+
+# ZSH
+RUN mkdir -p ${home}/.local/share/fonts
+RUN curl -fL https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/patched-fonts/DroidSansMono/DroidSansMNerdFontMono-Regular.otf --output ${home}/.local/share/fonts/DroidSansMNerdFontMono-Regular.otf 
+RUN git clone https://github.com/tarjoilija/zgen.git "${home}/.zgen"
+RUN git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-${home}/.oh-my-zsh/custom}/themes/powerlevel10k
+RUN cp /workspace/.devcontainer/zshrc ${home}/.zshrc
+
+# ASDF
+RUN git clone https://github.com/asdf-vm/asdf.git ${home}/.asdf
+RUN echo '. "$HOME/.asdf/asdf.sh"'  >> ${home}/.bashrc
+RUN echo '. "$HOME/.asdf/completions/asdf.bash"'  >> ${home}/.bashrc
+RUN echo '. "$HOME/.asdf/asdf.sh"'  >> ${home}/.zshrc
+RUN echo '. "$HOME/.asdf/completions/asdf.bash"'  >> ${home}/.zshrc
+RUN export PATH=~/.asdf/bin:~/.asdf/shims:$PATH
+
+# CURL SSL DISABLE
+RUN sudo update-ca-certificates --fresh
+RUN echo "insecure" >> ${home}/.curlrc
+
+# RUN POETRY_VERSION=$(cat .tool-versions|grep 'poetry' | cut -d " " -f 2) && export PATH=${home}/.asdf/installs/poetry/$POETRY_VERSION/bin:$PATH
+
+RUN sudo chown -Rf vscode:vscode ${home}
+RUN sudo chown -Rf vscode:vscode /workspace
+
+WORKDIR /workspace
+
+SHELL ["/bin/bash", "-c"]
+RUN source ${home}/.asdf/asdf.sh && make install
+RUN sudo rm -rf /workspace

.devcontainer/boot.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -x
+export PATH=~/.asdf/bin:~/.asdf/shims:$PATH
+export PATH=~/.asdf/installs/poetry/$POETRY_VERSION/bin:$PATH
+make configure-poetry
+make dev

.devcontainer/devcontainer.json

@@ -2,9 +2,9 @@
   "name": "MyElectricalData development",
   "dockerComposeFile": ["docker-compose.yaml"],
   "shutdownAction": "stopCompose",
-  "postCreateCommand": "/bin/bash -lc ./.devcontainer/post-install.sh",
+  // "postCreateCommand": "/bin/zsh -lc ./.devcontainer/post-install.sh",
   // "postCreateCommand": "make init-devcontainer",
-  "postStartCommand": "make dev",
+  "postStartCommand": "/bin/zsh -lc ./.devcontainer/boot.sh",
   "service": "workspace",
   "workspaceFolder": "/workspace",
   "forwardPorts": [],
@@ -56,6 +56,7 @@
       "git.autofetch": true,
       "window.title": "${rootName}${dirty}${activeEditorShort}${separator}${separator}${profileName}${separator}${appName}",
       "http.proxyStrictSSL": false,
+      "terminal.integrated.defaultProfile.linux": "zsh",
       // PYTHON
       "python.testing.pytestEnabled": true,
       "python.analysis.autoImportCompletions": false,

.devcontainer/docker-compose.tools.yaml

@@ -21,7 +21,7 @@ services:
     ports:
       - '8086:8086'
     volumes:
-      - ./../data/influxdb:/var/lib/influxdb2
+      - ~/tmp/med/data/influxdb:/var/lib/influxdb2
     healthcheck:
       test: ["CMD", "curl", "-f", "http://influxdb:8086"]
       interval: 25s
@@ -43,7 +43,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-      - ./../data/mosquitto:/data
+      - /tmp/med/data/mosquitto:/data
       - ./../mosquitto:/mosquitto/config/
     ports:
       - 1883:1883
@@ -56,7 +56,7 @@ services:
     links:
       - mosquitto
     volumes:
-      - ./../data/:/mqtt-explorer/config
+      - /tmp/med/data/mqtt-explorer:/mqtt-explorer/config
     ports:
       - 4000:4000
 
@@ -73,7 +73,7 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./../data/postgresql/data:/var/lib/postgresql/data
+      - /tmp/med/data/postgresql:/var/lib/postgresql/data
       - ./../init.sql:/docker-entrypoint-initdb.d/init.sql
 
   mysql:
@@ -87,7 +87,7 @@ services:
     ports:
       - "3306:3306"
     volumes:
-      - ./../data/mysql/data:/var/lib/mysql
+      - /tmp/med/data/data/mysql/data:/var/lib/mysql
 
 volumes:
   mydata:

.devcontainer/post-install.sh

@@ -22,4 +22,5 @@ echo "insecure" >> ${HOME}/.curlrc
 sudo update-ca-certificates --fresh
 echo ""
 echo "Install environment"
-make install
+make install
+chmod +x /workspace/.devcontainer/boot.sh

.flake8

@@ -40,4 +40,4 @@ exclude =
 max-complexity = 15
 import-order-style = google
 application-import-names = flake8
-min_python_version = 3.12.2
+min_python_version = 3.12.3

.github/workflows/deploy_prerelease.yaml

@@ -57,17 +57,17 @@ jobs:
       IMAGE_REPO: ${{ steps.informations.outputs.IMAGE_REPO }}
       IMAGE_NAME: ${{ steps.informations.outputs.IMAGE_NAME }}
 
-  Discord-Begin:
-    needs: [informations]
-    if: ${{ needs.informations.outputs.build  == 'true' }}
-    uses: MyElectricalData/.github/.github/workflows/discord.yaml@main
-    with:
-      MESSAGE: '**MyElectricalData** : Version **${{ needs.informations.outputs.version }}** is in building state...'
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+  # Discord-Begin:
+  #   needs: [informations]
+  #   if: ${{ needs.informations.outputs.build  == 'true' }}
+  #   uses: MyElectricalData/.github/.github/workflows/discord.yaml@main
+  #   with:
+  #     MESSAGE: '**MyElectricalData** : Version **${{ needs.informations.outputs.version }}** is in building state...'
+  #   secrets:
+  #     DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
 
   Build-And-Push-Image:
-    needs: [informations, Discord-Begin]
+    needs: [informations]
 #    needs: [informations]
     if: ${{ needs.informations.outputs.build  == 'true' }}
     uses: MyElectricalData/.github/.github/workflows/dockerhub-build-push.yaml@main
@@ -77,6 +77,10 @@ jobs:
       PUSH: true
       TAG: ${{ needs.informations.outputs.version }}
       LATEST: false
+      BUILD_ARGS: |
+        BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+        BUILD_REF=$(git rev-parse --short HEAD)
+        BUILD_VERSION=${{ needs.informations.outputs.version }}
     secrets:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 

.github/workflows/deploy_release.yaml

@@ -78,6 +78,10 @@ jobs:
       PUSH: true
       TAG: ${{ needs.informations.outputs.version }}
       LATEST: true
+      BUILD_ARGS: |
+        BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+        BUILD_REF=$(git rev-parse --short HEAD)
+        BUILD_VERSION=${{ needs.informations.outputs.version }}
     secrets:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 

.tool-versions

@@ -1,3 +1,3 @@
 poetry 1.7.1
-python 3.12.2
+python 3.12.3
 pre-commit 3.6.1

.vscode/launch.json

@@ -1,15 +1,22 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "1.0.0",
-    "configurations": [        
-        {
-            "name": "Python (Integrated Terminal)",
-            "type": "python",
-            "request": "launch",
-            "program": "/app/main.py",
-            "console": "integratedTerminal"
-        }
-    ]
-}
+  // Utilisez IntelliSense pour en savoir plus sur les attributs possibles.
+  // Pointez pour afficher la description des attributs existants.
+  // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Débogueur Python : Fichier actuel",
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}/src",
+        "DEV": "true",
+        "DEBUG": "true"
+      },
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/src/main.py",
+      "console": "integratedTerminal",
+      "envFile": "${workspaceFolder}/.env"
+      // "preLaunchTask": "select-environment-mock"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,26 +1,34 @@
 {
-    "sqltools.connections": [
-        {
-            "previewLimit": 50,
-            "server": "127.0.0.1",
-            "port": 5432,
-            "driver": "PostgreSQL",
-            "name": "MED Import",
-            "group": "MED",
-            "database": "myelectricaldata",
-            "username": "myelectricaldata",
-            "password": "myelectricaldata"
-        }
-    ],
-    "github-actions.workflows.pinned.workflows": [],
-    "GitHooks.hooksDirectory": "/home/cvalentin/git/myelectricaldata/myelectricaldata_import/.git/hooks",
-    "files.exclude": {
-        "**/.git": true,
-        "**/.svn": true,
-        "**/.hg": true,
-        "**/CVS": true,
-        "**/.DS_Store": true,
-        "**/Thumbs.db": true
-    },
-    "hide-files.files": []
+  "sqltools.connections": [
+    {
+      "previewLimit": 50,
+      "server": "127.0.0.1",
+      "port": 5432,
+      "driver": "PostgreSQL",
+      "name": "MED Import",
+      "group": "MED",
+      "database": "myelectricaldata",
+      "username": "myelectricaldata",
+      "password": "myelectricaldata"
+    }
+  ],
+  "github-actions.workflows.pinned.workflows": [],
+  "GitHooks.hooksDirectory": "/home/cvalentin/git/myelectricaldata/myelectricaldata_import/.git/hooks",
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "**/Thumbs.db": true,
+    ".venv": true,
+    ".pytest_cache": true
+  },
+  "hide-files.files": [
+    ".venv",
+    ".pytest_cache"
+  ],
+  "yaml.schemas": {
+    "https://json.schemastore.org/yamllint.json": "file:///home/cvalentin/git/myelectricaldata/myelectricaldata_import/data/config.yaml"
+  }
 }