futurehouse-client 0.5.3__tar.gz → 0.5.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. {futurehouse_client-0.5.3/src/futurehouse_client.egg-info → futurehouse_client-0.5.4}/PKG-INFO +1 -1
  2. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/clients/rest_client.py +9 -2
  3. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/version.py +3 -3
  4. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4/src/futurehouse_client.egg-info}/PKG-INFO +1 -1
  5. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_rest.py +40 -0
  6. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/LICENSE +0 -0
  7. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/README.md +0 -0
  8. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/data_storage.md +0 -0
  9. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/docs/__init__.py +0 -0
  10. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/docs/client_notebook.ipynb +0 -0
  11. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/pyproject.toml +0 -0
  12. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/setup.cfg +0 -0
  13. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/__init__.py +0 -0
  14. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/clients/__init__.py +0 -0
  15. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/clients/data_storage_methods.py +0 -0
  16. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/clients/job_client.py +0 -0
  17. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/__init__.py +0 -0
  18. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/app.py +0 -0
  19. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/client.py +0 -0
  20. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/data_storage_methods.py +0 -0
  21. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/job_event.py +0 -0
  22. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/models/rest.py +0 -0
  23. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/py.typed +0 -0
  24. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/__init__.py +0 -0
  25. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/auth.py +0 -0
  26. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/general.py +0 -0
  27. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/module_utils.py +0 -0
  28. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/monitoring.py +0 -0
  29. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client/utils/world_model_tools.py +0 -0
  30. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client.egg-info/SOURCES.txt +0 -0
  31. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client.egg-info/dependency_links.txt +0 -0
  32. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client.egg-info/requires.txt +0 -0
  33. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/src/futurehouse_client.egg-info/top_level.txt +0 -0
  34. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_client.py +0 -0
  35. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_data/test_file.txt +0 -0
  36. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_data/test_information.txt +0 -0
  37. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_data/test_manifest.yaml +0 -0
  38. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_data_storage_e2e.py +0 -0
  39. {futurehouse_client-0.5.3 → futurehouse_client-0.5.4}/tests/test_data_storage_methods.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: futurehouse-client
3
- Version: 0.5.3
3
+ Version: 0.5.4
4
4
  Summary: A client for interacting with endpoints of the FutureHouse service.
5
5
  Author-email: FutureHouse technical staff <hello@futurehouse.org>
6
6
  License: Apache License
@@ -793,7 +793,11 @@ class RestClient(DataStorageMethods):
793
793
  task_id not in completed_tasks
794
794
  and ExecutionStatus(task.status).is_terminal_state()
795
795
  ):
796
- completed_tasks[task_id] = task
796
+ # on completion fetches the full state and messages of the task
797
+ completed_tasks[task_id] = await self.aget_task(
798
+ task_id=task_id,
799
+ lite=False,
800
+ )
797
801
  if progress_bar:
798
802
  progress.update(1)
799
803
 
@@ -870,7 +874,10 @@ class RestClient(DataStorageMethods):
870
874
  if not ExecutionStatus(task.status).is_terminal_state():
871
875
  all_done = False
872
876
  elif task_id not in completed_tasks:
873
- completed_tasks[task_id] = task
877
+ completed_tasks[task_id] = self.get_task(
878
+ task_id=task_id,
879
+ lite=False,
880
+ )
874
881
  if progress_bar:
875
882
  progress.update(1)
876
883
 
@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
28
28
  commit_id: COMMIT_ID
29
29
  __commit_id__: COMMIT_ID
30
30
 
31
- __version__ = version = '0.5.3'
32
- __version_tuple__ = version_tuple = (0, 5, 3)
31
+ __version__ = version = '0.5.4'
32
+ __version_tuple__ = version_tuple = (0, 5, 4)
33
33
 
34
- __commit_id__ = commit_id = 'gaaaa80cba'
34
+ __commit_id__ = commit_id = 'gcb60aa15d'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: futurehouse-client
3
- Version: 0.5.3
3
+ Version: 0.5.4
4
4
  Summary: A client for interacting with endpoints of the FutureHouse service.
5
5
  Author-email: FutureHouse technical staff <hello@futurehouse.org>
6
6
  License: Apache License
@@ -44,6 +44,7 @@ from futurehouse_client.models.app import (
44
44
  PQATaskResponse,
45
45
  Stage,
46
46
  TaskRequest,
47
+ TaskResponse,
47
48
  TaskResponseVerbose,
48
49
  )
49
50
  from futurehouse_client.models.job_event import (
@@ -244,6 +245,25 @@ def test_run_until_done_futurehouse_dummy_env_crow(
244
245
  assert all(task.status == "success" for task in results)
245
246
 
246
247
 
248
+ @pytest.mark.timeout(300)
249
+ @pytest.mark.flaky(reruns=3)
250
+ def test_run_until_done_returns_task_response(
251
+ admin_client: RestClient, task_req: TaskRequest
252
+ ):
253
+ """Test that run_tasks_until_done returns TaskResponse instead of LiteTaskResponse."""
254
+ tasks_to_do = [task_req, task_req]
255
+
256
+ results = admin_client.run_tasks_until_done(tasks_to_do)
257
+
258
+ assert len(results) == len(tasks_to_do), "Should return 2 tasks."
259
+ assert all(task.status == "success" for task in results)
260
+
261
+ for task in results:
262
+ assert isinstance(task, TaskResponse), (
263
+ f"Expected TaskResponse, got {type(task)}"
264
+ )
265
+
266
+
247
267
  @pytest.mark.timeout(300)
248
268
  @pytest.mark.flaky(reruns=3)
249
269
  @pytest.mark.asyncio
@@ -258,6 +278,26 @@ async def test_arun_until_done_futurehouse_dummy_env_crow(
258
278
  assert all(task.status == "success" for task in results)
259
279
 
260
280
 
281
+ @pytest.mark.timeout(300)
282
+ @pytest.mark.flaky(reruns=3)
283
+ @pytest.mark.asyncio
284
+ async def test_arun_until_done_returns_task_response(
285
+ admin_client: RestClient, task_req: TaskRequest
286
+ ):
287
+ """Test that arun_tasks_until_done returns TaskResponse instead of LiteTaskResponse."""
288
+ tasks_to_do = [task_req, task_req]
289
+
290
+ results = await admin_client.arun_tasks_until_done(tasks_to_do)
291
+
292
+ assert len(results) == len(tasks_to_do), "Should return 2 tasks."
293
+ assert all(task.status == "success" for task in results)
294
+
295
+ for task in results:
296
+ assert isinstance(task, TaskResponse), (
297
+ f"Expected TaskResponse, got {type(task)}"
298
+ )
299
+
300
+
261
301
  @pytest.mark.timeout(300)
262
302
  @pytest.mark.flaky(reruns=3)
263
303
  @pytest.mark.asyncio