Merge pull request #8106 from OpenMined/feat/notifications_object_repr

feat: improve notifications html
OpenMined · Oct 2, 2023 · c0d3000 · c0d3000
2 parents 0eacb5c + d24bf5e
commit c0d3000
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/packages/syft/src/syft/client/api.py b/packages/syft/src/syft/client/api.py
@@ -357,10 +357,7 @@ def __getitem__(self, key: Union[str, int]) -> Any:
     def _repr_html_(self) -> Any:
         if not hasattr(self, "get_all"):
             return NotImplementedError
-        if hasattr(self, "get_all_unread"):
-            results = self.get_all_unread()
-        else:
-            results = self.get_all()
+        results = self.get_all()
         return results._repr_html_()
 
 

diff --git a/packages/syft/src/syft/service/notification/notifications.py b/packages/syft/src/syft/service/notification/notifications.py
@@ -17,6 +17,8 @@
 from ...types.transforms import generate_id
 from ...types.transforms import transform
 from ...types.uid import UID
+from ...util import options
+from ...util.colors import SURFACE
 
 
 @serializable()
@@ -67,6 +69,22 @@ class Notification(SyftObject):
     ]
     __repr_attrs__ = ["subject", "status", "created_at", "linked_obj"]
 
+    def _repr_html_(self) -> str:
+        return f"""
+            <style>
+            .syft-request {{color: {SURFACE[options.color_theme]}; line-height: 1;}}
+            </style>
+            <div class='syft-request'>
+                <h3>Notification</h3>
+                <p><strong>ID: </strong>{self.id}</p>
+                <p><strong>Subject: </strong>{self.subject}</p>
+                <p><strong>Status: </strong>{self.status.name}</p>
+                <p><strong>Created at: </strong>{self.created_at}</p>
+                <p><strong>Linked object: </strong>{self.linked_obj}</p>
+                <p>
+            </div>
+        """
+
     @property
     def link(self) -> Optional[SyftObject]:
         if self.linked_obj:

diff --git a/packages/syft/src/syft/store/linked_obj.py b/packages/syft/src/syft/store/linked_obj.py
@@ -30,7 +30,10 @@ class LinkedObject(SyftObject):
     object_uid: UID
 
     def __str__(self) -> str:
-        return f"<{self.object_type}: {self.object_uid}@<Node: {self.node_uid}>"
+        resolved_obj_type = (
+            type(self.resolve) if self.object_type is None else self.object_type
+        )
+        return f"{resolved_obj_type.__name__}: {self.object_uid} @ Node {self.node_uid}"
 
     @property
     def resolve(self) -> SyftObject: