Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix request repr #8811

Merged
merged 4 commits into from
May 21, 2024
Merged

Fix request repr #8811

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af5334f
fix request repr
teo-milea May 14, 2024
f5cd811
Merge branch 'dev' into fix_request_repr
teo-milea May 21, 2024
5c8314c
remove duplicated line
teo-milea May 21, 2024
e17b6ed
Merge branch 'fix_request_repr' of github.com:OpenMined/PySyft into f…
teo-milea May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions packages/syft/src/syft/service/request/request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,9 @@ def _coll_repr_(self) -> dict[str, str | dict[str, str]]:
]

return {
"Request time": str(self.request_time),
"Description": self.html_description,
"Requested By": "\n".join(user_data),
"Creation Time": str(self.request_time),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate of line 470

"Status": status_badge,
}

Expand Down Expand Up @@ -1220,18 +1220,19 @@ def nested_repr(self, node: Any | None = None, level: int = 0) -> str:

def __repr_syft_nested__(self) -> str:
msg = (
f"Request to change <b>{self.code.service_func_name}</b> "
f"(Pool Id: <b>{self.code.worker_pool_name}</b>) "
f"Request to change <strong>{self.code.service_func_name}</strong> "
f"(Pool Id: <strong>{self.code.worker_pool_name}</strong>) "
)
msg += "to permission <strong>RequestStatus.APPROVED.</strong>"
if self.nested_solved:
if self.link.nested_codes == {}: # type: ignore
msg += "No nested requests."
else:
msg += "to permission RequestStatus.APPROVED."
if self.code.nested_codes is None or self.code.nested_codes == {}: # type: ignore
msg += " No nested requests"
else:
if self.nested_solved:
# else:
msg += "<br><br>This change requests the following nested functions calls:<br>"
msg += self.nested_repr()
else:
msg += "Nested Requests not resolved."
else:
msg += " Nested Requests not resolved"
return msg

def _repr_markdown_(self, wrap_as_python: bool = True, indent: int = 0) -> str:
Expand Down
Loading