From 5b3c0b8c1d3b13362fb0055cd9e28dae36ea4a5f Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Wed, 28 Jun 2023 20:03:27 +0300
Subject: [PATCH 01/11] init commit

---
 packages/syft/src/syft/client/client.py | 17 +++++++++++++++++
 packages/syft/src/syft/util/env.py      | 15 +++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 packages/syft/src/syft/util/env.py

diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index 63e79cae1c4..8550fd8db25 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -22,6 +22,7 @@
 from requests.packages.urllib3.util.retry import Retry
 from tqdm import tqdm
 from typing_extensions import Self
+import subprocess
 
 # relative
 from .. import __version__
@@ -52,6 +53,7 @@
 from ..util.util import get_mb_size
 from ..util.util import thread_ident
 from ..util.util import verify_tls
+from ..util.env import Env
 from .api import APIModule
 from .api import APIRegistry
 from .api import SignedSyftAPICall
@@ -328,6 +330,21 @@ def __init__(
 
         self.post_init()
 
+    def get_env(self) -> Env:
+        res = subprocess.run("pip list | tail -n +3 | awk '{print $1,$2}'",
+                             shell=True, check=True, executable='/bin/bash',
+                             capture_output=True)
+        packages_dict = {}
+        for line in res.stdout.decode().split('\n')[:-1]:
+            print(line)
+            elems = line.split(" ")
+            package_name = elems[0]
+            version = elems[1]
+            if len(elems) == 3:
+                print(f"Warning, package {package_name} is installed in editable mode so errors might occur!!!")
+            packages_dict[package_name] = version
+        return Env(packages_dict=packages_dict)
+
     def post_init(self) -> None:
         if self.metadata is None:
             self._fetch_node_metadata(self.credentials)
diff --git a/packages/syft/src/syft/util/env.py b/packages/syft/src/syft/util/env.py
new file mode 100644
index 00000000000..cc44998e898
--- /dev/null
+++ b/packages/syft/src/syft/util/env.py
@@ -0,0 +1,15 @@
+from ..types.syft_object import SyftObject, SYFT_OBJECT_VERSION_1
+from typing import Dict
+import venv
+
+class Env(SyftObject):
+    __canonical_name__ = "Env"
+    __version__ = SYFT_OBJECT_VERSION_1
+    packages_dict: Dict[str, str]
+    
+    @property
+    def packages(self):
+        return [(k, v) for k, v in self.packages_dict.items()]
+    
+    def create_local_env(self):
+        venv.EnvBuilder()
\ No newline at end of file

From efdf4610d4af5332241d92aa4612f8e38519f052 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Mon, 3 Jul 2023 12:26:15 +0300
Subject: [PATCH 02/11] changed pip list to freeze format

---
 packages/syft/src/syft/client/client.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index 8550fd8db25..7e6db7d3be0 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -331,19 +331,20 @@ def __init__(
         self.post_init()
 
     def get_env(self) -> Env:
-        res = subprocess.run("pip list | tail -n +3 | awk '{print $1,$2}'",
+        res = subprocess.run("pip list --format=freeze",
                              shell=True, check=True, executable='/bin/bash',
                              capture_output=True)
-        packages_dict = {}
-        for line in res.stdout.decode().split('\n')[:-1]:
-            print(line)
-            elems = line.split(" ")
-            package_name = elems[0]
-            version = elems[1]
-            if len(elems) == 3:
-                print(f"Warning, package {package_name} is installed in editable mode so errors might occur!!!")
-            packages_dict[package_name] = version
-        return Env(packages_dict=packages_dict)
+        return res.stdout.decode()
+        # packages_dict = {}
+        # for line in res.stdout.decode().split('\n')[:-1]:
+        #     print(line)
+        #     elems = line.split(" ")
+        #     package_name = elems[0]
+        #     version = elems[1]
+        #     if len(elems) == 3:
+        #         print(f"Warning, package {package_name} is installed in editable mode so errors might occur!!!")
+        #     packages_dict[package_name] = version
+        # return Env(packages_dict=packages_dict)
 
     def post_init(self) -> None:
         if self.metadata is None:

From a1eb538024f43f697e01eaaf05e327675086f030 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Thu, 6 Jul 2023 17:12:37 +0300
Subject: [PATCH 03/11] fix lint

---
 packages/syft/src/syft/client/client.py | 14 +++++++++-----
 packages/syft/src/syft/util/env.py      | 13 +++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index 7e6db7d3be0..532a3172597 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -5,6 +5,7 @@
 from enum import Enum
 import hashlib
 import json
+import subprocess
 from typing import Any
 from typing import Dict
 from typing import Optional
@@ -22,7 +23,6 @@
 from requests.packages.urllib3.util.retry import Retry
 from tqdm import tqdm
 from typing_extensions import Self
-import subprocess
 
 # relative
 from .. import __version__
@@ -47,13 +47,13 @@
 from ..types.grid_url import GridURL
 from ..types.syft_object import SYFT_OBJECT_VERSION_1
 from ..types.uid import UID
+from ..util.env import Env
 from ..util.fonts import fonts_css
 from ..util.logger import debug
 from ..util.telemetry import instrument
 from ..util.util import get_mb_size
 from ..util.util import thread_ident
 from ..util.util import verify_tls
-from ..util.env import Env
 from .api import APIModule
 from .api import APIRegistry
 from .api import SignedSyftAPICall
@@ -331,9 +331,13 @@ def __init__(
         self.post_init()
 
     def get_env(self) -> Env:
-        res = subprocess.run("pip list --format=freeze",
-                             shell=True, check=True, executable='/bin/bash',
-                             capture_output=True)
+        res = subprocess.run(
+            "pip list --format=freeze",
+            shell=True,
+            check=True,
+            executable="/bin/bash",
+            capture_output=True,
+        )
         return res.stdout.decode()
         # packages_dict = {}
         # for line in res.stdout.decode().split('\n')[:-1]:
diff --git a/packages/syft/src/syft/util/env.py b/packages/syft/src/syft/util/env.py
index cc44998e898..e84b5118494 100644
--- a/packages/syft/src/syft/util/env.py
+++ b/packages/syft/src/syft/util/env.py
@@ -1,15 +1,20 @@
-from ..types.syft_object import SyftObject, SYFT_OBJECT_VERSION_1
+# stdlib
 from typing import Dict
 import venv
 
+# relative
+from ..types.syft_object import SYFT_OBJECT_VERSION_1
+from ..types.syft_object import SyftObject
+
+
 class Env(SyftObject):
     __canonical_name__ = "Env"
     __version__ = SYFT_OBJECT_VERSION_1
     packages_dict: Dict[str, str]
-    
+
     @property
     def packages(self):
         return [(k, v) for k, v in self.packages_dict.items()]
-    
+
     def create_local_env(self):
-        venv.EnvBuilder()
\ No newline at end of file
+        venv.EnvBuilder()

From b0b4c13fbffcbdf1d1550ed958abbcb83f74072c Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Thu, 13 Jul 2023 17:27:11 +0300
Subject: [PATCH 04/11] added get_env method

---
 packages/syft/src/syft/client/client.py       |  9 +------
 packages/syft/src/syft/node/node.py           |  3 +++
 .../syft/service/metadata/metadata_service.py | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 packages/syft/src/syft/service/metadata/metadata_service.py

diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index 0afee859b55..22e7c4f588b 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -358,14 +358,7 @@ def __init__(
         self.post_init()
 
     def get_env(self) -> str:
-        res = subprocess.run(
-            "pip list --format=freeze",
-            shell=True,
-            check=True,
-            executable="/bin/bash",
-            capture_output=True,
-        )
-        return res.stdout.decode()
+        return self.api.services.metadata.get_env()
 
     def post_init(self) -> None:
         if self.metadata is None:
diff --git a/packages/syft/src/syft/node/node.py b/packages/syft/src/syft/node/node.py
index 637c5286343..53d4108d1d0 100644
--- a/packages/syft/src/syft/node/node.py
+++ b/packages/syft/src/syft/node/node.py
@@ -73,6 +73,7 @@
 from ..service.user.user import User
 from ..service.user.user import UserCreate
 from ..service.user.user_roles import ServiceRole
+from ..service.metadata.metadata_service import MetadataService
 from ..service.user.user_service import UserService
 from ..service.user.user_stash import UserStash
 from ..store.dict_document_store import DictStoreConfig
@@ -211,6 +212,7 @@ def __init__(
                 DataSubjectMemberService,
                 ProjectService,
                 EnclaveService,
+                MetadataService,
             ]
             if services is None
             else services
@@ -456,6 +458,7 @@ def _construct_services(self):
                 DataSubjectMemberService,
                 ProjectService,
                 EnclaveService,
+                MetadataService
             ]
 
             if OBLV:
diff --git a/packages/syft/src/syft/service/metadata/metadata_service.py b/packages/syft/src/syft/service/metadata/metadata_service.py
new file mode 100644
index 00000000000..62676cb9a15
--- /dev/null
+++ b/packages/syft/src/syft/service/metadata/metadata_service.py
@@ -0,0 +1,27 @@
+import gevent.subprocess as subprocess
+from ...serde.serializable import serializable
+from ...util.telemetry import instrument
+from ..service import AbstractService
+from ..service import service_method
+from ..context import AuthedServiceContext
+from ..user.user_roles import GUEST_ROLE_LEVEL
+from ..response import SyftError
+from ..response import SyftSuccess
+from ...store.document_store import DocumentStore
+
+@instrument
+@serializable()
+class MetadataService(AbstractService):
+
+    def __init__(self, store: DocumentStore) -> None:
+        self.store = store
+        
+    @service_method(path="metadata.get_env", name="get_env", roles=GUEST_ROLE_LEVEL)
+    def get_env(self, context: AuthedServiceContext):
+        
+        res = subprocess.getoutput(
+            "pip list --format=freeze",
+        )
+        import sys
+        print(res, file=sys.stderr)
+        return SyftSuccess(message=res.stdout.decode())
\ No newline at end of file

From 2c88fd4fc9bd0f79b69680894b4db9e45e160d83 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Thu, 13 Jul 2023 18:51:17 +0300
Subject: [PATCH 05/11] modified request repr

---
 packages/syft/src/syft/client/client.py       |  1 -
 .../syft/src/syft/client/gateway_client.py    |  4 ++-
 packages/syft/src/syft/node/node.py           |  4 +--
 .../syft/service/metadata/metadata_service.py | 31 ++++++++++++++-----
 .../syft/src/syft/service/request/request.py  |  8 +++--
 .../src/syft/service/user/user_service.py     |  9 ++++++
 .../syft/src/syft/service/user/user_stash.py  |  5 +++
 7 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index cea2684ddee..7f4accfe75a 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -5,7 +5,6 @@
 from enum import Enum
 import hashlib
 import json
-import subprocess
 from typing import Any
 from typing import Callable
 from typing import Dict
diff --git a/packages/syft/src/syft/client/gateway_client.py b/packages/syft/src/syft/client/gateway_client.py
index a7806be0fe6..eaa1c2a1ad3 100644
--- a/packages/syft/src/syft/client/gateway_client.py
+++ b/packages/syft/src/syft/client/gateway_client.py
@@ -64,7 +64,9 @@ def proxy_client_for(
     def domains(self) -> Optional[Union[List[NodePeer], SyftError]]:
         if not self.api.has_service("network"):
             return None
-        return self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
+        domains = self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
+        domains.append(self)
+        return domains
 
     @property
     def enclaves(self) -> Optional[Union[List[NodePeer], SyftError]]:
diff --git a/packages/syft/src/syft/node/node.py b/packages/syft/src/syft/node/node.py
index 8973a888b64..993519eb055 100644
--- a/packages/syft/src/syft/node/node.py
+++ b/packages/syft/src/syft/node/node.py
@@ -52,6 +52,7 @@
 from ..service.data_subject.data_subject_service import DataSubjectService
 from ..service.dataset.dataset_service import DatasetService
 from ..service.enclave.enclave_service import EnclaveService
+from ..service.metadata.metadata_service import MetadataService
 from ..service.metadata.node_metadata import NodeMetadata
 from ..service.network.network_service import NetworkService
 from ..service.notification.notification_service import NotificationService
@@ -74,7 +75,6 @@
 from ..service.user.user import User
 from ..service.user.user import UserCreate
 from ..service.user.user_roles import ServiceRole
-from ..service.metadata.metadata_service import MetadataService
 from ..service.user.user_service import UserService
 from ..service.user.user_stash import UserStash
 from ..store.dict_document_store import DictStoreConfig
@@ -459,7 +459,7 @@ def _construct_services(self):
                 DataSubjectMemberService,
                 ProjectService,
                 EnclaveService,
-                MetadataService
+                MetadataService,
             ]
 
             if OBLV:
diff --git a/packages/syft/src/syft/service/metadata/metadata_service.py b/packages/syft/src/syft/service/metadata/metadata_service.py
index 62676cb9a15..7b859470cd2 100644
--- a/packages/syft/src/syft/service/metadata/metadata_service.py
+++ b/packages/syft/src/syft/service/metadata/metadata_service.py
@@ -1,27 +1,42 @@
+# third party
 import gevent.subprocess as subprocess
+
+# relative
 from ...serde.serializable import serializable
+from ...store.document_store import DocumentStore
 from ...util.telemetry import instrument
+from ..context import AuthedServiceContext
+from ..response import SyftSuccess
 from ..service import AbstractService
 from ..service import service_method
-from ..context import AuthedServiceContext
 from ..user.user_roles import GUEST_ROLE_LEVEL
-from ..response import SyftError
-from ..response import SyftSuccess
-from ...store.document_store import DocumentStore
+
 
 @instrument
 @serializable()
 class MetadataService(AbstractService):
-
     def __init__(self, store: DocumentStore) -> None:
         self.store = store
-        
+
+    @service_method(
+        path="metadata.get_metadata", name="get_metadata", roles=GUEST_ROLE_LEVEL
+    )
+    def get_metadata(self, context: AuthedServiceContext):
+        return context.node.metadata
+
+    # @service_method(path="metadata.get_admin", name="get_admin", roles=GUEST_ROLE_LEVEL)
+    # def get_admin(self, context: AuthedServiceContext):
+    #     user_service = context.node.get_service("userservice")
+    #     admin_user = user_service.get_all(context=context)[0]
+    #     return admin_user
+
     @service_method(path="metadata.get_env", name="get_env", roles=GUEST_ROLE_LEVEL)
     def get_env(self, context: AuthedServiceContext):
-        
         res = subprocess.getoutput(
             "pip list --format=freeze",
         )
+        # stdlib
         import sys
+
         print(res, file=sys.stderr)
-        return SyftSuccess(message=res.stdout.decode())
\ No newline at end of file
+        return SyftSuccess(message=res.stdout.decode())
diff --git a/packages/syft/src/syft/service/request/request.py b/packages/syft/src/syft/service/request/request.py
index bf634075647..2a73c6b38b7 100644
--- a/packages/syft/src/syft/service/request/request.py
+++ b/packages/syft/src/syft/service/request/request.py
@@ -189,7 +189,8 @@ def _repr_html_(self) -> Any:
             self.node_uid,
             self.syft_client_verify_key,
         )
-
+        metadata = api.services.metadata.get_metadata()
+        admin_user = api.services.user.get_admin()
         return f"""
             <style>
             .syft-request {{color: {SURFACE[options.color_theme]};}}
@@ -201,7 +202,10 @@ def _repr_html_(self) -> Any:
                 {updated_at_line}
                 <p><strong>Changes: </strong> {str_changes}</p>
                 <p><strong>Status: </strong>{self.status}</p>
-                <p><strong>Sent to Domain </strong>{api.node_name}</p>
+                <p><strong>Sent to: </strong></p>
+                <p>&emsp; <strong>Name:  </strong>{api.node_name}</p>
+                <p>&emsp; <strong>Type:  </strong>{metadata.node_type.value}</p>
+                <p>&emsp; <strong>Domain Owner's email:  </strong>{admin_user.email}</p>
             </div>
             """
 
diff --git a/packages/syft/src/syft/service/user/user_service.py b/packages/syft/src/syft/service/user/user_service.py
index 4fa286ab542..035f287202c 100644
--- a/packages/syft/src/syft/service/user/user_service.py
+++ b/packages/syft/src/syft/service/user/user_service.py
@@ -176,6 +176,15 @@ def search(
 
         return results
 
+    @service_method(path="user.get_admin", name="get_admin", roles=GUEST_ROLE_LEVEL)
+    def get_admin(self, context: AuthedServiceContext) -> UserView:
+        result = self.stash.admin_user()
+        if result.is_ok():
+            user = result.ok()
+            if user:
+                return user
+        return SyftError(message=str(result.err()))
+
     @service_method(
         path="user.get_current_user", name="get_current_user", roles=GUEST_ROLE_LEVEL
     )
diff --git a/packages/syft/src/syft/service/user/user_stash.py b/packages/syft/src/syft/service/user/user_stash.py
index bef3fca0067..e3fd20bd179 100644
--- a/packages/syft/src/syft/service/user/user_stash.py
+++ b/packages/syft/src/syft/service/user/user_stash.py
@@ -59,6 +59,11 @@ def set(
     def admin_verify_key(self):
         return Ok(self.partition.root_verify_key)
 
+    def admin_user(self):
+        return self.get_by_role(
+            credentials=self.admin_verify_key().ok(), role=ServiceRole.ADMIN
+        )
+
     def get_by_uid(
         self, credentials: SyftVerifyKey, uid: UID
     ) -> Result[Optional[User], str]:

From b9ea3c4cd9093095e38490d66ee3dcc6e0aca4b2 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Thu, 13 Jul 2023 19:06:18 +0300
Subject: [PATCH 06/11] added gateway client to .domains

---
 packages/syft/src/syft/client/gateway_client.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/syft/src/syft/client/gateway_client.py b/packages/syft/src/syft/client/gateway_client.py
index eaa1c2a1ad3..c8cd780ae82 100644
--- a/packages/syft/src/syft/client/gateway_client.py
+++ b/packages/syft/src/syft/client/gateway_client.py
@@ -11,6 +11,7 @@
 from ..abstract_node import NodeType
 from ..node.credentials import SyftSigningKey
 from ..serde.serializable import serializable
+from ..service.metadata.node_metadata import NodeMetadata
 from ..service.network.node_peer import NodePeer
 from ..service.response import SyftError
 from ..service.response import SyftException
@@ -65,8 +66,9 @@ def domains(self) -> Optional[Union[List[NodePeer], SyftError]]:
         if not self.api.has_service("network"):
             return None
         domains = self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
-        domains.append(self)
+        domains.append(self.metadata.to(NodeMetadata).to(NodePeer))
         return domains
+        # return self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
 
     @property
     def enclaves(self) -> Optional[Union[List[NodePeer], SyftError]]:

From 8b547196168e0d5903ac6e651d7d19185367cfd8 Mon Sep 17 00:00:00 2001
From: Koen van der Veen <koenlennartvanderveen@gmail.com>
Date: Fri, 14 Jul 2023 10:21:21 +0200
Subject: [PATCH 07/11] refactor request repr code

---
 packages/syft/src/syft/service/request/request.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/syft/src/syft/service/request/request.py b/packages/syft/src/syft/service/request/request.py
index 2a73c6b38b7..4e286fb357f 100644
--- a/packages/syft/src/syft/service/request/request.py
+++ b/packages/syft/src/syft/service/request/request.py
@@ -191,6 +191,7 @@ def _repr_html_(self) -> Any:
         )
         metadata = api.services.metadata.get_metadata()
         admin_user = api.services.user.get_admin()
+        node_name = api.node_name.capitalize() if api.node_name is not None else ""
         return f"""
             <style>
             .syft-request {{color: {SURFACE[options.color_theme]};}}
@@ -202,10 +203,8 @@ def _repr_html_(self) -> Any:
                 {updated_at_line}
                 <p><strong>Changes: </strong> {str_changes}</p>
                 <p><strong>Status: </strong>{self.status}</p>
-                <p><strong>Sent to: </strong></p>
-                <p>&emsp; <strong>Name:  </strong>{api.node_name}</p>
-                <p>&emsp; <strong>Type:  </strong>{metadata.node_type.value}</p>
-                <p>&emsp; <strong>Domain Owner's email:  </strong>{admin_user.email}</p>
+                <p><strong>Requested on: </strong> {node_name} of type <strong> \
+                    {metadata.node_type.value.capitalize()}</strong> owned by {admin_user.email}</p>
             </div>
             """
 

From 76381a17667c80814b292f301d077d1029c42442 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Fri, 14 Jul 2023 11:23:53 +0300
Subject: [PATCH 08/11] added admin email in node metadata and node peer

---
 packages/syft/src/syft/client/gateway_client.py  |  5 +----
 packages/syft/src/syft/node/node.py              | 16 ++++++++++++++--
 .../src/syft/service/metadata/node_metadata.py   |  3 +++
 .../src/syft/service/network/network_service.py  |  2 +-
 .../syft/src/syft/service/network/node_peer.py   |  3 ++-
 .../syft/src/syft/service/settings/settings.py   |  4 +++-
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/packages/syft/src/syft/client/gateway_client.py b/packages/syft/src/syft/client/gateway_client.py
index c8cd780ae82..de4a09da09e 100644
--- a/packages/syft/src/syft/client/gateway_client.py
+++ b/packages/syft/src/syft/client/gateway_client.py
@@ -65,10 +65,7 @@ def proxy_client_for(
     def domains(self) -> Optional[Union[List[NodePeer], SyftError]]:
         if not self.api.has_service("network"):
             return None
-        domains = self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
-        domains.append(self.metadata.to(NodeMetadata).to(NodePeer))
-        return domains
-        # return self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
+        return self.api.services.network.get_peers_by_type(node_type=NodeType.DOMAIN)
 
     @property
     def enclaves(self) -> Optional[Union[List[NodePeer], SyftError]]:
diff --git a/packages/syft/src/syft/node/node.py b/packages/syft/src/syft/node/node.py
index 993519eb055..6ac37882d72 100644
--- a/packages/syft/src/syft/node/node.py
+++ b/packages/syft/src/syft/node/node.py
@@ -93,6 +93,7 @@
 from .credentials import SyftSigningKey
 from .credentials import SyftVerifyKey
 from .worker_settings import WorkerSettings
+import subprocess
 
 # if user code needs to be serded and its not available we can call this to refresh
 # the code for a specific node UID and thread
@@ -142,6 +143,11 @@ def get_default_root_password() -> Optional[str]:
 def get_dev_mode() -> bool:
     return str_to_bool(get_env("DEV_MODE", "False"))
 
+def get_venv_packages() -> str:
+    res = subprocess.getoutput(
+            "pip list --format=freeze",
+        )
+    return res
 
 dev_mode = get_dev_mode()
 
@@ -156,6 +162,7 @@ def get_dev_mode() -> bool:
 class Node(AbstractNode):
     signing_key: Optional[SyftSigningKey]
     required_signed_calls: bool = True
+    packages: str
 
     def __init__(
         self,
@@ -183,6 +190,7 @@ def __init__(
             if id is None:
                 id = UID()
             self.id = id
+        self.packages = get_venv_packages()
 
         self.signing_key = None
         if signing_key_env is not None:
@@ -250,7 +258,7 @@ def __init__(
         self.node_type = node_type
 
         self.post_init()
-        self.create_initial_settings()
+        self.create_initial_settings(admin_email=root_email)
         if not (self.is_subprocess or self.processes == 0):
             self.init_queue_manager(queue_config=queue_config)
 
@@ -506,6 +514,7 @@ def metadata(self) -> NodeMetadata:
         on_board = False
         description = ""
         signup_enabled = False
+        admin_email = ""
 
         settings_stash = SettingsStash(store=self.document_store)
         settings = settings_stash.get_all(self.signing_key.verify_key)
@@ -517,6 +526,7 @@ def metadata(self) -> NodeMetadata:
             on_board = settings_data.on_board
             description = settings_data.description
             signup_enabled = settings_data.signup_enabled
+            admin_email = settings_data.admin_email
 
         return NodeMetadata(
             name=name,
@@ -531,6 +541,7 @@ def metadata(self) -> NodeMetadata:
             on_board=on_board,
             node_type=self.node_type.value,
             signup_enabled=signup_enabled,
+            admin_email=admin_email
         )
 
     @property
@@ -705,7 +716,7 @@ def get_unauthed_context(
     ) -> NodeServiceContext:
         return UnauthedServiceContext(node=self, login_credentials=login_credentials)
 
-    def create_initial_settings(self) -> Optional[NodeSettings]:
+    def create_initial_settings(self, admin_email: str) -> Optional[NodeSettings]:
         if self.name is None:
             self.name = random_name()
         try:
@@ -723,6 +734,7 @@ def create_initial_settings(self) -> Optional[NodeSettings]:
                     name=self.name,
                     deployed_on=datetime.now().date().strftime("%m/%d/%Y"),
                     signup_enabled=flags.CAN_REGISTER,
+                    admin_email=admin_email,
                 )
                 result = settings_stash.set(
                     credentials=self.signing_key.verify_key, settings=new_settings
diff --git a/packages/syft/src/syft/service/metadata/node_metadata.py b/packages/syft/src/syft/service/metadata/node_metadata.py
index ea6603f5d14..7f1f4644bb7 100644
--- a/packages/syft/src/syft/service/metadata/node_metadata.py
+++ b/packages/syft/src/syft/service/metadata/node_metadata.py
@@ -56,6 +56,7 @@ class NodeMetadataUpdate(SyftObject):
     highest_object_version: Optional[int]
     lowest_object_version: Optional[int]
     syft_version: Optional[str]
+    admin_email: Optional[str]
 
 
 @serializable()
@@ -75,6 +76,7 @@ class NodeMetadata(SyftObject):
     on_board: bool = False
     description: str = "Text"
     signup_enabled: bool
+    admin_email: str
 
     def check_version(self, client_version: str) -> bool:
         return check_version(
@@ -99,6 +101,7 @@ class NodeMetadataJSON(BaseModel, StorableObjectType):
     on_board: bool = False
     description: str = "My cool domain"
     signup_enabled: bool
+    admin_email: str
 
     def check_version(self, client_version: str) -> bool:
         return check_version(
diff --git a/packages/syft/src/syft/service/network/network_service.py b/packages/syft/src/syft/service/network/network_service.py
index 60341972e2b..123621dd194 100644
--- a/packages/syft/src/syft/service/network/network_service.py
+++ b/packages/syft/src/syft/service/network/network_service.py
@@ -530,5 +530,5 @@ def node_route_to_http_connection(
 @transform(NodeMetadata, NodePeer)
 def metadata_to_peer() -> List[Callable]:
     return [
-        keep(["id", "name", "verify_key", "node_type"]),
+        keep(["id", "name", "verify_key", "node_type", "admin_email"]),
     ]
diff --git a/packages/syft/src/syft/service/network/node_peer.py b/packages/syft/src/syft/service/network/node_peer.py
index 646f1889a76..956f5b50160 100644
--- a/packages/syft/src/syft/service/network/node_peer.py
+++ b/packages/syft/src/syft/service/network/node_peer.py
@@ -31,7 +31,7 @@ class NodePeer(SyftObject):
 
     __attr_searchable__ = ["name", "node_type"]
     __attr_unique__ = ["verify_key"]
-    __repr_attrs__ = ["name", "node_type"]
+    __repr_attrs__ = ["name", "node_type", "admin_email"]
 
     id: Optional[UID]
     name: str
@@ -40,6 +40,7 @@ class NodePeer(SyftObject):
     vpn_auth_key: Optional[str] = None
     node_routes: List[NodeRouteType] = []
     node_type: NodeType
+    admin_email: str
 
     def update_routes(self, new_routes: List[NodeRoute]) -> None:
         add_routes = []
diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index a91d225da15..7e2b1b40376 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -19,13 +19,14 @@ class NodeSettingsUpdate(PartialSyftObject):
     description: str
     on_board: bool
     signup_enabled: bool
+    admin_email: str
 
 
 @serializable()
 class NodeSettings(SyftObject):
     __canonical_name__ = "NodeSettings"
     __version__ = SYFT_OBJECT_VERSION_1
-    __repr_attrs__ = ["name", "organization", "deployed_on", "signup_enabled"]
+    __repr_attrs__ = ["name", "organization", "deployed_on", "signup_enabled", "admin_email"]
 
     name: str = "Node"
     deployed_on: str
@@ -33,3 +34,4 @@ class NodeSettings(SyftObject):
     on_board: bool = False
     description: str = "Text"
     signup_enabled: bool
+    admin_email: str

From b87d5b1431a8c1c24a27b12dba532a2b9c328c84 Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Fri, 14 Jul 2023 11:40:11 +0300
Subject: [PATCH 09/11] fixed get_env

---
 packages/syft/src/syft/client/gateway_client.py       |  1 -
 packages/syft/src/syft/node/node.py                   | 10 ++++++----
 .../src/syft/service/metadata/metadata_service.py     | 11 +----------
 packages/syft/src/syft/service/settings/settings.py   |  8 +++++++-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/syft/src/syft/client/gateway_client.py b/packages/syft/src/syft/client/gateway_client.py
index de4a09da09e..a7806be0fe6 100644
--- a/packages/syft/src/syft/client/gateway_client.py
+++ b/packages/syft/src/syft/client/gateway_client.py
@@ -11,7 +11,6 @@
 from ..abstract_node import NodeType
 from ..node.credentials import SyftSigningKey
 from ..serde.serializable import serializable
-from ..service.metadata.node_metadata import NodeMetadata
 from ..service.network.node_peer import NodePeer
 from ..service.response import SyftError
 from ..service.response import SyftException
diff --git a/packages/syft/src/syft/node/node.py b/packages/syft/src/syft/node/node.py
index 6ac37882d72..35a7ab12f93 100644
--- a/packages/syft/src/syft/node/node.py
+++ b/packages/syft/src/syft/node/node.py
@@ -9,6 +9,7 @@
 import hashlib
 from multiprocessing import current_process
 import os
+import subprocess
 import traceback
 from typing import Any
 from typing import Callable
@@ -93,7 +94,6 @@
 from .credentials import SyftSigningKey
 from .credentials import SyftVerifyKey
 from .worker_settings import WorkerSettings
-import subprocess
 
 # if user code needs to be serded and its not available we can call this to refresh
 # the code for a specific node UID and thread
@@ -143,12 +143,14 @@ def get_default_root_password() -> Optional[str]:
 def get_dev_mode() -> bool:
     return str_to_bool(get_env("DEV_MODE", "False"))
 
+
 def get_venv_packages() -> str:
     res = subprocess.getoutput(
-            "pip list --format=freeze",
-        )
+        "pip list --format=freeze",
+    )
     return res
 
+
 dev_mode = get_dev_mode()
 
 signing_key_env = get_private_key_env()
@@ -541,7 +543,7 @@ def metadata(self) -> NodeMetadata:
             on_board=on_board,
             node_type=self.node_type.value,
             signup_enabled=signup_enabled,
-            admin_email=admin_email
+            admin_email=admin_email,
         )
 
     @property
diff --git a/packages/syft/src/syft/service/metadata/metadata_service.py b/packages/syft/src/syft/service/metadata/metadata_service.py
index 7b859470cd2..b053a7d7626 100644
--- a/packages/syft/src/syft/service/metadata/metadata_service.py
+++ b/packages/syft/src/syft/service/metadata/metadata_service.py
@@ -1,12 +1,10 @@
 # third party
-import gevent.subprocess as subprocess
 
 # relative
 from ...serde.serializable import serializable
 from ...store.document_store import DocumentStore
 from ...util.telemetry import instrument
 from ..context import AuthedServiceContext
-from ..response import SyftSuccess
 from ..service import AbstractService
 from ..service import service_method
 from ..user.user_roles import GUEST_ROLE_LEVEL
@@ -32,11 +30,4 @@ def get_metadata(self, context: AuthedServiceContext):
 
     @service_method(path="metadata.get_env", name="get_env", roles=GUEST_ROLE_LEVEL)
     def get_env(self, context: AuthedServiceContext):
-        res = subprocess.getoutput(
-            "pip list --format=freeze",
-        )
-        # stdlib
-        import sys
-
-        print(res, file=sys.stderr)
-        return SyftSuccess(message=res.stdout.decode())
+        return context.node.packages
diff --git a/packages/syft/src/syft/service/settings/settings.py b/packages/syft/src/syft/service/settings/settings.py
index 7e2b1b40376..2262fd3af9b 100644
--- a/packages/syft/src/syft/service/settings/settings.py
+++ b/packages/syft/src/syft/service/settings/settings.py
@@ -26,7 +26,13 @@ class NodeSettingsUpdate(PartialSyftObject):
 class NodeSettings(SyftObject):
     __canonical_name__ = "NodeSettings"
     __version__ = SYFT_OBJECT_VERSION_1
-    __repr_attrs__ = ["name", "organization", "deployed_on", "signup_enabled", "admin_email"]
+    __repr_attrs__ = [
+        "name",
+        "organization",
+        "deployed_on",
+        "signup_enabled",
+        "admin_email",
+    ]
 
     name: str = "Node"
     deployed_on: str

From 058c6032a976cceba3755d64d73b80515121840e Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Fri, 14 Jul 2023 12:26:06 +0300
Subject: [PATCH 10/11] removed user.get_admin and added settings change on
 admin user update

---
 .../syft/src/syft/service/request/request.py  |  4 +--
 .../src/syft/service/user/user_service.py     | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/syft/src/syft/service/request/request.py b/packages/syft/src/syft/service/request/request.py
index 4e286fb357f..fe89eac8821 100644
--- a/packages/syft/src/syft/service/request/request.py
+++ b/packages/syft/src/syft/service/request/request.py
@@ -190,7 +190,7 @@ def _repr_html_(self) -> Any:
             self.syft_client_verify_key,
         )
         metadata = api.services.metadata.get_metadata()
-        admin_user = api.services.user.get_admin()
+        admin_email = metadata.admin_email
         node_name = api.node_name.capitalize() if api.node_name is not None else ""
         return f"""
             <style>
@@ -204,7 +204,7 @@ def _repr_html_(self) -> Any:
                 <p><strong>Changes: </strong> {str_changes}</p>
                 <p><strong>Status: </strong>{self.status}</p>
                 <p><strong>Requested on: </strong> {node_name} of type <strong> \
-                    {metadata.node_type.value.capitalize()}</strong> owned by {admin_user.email}</p>
+                    {metadata.node_type.value.capitalize()}</strong> owned by {admin_email}</p>
             </div>
             """
 
diff --git a/packages/syft/src/syft/service/user/user_service.py b/packages/syft/src/syft/service/user/user_service.py
index 9f3d4302f18..7e098a52da1 100644
--- a/packages/syft/src/syft/service/user/user_service.py
+++ b/packages/syft/src/syft/service/user/user_service.py
@@ -25,6 +25,7 @@
 from ..service import SERVICE_TO_TYPES
 from ..service import TYPE_TO_SERVICE
 from ..service import service_method
+from ..settings.settings_stash import SettingsStash
 from .user import User
 from .user import UserCreate
 from .user import UserPrivateKey
@@ -175,14 +176,14 @@ def search(
 
         return results
 
-    @service_method(path="user.get_admin", name="get_admin", roles=GUEST_ROLE_LEVEL)
-    def get_admin(self, context: AuthedServiceContext) -> UserView:
-        result = self.stash.admin_user()
-        if result.is_ok():
-            user = result.ok()
-            if user:
-                return user
-        return SyftError(message=str(result.err()))
+    # @service_method(path="user.get_admin", name="get_admin", roles=GUEST_ROLE_LEVEL)
+    # def get_admin(self, context: AuthedServiceContext) -> UserView:
+    #     result = self.stash.admin_user()
+    #     if result.is_ok():
+    #         user = result.ok()
+    #         if user:
+    #             return user
+    #     return SyftError(message=str(result.err()))
 
     @service_method(
         path="user.get_current_user", name="get_current_user", roles=GUEST_ROLE_LEVEL
@@ -279,6 +280,15 @@ def update(
             return SyftError(message=error_msg)
 
         user = result.ok()
+        if user.role == ServiceRole.ADMIN:
+            settings_stash = SettingsStash(store=self.store)
+            settings = settings_stash.get_all(context.credentials)
+            if settings.is_ok() and len(settings.ok()) > 0:
+                settings_data = settings.ok()[0]
+                settings_data.admin_email = user.email
+                settings_stash.update(
+                    credentials=context.credentials, settings=settings_data
+                )
 
         return user.to(UserView)
 

From 1e516970e5444a8b0ad8612077ac11d5bba48a3a Mon Sep 17 00:00:00 2001
From: teo <teo.milea97@gmail.com>
Date: Fri, 14 Jul 2023 13:07:13 +0300
Subject: [PATCH 11/11] fix tests

---
 packages/syft/src/syft/node/node.py                        | 2 +-
 packages/syft/tests/syft/settings/fixtures.py              | 2 ++
 packages/syft/tests/syft/settings/settings_service_test.py | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/syft/src/syft/node/node.py b/packages/syft/src/syft/node/node.py
index 21859fff075..2241e8f3b69 100644
--- a/packages/syft/src/syft/node/node.py
+++ b/packages/syft/src/syft/node/node.py
@@ -9,7 +9,7 @@
 import hashlib
 from multiprocessing import current_process
 import os
-import subprocess
+import subprocess  # nosec
 import traceback
 from typing import Any
 from typing import Callable
diff --git a/packages/syft/tests/syft/settings/fixtures.py b/packages/syft/tests/syft/settings/fixtures.py
index ce9d41e47d1..61df9698b42 100644
--- a/packages/syft/tests/syft/settings/fixtures.py
+++ b/packages/syft/tests/syft/settings/fixtures.py
@@ -29,6 +29,7 @@ def settings(worker, faker) -> NodeSettings:
         description=faker.text(),
         deployed_on=datetime.now().date().strftime("%m/%d/%Y"),
         signup_enabled=False,
+        admin_email="info@openmined.org",
     )
 
 
@@ -52,6 +53,7 @@ def metadata_json(faker) -> NodeMetadataJSON:
         lowest_object_version=LOWEST_SYFT_OBJECT_VERSION,
         syft_version=__version__,
         signup_enabled=False,
+        admin_email="info@openmined.org",
     )
 
 
diff --git a/packages/syft/tests/syft/settings/settings_service_test.py b/packages/syft/tests/syft/settings/settings_service_test.py
index 08e2477e457..5f99821590f 100644
--- a/packages/syft/tests/syft/settings/settings_service_test.py
+++ b/packages/syft/tests/syft/settings/settings_service_test.py
@@ -233,6 +233,7 @@ def test_settings_allow_guest_registration(
         lowest_object_version=2,
         syft_version=syft.__version__,
         signup_enabled=False,
+        admin_email="info@openmined.org",
     )
 
     with mock.patch(
@@ -307,6 +308,7 @@ def get_mock_client(faker, root_client, role):
         lowest_object_version=2,
         syft_version=syft.__version__,
         signup_enabled=False,
+        admin_email="info@openmined.org",
     )
 
     with mock.patch(