futurehouse-client 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

futurehouse_client/clients/data_storage_methods.py

@@ -2514,7 +2514,7 @@ class DataStorageMethods:
                 return self._download_from_gcs(
                     storage_location.storage_config.signed_url,
                     (
-                        storage_location.storage_config.location.split("/")[-1]
+                        Path(storage_location.storage_config.location).name
                         if storage_location.storage_config.location
                         else None
                     ),

futurehouse_client/clients/rest_client.py

@@ -46,6 +46,7 @@ from futurehouse_client.clients.data_storage_methods import DataStorageMethods
 from futurehouse_client.models.app import (
     AuthType,
     JobDeploymentConfig,
+    LiteTaskResponse,
     Stage,
     TaskRequest,
     TaskResponse,
@@ -530,8 +531,12 @@ class RestClient(DataStorageMethods):
         before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def get_task(
-        self, task_id: str | None = None, history: bool = False, verbose: bool = False
-    ) -> "TaskResponse":
+        self,
+        task_id: str | None = None,
+        history: bool = False,
+        verbose: bool = False,
+        lite: bool = False,
+    ) -> "TaskResponse | LiteTaskResponse":
         """Get details for a specific task."""
         task_id = task_id or self.trajectory_id
         url = f"/v0.1/trajectories/{task_id}"
@@ -547,7 +552,9 @@ class RestClient(DataStorageMethods):
                     "job_id": task_id,
                 },
             ),
-            self.client.stream("GET", url, params={"history": history}) as response,
+            self.client.stream(
+                "GET", url, params={"history": history, "lite": lite}
+            ) as response,
         ):
             if response.status_code in {401, 403}:
                 raise PermissionError(
@@ -558,6 +565,10 @@ class RestClient(DataStorageMethods):
             data = json.loads(json_data)
             if "id" not in data:
                 data["id"] = task_id
+
+            if lite:
+                return LiteTaskResponse(**data)
+
             verbose_response = TaskResponseVerbose(**data)
 
         if verbose:
@@ -571,8 +582,12 @@ class RestClient(DataStorageMethods):
         before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     async def aget_task(
-        self, task_id: str | None = None, history: bool = False, verbose: bool = False
-    ) -> "TaskResponse":
+        self,
+        task_id: str | None = None,
+        history: bool = False,
+        verbose: bool = False,
+        lite: bool = False,
+    ) -> "TaskResponse | LiteTaskResponse":
         """Get details for a specific task asynchronously."""
         task_id = task_id or self.trajectory_id
         url = f"/v0.1/trajectories/{task_id}"
@@ -588,7 +603,7 @@ class RestClient(DataStorageMethods):
             },
         ):
             async with self.async_client.stream(
-                "GET", url, params={"history": history}
+                "GET", url, params={"history": history, "lite": lite}
             ) as response:
                 if response.status_code in {401, 403}:
                     raise PermissionError(
@@ -599,6 +614,10 @@ class RestClient(DataStorageMethods):
                 data = json.loads(json_data)
                 if "id" not in data:
                     data["id"] = task_id
+
+                if lite:
+                    return LiteTaskResponse(**data)
+
                 verbose_response = TaskResponseVerbose(**data)
 
         if verbose:
@@ -735,7 +754,9 @@ class RestClient(DataStorageMethods):
         progress_bar: bool = False,
         concurrency: int = 10,
         timeout: int = DEFAULT_AGENT_TIMEOUT,
-    ) -> list[TaskResponse]:
+    ) -> list[
+        LiteTaskResponse | TaskResponse
+    ]:  # return will always be lite because  we always call with lite=True
         all_tasks: Collection[TaskRequest | dict[str, Any]] = (
             cast(Collection[TaskRequest | dict[str, Any]], [task_data])
             if (isinstance(task_data, dict) or not isinstance(task_data, Collection))
@@ -749,7 +770,7 @@ class RestClient(DataStorageMethods):
         )
 
         start_time = time.monotonic()
