Merge branch 'dev' into eelco/pydantic-warnings

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5-beta.1
+current_version = 0.8.5-beta.2
 tag = False
 tag_name = {new_version}
 commit = True

.github/workflows/cd-syft.yml

@@ -120,6 +120,11 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Install Git
+        run: |
+          sudo apt-get update
+          sudo apt-get install git -y
+
       - name: Check python version
         run: |
           python --version

.github/workflows/pr-tests-stack.yml

@@ -30,7 +30,7 @@ jobs:
         # os: [om-ci-16vcpu-ubuntu2204]
         os: [ubuntu-latest]
         python-version: ["3.12"]
-        pytest-modules: ["frontend network container_workload"]
+        pytest-modules: ["frontend network container_workload local_node"]
       fail-fast: false
 
     runs-on: ${{matrix.os}}

.github/workflows/pr-tests-syft.yml

@@ -88,9 +88,11 @@ jobs:
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
 
-      - name: Docker on MacOS
-        if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest'
-        uses: crazy-max/[email protected]
+      # - name: Docker on MacOS
+      #   if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest'
+      #   uses: crazy-max/[email protected]
+      #   with:
+      #     set-host: true
 
       - name: Run unit tests
         if: steps.changes.outputs.syft == 'true'

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         exclude: ^(packages/grid/ansible/)
       - id: name-tests-test
         always_run: true
-        exclude: ^(packages/grid/backend/grid/tests/utils/)|^(.*fixtures.py)|^packages/syft/tests/.*/utils.py
+        exclude: ^(.*/tests/utils/)|^(.*fixtures.py)
       - id: requirements-txt-fixer
         always_run: true
       - id: mixed-line-ending

VERSION

@@ -1,5 +1,5 @@
  # Mono Repo Global Version
-__version__ = "0.8.5-beta.1"
+__version__ = "0.8.5-beta.2"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

packages/grid/VERSION

@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.5-beta.1"
+__version__ = "0.8.5-beta.2"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

packages/grid/backend/grid/core/config.py

@@ -103,7 +103,7 @@ def get_emails_enabled(self) -> Self:
 
     OPEN_REGISTRATION: bool = True
 
-    DOMAIN_ASSOCIATION_REQUESTS_AUTOMATICALLY_ACCEPTED: bool = True
+    # DOMAIN_ASSOCIATION_REQUESTS_AUTOMATICALLY_ACCEPTED: bool = True
     USE_BLOB_STORAGE: bool = (
         True if os.getenv("USE_BLOB_STORAGE", "false").lower() == "true" else False
     )
@@ -117,22 +117,22 @@ def get_emails_enabled(self) -> Self:
     )  # 30 minutes in seconds
     SEAWEED_MOUNT_PORT: int = int(os.getenv("SEAWEED_MOUNT_PORT", 4001))
 
-    REDIS_HOST: str = str(os.getenv("REDIS_HOST", "redis"))
-    REDIS_PORT: int = int(os.getenv("REDIS_PORT", 6379))
-    REDIS_STORE_DB_ID: int = int(os.getenv("REDIS_STORE_DB_ID", 0))
-    REDIS_LEDGER_DB_ID: int = int(os.getenv("REDIS_LEDGER_DB_ID", 1))
-    STORE_DB_ID: int = int(os.getenv("STORE_DB_ID", 0))
-    LEDGER_DB_ID: int = int(os.getenv("LEDGER_DB_ID", 1))
-    NETWORK_CHECK_INTERVAL: int = int(os.getenv("NETWORK_CHECK_INTERVAL", 60))
-    DOMAIN_CHECK_INTERVAL: int = int(os.getenv("DOMAIN_CHECK_INTERVAL", 60))
+    # REDIS_HOST: str = str(os.getenv("REDIS_HOST", "redis"))
+    # REDIS_PORT: int = int(os.getenv("REDIS_PORT", 6379))
+    # REDIS_STORE_DB_ID: int = int(os.getenv("REDIS_STORE_DB_ID", 0))
+    # REDIS_LEDGER_DB_ID: int = int(os.getenv("REDIS_LEDGER_DB_ID", 1))
+    # STORE_DB_ID: int = int(os.getenv("STORE_DB_ID", 0))
+    # LEDGER_DB_ID: int = int(os.getenv("LEDGER_DB_ID", 1))
+    # NETWORK_CHECK_INTERVAL: int = int(os.getenv("NETWORK_CHECK_INTERVAL", 60))
+    # DOMAIN_CHECK_INTERVAL: int = int(os.getenv("DOMAIN_CHECK_INTERVAL", 60))
     CONTAINER_HOST: str = str(os.getenv("CONTAINER_HOST", "docker"))
     MONGO_HOST: str = str(os.getenv("MONGO_HOST", ""))
