Remove all code and files related to Oblivous Enclave

OpenMined · Mar 28, 2024 · 00291ec · 00291ec
1 parent 2e7cfde
commit 00291ec
Show file tree

Hide file tree

Showing 31 changed files with 2 additions and 1,841 deletions.
diff --git a/.github/workflows/pr-tests-enclave.yml b/.github/workflows/pr-tests-enclave.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -173,7 +173,7 @@ repos:
         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|^packages/syft/src/syft/external/oblv/"
+        exclude: "packages/syft/src/syft/types/dicttuple.py|^packages/syft/src/syft/service/action/action_graph.py"
         args: [
             "--follow-imports=skip",
             "--ignore-missing-imports",

diff --git a/docs/source/api_reference/syft.external.oblv.rst b/docs/source/api_reference/syft.external.oblv.rst
diff --git a/docs/source/api_reference/syft.external.rst b/docs/source/api_reference/syft.external.rst
@@ -25,14 +25,3 @@
 
 
 
-
-
-
-.. rubric:: Modules
-
-.. autosummary::
-   :toctree:
-   :recursive:
-
-   syft.external.oblv
-
diff --git a/docs/source/api_reference/syft.node.node.rst b/docs/source/api_reference/syft.node.node.rst
@@ -14,7 +14,6 @@ syft.node.node
    .. autosummary::
 
       create_admin_new
-      create_oblv_key_pair
       create_worker_metadata
       get_default_root_email
       get_default_root_password

diff --git a/notebooks/tutorials/data-engineer/01-setting-up-dev-mode.ipynb b/notebooks/tutorials/data-engineer/01-setting-up-dev-mode.ipynb
@@ -120,7 +120,6 @@
     "syft.test.unit\n",
     "syft.test.notebook\n",
     "stack.test.notebook\n",
-    "stack.test.integration.enclave.oblv\n",
     "stack.test.vm\n",
     "frontend.test.unit\n",
     "frontend.test.e2e\n",

diff --git a/packages/grid/backend/backend.dockerfile b/packages/grid/backend/backend.dockerfile
@@ -96,8 +96,6 @@ ENV PATH=$PATH:$HOME/.local/bin \
     DEV_MODE="False" \
     DEBUGGER_ENABLED="False" \
     CONTAINER_HOST="docker" \
-    OBLV_ENABLED="False" \
-    OBLV_LOCALHOST_PORT=3030 \
     DEFAULT_ROOT_EMAIL="[email protected]" \
     DEFAULT_ROOT_PASSWORD="changethis" \
     STACK_API_KEY="changeme" \

diff --git a/packages/grid/backend/install_oblivious.sh b/packages/grid/backend/install_oblivious.sh
diff --git a/packages/grid/backend/wheels/oblv-ccli-0.4.0-x86_64-unknown-linux-musl.tar.gz b/packages/grid/backend/wheels/oblv-ccli-0.4.0-x86_64-unknown-linux-musl.tar.gz
diff --git a/packages/grid/default.env b/packages/grid/default.env
@@ -108,11 +108,6 @@ NODE_SIDE_TYPE=high
 # Worker
 USE_BLOB_STORAGE=False
 
-#Oblivious
-OBLV_ENABLED=false
-OBLV_KEY_PATH="~/.oblv"
-OBLV_LOCALHOST_PORT=3030
-
 # Registation
 ENABLE_SIGNUP=False
 

diff --git a/packages/grid/docker-compose.yml b/packages/grid/docker-compose.yml
@@ -149,8 +149,6 @@ services:
       - JAEGER_PORT=${JAEGER_PORT}
       - ASSOCIATION_TIMEOUT=${ASSOCIATION_TIMEOUT}
       - DEV_MODE=${DEV_MODE}
-      - OBLV_LOCALHOST_PORT=${OBLV_LOCALHOST_PORT}
-      - OBLV_ENABLED=${OBLV_ENABLED}
       - DEFAULT_ROOT_EMAIL=${DEFAULT_ROOT_EMAIL}
       - DEFAULT_ROOT_PASSWORD=${DEFAULT_ROOT_PASSWORD}
       - BACKEND_STORAGE_PATH=${BACKEND_STORAGE_PATH}
@@ -196,8 +194,6 @@ services:
   #     - JAEGER_HOST=${JAEGER_HOST}
   #     - JAEGER_PORT=${JAEGER_PORT}
   #     - DEV_MODE=${DEV_MODE}
-  #     - OBLV_LOCALHOST_PORT=${OBLV_LOCALHOST_PORT}
-  #     - OBLV_ENABLED=${OBLV_ENABLED}
   #   network_mode: service:proxy
   #   volumes:
   #     - credentials-data:/root/data/creds/
@@ -230,8 +226,6 @@ services:
   #     - JAEGER_HOST=${JAEGER_HOST}
   #     - JAEGER_PORT=${JAEGER_PORT}
   #     - DEV_MODE=${DEV_MODE}
-  #     - OBLV_LOCALHOST_PORT=${OBLV_LOCALHOST_PORT}
-  #     - OBLV_ENABLED=${OBLV_ENABLED}
   #   command: "/app/grid/worker-start.sh"
   #   network_mode: service:proxy
   #   volumes:

diff --git a/packages/grid/helm/syft/templates/backend/backend-statefulset.yaml b/packages/grid/helm/syft/templates/backend/backend-statefulset.yaml
@@ -114,13 +114,6 @@ spec:
               value: "localhost"
             - name: JAEGER_PORT
               value: "14268"
-            # Oblivious
-            {{- if .Values.node.oblv.enabled }}
-            - name: OBLV_LOCALHOST_PORT
-              value: {{ .Values.node.oblv.port | quote }}
-            - name: OBLV_ENABLED
-              value: {{ .Values.node.oblv.enabled | quote }}
-            {{- end }}
             # Veilid
             {{- if .Values.veilid.enabled }}
             - name: VEILID_ENABLED

diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml
@@ -105,11 +105,6 @@ node:
     username: apikey
     password: password
 
-  # Oblivious settings
-  oblv:
-    enabled: false
-    port: 3030
-
   # Extra environment vars
   env: null
 

diff --git a/packages/grid/podman/podman-kube/podman-syft-kube-config.yaml b/packages/grid/podman/podman-kube/podman-syft-kube-config.yaml
@@ -103,10 +103,5 @@ data:
   # Worker
   USE_BLOB_STORAGE: False
 
-  #Oblivious
-  OBLV_ENABLED: false
-  OBLV_KEY_PATH: "~/.oblv"
-  OBLV_LOCALHOST_PORT: 3030
-
   # Registation
   ENABLE_SIGNUP: False
diff --git a/packages/hagrid/hagrid/cli.py b/packages/hagrid/hagrid/cli.py
@@ -392,11 +392,6 @@ def clean(location: str) -> None:
     is_flag=True,
     help="Turn off auto health checks post node launch",
 )
