Merge branch 'dev' into yash/remote-debugging

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.4-beta.30
+current_version = 0.8.5-beta.1
 tag = False
 tag_name = {new_version}
 commit = True
@@ -26,20 +26,14 @@ values =
 [bumpversion:part:prenum]
 first_value = 1
 
-# Root
-
 [bumpversion:file:VERSION]
 
-# Syft
-
 [bumpversion:file:packages/syft/setup.cfg]
 
 [bumpversion:file:packages/syft/src/syft/__init__.py]
 
 [bumpversion:file:packages/syft/src/syft/VERSION]
 
-# Grid
-
 [bumpversion:file:packages/grid/devspace.yaml]
 
 [bumpversion:file:packages/grid/VERSION]
@@ -56,14 +50,8 @@ first_value = 1
 
 [bumpversion:file:packages/grid/helm/syft/values.yaml]
 
-# Hagrid
-
 [bumpversion:file:packages/hagrid/hagrid/manifest_template.yml]
 
 [bumpversion:file:packages/hagrid/hagrid/deps.py]
 
-# Syft CLI
-
 [bumpversion:file:packages/syftcli/manifest.yml]
-
-

.bumpversion_stable.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.3
+current_version = 0.8.4
 tag = False
 tag_name = {new_version}
 commit = True
@@ -12,14 +12,8 @@ parse =
 serialize =
 	{major}.{minor}.{patch}
 
-# Syft
-
 [bumpversion:file:packages/syft/src/syft/stable_version.py]
 
-# Hagrid
-
 [bumpversion:file:packages/hagrid/hagrid/stable_version.py]
 
 [bumpversion:file:packages/hagrid/hagrid/cache.py]
-
-

.github/workflows/cd-post-release-tests.yml

@@ -70,6 +70,14 @@ jobs:
         run: |
           hagrid version
 
+      - name: Remove existing containers
+        continue-on-error: true
+        shell: bash
+        run: |
+          docker rm $(docker ps -aq) --force || true
+          docker volume prune -f || true
+          docker buildx use default || true
+
       - name: Launch Domain
         run: |
           hagrid launch test-domain-1 to docker:8081 --tag=${{ inputs.syft_version }} --low-side
@@ -82,6 +90,30 @@ jobs:
         run: |
           tox -e e2e.test.notebook
 
+      #Run log collector python script
+      - name: Run log collector
+        timeout-minutes: 5
+        if: failure()
+        shell: bash
+        run: |
+          python ./scripts/container_log_collector.py
+
+      # Get Job name and url
+      - name: Get job name and url
+        id: job_name
+        if: failure()
+        shell: bash
+        run: |
+          echo "job_name=$(echo ${{ github.job }})" >> $GITHUB_OUTPUT
+          echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - name: Upload logs to GitHub
+        uses: actions/upload-artifact@master
+        if: failure()
+        with:
+          name: ${{ matrix.os }}-${{ steps.job_name.outputs.job_name }}-logs-${{ steps.job_name.outputs.date }}
+          path: ./logs/${{ steps.job_name.outputs.job_name}}/
+
   syft-install-check:
     strategy:
       max-parallel: 99
@@ -90,7 +122,6 @@ jobs:
         # Re-enable macos-14 when it's available when we remove python 3.9 from syft
         # os: [ubuntu-latest, macos-latest, windows-latest, macos-14]
         python-version: ["3.11", "3.10", "3.9"]
-
     runs-on: ${{ matrix.os }}
     steps:
       - name: System Architecture

.github/workflows/cd-syft.yml

@@ -424,7 +424,7 @@ jobs:
           author_name: ${{ secrets.OM_BOT_NAME }}
           author_email: ${{ secrets.OM_BOT_EMAIL }}
           message: "[syft] bump protocol version"
-          add: "['packages/syft/src/syft/protocol/protocol_version.json', 'packages/syft/src/syft/protocol/releases/']"
+          add: "['packages/syft/src/syft/protocol/protocol_version.json', 'packages/syft/src/syft/protocol/releases/','packages/syft/PYPI.md','packages/grid/helm/repo']"
 
       - name: Scheduled Build and Publish
         if: github.event_name == 'schedule'

