Merge branch 'dev' into jax

OpenMined · May 16, 2024 · 924eee6 · 924eee6
2 parents 1e133a7 + 5c739a5
commit 924eee6
Show file tree

Hide file tree

Showing 26 changed files with 381 additions and 740 deletions.
diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml
@@ -202,7 +202,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.10", "3.11", "3.12"]
-        deployment-type: ["k8s"]
+        deployment-type: ["remote"]
         notebook-paths: ["api/0.8"]
       fail-fast: false
 

diff --git a/notebooks/admin/Custom API + Custom Worker.ipynb b/notebooks/admin/Custom API + Custom Worker.ipynb
@@ -36,8 +36,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "## k8s mode\n",
-    "# os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"k8s\"\n",
+    "## remote mode\n",
+    "# os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"remote\"\n",
     "# os.environ[\"DEV_MODE\"] = \"True\"\n",
     "domain_client = sy.login(\n",
     "    email=\"[email protected]\",\n",

diff --git a/notebooks/api/0.8/09-blob-storage.ipynb b/notebooks/api/0.8/09-blob-storage.ipynb
@@ -36,7 +36,6 @@
     "node = sy.orchestra.launch(\n",
     "    name=\"test-domain-1\",\n",
     "    dev_mode=True,\n",
-    "    in_memory_workers=True,\n",
     "    reset=True,\n",
     "    create_producer=True,\n",
     ")"

diff --git a/notebooks/api/0.8/10-container-images.ipynb b/notebooks/api/0.8/10-container-images.ipynb
@@ -91,8 +91,7 @@
     "# Disable inmemory worker for container stack\n",
     "running_as_container = os.environ.get(\"ORCHESTRA_DEPLOYMENT_TYPE\") in (\n",
     "    \"container_stack\",\n",
-    ")\n",
-    "in_memory_workers = not running_as_container"
+    ")"
    ]
   },
   {
@@ -106,7 +105,6 @@
     "    name=\"test-domain-1\",\n",
     "    dev_mode=True,\n",
     "    create_producer=True,\n",
-    "    in_memory_workers=in_memory_workers,\n",
     "    reset=True,\n",
     "    port=8081,\n",
     ")"
@@ -1485,7 +1483,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.11.7"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/api/0.8/11-container-images-k8s.ipynb b/notebooks/api/0.8/11-container-images-k8s.ipynb
@@ -45,7 +45,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"k8s\"\n",
+    "os.environ[\"ORCHESTRA_DEPLOYMENT_TYPE\"] = \"remote\"\n",
     "os.environ[\"DEV_MODE\"] = \"True\"\n",
     "\n",
     "# Uncomment this to add custom values\n",

diff --git a/notebooks/api/0.8/12-custom-api-endpoint.ipynb b/notebooks/api/0.8/12-custom-api-endpoint.ipynb
@@ -33,7 +33,6 @@
     "    dev_mode=True,\n",
     "    create_producer=True,\n",
     "    n_consumers=3,\n",
-    "    in_memory_workers=True,\n",
     "    reset=True,\n",
     "    port=8081,\n",
     ")\n",

diff --git a/notebooks/tutorials/data-engineer/02-deployment-types.ipynb b/notebooks/tutorials/data-engineer/02-deployment-types.ipynb
@@ -67,7 +67,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "memory_node = sy.Orchestra.launch(\n",
+    "memory_node = sy.orchestra.launch(\n",
     "    name=\"Arbitrary Dev Node\",\n",
     "    dev_mode=True,\n",
     "    reset=True,\n",
@@ -99,7 +99,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "webserver_node = sy.Orchestra.launch(\n",
+    "webserver_node = sy.orchestra.launch(\n",
     "    name=\"Arbitrary Webserver Dev Node\", dev_mode=True, reset=True, port=8081\n",
     ")"
    ]

diff --git a/notebooks/tutorials/enclaves/Enclave-single-notebook-high-low-network.ipynb b/notebooks/tutorials/enclaves/Enclave-single-notebook-high-low-network.ipynb
@@ -45,7 +45,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "embassador_node_low = sy.Orchestra.launch(\n",
+    "embassador_node_low = sy.orchestra.launch(\n",
     "    name=\"ambassador node\",\n",
     "    node_side_type=\"low\",\n",
     "    local_db=True,\n",
@@ -69,14 +69,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ca_node_low = sy.Orchestra.launch(\n",
+    "ca_node_low = sy.orchestra.launch(\n",
     "    name=\"canada-1\",\n",
     "    node_side_type=\"low\",\n",
     "    local_db=True,\n",
     "    reset=True,\n",
     "    #     enable_warnings=True,\n",
     ")\n",
-    "it_node_low = sy.Orchestra.launch(\n",
+    "it_node_low = sy.orchestra.launch(\n",
     "    name=\"italy-1\",\n",
     "    node_side_type=\"low\",\n",
     "    local_db=True,\n",
@@ -125,13 +125,13 @@
     "    reset=True,\n",
     "    #     enable_warnings=True,\n",
     ")\n",
-    "ca_node_high = sy.Orchestra.launch(\n",
+    "ca_node_high = sy.orchestra.launch(\n",
     "    name=\"canada-2\",\n",
     "    local_db=True,\n",
     "    reset=True,\n",
     "    #     enable_warnings=True,\n",
     ")\n",
-    "it_node_high = sy.Orchestra.launch(\n",
+    "it_node_high = sy.orchestra.launch(\n",
     "    name=\"italy-2\",\n",
     "    local_db=True,\n",
     "    reset=True,\n",

diff --git a/packages/grid/backend/backend.dockerfile b/packages/grid/backend/backend.dockerfile
@@ -34,8 +34,7 @@ COPY syft/src/syft/VERSION ./syft/src/syft/
 RUN --mount=type=cache,target=/root/.cache,sharing=locked \
     # remove torch because we already have the cpu version pre-installed
     sed --in-place /torch==/d ./syft/setup.cfg && \
-    uv pip install -e ./syft[data_science] && \
-    uv pip freeze | grep ansible | xargs uv pip uninstall
+    uv pip install -e ./syft[data_science]
 
 # ==================== [Final] Setup Syft Server ==================== #
 

diff --git a/packages/grid/syft-client/syft.Dockerfile b/packages/grid/syft-client/syft.Dockerfile
@@ -14,8 +14,7 @@ RUN apk update && apk upgrade && \
 COPY ./syft /tmp/syft
 
 RUN --mount=type=cache,target=/root/.cache,sharing=locked \
-    pip install --user jupyterlab==4.1.6 pip-autoremove==0.10.0 /tmp/syft && \
-    pip-autoremove ansible ansible-core -y
+    pip install --user jupyterlab==4.1.6 /tmp/syft
 
 # ==================== [Final] Setup Syft Client ==================== #