-@click.option(
-    "--oblv",
-    is_flag=True,
-    help="Installs Oblivious CLI tool",
-)
 @click.option(
     "--set-root-email",
     default=None,
@@ -1309,8 +1304,6 @@ def create_launch_cmd(
     headless = bool(kwargs["headless"])
     parsed_kwargs["headless"] = headless
 
-    parsed_kwargs["oblv"] = bool(kwargs["oblv"])
-
     parsed_kwargs["tls"] = bool(kwargs["tls"])
     parsed_kwargs["test"] = bool(kwargs["test"])
     parsed_kwargs["dev"] = bool(kwargs["dev"])
@@ -2197,7 +2190,6 @@ def create_launch_docker_cmd(
     smtp_port = kwargs.get("smtp_port")
     smtp_host = kwargs.get("smtp_host")
 
-    enable_oblv = bool(kwargs["oblv"])
     print("  - NAME: " + str(snake_name))
     print("  - TEMPLATE DIR: " + template_grid_dir)
     if compose_src_path:
@@ -2215,9 +2207,6 @@ def create_launch_docker_cmd(
     print("  - PORT: " + str(host_term.free_port))
     print("  - DOCKER COMPOSE: " + docker_version)
     print("  - IN-MEMORY WORKERS: " + str(in_mem_workers))
-    if enable_oblv:
-        print("  - OBLV: ", enable_oblv)
-
     print("\n")
 
     use_blob_storage = (
@@ -2255,7 +2244,6 @@ def create_launch_docker_cmd(
         "STACK_API_KEY": str(
             generate_sec_random_password(length=48, special_chars=False)
         ),
-        "OBLV_ENABLED": str(enable_oblv).lower(),
         "CREDENTIALS_VOLUME": host_path,
         "NODE_SIDE_TYPE": kwargs["node_side_type"],
         "SINGLE_CONTAINER_MODE": single_container_mode,

diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py
@@ -26,8 +26,6 @@
 from .client.user_settings import UserSettings  # noqa: F401
 from .client.user_settings import settings  # noqa: F401
 from .custom_worker.config import DockerWorkerConfig  # noqa: F401
-from .external import OBLV_ENABLED  # noqa: F401
-from .external import enable_external_lib  # noqa: F401
 from .node.credentials import SyftSigningKey  # noqa: F401
 from .node.domain import Domain  # noqa: F401
 from .node.enclave import Enclave  # noqa: F401
@@ -107,10 +105,6 @@
 except:  # noqa: E722
     pass  # nosec
 
-# For server-side, to enable by environment variable
-if OBLV_ENABLED:
-    enable_external_lib("oblv")
-
 
 def module_property(func: Any) -> Callable:
     """Decorator to turn module functions into properties.