Merge branch 'dev' into syft_error_improvements

.bumpversion.cfg

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

.github/workflows/cd-docs.yml

@@ -5,12 +5,12 @@ on:
       none:
         description: "Deploy Syft Documentation"
         required: false
-  pull_request:
-    branches: [dev]
-    paths: [docs/]
-  push:
-    branches: [dev]
-    paths: [docs/]
+  # pull_request:
+  #   branches: [dev]
+  #   paths: [docs/]
+  # push:
+  #   branches: [dev]
+  #   paths: [docs/]
 
 jobs:
   cd-docs:

.pre-commit-config.yaml

@@ -39,7 +39,7 @@ repos:
         args: ["--fix=lf"]
         exclude: '\.bat|\.csv|\.ps1$|packages/syft/tests/mongomock'
 
-  - repo: https://github.com/MarcoGorelli/absolufy-imports
+  - repo: https://github.com/MarcoGorelli/absolufy-imports # This repository has been archived by the owner on Aug 15, 2023. It is now read-only.
     rev: v0.3.1
     hooks:
       - id: absolufy-imports
@@ -76,16 +76,15 @@ repos:
         always_run: true
 
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.3
+    rev: 1.8.5
     # nbQA has no files attribute
     # files: "^notebooks/(api|tutorials|admin)"
     hooks:
       - id: nbqa-isort
-      - id: nbqa-black
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.4.3"
+    rev: "v0.4.7"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes]
@@ -95,7 +94,7 @@ repos:
         types_or: [python, pyi, jupyter]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.10.0
     hooks:
       - id: mypy
         name: "mypy: syft-cli"
@@ -120,7 +119,7 @@ repos:
           ]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.10.0
     hooks:
       - id: mypy
         name: "mypy: grid"
@@ -145,13 +144,13 @@ repos:
           ]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.10.0
     hooks:
       - id: mypy
         name: "mypy: syft"
         always_run: true
         files: "^packages/syft/src/syft/"
-        exclude: "packages/syft/src/syft/types/dicttuple.py|^packages/syft/src/syft/service/action/action_graph.py"
+        exclude: "packages/syft/src/syft/types/dicttuple.py"
         args: [
             "--follow-imports=skip",
             "--ignore-missing-imports",
@@ -176,7 +175,7 @@ repos:
       - id: nbstripout
         files: "^notebooks/(api|tutorials|admin)"
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
+  - repo: https://github.com/pre-commit/mirrors-prettier # This repository has been archived by the owner on Apr 11, 2024. It is now read-only.
     rev: "v3.0.0-alpha.9-for-vscode"
     hooks:
       - id: prettier

README.md

@@ -61,7 +61,7 @@ domain_client = sy.login(
 - <a href="notebooks/api/0.8/01-submit-code.ipynb">01-submit-code.ipynb</a>
 - <a href="notebooks/api/0.8/02-review-code-and-approve.ipynb">02-review-code-and-approve.ipynb</a>
 - <a href="notebooks/api/0.8/03-data-scientist-download-result.ipynb">03-data-scientist-download-result.ipynb</a>
-- <a href="notebooks/api/0.8/04-jax-example.ipynb">04-jax-example.ipynb</a>
+- <a href="notebooks/api/0.8/04-pytorch-example.ipynb">04-pytorch-example.ipynb</a>
 - <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>
@@ -73,6 +73,13 @@ domain_client = sy.login(
 
 ## Deploy Kubernetes Helm Chart
 
+#### 0. Deploy Kubernetes
+
+Required resources: 1 CPU and 4GB RAM. However, you will need some special instructions to deploy, please consult [these instructions](https://github.com/OpenMined/PySyft/blob/dev/notebooks/tutorials/deployments/03-deploy-k8s-k3d.ipynb) or look at the resource constraint testing [here](https://github.com/OpenMined/PySyft/pull/8828#issue-2300774645).  
+Recommended resources: 8+ Cores and 16GB RAM
+
+If you're using Docker Desktop to deploy your Kubernetes, you may need to go into Settings > Resources and increase CPUs and Memory.
+
 **Note**: Assuming we have a Kubernetes cluster already setup.
 
 #### 1. Add and update Helm repo for Syft
@@ -433,15 +440,6 @@ OpenMined and Syft appreciates all contributors, if you would like to fix a bug
 </tr>
 </table>
 
-# Open Collective
-
-`OpenMined` is a fiscally sponsored `501(c)(3)` in the USA. We are funded by our generous supporters on <a href="https://opencollective.com/openmined">Open Collective</a>. <br /><br />
-
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="docs/img/opencollective_dark.png">
-  <img src="docs/img/opencollective_light.png" alt="Contributors" width="100%" />
-</picture>
-
 # Disclaimer
 
 Syft is under active development and is not yet ready for pilots on private data without our assistance. As early access participants, please contact us via [Slack](https://slack.openmined.org/) or email if you would like to ask a question or have a use case that you would like to discuss.

VERSION

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

docs/source/deployment/glossary.rst

@@ -43,10 +43,6 @@ PyGrid
 ~~~~~~~~~~~~~~~~~~~~~
 ``PyGrid`` is a ``peer-to-peer network`` of data owners and data scientists who can collectively train AI models using ``PySyft``. ``PyGrid`` is also the central server for conducting both model-centric and data-centric ``federated learning``. You may control PyGrid via our user-interface, ``PyGrid Admin``.
 
-HaGrid
-~~~~~~~~~~~~~~~~~~~~~
-``Hagrid`` (HAppy GRID!) is a ``command-line tool`` that speeds up the deployment of ``PyGrid``, the software providing a peer-to-peer network of data owners and data scientists who can collectively train models.
-
 Remote Data Science
 ~~~~~~~~~~~~~~~~~~~~~
 A sub-field of data science wherein a data scientist is able to extract insights from a dataset owned by a data owner, but only those insights which the data owner explicitly decides to allow, whose preferences are enforced by information-restricting technologies such as cryptography, information security, and distributed systems.