From 4af628faf0118478be184882d25572aa83266443 Mon Sep 17 00:00:00 2001
From: Thiago Costa Porto <thiagocostaporto@gmail.com>
Date: Thu, 21 Sep 2023 17:35:29 +0100
Subject: [PATCH 1/3] fix: adds uploader to dataset/asset

A contributor added with the role of "Uploader" is also added to the
dataset and asset as the "uploader".
---
 .../syft/src/syft/service/dataset/dataset.py  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py
index e9da25cbb45..84856a9ce16 100644
--- a/packages/syft/src/syft/service/dataset/dataset.py
+++ b/packages/syft/src/syft/service/dataset/dataset.py
@@ -21,6 +21,7 @@
 from result import Err
 from result import Ok
 from result import Result
+from syft.service.user.roles import Roles
 
 # relative
 from ...serde.serializable import serializable
@@ -154,11 +155,7 @@ def _repr_html_(self) -> Any:
         # relative
         from ...service.action.action_object import ActionObject
 
-        uploaded_by_line = "n/a"
-        if len(self.contributors) > 0:
-            uploaded_by_line = (
-                f"<p><strong>Uploaded by: </strong>{self.uploader.name}</p>"
-            )
+        uploaded_by_line = f"<p><strong>Uploaded by: </strong>{self.uploader.name} ({self.uploader.email})</p>" if self.uploader else ""
         if isinstance(self.data, ActionObject):
             data_table_line = itables.to_html_datatable(
                 df=self.data.syft_action_data, css=itables_css
@@ -336,6 +333,8 @@ def add_contributor(
                 name=name, role=_role_str, email=email, phone=phone, note=note
             )
             self.contributors.append(contributor)
+            if _role_str == Roles.UPLOADER.value:
+                self.uploader = contributor
             return SyftSuccess(
                 message=f"Contributor '{name}' added to '{self.name}' Asset."
             )
@@ -451,12 +450,11 @@ def _coll_repr_(self) -> Dict[str, Any]:
         }
 
     def _repr_html_(self) -> Any:
-        uploaded_by_line = "n/a"
-        if len(self.contributors) > 0:
-            uploaded_by_line = (
+        uploaded_by_line = (
                 "<p class='paragraph-sm'><strong>"
-                + f"<span class='pr-8'>Uploaded by:</span></strong>{self.uploader.name}</p>"
-            )
+                + f"<span class='pr-8'>Uploaded by:</span></strong>{self.uploader.name} ({self.uploader.email})</p>"
+            ) if self.uploader else ""
+
         return f"""
             <style>
             {fonts_css}
@@ -620,6 +618,8 @@ def add_contributor(
                 name=name, role=_role_str, email=email, phone=phone, note=note
             )
             self.contributors.append(contributor)
+            if _role_str == Roles.UPLOADER.value:
+                self.uploader = contributor
             return SyftSuccess(
                 message=f"Contributor '{name}' added to '{self.name}' Dataset."
             )

From 68cac4ffd635e9faa187f1c8155c58f423ffad6b Mon Sep 17 00:00:00 2001
From: Thiago Costa Porto <thiagocostaporto@gmail.com>
Date: Thu, 21 Sep 2023 18:13:34 +0100
Subject: [PATCH 2/3] fix: remove role matching in service/dataset

---
 packages/syft/src/syft/service/dataset/dataset.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py
index 84856a9ce16..cc79b9d6e6b 100644
--- a/packages/syft/src/syft/service/dataset/dataset.py
+++ b/packages/syft/src/syft/service/dataset/dataset.py
@@ -21,7 +21,6 @@
 from result import Err
 from result import Ok
 from result import Result
-from syft.service.user.roles import Roles
 
 # relative
 from ...serde.serializable import serializable
@@ -131,7 +130,7 @@ class Asset(SyftObject):
     mock_is_real: bool = False
     shape: Optional[Tuple]
     created_at: DateTime = DateTime.now()
-    uploader: Contributor
+    uploader: Optional[Contributor]
 
     __repr_attrs__ = ["name", "shape"]
 
@@ -156,6 +155,7 @@ def _repr_html_(self) -> Any:
         from ...service.action.action_object import ActionObject
 
         uploaded_by_line = f"<p><strong>Uploaded by: </strong>{self.uploader.name} ({self.uploader.email})</p>" if self.uploader else ""
+
         if isinstance(self.data, ActionObject):
             data_table_line = itables.to_html_datatable(
                 df=self.data.syft_action_data, css=itables_css
@@ -333,8 +333,6 @@ def add_contributor(
                 name=name, role=_role_str, email=email, phone=phone, note=note
             )
             self.contributors.append(contributor)
-            if _role_str == Roles.UPLOADER.value:
-                self.uploader = contributor
             return SyftSuccess(
                 message=f"Contributor '{name}' added to '{self.name}' Asset."
             )
@@ -618,8 +616,6 @@ def add_contributor(
                 name=name, role=_role_str, email=email, phone=phone, note=note
             )
             self.contributors.append(contributor)
-            if _role_str == Roles.UPLOADER.value:
-                self.uploader = contributor
             return SyftSuccess(
                 message=f"Contributor '{name}' added to '{self.name}' Dataset."
             )

From da3cca512ce4f09ce67ab2471c4991f4e2664f3f Mon Sep 17 00:00:00 2001
From: Thiago Costa Porto <thiagocostaporto@gmail.com>
Date: Thu, 21 Sep 2023 18:15:10 +0100
Subject: [PATCH 3/3] lint: service/dataset

---
 packages/syft/src/syft/service/dataset/dataset.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py
index cc79b9d6e6b..82e1c30311f 100644
--- a/packages/syft/src/syft/service/dataset/dataset.py
+++ b/packages/syft/src/syft/service/dataset/dataset.py
@@ -154,7 +154,11 @@ def _repr_html_(self) -> Any:
         # relative
         from ...service.action.action_object import ActionObject
 
-        uploaded_by_line = f"<p><strong>Uploaded by: </strong>{self.uploader.name} ({self.uploader.email})</p>" if self.uploader else ""
+        uploaded_by_line = (
+            f"<p><strong>Uploaded by: </strong>{self.uploader.name} ({self.uploader.email})</p>"
+            if self.uploader
+            else ""
+        )
 
         if isinstance(self.data, ActionObject):
             data_table_line = itables.to_html_datatable(
@@ -449,9 +453,13 @@ def _coll_repr_(self) -> Dict[str, Any]:
 
     def _repr_html_(self) -> Any:
         uploaded_by_line = (
+            (
                 "<p class='paragraph-sm'><strong>"
                 + f"<span class='pr-8'>Uploaded by:</span></strong>{self.uploader.name} ({self.uploader.email})</p>"
-            ) if self.uploader else ""
+            )
+            if self.uploader
+            else ""
+        )
 
         return f"""
             <style>