Merge pull request #121 from AD-SDL/dev

Push v0.5.9 to Production

Author: LuckierDodge

.dockerignore

@@ -0,0 +1 @@
+**/node_modules

.github/workflows/docker-build.yml

@@ -7,9 +7,11 @@ name: Docker Build and Publish
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "*" ]
     # Publish semver tags as releases.
     tags: [ '*' ]
+  schedule: # Run on Tuesday's at noon
+    - cron: '0 12 * * 2'
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -21,7 +23,6 @@ env:
 jobs:
   build_and_publish:
 
-    environment: production
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -37,10 +38,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # Login against a Docker registry except on PR
+      # Login against a Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -61,7 +61,7 @@ jobs:
             type=ref,event=pr
             type=raw,value=latest,enable={{is_default_branch}}
 
-      # Build and push Docker image with Buildx (don't push on PR)
+      # Build and push Docker image with Buildx
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push

.github/workflows/docker-publish.yml

@@ -301,3 +301,6 @@ test_experiment/
 
 # Output data
 .wei/
+
+#node modules
+**/node_modules

.gitignore

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-yaml
       - id: check-json
@@ -17,7 +17,7 @@ repos:
       - id: nbstripout
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.3.2
+    rev: v0.4.8
     hooks:
       # Run the linter.
       - id: ruff

.pre-commit-config.yaml

@@ -7,6 +7,7 @@ LABEL org.opencontainers.image.licenses=MIT
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y gosu; \
+	apt-get install -y npm; \
 	rm -rf /var/lib/apt/lists/*
 
 # User configuration
@@ -29,18 +30,24 @@ COPY requirements/dev.txt wei/requirements/dev.txt
 RUN --mount=type=cache,target=/root/.cache \
     pip install -r wei/requirements/requirements.txt
 
-# Copy wei files
-COPY wei wei/wei
+# Install Node Dependencies first, for caching purposes
+COPY ./src/ui/package*.json ./
+RUN npm install
+
+# Copy rest of wei files
+COPY src wei/src
 COPY tests wei/tests
 COPY pyproject.toml wei/pyproject.toml
 COPY README.md wei/README.md
 COPY scripts wei/scripts
 
-
 # Install dependencies and wei
 RUN --mount=type=cache,target=/root/.cache \
     pip install -e wei
 
 COPY wei-entrypoint.sh /wei-entrypoint.sh
 RUN chmod +x /wei-entrypoint.sh
 ENTRYPOINT [ "/wei-entrypoint.sh" ]
+
+# build ui for production with minification
+RUN npm run build --prefix wei/src/ui

Dockerfile

@@ -3,41 +3,35 @@
 ################################################################################
 .DEFAULT_GOAL := init
 
-.PHONY: init paths checks test clean
+.PHONY: init checks test clean
 
 init: # Do the initial configuration of the project
 	@test -e .env || cp example.env .env
 ifeq ($(shell uname),Darwin)
-	@sed -i '' 's/^PROJECT_DIR=.*/PROJECT_DIR=$(shell pwd | sed 's/\//\\\//g')/' .env
 	@sed -i '' 's/^USER_ID=.*/USER_ID=1000/' .env
 	@sed -i '' 's/^GROUP_ID=.*/GROUP_ID=1000/' .env
 else
-	@sed -i 's/^PROJECT_DIR=.*/PROJECT_DIR=$(shell pwd | sed 's/\//\\\//g')/' .env
 	@sed -i 's/^USER_ID=.*/USER_ID=$(shell id -u)/' .env
 	@sed -i 's/^GROUP_ID=.*/GROUP_ID=$(shell id -g)/' .env
 endif
 
 
 .env: init
 
-paths: .env # Create the necessary data directories
-	@mkdir -p $(shell grep -E '^WEI_DATA_DIR=' .env | cut -d '=' -f 2)
-	@mkdir -p $(shell grep -E '^REDIS_DIR=' .env | cut -d '=' -f 2)
-
 checks: # Runs all the pre-commit checks
 	@pre-commit install
 	@pre-commit run --all-files || { echo "Checking fixes\n" ; pre-commit run --all-files; }
 
-test: init .env paths # Runs all the tests
-	@docker compose up --build -d
-	@docker compose run test_app pytest -p no:cacheprovider wei
-	@docker compose down
+test: init .env build # Runs all the tests
+	@docker compose up -d
+	@docker compose run wei_engine pytest -p no:cacheprovider wei
+	@#docker compose down
 
 clean:
 	@rm .env
 
 .PHONY += docs