-        completed_tasks: dict[str, TaskResponse] = {}
+        completed_tasks: dict[str, LiteTaskResponse | TaskResponse] = {}
 
         if progress_bar:
             progress = tqdm(
@@ -760,7 +781,7 @@ class RestClient(DataStorageMethods):
             task_results = await gather_with_concurrency(
                 concurrency,
                 [
-                    self.aget_task(task_id, verbose=verbose)
+                    self.aget_task(task_id, verbose=verbose, lite=True)
                     for task_id in trajectory_ids
                     if task_id not in completed_tasks
                 ],
@@ -807,7 +828,9 @@ class RestClient(DataStorageMethods):
         verbose: bool = False,
         progress_bar: bool = False,
         timeout: int = DEFAULT_AGENT_TIMEOUT,
-    ) -> list[TaskResponse]:
+    ) -> list[
+        LiteTaskResponse | TaskResponse
+    ]:  # return will always be lite because  we always call with lite=True
         """Run multiple tasks and wait for them to complete.
 
         Args:
@@ -828,7 +851,7 @@ class RestClient(DataStorageMethods):
         trajectory_ids = [self.create_task(task) for task in all_tasks]
 
         start_time = time.monotonic()
-        completed_tasks: dict[str, TaskResponse] = {}
+        completed_tasks: dict[str, LiteTaskResponse | TaskResponse] = {}
 
         if progress_bar:
             progress = sync_tqdm(
@@ -842,7 +865,7 @@ class RestClient(DataStorageMethods):
                 if task_id in completed_tasks:
                     continue
 
-                task = self.get_task(task_id, verbose=verbose)
+                task = self.get_task(task_id, verbose=verbose, lite=True)
 
                 if not ExecutionStatus(task.status).is_terminal_state():
                     all_done = False

futurehouse_client/models/app.py

@@ -749,6 +749,22 @@ class SimpleOrganization(BaseModel):
     display_name: str
 
 
+class LiteTaskResponse(BaseModel):
+    task_id: UUID = Field(description="Identifier for a trajectory")
+    query: str = Field(description="Query executed for the trajectory")
+    status: str = Field(description="Current status of the trajectory")
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_fields(cls, original_data: Mapping[str, Any]) -> Mapping[str, Any]:
+        data = copy.deepcopy(original_data)  # Avoid mutating the original data
+        if not isinstance(data, dict):
+            return data
+        data["query"] = data.get("task", data.get("query"))
+        data["task_id"] = cast(UUID, data.get("id", data.get("task_id")))
+        return data
+
+
 class TaskResponse(BaseModel):
     """Base class for task responses. This holds attributes shared over all futurehouse jobs."""
 

futurehouse_client/models/data_storage_methods.py

@@ -3,25 +3,14 @@ from datetime import datetime
 from enum import StrEnum, auto
 from os import PathLike
 from pathlib import Path
-from typing import Annotated, Any
+from typing import Any
 from uuid import UUID
 
 from pydantic import (
     BaseModel,
     Field,
     JsonValue,
-    PlainSerializer,
-    PlainValidator,
-    WithJsonSchema,
 )
-from sqlalchemy_utils import Ltree
-
-LtreeField = Annotated[
-    Ltree,
-    PlainValidator(Ltree),
-    PlainSerializer(lambda v: v.path),
-    WithJsonSchema({"type": "string", "examples": ["some.path"]}),
-]
 
 
 class DataStorageEntryStatus(StrEnum):

futurehouse_client/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.0'
-__version_tuple__ = version_tuple = (0, 5, 0)
+__version__ = version = '0.5.2'
+__version_tuple__ = version_tuple = (0, 5, 2)
 
 __commit_id__ = commit_id = None

{futurehouse_client-0.5.0.dist-info → futurehouse_client-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.5.0
+Version: 0.5.2
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License
@@ -224,7 +224,6 @@ Requires-Dist: openai<1.100.0,>=1
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
 Requires-Dist: requests
-Requires-Dist: sqlalchemy-utils>=0.41.2
 Requires-Dist: tenacity
 Requires-Dist: tqdm>=4.62
 Provides-Extra: dev

{futurehouse_client-0.5.0.dist-info → futurehouse_client-0.5.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 futurehouse_client/__init__.py,sha256=q5cpcuPkhTaueXsySsgWpH0F-2EsRxcdJfP91ze6khU,991
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=fvHpBU3KZKRinkriKdtAt3crenOyysELF-M9y3ozg3U,704
+futurehouse_client/version.py,sha256=LGYtjQ6cyPZC_N0AovMIeSYYDK21050nm3HYgDanQBM,704
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
-futurehouse_client/clients/data_storage_methods.py,sha256=wnKu8CazlEX_BQauX1qvZRRw7EpbD0oofmH1wXLnDf8,120034
+futurehouse_client/clients/data_storage_methods.py,sha256=eBbGdxUmk-QGmLveuwdZd4LjsElhJxJGsvu4q-MoTGY,120030
 futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
-futurehouse_client/clients/rest_client.py,sha256=tLskIkiR6-Acbo2W1_UUNdIjiYfZMURaN_Mi0aJPWXg,110277
+futurehouse_client/clients/rest_client.py,sha256=LI8-F4cUcv8gnWhI06NB0k6iMnfDZVKv9Uh0FfXiDwo,110915
 futurehouse_client/models/__init__.py,sha256=N1MwDUYonsMN9NdaShsYcJspyL7H756MYj7VWFeD3fk,978
-futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
+futurehouse_client/models/app.py,sha256=2bFtQY1wl9oZM5Gyx1NrybKC9-fKzk20YRu20h2LiHY,32581
 futurehouse_client/models/client.py,sha256=554vp7Cr-17BTeRZtN5DhCRQesRRtr31ZPkHXUrhyCE,3835
-futurehouse_client/models/data_storage_methods.py,sha256=cpF2g4y_REECaz--WhaJeLqXA_3m3keRP5XOXiL8GOI,13811
+futurehouse_client/models/data_storage_methods.py,sha256=tqLBEPXyyvLNVLU167_EiEnzT8AiMWeL3Fga1HpLg5o,13533
 futurehouse_client/models/job_event.py,sha256=lMrx-lV7BQkKl419ErWZ6Q1EjurmhBFSns0z6zwGaVo,2766
 futurehouse_client/models/rest.py,sha256=SbeXZSPUCM0lQ_gVUPa64vKzMxuUVgqmJ5YThfDWs8g,4726
 futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,8 +17,8 @@ futurehouse_client/utils/general.py,sha256=PIkGLCSA3kUvc6mwR-prEB7YnMdKILOIm6cPo
 futurehouse_client/utils/module_utils.py,sha256=aFyd-X-pDARXz9GWpn8SSViUVYdSbuy9vSkrzcVIaGI,4955
 futurehouse_client/utils/monitoring.py,sha256=UjRlufe67kI3VxRHOd5fLtJmlCbVA2Wqwpd4uZhXkQM,8728
 futurehouse_client/utils/world_model_tools.py,sha256=v2krZGrco0ur2a_pcRMtnQL05SxlIoBXuJ5R1JkQNws,2921
-futurehouse_client-0.5.0.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.5.0.dist-info/METADATA,sha256=4lMUB0HZPj5tBCb2l5QxCwjBzk9KtOG73V_zNxui_ug,27094
-futurehouse_client-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.5.0.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.5.0.dist-info/RECORD,,
+futurehouse_client-0.5.2.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.5.2.dist-info/METADATA,sha256=jUjgFhsqsfh_w4WzwGLblQPy5MgWt50mxyEtpRziN6M,27054
+futurehouse_client-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.5.2.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.5.2.dist-info/RECORD,,