Merge branch 'dev' into small_dataset_changes

.bumpversion.cfg

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

VERSION

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

notebooks/api/0.8/01-submit-code.ipynb

@@ -191,8 +191,7 @@
    },
    "outputs": [],
    "source": [
-    "@sy.syft_function(input_policy=sy.ExactMatch(trade_data=asset),\n",
-    "                  output_policy=sy.SingleExecutionExactOutput())\n",
+    "@sy.syft_function_single_use(trade_data=asset)\n",
     "def sum_trade_value_mil(trade_data):\n",
     "    import pandas as pd\n",
     "    from opendp.mod import enable_features\n",

packages/grid/VERSION

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

packages/grid/devspace.yaml

@@ -109,7 +109,7 @@ images:
     tags:
       - "######"
       - latest
-      - "0.8.1-beta.9"
+      - "0.8.1-beta.10"
     createPullSecret: true
     dockerfile: ./backend/backend.dockerfile
     context: ../
@@ -121,7 +121,7 @@ images:
     tags:
       - "######"
       - latest
-      - "0.8.1-beta.9"
+      - "0.8.1-beta.10"
     createPullSecret: true
     dockerfile: ./frontend/frontend.dockerfile
     context: ./frontend
@@ -137,7 +137,7 @@ images:
     tags:
       - "######"
       - latest
-      - "0.8.1-beta.9"
+      - "0.8.1-beta.10"
     createPullSecret: true
     dockerfile: ./vpn/headscale.dockerfile
     context: ./vpn
@@ -149,7 +149,7 @@ images:
     tags:
       - "######"
       - latest
-      - "0.8.1-beta.9"
+      - "0.8.1-beta.10"
     createPullSecret: true
     dockerfile: ./vpn/tailscale.dockerfile
     context: ./vpn
@@ -161,7 +161,7 @@ images:
     tags:
       - "######"
       - latest
-      - "0.8.1-beta.9"
+      - "0.8.1-beta.10"
     createPullSecret: true
     dockerfile: ./vpn/iptables.dockerfile
     context: ./vpn

packages/grid/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pygrid-ui",
-  "version": "0.8.1-beta.9",
+  "version": "0.8.1-beta.10",
   "private": true,
   "scripts": {
     "dev": "pnpm i && vite dev --host --port 80",

packages/hagrid/hagrid/manifest_template.yml

@@ -1,9 +1,9 @@
 manifestVersion: 0.1
 hagrid_version: 0.3.24
-syft_version: 0.8.1-beta.9
-dockerTag: 0.8.1-beta.9
+syft_version: 0.8.1-beta.10
+dockerTag: 0.8.1-beta.10
 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
-hash: cdb7e476a444cbf9d51fa9e029020384cafe7d6c
+hash: aa69e5aec85fb652342861105dedce1aa317d0ac
 target_dir: ~/.hagrid/PySyft/
 files:
   grid:

packages/syft/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = syft
-version = attr: "0.8.1-beta.9"
+version = attr: "0.8.1-beta.10"
 description = Perform numpy-like analysis on data that remains in someone elses server
 author = OpenMined
 author_email = [email protected]

packages/syft/src/syft/VERSION

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

packages/syft/src/syft/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.8.1-beta.9"
+__version__ = "0.8.1-beta.10"
 
 # stdlib
 import pathlib
@@ -38,8 +38,9 @@
 from .service.action.action_object import ActionObject  # noqa: F401
 from .service.action.plan import Plan  # noqa: F401
 from .service.action.plan import planify  # noqa: F401
-from .service.code.user_code import UserCodeStatus  # noqa: F401
-from .service.code.user_code import syft_function  # noqa: F401
+from .service.code.user_code import UserCodeStatus  # noqa: F401; noqa: F401
+from .service.code.user_code import syft_function  # noqa: F401; noqa: F401
+from .service.code.user_code import syft_function_single_use  # noqa: F401; noqa: F401
 from .service.data_subject import DataSubjectCreate as DataSubject  # noqa: F401
 from .service.dataset.dataset import Contributor  # noqa: F401
 from .service.dataset.dataset import CreateAsset as Asset  # noqa: F401

packages/syft/src/syft/service/code/user_code.py

@@ -42,6 +42,7 @@
 from ..metadata.node_metadata import EnclaveMetadata
 from ..policy.policy import CustomInputPolicy
 from ..policy.policy import CustomOutputPolicy
+from ..policy.policy import ExactMatch
 from ..policy.policy import InputPolicy
 from ..policy.policy import OutputPolicy
 from ..policy.policy import Policy
@@ -106,6 +107,12 @@ def __init__(self, base_dict: Dict):
     def __repr__(self):
         return str(self.base_dict)
 
+    def __repr_syft_nested__(self):
+        string = ""
+        for node_view, status in self.base_dict.items():
+            string += f"{node_view.node_name}: {status}<br>"
+        return string
+
     @property
     def approved(self) -> bool:
         # approved for this node only
@@ -347,6 +354,16 @@ def wrapper(*args: Any, **kwargs: Any) -> Callable:
     def code(self) -> str:
         return self.raw_code
 
+    def show_code_cell(self):
+        warning_message = """# WARNING: \n# Before you submit
+# change the name of the function \n# for no duplicates\n\n"""
+
+        # third party
+        from IPython import get_ipython
+
+        ip = get_ipython()
+        ip.set_next_input(warning_message + self.raw_code)
+
 
 @serializable(without=["local_function"])
 class SubmitUserCode(SyftObject):
@@ -366,6 +383,8 @@ class SubmitUserCode(SyftObject):
     input_kwargs: List[str]
     enclave_metadata: Optional[EnclaveMetadata] = None
 
+    __attr_repr_cols__ = ["func_name", "code"]
+
     @property
     def kwargs(self) -> List[str]:
         return self.input_policy_init_kwargs
@@ -394,6 +413,13 @@ def debox_asset(arg: Any) -> Any:
     return deboxed_arg
 
 
+def syft_function_single_use(*args: Any, **kwargs: Any):
+    return syft_function(
+        input_policy=ExactMatch(*args, **kwargs),
+        output_policy=SingleExecutionExactOutput(),
+    )
+
+
 def syft_function(
     input_policy: Union[InputPolicy, UID],
     output_policy: Optional[Union[OutputPolicy, UID]] = None,

packages/syft/src/syft/service/dataset/dataset.py

@@ -24,15 +24,17 @@
 from ...serde.serializable import serializable
 from ...store.document_store import PartitionKey
 from ...types.datetime import DateTime
-from ...types.syft_object import SURFACE_DARK_BRIGHT
 from ...types.syft_object import SYFT_OBJECT_VERSION_1
 from ...types.syft_object import SyftObject
-from ...types.syft_object import itables_css
 from ...types.transforms import TransformContext
 from ...types.transforms import generate_id
 from ...types.transforms import transform
 from ...types.transforms import validate_url
 from ...types.uid import UID
+from ...util import options
+from ...util.colors import ON_SURFACE_HIGHEST
+from ...util.colors import SURFACE
+from ...util.colors import SURFACE_SURFACE
 from ...util.fonts import ITABLES_CSS
 from ...util.fonts import fonts_css
 from ...util.markdown import as_markdown_python_code
@@ -88,6 +90,15 @@ class Asset(SyftObject):
     __attr_repr_cols__ = ["name", "shape"]
 
     def _repr_html_(self) -> Any:
+        itables_css = f"""
+        .itables table {{
+            margin: 0 auto;
+            float: left;
+            color: {ON_SURFACE_HIGHEST[options.color_theme]};
+        }}
+        .itables table th {{color: {SURFACE_SURFACE[options.color_theme]};}}
+        """
+
         # relative
         from ...service.action.action_object import ActionObject
 
@@ -106,7 +117,7 @@ def _repr_html_(self) -> Any:
             f"""
             <style>
             {fonts_css}
-            .syft-asset {{color: {SURFACE_DARK_BRIGHT};}}
+            .syft-asset {{color: {SURFACE[options.color_theme]};}}
             .syft-asset h3,
             .syft-asset p
               {{font-family: 'Open Sans'}}
@@ -338,7 +349,7 @@ def _repr_html_(self) -> Any:
             f"""
             <style>
             {fonts_css}
-            .syft-dataset {{color: {SURFACE_DARK_BRIGHT};}}
+            .syft-dataset {{color: {SURFACE[options.color_theme]};}}
             .syft-dataset h3,
             .syft-dataset p
               {{font-family: 'Open Sans';}}

packages/syft/src/syft/service/project/project.py

@@ -35,11 +35,15 @@
 from ...types.datetime import DateTime
 from ...types.syft_object import SYFT_OBJECT_VERSION_1
 from ...types.syft_object import SyftObject
+from ...types.syft_object import short_qual_name
 from ...types.transforms import TransformContext
 from ...types.transforms import keep
 from ...types.transforms import transform
 from ...types.uid import UID
+from ...util import options
+from ...util.colors import SURFACE
 from ...util.markdown import markdown_as_class_with_fields
+from ...util.util import full_name_with_qualname
 from ..code.user_code import SubmitUserCode
 from ..network.network_service import NodePeer
 from ..network.routes import NodeRoute
@@ -116,6 +120,12 @@ class ProjectEvent(SyftObject):
     creator_verify_key: Optional[SyftVerifyKey]
     signature: Optional[bytes]  # dont use in signing
 
+    def __repr_syft_nested__(self):
+        return (
+            short_qual_name(full_name_with_qualname(self)),
+            f"{str(self.id)[:4]}...{str(self.id)[-3:]}",
+        )
+
     @pydantic.root_validator(pre=True)
     def make_timestamp(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         if "timestamp" not in values or values["timestamp"] is None:
@@ -704,6 +714,21 @@ class Project(SyftObject):
     # store: Dict[UID, Dict[UID, SyftObject]] = {}
     # permissions: Dict[UID, Dict[UID, Set[str]]] = {}
 
+    def _repr_html_(self) -> Any:
+        return (
+            f"""
+            <style>
+            .syft-project {{color: {SURFACE[options.color_theme]};}}
+            </style>
+            """
+            + "<div class='syft-project'>"
+            + f"<h3>{self.name}</h3>"
+            + f"<p>{self.description}</p>"
+            + f"<p><strong>Created by: </strong>{self.created_by}</p>"
+            + self.requests._repr_html_()
+            + "</div>"
+        )
+
     def _broadcast_event(
         self, project_event: ProjectEvent
     ) -> Union[SyftSuccess, SyftError]:
@@ -1165,6 +1190,20 @@ def __init__(self, *args, **kwargs):
         # Convert SyftClients to NodeIdentities
         self.members = list(map(self.to_node_identity, self.members))
 
+    def _repr_html_(self) -> Any:
+        return (
+            f"""
+            <style>
+            .syft-project-create {{color: {SURFACE[options.color_theme]};}}
+            </style>
+            """
+            + "<div class='syft-project-create'>"
+            + f"<h3>{self.name}</h3>"
+            + f"<p>{self.description}</p>"
+            + f"<p><strong>Created by: </strong>{self.created_by}</p>"
+            + "</div>"
+        )
+
     @validator("members", pre=True)
     def verify_members(cls, val: Union[List[SyftClient], List[NodeIdentity]]):
         # SyftClients must be logged in by the same emails