-docs: wei docs/source # Builds the docs for wei
+docs: src docs/source # Builds the docs for wei
 	cd docs && pdm run make clean html
 
 build: build-python # Builds the project

Makefile

@@ -1,55 +1,25 @@
 services:
-  ###########
-  # Dev App #
-  ###########
-  test_app:
-    container_name: test_app
-    image: ${IMAGE_TEST}
-    build:
-      context: tests/
-      dockerfile: ${DOCKERFILE_TEST}
-      tags:
-        - ${IMAGE_TEST}:latest
-        - ${IMAGE_TEST}:dev
-    volumes:
-      - ${WORKCELLS_DIR}:/workcell_defs
-      - ${WEI_DATA_DIR}:/home/app/.wei
-      - diaspora_config:/home/app/.diaspora
-      - ${PROJECT_DIR}:/home/app/wei # for development only
-    env_file:
-      - .env
-    profiles:
-      - test
-    command: pytest -p no:cacheprovider wei
-    depends_on:
-      - synthesis
-      - transfer
-      - measure
-      - wei_server
-      - wei_engine
-      - wei_redis
-
   ###########
   # Modules #
   ###########
   synthesis:
-    image: ${IMAGE_TEST}
+    image: ${IMAGE}
     container_name: synthesis
     ports:
       - 2000:2000
     command: 'python3 wei/tests/test_module/test_rest_node.py
       --port 2000
       --alias synthesis'
   transfer:
-    image: ${IMAGE_TEST}
+    image: ${IMAGE}
     container_name: transfer
     ports:
       - 2001:2001
     command: 'python3 wei/tests/test_module/test_rest_node.py
       --port 2001
       --alias transfer'
   measure:
-    image: ${IMAGE_TEST}
+    image: ${IMAGE}
     container_name: measure
     ports:
       - 2002:2002
@@ -72,26 +42,29 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - ${WORKCELLS_DIR}:/workcell_defs
-      - ${WEI_DATA_DIR}:/home/app/.wei
       - diaspora_config:/home/app/.diaspora
-      - ${PROJECT_DIR}:/home/app/wei # for development only
-    env_file:
-      - .env
+      - ./tests/workcells:/workcell_defs
+      - ~/.wei:/home/app/.wei
+
+    environment:
+      - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
+      - USER_ID=${USER_ID:-1000}
+      - GROUP_ID=${GROUP_ID:-1000}
     command: python3 -m wei.server --workcell /workcell_defs/${WORKCELL_FILENAME}
     depends_on:
       - wei_redis
   wei_engine:
     image: ${IMAGE}
     container_name: wei_engine
     volumes:
-      - ${WORKCELLS_DIR}:/workcell_defs
-      - ${WEI_DATA_DIR}:/home/app/.wei
-      - ${PROJECT_DIR}:/home/app/wei # for development only
+      - diaspora_config:/home/app/.diaspora
+      - ./tests/workcells:/workcell_defs
+      - ~/.wei:/home/app/.wei
+      - ./:/home/app/wei # for development only
     environment:
-     - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
-    env_file:
-      - .env
+      - PYTHONUNBUFFERED=1 # Fix weird bug with empty logging
+      - USER_ID=${USER_ID:-1000}
+      - GROUP_ID=${GROUP_ID:-1000}
     command: python3 -m wei.engine --workcell /workcell_defs/${WORKCELL_FILENAME}
     depends_on:
       - wei_redis
@@ -102,8 +75,11 @@ services:
     ports:
       - 6379:6379
     volumes:
-      - ${REDIS_DIR}:/data
-    command: redis-server --save 60 1 --loglevel warning
+      - ~/.wei/redis:/data
+    command: 'redis-server
+      --save 600 1
+      --loglevel warning
+      --appendonly yes'
 
 ################
 # Data Storage #

compose.yaml

@@ -51,6 +51,9 @@
     "members": True,
 }
 
+autodoc_pydantic_model_show_json_error_strategy = "warn"
+
+
 # Napoleon settings
 napoleon_google_docstring = True
 napoleon_numpy_docstring = True

docs/source/conf.py

@@ -14,14 +14,11 @@ wei.core.admin
    .. autosummary::
 
       send_cancel
-      send_estop
-      send_lock
       send_pause
       send_reset
       send_resume
       send_safety_stop
       send_shutdown
-      send_unlock