Skip to content

Commit 0eda9c1

Browse files
added artifacts to tests
1 parent 50fe749 commit 0eda9c1

File tree

14 files changed

+44
-4
lines changed

14 files changed

+44
-4
lines changed

compute_horde/tests/test_organic_miner_client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def get_miner_client(
5757
job_uuid=JOB_UUID,
5858
docker_process_stdout="stdout",
5959
docker_process_stderr="stderr",
60+
artifacts={},
6061
),
6162
),
6263
],
@@ -149,6 +150,7 @@ async def test_organic_miner_client__skip_different_job__initial_future(initial_
149150
job_uuid=str(uuid.uuid4()),
150151
docker_process_stdout="stdout",
151152
docker_process_stderr="stderr",
153+
artifacts={},
152154
),
153155
],
154156
)

compute_horde/tests/test_run_organic_job.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ async def test_run_organic_job__success(keypair):
4444
job_uuid=JOB_UUID,
4545
docker_process_stdout="stdout",
4646
docker_process_stderr="stderr",
47+
artifacts={},
4748
).model_dump_json(),
4849
],
4950
)

executor/app/src/compute_horde_executor/executor/tests/integration/test_main_loop.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ def test_main_loop():
167167
"message_type": "V0FinishedRequest",
168168
"docker_process_stdout": payload,
169169
"docker_process_stderr": mock.ANY,
170+
"artifacts": {},
170171
"job_uuid": job_uuid,
171172
},
172173
]
@@ -224,6 +225,7 @@ def test_main_loop_streaming_job():
224225
"message_type": "V0FinishedRequest",
225226
"docker_process_stdout": mock.ANY,
226227
"docker_process_stderr": mock.ANY,
228+
"artifacts": {},
227229
"job_uuid": job_uuid,
228230
},
229231
]
@@ -286,6 +288,7 @@ def test_huggingface_volume():
286288
"message_type": "V0FinishedRequest",
287289
"docker_process_stdout": payload,
288290
"docker_process_stderr": mock.ANY,
291+
"artifacts": {},
289292
"job_uuid": job_uuid,
290293
},
291294
]
@@ -361,6 +364,7 @@ def test_huggingface_volume_dataset():
361364
"message_type": "V0FinishedRequest",
362365
"docker_process_stdout": payload,
363366
"docker_process_stderr": mock.ANY,
367+
"artifacts": {},
364368
"job_uuid": job_uuid,
365369
},
366370
]
@@ -419,6 +423,7 @@ def test_zip_url_volume(httpx_mock: HTTPXMock):
419423
"message_type": "V0FinishedRequest",
420424
"docker_process_stdout": payload,
421425
"docker_process_stderr": mock.ANY,
426+
"artifacts": {},
422427
"job_uuid": job_uuid,
423428
},
424429
]
@@ -532,6 +537,7 @@ def response_callback(request: httpx.Request) -> httpx.Response:
532537
"message_type": "V0FinishedRequest",
533538
"docker_process_stdout": payload,
534539
"docker_process_stderr": mock.ANY,
540+
"artifacts": {},
535541
"job_uuid": job_uuid,
536542
},
537543
]
@@ -656,6 +662,7 @@ def test_zip_and_http_post_output_uploader(httpx_mock: HTTPXMock, tmp_path):
656662
"message_type": "V0FinishedRequest",
657663
"docker_process_stdout": payload,
658664
"docker_process_stderr": mock.ANY,
665+
"artifacts": {},
659666
"job_uuid": job_uuid,
660667
},
661668
]
@@ -722,6 +729,7 @@ def test_zip_and_http_put_output_uploader(httpx_mock: HTTPXMock, tmp_path):
722729
"message_type": "V0FinishedRequest",
723730
"docker_process_stdout": payload,
724731
"docker_process_stderr": mock.ANY,
732+
"artifacts": {},
725733
"job_uuid": job_uuid,
726734
},
727735
]
@@ -846,6 +854,7 @@ def test_output_upload_retry(httpx_mock: HTTPXMock, tmp_path):
846854
"message_type": "V0FinishedRequest",
847855
"docker_process_stdout": payload,
848856
"docker_process_stderr": mock.ANY,
857+
"artifacts": {},
849858
"job_uuid": job_uuid,
850859
},
851860
]
@@ -903,6 +912,7 @@ def test_raw_script_job():
903912
"message_type": "V0FinishedRequest",
904913
"docker_process_stdout": f"{payload}\n",
905914
"docker_process_stderr": mock.ANY,
915+
"artifacts": {},
906916
"job_uuid": job_uuid,
907917
},
908918
]
@@ -987,6 +997,7 @@ async def read_file_callback(request: httpx.Request, *args, **kwargs) -> httpx.R
987997
"message_type": "V0FinishedRequest",
988998
"docker_process_stdout": payload,
989999
"docker_process_stderr": mock.ANY,
1000+
"artifacts": {},
9901001
"job_uuid": job_uuid,
9911002
},
9921003
]
@@ -1075,6 +1086,7 @@ def test_single_file_volume(httpx_mock: HTTPXMock, tmp_path):
10751086
"message_type": "V0FinishedRequest",
10761087
"docker_process_stdout": payload,
10771088
"docker_process_stderr": mock.ANY,
1089+
"artifacts": {},
10781090
"job_uuid": job_uuid,
10791091
},
10801092
]
@@ -1158,6 +1170,7 @@ def test_multi_volume(httpx_mock: HTTPXMock, tmp_path):
11581170
"message_type": "V0FinishedRequest",
11591171
"docker_process_stdout": payload,
11601172
"docker_process_stderr": mock.ANY,
1173+
"artifacts": {},
11611174
"job_uuid": job_uuid,
11621175
},
11631176
]