.pre-commit-config.yaml

@@ -172,7 +172,7 @@ repos:
       - id: mypy
         name: "mypy: syft"
         always_run: true
-        files: "^packages/syft/src/syft/serde|^packages/syft/src/syft/util/env.py|^packages/syft/src/syft/util/logger.py|^packages/syft/src/syft/util/markdown.py|^packages/syft/src/syft/util/notebook_ui/notebook_addons.py|^packages/syft/src/syft/service/warnings.py|^packages/syft/src/syft/service/dataset|^packages/syft/src/syft/service/worker|^packages/syft/src/syft/service/user"
+        files: "^packages/syft/src/syft/serde|^packages/syft/src/syft/util/env.py|^packages/syft/src/syft/util/logger.py|^packages/syft/src/syft/util/markdown.py|^packages/syft/src/syft/util/notebook_ui/notebook_addons.py|^packages/syft/src/syft/img/base64.py|^packages/syft/src/syft/store/mongo_codecs.py|^packages/syft/src/syft/service/warnings.py|^packages/syft/src/syft/util/util.py|^packages/syft/src/syft/client/api.py|^packages/syft/src/syft/service/worker|^packages/syft/src/syft/service/user|^packages/syft/src/syft/service/dataset"
         #files: "^packages/syft/src/syft/serde"
         args: [
             "--follow-imports=skip",

README.md

@@ -23,7 +23,7 @@ $ pip install -U syft[data_science]
 ```python
 # from Jupyter / Python
 import syft as sy
-sy.requires(">=0.8.3,<0.8.4")
+sy.requires(">=0.8.4,<0.8.5")
 node = sy.orchestra.launch(name="my-domain", port=8080, dev_mode=True, reset=True)
 ```
 
@@ -38,7 +38,7 @@ Starting syft-node server on 0.0.0.0:8080
 
 ```python
 import syft as sy
-sy.requires(">=0.8.3,<0.8.4")
+sy.requires(">=0.8.4,<0.8.5")
 domain_client = sy.login(port=8080, email="[email protected]", password="changethis")
 ```
 
@@ -54,6 +54,10 @@ domain_client = sy.login(port=8080, email="[email protected]", password="change
 - <a href="notebooks/api/0.8/05-custom-policy.ipynb">05-custom-policy.ipynb</a>
 - <a href="notebooks/api/0.8/06-multiple-code-requests.ipynb">06-multiple-code-requests.ipynb</a>
 - <a href="notebooks/api/0.8/07-domain-register-control-flow.ipynb">07-domain-register-control-flow.ipynb</a>
+- <a href="notebooks/api/0.8/08-code-version.ipynb">08-code-version.ipynb</a>
+- <a href="notebooks/api/0.8/09-blob-storage.ipynb">09-blob-storage.ipynb</a>
+- <a href="notebooks/api/0.8/10-container-images.ipynb">10-container-images.ipynb</a>
+- <a href="notebooks/api/0.8/11-container-images-k8s.ipynb">11-container-images-k8s.ipynb</a>
 
 ## Deploy Kubernetes Helm Chart
 
@@ -132,11 +136,12 @@ helm install ... --set ingress.class="gce"
 # Versions
 
 `0.9.0` - Coming soon...  
-`0.8.4` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
-`0.8.3` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.3/notebooks/api/0.8">API</a>
+`0.8.5` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
+`0.8.4` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.4/notebooks/api/0.8">API</a>
 
 Deprecated:
 
+- `0.8.3` - <a href="https://github.com/OpenMined/PySyft/tree/0.8.3/notebooks/api/0.8">API</a>
 - `0.8.2` - <a href="https://github.com/OpenMined/PySyft/tree/0.8.2/notebooks/api/0.8">API</a>
 - `0.8.1` - <a href="https://github.com/OpenMined/PySyft/tree/0.8.1/notebooks/api/0.8">API</a>
 - `0.8.0` - <a href="https://github.com/OpenMined/PySyft/tree/0.8/notebooks/api/0.8">API</a>

VERSION

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