Skip to content

Commit e151321

Browse files
committed
fix input_ids validation
1 parent f84fcd2 commit e151321

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

packages/syft/src/syft/service/job/job_stash.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -862,9 +862,6 @@ def set_result(
862862
if valid.is_err():
863863
return SyftError(message=valid.err())
864864

865-
# stdlib
866-
import sys
867-
868865
# Ensure we never save cached result data in the database,
869866
# as they can be arbitrarily large
870867
if (
@@ -873,11 +870,6 @@ def set_result(
873870
):
874871
item.result._clear_cache()
875872

876-
print(
877-
f"(CACHE CLEARED) SETTING RESULT {item.result} for job {item.id}",
878-
file=sys.stderr,
879-
)
880-
881873
return super().update(credentials, item, add_permissions)
882874

883875
def get_by_result_id(

packages/syft/src/syft/service/output/output_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def from_ids(
116116
else:
117117
job_link = None
118118

119-
if input_ids:
119+
if input_ids is not None:
120120
input_ids = {k: v for k, v in input_ids.items() if isinstance(v, UID)}
121121
return cls(
122122
output_ids=output_ids,

packages/syft/src/syft/service/request/request.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,8 @@ def _create_output_history_for_deposited_result(
792792
if input_policy is not None:
793793
for input_ in input_policy.inputs.values():
794794
input_ids.update(input_)
795+
796+
input_ids = {k: v for k, v in input_ids.items() if isinstance(v, UID)}
795797
res = api.services.code.store_execution_output(
796798
user_code_id=code.id,
797799
outputs=result,
@@ -1088,6 +1090,7 @@ def _deposit_result_l2(
10881090
for inps in code.input_policy.inputs.values():
10891091
input_ids.update(inps)
10901092

1093+
input_ids = {k: v for k, v in input_ids.items() if isinstance(v, UID)}
10911094
res = api.services.code.store_execution_output(
10921095
user_code_id=code.id,
10931096
outputs=result,
@@ -1104,7 +1107,13 @@ def _deposit_result_l2(
11041107
else JobStatus.COMPLETED
11051108
)
11061109

1107-
existing_result = job.result.id if job.result is not None else None
1110+
existing_result = None
1111+
if isinstance(job.result, ActionObject):
1112+
existing_result = job.result.id
1113+
elif isinstance(job.result, Err):
1114+
existing_result = job.result
1115+
else:
1116+
existing_result = job.result
11081117
print(
11091118
f"Job({job.id}) Setting new result {existing_result} -> {job_info.result.id}"
11101119
)

0 commit comments

Comments
 (0)