miner/app/src/compute_horde_miner/miner/tests/executor_manager.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@ async def fake_executor(token):
3939
"docker_run_cmd": [],
4040
"volume": {"volume_type": "inline", "contents": "nonsense", "relative_path": None},
4141
"output_upload": mock.ANY,
42+
"artifacts_dir": None,
4243
}, response
4344
await communicator.send_json_to(
4445
{
4546
"message_type": "V0FinishedRequest",
4647
"job_uuid": fake_executor.job_uuid,
4748
"docker_process_stdout": "some stdout",
4849
"docker_process_stderr": "some stderr",
50+
"artifacts": {},
4951
}
5052
)
5153
await communicator.disconnect()

miner/app/src/compute_horde_miner/miner/tests/integration/test_mocked_executor_manager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ async def run_regular_flow_test(validator_key: str, job_uuid: str):
134134
"job_uuid": job_uuid,
135135
"docker_process_stdout": "some stdout",
136136
"docker_process_stderr": "some stderr",
137+
"artifacts": {},
137138
}
138139

139140

tests/integration_tests/test_miner_on_dev_executor_manager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,5 @@ async def test_echo_image(self):
244244
"job_uuid": job_uuid,
245245
"docker_process_stdout": payload,
246246
"docker_process_stderr": mock.ANY,
247+
"artifacts": {},
247248
}

validator/app/src/compute_horde_validator/validator/tests/helpers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ def __init__(self, *args, **kwargs):
134134
job_uuid=self.job_uuid,
135135
docker_process_stdout="",
136136
docker_process_stderr="",
137+
artifacts={},
137138
)
138139
)
139140

validator/app/src/compute_horde_validator/validator/tests/test_cross_validation/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def job_finish_message(job_uuid: uuid.UUID):
5757
job_uuid=str(job_uuid),
5858
docker_process_stdout="",
5959
docker_process_stderr="",
60+
artifacts={},
6061
).model_dump_json()
6162

6263

validator/app/src/compute_horde_validator/validator/tests/test_miner_driver.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ async def test_miner_driver(
133133
job_uuid=job_uuid,
134134
docker_process_stdout="mocked stdout",
135135
docker_process_stderr="mocked stderr",
136+
artifacts={},
136137
)
137138
)
138139

