Merge branch 'dev' into network-test

OpenMined · Mar 22, 2024 · afe3d1b · afe3d1b
2 parents 57378ab + 632a763
commit afe3d1b
Show file tree

Hide file tree

Showing 46 changed files with 635 additions and 453 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.8.5-beta.9
+current_version = 0.8.5-beta.10
 tag = False
 tag_name = {new_version}
 commit = True

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
  # Mono Repo Global Version
-__version__ = "0.8.5-beta.9"
+__version__ = "0.8.5-beta.10"
 # 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
@@ -41,7 +41,7 @@
    },
    "outputs": [],
    "source": [
-    "node = sy.orchestra.launch(name=\"test-domain-1\", port=\"auto\", dev_mode=True)"
+    "node = sy.orchestra.launch(name=\"test-domain-1\", port=\"auto\", reset=True, dev_mode=True)"
    ]
   },
   {
@@ -90,18 +90,34 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "dataset2 = sy.Dataset(name=\"My Sample Dataset - II\")\n",
+    "asset2 = sy.Asset(name=\"Sample Data - II\")\n",
+    "asset2.set_obj(sample_data * 10)\n",
+    "asset2.set_mock(mock_sample_data * 10, mock_is_real=False)\n",
+    "asset2.set_shape(sample_data.shape)\n",
+    "dataset2.add_asset(asset2)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7",
    "metadata": {
     "tags": []
    },
    "outputs": [],
    "source": [
-    "root_client.upload_dataset(dataset)"
+    "for dset in [dataset, dataset2]:\n",
+    "    root_client.upload_dataset(dset)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "7",
+   "id": "8",
    "metadata": {
     "tags": []
    },
@@ -120,7 +136,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "8",
+   "id": "9",
    "metadata": {
     "tags": []
    },
@@ -132,7 +148,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9",
+   "id": "10",
    "metadata": {
     "tags": []
    },
@@ -144,7 +160,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "10",
+   "id": "11",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -154,19 +170,19 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "11",
+   "id": "12",
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert len(datasets) == 1\n",
+    "assert len(datasets) == 2\n",
     "dataset_ptr = datasets[0]\n",
     "dataset_ptr"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "12",
+   "id": "13",
    "metadata": {
     "tags": []
    },
@@ -199,7 +215,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "13",
+   "id": "14",
    "metadata": {
     "tags": []
    },
@@ -216,7 +232,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "14",
+   "id": "15",
    "metadata": {
     "tags": []
    },
@@ -228,7 +244,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "15",
+   "id": "16",
    "metadata": {
     "tags": []
    },
@@ -242,7 +258,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "16",
+   "id": "17",
    "metadata": {
     "tags": []
    },
@@ -254,7 +270,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "17",
+   "id": "18",
    "metadata": {
     "tags": []
    },
@@ -267,7 +283,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "18",
+   "id": "19",
    "metadata": {
     "tags": []
    },
@@ -300,7 +316,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "19",
+   "id": "20",
    "metadata": {
     "tags": []
    },
@@ -313,7 +329,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "20",
+   "id": "21",
    "metadata": {
     "tags": []
    },
@@ -325,7 +341,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "21",
+   "id": "22",
    "metadata": {
     "tags": []
    },
@@ -338,7 +354,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "22",
+   "id": "23",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -350,7 +366,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "23",
+   "id": "24",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -360,7 +376,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "24",
+   "id": "25",
    "metadata": {
     "tags": []
    },
@@ -374,7 +390,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "25",
+   "id": "26",
    "metadata": {
     "tags": []
    },
@@ -386,7 +402,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "26",
+   "id": "27",
    "metadata": {
     "tags": []
    },
@@ -399,7 +415,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "27",
+   "id": "28",
    "metadata": {
     "tags": []
    },
@@ -408,16 +424,6 @@
     "assert isinstance(request_2, sy.SyftSuccess)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "28",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "ds_client.datasets"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -468,6 +474,38 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "33",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "datasets = ds_client.datasets.search(name=\"My Sample Dataset - II\")\n",
+    "dataset_ptr2 = datasets[0]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "34",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Validate if input policy is violated\n",
+    "sum_ptr = ds_client.code.calculate_sum(data=dataset_ptr2.assets[0])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "35",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert isinstance(sum_ptr, sy.SyftError), sum_ptr"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "36",
    "metadata": {
     "tags": []
    },
@@ -479,7 +517,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "34",
+   "id": "37",
    "metadata": {
     "tags": []
    },
@@ -491,7 +529,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "35",
+   "id": "38",
    "metadata": {
     "tags": []
    },
@@ -503,7 +541,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "36",
+   "id": "39",
    "metadata": {
     "tags": []
    },
@@ -512,6 +550,14 @@
     "if node.node_type.value == \"python\":\n",
     "    node.land()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "40",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -530,7 +576,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.2"
+   "version": "3.11.5"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/notebooks/tutorials/hello-syft/01-hello-syft.ipynb b/notebooks/tutorials/hello-syft/01-hello-syft.ipynb
@@ -262,7 +262,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@sy.syft_function_single_use(data=asset)\n",
+    "@sy.syft_function_single_use(df=asset)\n",
     "def get_mean_age(df):\n",
     "    return df[\"Age\"].mean()"
    ]
@@ -557,7 +557,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.16"
+   "version": "3.11.4"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/packages/.dockerignore b/packages/.dockerignore
@@ -1,9 +1,11 @@
 **/*.pyc
 
-grid/data
-grid/packer
-grid/.devspace
+grid/*
+!grid/backend
+
 syftcli
 
 syft/tests
 syft/README.md
+
+hagrid
diff --git a/packages/grid/VERSION b/packages/grid/VERSION
@@ -1,5 +1,5 @@
 # Mono Repo Global Version
-__version__ = "0.8.5-beta.9"
+__version__ = "0.8.5-beta.10"
 # elsewhere we can call this file: `python VERSION` and simply take the stdout
 
 # stdlib