-    MONGO_PORT: int = int(os.getenv("MONGO_PORT", 0))
+    MONGO_PORT: int = int(os.getenv("MONGO_PORT", 27017))
     MONGO_USERNAME: str = str(os.getenv("MONGO_USERNAME", ""))
     MONGO_PASSWORD: str = str(os.getenv("MONGO_PASSWORD", ""))
     DEV_MODE: bool = True if os.getenv("DEV_MODE", "false").lower() == "true" else False
     # ZMQ stuff
-    QUEUE_PORT: int = int(os.getenv("QUEUE_PORT", 0))
+    QUEUE_PORT: int = int(os.getenv("QUEUE_PORT", 5556))
     CREATE_PRODUCER: bool = (
         True if os.getenv("CREATE_PRODUCER", "false").lower() == "true" else False
     )
@@ -145,8 +145,8 @@ def get_emails_enabled(self) -> Self:
     EMAIL_SENDER: str = os.getenv("EMAIL_SENDER", "")
     SMTP_PASSWORD: str = os.getenv("SMTP_PASSWORD", "")
     SMTP_TLS: bool = True
-    SMTP_PORT: str | None = os.getenv("SMTP_PORT", "")
-    SMTP_HOST: str | None = os.getenv("SMTP_HOST", "")
+    SMTP_PORT: int = int(os.getenv("SMTP_PORT", 587))
+    SMTP_HOST: str = os.getenv("SMTP_HOST", "")
 
     TEST_MODE: bool = (
         True if os.getenv("TEST_MODE", "false").lower() == "true" else False

packages/grid/backend/worker_cpu.dockerfile

@@ -9,7 +9,7 @@
 # Later we'd want to uninstall old python, and then install a new python runtime...
 # ... but pre-built syft deps may break!
 
-ARG SYFT_VERSION_TAG="0.8.5-beta.1"
+ARG SYFT_VERSION_TAG="0.8.5-beta.2"
 FROM openmined/grid-backend:${SYFT_VERSION_TAG}
 
 ARG PYTHON_VERSION="3.12"

packages/grid/devspace.yaml

@@ -25,7 +25,7 @@ vars:
   DEVSPACE_ENV_FILE: "default.env"
   CONTAINER_REGISTRY: "docker.io"
   NODE_NAME: "mynode"
-  VERSION: "0.8.5-beta.1"
+  VERSION: "0.8.5-beta.2"
 
 # This is a list of `images` that DevSpace can build for this project
 # We recommend to skip image building during development (devspace dev) as much as possible

packages/grid/docker-compose.yml

@@ -299,7 +299,8 @@ services:
 
 volumes:
   credentials-data:
-  # app-redis-data:
+    labels:
+      orgs.openmined.syft: "this is a syft credentials volume"
   seaweedfs-data:
     labels:
       orgs.openmined.syft: "this is a syft seaweedfs volume"

packages/grid/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pygrid-ui",
-  "version": "0.8.5-beta.1",
+  "version": "0.8.5-beta.2",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",