validator/app/src/compute_horde_validator/validator/tests/test_synthetic_jobs/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ def job_finish_message(job_uuid: uuid.UUID, docker_process_stdout: str, docker_p
155155
job_uuid=str(job_uuid),
156156
docker_process_stdout=docker_process_stdout,
157157
docker_process_stderr=docker_process_stderr,
158+
artifacts={},
158159
).model_dump_json()
159160

160161

validator/app/src/compute_horde_validator/validator/tests/test_synthetic_jobs/test_batch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ async def add_job_messages(request_class, send_before=1, sleep_before=0, **kwarg
7272
sleep_before=0.05,
7373
docker_process_stdout="",
7474
docker_process_stderr="",
75+
artifacts={},
7576
)
7677

7778
batch = await SyntheticJobBatch.objects.acreate(

validator/app/src/compute_horde_validator/validator/tests/test_synthetic_jobs/test_llm_prompts_generator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
job_uuid="CF8753B2-C86C-45A3-A01F-84295C3BAD8F",
1313
docker_process_stdout="",
1414
docker_process_stderr="",
15+
artifacts={},
1516
)
1617

1718

validator/app/src/compute_horde_validator/validator/tests/test_synthetic_jobs/test_multiple_miners.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,10 @@ async def test_all_succeed(
173173
await transport.add_message(executor_ready_message, send_before=0)
174174

175175
job_finish_message = miner_requests.V0JobFinishedRequest(
176-
job_uuid=str(job_uuid), docker_process_stdout="", docker_process_stderr=""
176+
job_uuid=str(job_uuid),
177+
docker_process_stdout="",
178+
docker_process_stderr="",
179+
artifacts={},
177180
).model_dump_json()
178181

179182
await transport.add_message(job_finish_message, send_before=2)
@@ -410,7 +413,10 @@ async def test_some_streaming_succeed(
410413
await transport.add_message(streaming_ready_message, send_before=0)
411414

412415
job_finish_message = miner_requests.V0JobFinishedRequest(
413-
job_uuid=str(job_uuid), docker_process_stdout="", docker_process_stderr=""
416+
job_uuid=str(job_uuid),
417+
docker_process_stdout="",
418+
docker_process_stderr="",
419+
artifacts={},
414420
).model_dump_json()
415421

416422
await transport.add_message(job_finish_message, send_before=2)
@@ -538,7 +544,10 @@ async def flow_0(
538544
await transport.add_message(executor_ready_message, send_before=0)
539545

540546
job_finish_message = miner_requests.V0JobFinishedRequest(
541-
job_uuid=str(job_uuid), docker_process_stdout="", docker_process_stderr=""
547+
job_uuid=str(job_uuid),
548+
docker_process_stdout="",
549+
docker_process_stderr="",
550+
artifacts={},
542551
).model_dump_json()
543552

544553
await transport.add_message(job_finish_message, send_before=2)
@@ -567,7 +576,10 @@ async def flow_1(
567576
await transport.add_message(executor_ready_message, send_before=0)
568577

569578
job_finish_message = miner_requests.V0JobFinishedRequest(
570-
job_uuid=str(job_uuid), docker_process_stdout="", docker_process_stderr=""
579+
job_uuid=str(job_uuid),
580+
docker_process_stdout="",
581+
docker_process_stderr="",
582+
artifacts={},
571583
).model_dump_json()
572584

573585
await transport.add_message(job_finish_message, send_before=2, sleep_before=2)

validator/app/src/compute_horde_validator/validator/tests/test_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ async def interaction_callback(miner_client, after_job_sent):
346346
job_uuid=job_uuid,
347347
docker_process_stdout="",
348348
docker_process_stderr="",
349+
artifacts={},
349350
)
350351
)
351352
return f2 is not None
@@ -409,6 +410,7 @@ async def interaction_callback(miner_client, after_job_sent):
409410
job_uuid=job_uuid,
410411
docker_process_stdout="",
411412
docker_process_stderr="",
413+
artifacts={},
412414
)
413415
)
414416

0 commit comments

Comments
 (0)