Merge branch 'dev' into network-test

OpenMined · Apr 1, 2024 · af23210 · af23210
2 parents 60e97e9 + 197a4f7
commit af23210
Show file tree

Hide file tree

Showing 40 changed files with 390 additions and 329 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.6-beta.1
+current_version = 0.8.5-post.1
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.bumpversion_stable.cfg b/.bumpversion_stable.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5
+current_version = 0.8.5-post.1
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/.github/workflows/pr-tests-hagrid.yml b/.github/workflows/pr-tests-hagrid.yml
@@ -80,7 +80,7 @@ jobs:
         if: steps.changes.outputs.hagrid == 'true'
         run: |
           bandit -r hagrid
-          safety check -i 42923 -i 54229 -i 54230 -i 54230 -i 54229 -i 62044 -i 65213
+          safety check -i 42923 -i 54229 -i 54230 -i 54230 -i 54229 -i 62044 -i 65213 -i 54564
 
       - name: Run normal tests
         if: steps.changes.outputs.hagrid == 'true'

diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -293,11 +293,11 @@ jobs:
         run: |
           pip install --upgrade tox tox-uv==1.5.1
 
-      - name: Run syft backend base image building test
-        if: steps.changes.outputs.stack == 'true'
-        timeout-minutes: 60
-        run: |
-          tox -e backend.test.basecpu
+      # - name: Run syft backend base image building test
+      #   if: steps.changes.outputs.stack == 'true'
+      #   timeout-minutes: 60
+      #   run: |
+      #     tox -e backend.test.basecpu
 
   pr-tests-notebook-stack:
     strategy:

diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml
@@ -110,6 +110,7 @@ jobs:
         python-version: ["3.12"]
         deployment-type: ["python"]
         notebook-paths: ["tutorials"]
+        bump-version: ["False"]
         include:
           - python-version: "3.11"
             os: "ubuntu-latest"
@@ -119,6 +120,11 @@ jobs:
             os: "ubuntu-latest"
             deployment-type: "python"
             notebook-paths: "tutorials"
+          - python-version: "3.12"
+            os: "ubuntu-latest"
+            deployment-type: "python"
+            notebook-paths: "tutorials"
+            bump-version: "True"
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -183,6 +189,7 @@ jobs:
         env:
           ORCHESTRA_DEPLOYMENT_TYPE: "${{ matrix.deployment-type }}"
           TEST_NOTEBOOK_PATHS: "${{ matrix.notebook-paths }}"
+          BUMP_VERSION: "${{ matrix.bump-version }}"
         with:
           timeout_seconds: 2400
           max_attempts: 3

diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ helm install ... --set ingress.class="gce"
 
 `0.9.0` - Coming soon...  
 `0.8.6` (Beta) - `dev` branch 👈🏽 <a href="https://github.com/OpenMined/PySyft/tree/dev/notebooks/api/0.8">API</a> - Coming soon...  
-`0.8.5` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.5/notebooks/api/0.8">API</a>
+`0.8.5-post.1` (Stable) - <a href="https://github.com/OpenMined/PySyft/tree/0.8.5-post.1/notebooks/api/0.8">API</a>
 
 Deprecated:
 

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

diff --git a/notebooks/api/0.8/06-multiple-code-requests.ipynb b/notebooks/api/0.8/06-multiple-code-requests.ipynb
@@ -478,7 +478,8 @@
    "outputs": [],
    "source": [
     "datasets = ds_client.datasets.search(name=\"My Sample Dataset - II\")\n",
-    "dataset_ptr2 = datasets[0]"
+    "dataset_ptr2 = datasets[0]\n",
+    "dataset_ptr2"
    ]
   },
   {
@@ -489,7 +490,8 @@
    "outputs": [],
    "source": [
     "# Validate if input policy is violated\n",
-    "sum_ptr = ds_client.code.calculate_sum(data=dataset_ptr2.assets[0])"
+    "sum_ptr = ds_client.code.calculate_sum(data=dataset_ptr2.assets[0])\n",
+    "sum_ptr"
    ]
   },
   {
@@ -499,7 +501,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert isinstance(sum_ptr, sy.SyftError), sum_ptr"
+    "assert isinstance(sum_ptr, sy.SyftError), (sum_ptr, str(dataset_ptr2.assets[0]))"
    ]
   },
   {
@@ -547,17 +549,9 @@
    },
    "outputs": [],
    "source": [
-    "if node.node_type.value == \"python\":\n",
+    "if node.deployment_type.value in [\"python\", \"single_container\"]:\n",
     "    node.land()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "40",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

diff --git a/notebooks/api/0.8/10-container-images.ipynb b/notebooks/api/0.8/10-container-images.ipynb
@@ -131,8 +131,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str = f\"\"\"\n",
-    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
+    "custom_dockerfile_str = \"\"\"\n",
+    "FROM openmined/grid-backend:0.8.5-beta.10\n",
     "\n",
     "RUN pip install pydicom\n",
     "\n",
@@ -1108,8 +1108,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str_2 = f\"\"\"\n",
-    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
+    "custom_dockerfile_str_2 = \"\"\"\n",
+    "FROM openmined/grid-backend:0.8.5-beta.10\n",
     "\n",
     "RUN pip install opendp\n",
     "\"\"\".strip()\n",
@@ -1260,8 +1260,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "custom_dockerfile_str_3 = f\"\"\"\n",
-    "FROM openmined/grid-backend:{syft_base_worker_tag}\n",
+    "custom_dockerfile_str_3 = \"\"\"\n",
+    "FROM openmined/grid-backend:0.8.5-beta.10\n",
     "\n",
     "RUN pip install recordlinkage\n",
     "\"\"\".strip()\n",

diff --git a/packages/grid/VERSION b/packages/grid/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.6-beta.1"
+__version__ = "0.8.5-post.1"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib

diff --git a/packages/grid/backend/worker_cpu.dockerfile b/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.6-beta.1"
+ARG SYFT_VERSION_TAG="0.8.5-post.1"
 FROM openmined/grid-backend:${SYFT_VERSION_TAG}
 
 ARG PYTHON_VERSION="3.12"

diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml
@@ -25,7 +25,7 @@ vars:
   DEVSPACE_ENV_FILE: "default.env"
   CONTAINER_REGISTRY: "docker.io"
   NODE_NAME: "mynode"
-  VERSION: "0.8.6-beta.1"
+  VERSION: "0.8.5-post.1"
 
 # 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

diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pygrid-ui",
-  "version": "0.8.6-beta.1",
+  "version": "0.8.5-post.1",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",