Standalone and Add-on merge

.devcontainer/devcontainer.json

@@ -3,10 +3,18 @@
 {
 	"name": "EMHASS",
 	"build": {
-		"dockerfile": "Dockerfile",
-		"context": ".."
+		"dockerfile": "../Dockerfile",
+		"context": "../",
+		"args": { "TARGETARCH": "amd64"}
 	},
 	"features": {
+		"ghcr.io/devcontainers/features/common-utils:2": {
+			"installZsh": "true",
+			"configureZshAsDefaultShell": "true",
+			"installOhMyZsh": "false",
+			"installOhMyZshConfig": "false",
+			"upgradePackages": "true"
+		},
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
 	},
 	//"appPort": ["5000:5000"] //used to access app from external device (User discretion advised)
@@ -17,17 +25,8 @@
 		  // Add the IDs of extensions you want installed when the container is created.
 		  "extensions": ["ms-python.debugpy", "ms-python.python"]
 		}
-	  }
-
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "pip3 install --user -r requirements.txt",
-	// Configure tool-specific properties.
-	// "customizations": {},
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
+	  },
+
+	"postCreateCommand": ["pip3", "install", "requests-mock", "--break-system-packages"]
+
+}

.github/workflows/codeql.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: [ 'python' , 'javascript' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 

.github/workflows/docker-build-test.yaml

@@ -34,10 +34,9 @@ jobs:
           context: .
           platforms: ${{ matrix.platform.buildx }}
           build-args: |
-            build_version=standalone
             TARGETARCH=${{ matrix.platform.target_arch }}
             os_version=${{ matrix.platform.os_version }}
-          tags: emhass/standalone-test
+          tags: emhass
           load: true
-      - name: Test #assume docker fail with FileNotFound secrets_emhass.yaml error
-        run: docker run --rm -it emhass/standalone-test | grep -q secrets_emhass.yaml && echo 0 || echo 1
+      - name: Test # Run docker for 2min, if the output contains waitress   INFO  "Serving on" http://0.0.0.0:5000 assume it worked
+        run: timeout 2 docker run --rm -it emhass | grep -q "Serving on"  && echo 0 || echo 1

.github/workflows/publish_docker.yaml

@@ -1,14 +1,23 @@
-#template modified from: https://docs.docker.com/build/ci/github-actions/multi-platform/
+#template modified from: https://docs.docker.com/build/ci/github-actions/multi-platform/ & https://docs.github.com/en/actions/use-cases-and-examples/publishing-packages/publishing-docker-images
 name: "Publish Docker"
 
 on:
   release:
     types: [published]
   workflow_dispatch:
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   build:
     runs-on: ubuntu-latest  
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
     strategy:
       fail-fast: false
       matrix:
@@ -19,35 +28,36 @@ jobs:
           {buildx: linux/arm64,  target_arch: aarch64, os_version: debian}
         ]
     steps:
+    # Pull git repo and build each architecture image separately (with QEMU and Buildx)
       - name: Checkout the repository
         uses: actions/checkout@v4
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/emhass-docker-standalone
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
+      - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push by digest
         id: build
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: ${{ matrix.platform.buildx }}
           build-args: |
-            build_version=standalone
             TARGETARCH=${{ matrix.platform.target_arch }}
             os_version=${{ matrix.platform.os_version }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/emhass-docker-standalone,push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+      # Export the build images as artifact for the next job of merging
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
@@ -60,6 +70,7 @@ jobs:
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
+ # Merge platforms into images into a multi-platform image 
   merge:
     if: always()
     runs-on: ubuntu-latest
@@ -74,24 +85,24 @@ jobs:
           merge-multiple: true
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Docker meta
+      - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/emhass-docker-standalone
-          tags: |
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
             type=semver,pattern={{version}}
             type=raw,value=latest
-      - name: Login to Docker Hub
+      - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ secrets.DOCKERHUB_USERNAME }}/emhass-docker-standalone@sha256:%s ' *)          
+            $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ secrets.DOCKERHUB_USERNAME }}/emhass-docker-standalone:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}

.github/workflows/python-test.yml

@@ -35,9 +35,8 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        python -m pip install pytest requests-mock
-        python setup.py install
+        pip install pytest requests-mock
+        pip install .
 
     - name: Test with pytest
       run: |

.gitignore

@@ -2,12 +2,13 @@
 test.py
 # Secret yaml file
 secrets_emhass.yaml
+# config json file 
+config.json
 *.tar
 .vscode/*
 .vscode/launch.json
 .vscode/settings.json
 .vscode/tasks.json
-*.html
 *.pkl
 **/app
 

.vscode/launch.json

@@ -19,31 +19,8 @@
       ],
       "justMyCode": true,
       "env": {
-        "CONFIG_PATH": "/workspaces/emhass/config_emhass.yaml",
-        "OPTIONS_PATH": "/workspaces/emhass/options.json",
-        "SECRETS_PATH": "/workspaces/emhass/secrets_emhass.yaml",
-        "DATA_PATH": "/workspaces/emhass/data/",
-        "LOGGING_LEVEL": "DEBUG"
-      }
-    },
-    {
-      "name": "EMHASS run ADDON",
-      "type": "debugpy",
-      "request": "launch",
-      "module": "emhass.web_server",
-      "console": "integratedTerminal",
-      "args": [
-        "--addon",
-        "true",
-        "--no_response",
-        "true"
-      ],
-      "purpose": [
-        "debug-in-terminal"
-      ],
-      "justMyCode": true,
-      "env": {
-        "CONFIG_PATH": "/workspaces/emhass/config_emhass.yaml",
+        //"LEGACY_CONFIG_PATH": "/workspaces/emhass/tests/config_emhass.yaml",
+        "CONFIG_PATH": "/workspaces/emhass/config.json",
         "OPTIONS_PATH": "/workspaces/emhass/options.json",
         "SECRETS_PATH": "/workspaces/emhass/secrets_emhass.yaml",
         "DATA_PATH": "/workspaces/emhass/data/",

.vscode/tasks.json

@@ -12,14 +12,15 @@
                 "install",
                 "--no-deps",
                 "--force-reinstall",
+                "--break-system-packages",
                 "--editable",
                 "."
             ],
             "presentation": {
                 "echo": true,
                 "panel": "shared",
                 "focus": true
-            }
+            },
         },
         {
             "label": "EMHASS install with dependencies",
@@ -29,7 +30,7 @@
                 "isDefault": true
             },
             "args": [
-                "install", "--force-reinstall", "."
+                "install", "--break-system-packages", "--force-reinstall", "."
             ],
             "presentation": {
                 "echo": true,