futurehouse-client 0.4.1.dev95__py3-none-any.whl → 0.4.2.dev274__py3-none-any.whl

futurehouse_client/clients/data_storage_methods.py

@@ -469,18 +469,18 @@ class DataStorageMethods:
     """
 
     # needed for mypy `NoReturn`
-    def _handle_http_errors(self, e: HTTPStatusError) -> NoReturn:
+    def _handle_http_errors(self, e: HTTPStatusError, operation: str) -> NoReturn:
         """Handle common HTTP errors for data storage operations."""
         if e.response.status_code == codes.FORBIDDEN:
             raise DataStorageCreationError(
-                "Not authorized to create data storage entries"
+                f"Error {operation} data storage entry, not authorized"
             ) from e
         if e.response.status_code == codes.UNPROCESSABLE_ENTITY:
             raise DataStorageCreationError(
                 f"Invalid request payload: {e.response.text}"
             ) from e
         raise DataStorageCreationError(
-            f"Error creating data storage entry: {e.response.status_code} - {e.response.text}"
+            f"Error {operation} data storage entry: {e.response.status_code} - {e.response.text}"
         ) from e
 
     def _validate_file_path(self, file_path: str | Path) -> Path:
@@ -761,6 +761,7 @@ class DataStorageMethods:
         path: str | None = None,
         ignore_patterns: list[str] | None = None,
         ignore_filename: str = ".gitignore",
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Upload a directory as a single zip file collection.
 
@@ -771,6 +772,7 @@ class DataStorageMethods:
             path: Optional GCS path for the zip file
             ignore_patterns: List of patterns to ignore when zipping
             ignore_filename: Name of ignore file to read from directory
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse for the uploaded zip file
@@ -790,6 +792,7 @@ class DataStorageMethods:
                 description=description,
                 path=zip_gcs_path,
                 is_collection=True,
+                project_id=project_id,
             )
 
             logger.debug(
@@ -832,6 +835,7 @@ class DataStorageMethods:
         path: str | None = None,
         ignore_patterns: list[str] | None = None,
         ignore_filename: str = ".gitignore",
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Asynchronously upload a directory as a single zip file.
 
@@ -842,6 +846,7 @@ class DataStorageMethods:
             path: Optional GCS path for the zip file
             ignore_patterns: List of patterns to ignore when zipping
             ignore_filename: Name of ignore file to read from directory
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse for the uploaded zip file
@@ -861,6 +866,7 @@ class DataStorageMethods:
                 description=description,
                 path=zip_gcs_path,
                 is_collection=True,
+                project_id=project_id,
             )
 
             data_storage_response = await self._acreate_data_storage_entry(payload)
@@ -898,6 +904,7 @@ class DataStorageMethods:
         file_path: Path,
         description: str | None,
         path: str | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Upload a single file."""
         file_size = file_path.stat().st_size
@@ -918,6 +925,7 @@ class DataStorageMethods:
                     content=text_content,
                     path=path,
                     is_collection=False,
+                    project_id=project_id,
                 )
 
                 logger.debug("Sending file as text content")
@@ -934,6 +942,7 @@ class DataStorageMethods:
             description=description,
             path=path,
             is_collection=False,
+            project_id=project_id,
         )
 
         logger.debug(
@@ -980,6 +989,7 @@ class DataStorageMethods:
         description: str | None,
         path: str | None = None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Asynchronously upload a single file."""
         file_size, text_payload = self._prepare_single_file_upload(
@@ -1000,6 +1010,7 @@ class DataStorageMethods:
             path=path,
             is_collection=False,
             dataset_id=dataset_id,
+            project_id=project_id,
         )
 
         data_storage_response = await self._acreate_data_storage_entry(payload)
@@ -1036,6 +1047,7 @@ class DataStorageMethods:
         path: str | None,
         parent_id: UUID | None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Upload a single file with a parent ID (sync version)."""
         file_size, text_payload = self._prepare_single_file_upload(
@@ -1046,6 +1058,7 @@ class DataStorageMethods:
             logger.debug("Sending file as text content with parent_id")
             text_payload.parent_id = parent_id
             text_payload.dataset_id = dataset_id
+            text_payload.project_id = project_id
             return self._create_data_storage_entry(text_payload)
 
         logger.debug(
@@ -1058,6 +1071,7 @@ class DataStorageMethods:
             is_collection=False,
             parent_id=parent_id,
             dataset_id=dataset_id,
+            project_id=project_id,
         )
         data_storage_response = self._create_data_storage_entry(payload)
 
@@ -1092,6 +1106,7 @@ class DataStorageMethods:
         dir_manifest: DirectoryManifest,
         current_parent_id: UUID,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse | None:
         """Process a single file item for upload."""
         try:
@@ -1109,6 +1124,7 @@ class DataStorageMethods:
                 path=None,
                 parent_id=current_parent_id,
                 dataset_id=dataset_id,
+                project_id=project_id,
             )
         except Exception as e:
             logger.error(f"Failed to upload file {item}: {e}")
@@ -1126,6 +1142,7 @@ class DataStorageMethods:
         base_dir: Path | None = None,
         dir_manifest: DirectoryManifest | None = None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> list[DataStorageResponse]:
         """Upload a directory with single dataset and individual file storage entries."""
         responses = []
@@ -1141,6 +1158,7 @@ class DataStorageMethods:
                 parent_id=None,
                 dataset_id=None,
                 is_collection=False,
+                project_id=project_id,
             )
 
             dir_response = self._create_data_storage_entry(payload)
@@ -1182,6 +1200,7 @@ class DataStorageMethods:
                     parent_id=current_parent_id,
                     dataset_id=current_dataset_id,
                     is_collection=False,
+                    project_id=project_id,
                 )
                 subdir_response = self._create_data_storage_entry(subdir_payload)
                 responses.append(subdir_response)
@@ -1197,6 +1216,7 @@ class DataStorageMethods:
                     base_dir=base_dir,
                     dir_manifest=subdir_manifest,
                     dataset_id=current_dataset_id,
+                    project_id=project_id,
                 )
                 responses.extend(subdir_responses)
             elif item.is_file():
@@ -1247,6 +1267,7 @@ class DataStorageMethods:
         path: str | None,
         parent_id: UUID | None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Asynchronously upload a single file with a parent ID."""
         file_size, text_payload = self._prepare_single_file_upload(
@@ -1257,6 +1278,7 @@ class DataStorageMethods:
             logger.debug("Sending file as text content with parent_id")
             text_payload.parent_id = parent_id
             text_payload.dataset_id = dataset_id
+            text_payload.project_id = project_id
             return await self._acreate_data_storage_entry(text_payload)
 
         logger.debug(
@@ -1269,6 +1291,7 @@ class DataStorageMethods:
             is_collection=False,
             parent_id=parent_id,
             dataset_id=dataset_id,
+            project_id=project_id,
         )
         data_storage_response = await self._acreate_data_storage_entry(payload)
 
@@ -1302,6 +1325,7 @@ class DataStorageMethods:
         dir_manifest: DirectoryManifest,
         current_parent_id: UUID,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse | None:
         """Asynchronously process a single file item for upload."""
         try:
@@ -1319,6 +1343,7 @@ class DataStorageMethods:
                 path=None,
                 parent_id=current_parent_id,
                 dataset_id=dataset_id,
+                project_id=project_id,
             )
         except Exception as e:
             logger.error(f"Failed to upload file {item}: {e}")
@@ -1336,6 +1361,7 @@ class DataStorageMethods:
         base_dir: Path | None = None,
         dir_manifest: DirectoryManifest | None = None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> list[DataStorageResponse]:
         """Upload a directory with single dataset and individual file storage entries (async)."""
         responses = []
@@ -1352,6 +1378,7 @@ class DataStorageMethods:
                 parent_id=None,
                 dataset_id=None,
                 is_collection=False,
+                project_id=project_id,
             )
 
             dir_response = await self._acreate_data_storage_entry(payload)
@@ -1392,6 +1419,7 @@ class DataStorageMethods:
                     parent_id=current_parent_id,
                     dataset_id=current_dataset_id,
                     is_collection=False,
+                    project_id=project_id,
                 )
                 subdir_response = await self._acreate_data_storage_entry(subdir_payload)
                 responses.append(subdir_response)
@@ -1407,6 +1435,7 @@ class DataStorageMethods:
                     base_dir=base_dir,
                     dir_manifest=subdir_manifest,
                     dataset_id=current_dataset_id,
+                    project_id=project_id,
                 )
                 responses.extend(subdir_responses)
             elif item.is_file():
@@ -1443,6 +1472,7 @@ class DataStorageMethods:
         content: str,
         description: str | None = None,
         path: str | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Store content as a string in the data storage system.
 
@@ -1451,6 +1481,7 @@ class DataStorageMethods:
             content: Content to store as a string
             description: Optional description of the data storage entry
             path: Optional path for the data storage entry
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse containing the created data storage entry and storage locations
@@ -1464,10 +1495,11 @@ class DataStorageMethods:
                 content=content,
                 description=description,
                 path=path,
+                project_id=project_id,
             )
             return self._create_data_storage_entry(payload)
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"
@@ -1486,6 +1518,7 @@ class DataStorageMethods:
         description: str | None = None,
         path: str | None = None,
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Asynchronously store content as a string in the data storage system.
 
@@ -1495,6 +1528,7 @@ class DataStorageMethods:
             description: Optional description of the data storage entry
             path: Optional path for the data storage entry
             dataset_id: Optional dataset ID to add entry to, or None to create new dataset
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse containing the created data storage entry and storage locations
@@ -1509,10 +1543,11 @@ class DataStorageMethods:
                 description=description,
                 path=path,
                 dataset_id=dataset_id,
+                project_id=project_id,
             )
             return await self._acreate_data_storage_entry(payload)
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"
@@ -1534,6 +1569,7 @@ class DataStorageMethods:
         manifest_filename: str | None = None,
         ignore_patterns: list[str] | None = None,
         ignore_filename: str = ".gitignore",
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Store file or directory content in the data storage system.
 
@@ -1552,6 +1588,7 @@ class DataStorageMethods:
             manifest_filename: Name of manifest file
             ignore_patterns: List of patterns to ignore when zipping directories
             ignore_filename: Name of ignore file to read from directory (default: .gitignore)
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse containing the final data storage entry
@@ -1564,7 +1601,13 @@ class DataStorageMethods:
         try:
             if file_path.is_dir() and as_collection:
                 return self._upload_data_directory(
-                    name, file_path, description, path, ignore_patterns, ignore_filename
+                    name,
+                    file_path,
+                    description,
+                    path,
+                    ignore_patterns,
+                    ignore_filename,
+                    project_id,
                 )
             if file_path.is_dir() and not as_collection:
                 responses = self._upload_directory_hierarchically(
@@ -1574,16 +1617,19 @@ class DataStorageMethods:
                     manifest_filename=manifest_filename,
                     ignore_patterns=ignore_patterns,
                     ignore_filename=ignore_filename,
+                    project_id=project_id,
                 )
                 if not responses:
                     raise DataStorageCreationError(
                         "No data storage entries were created"
                     )
                 return responses[0]
-            return self._upload_data_single_file(name, file_path, description, path)
+            return self._upload_data_single_file(
+                name, file_path, description, path, project_id
+            )
 
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred during file upload: {e!r}"
@@ -1606,6 +1652,7 @@ class DataStorageMethods:
         ignore_patterns: list[str] | None = None,
         ignore_filename: str = ".gitignore",
         dataset_id: UUID | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Asynchronously store file or directory content in the data storage system.
 
@@ -1620,6 +1667,7 @@ class DataStorageMethods:
             ignore_patterns: List of patterns to ignore when zipping.
             ignore_filename: Name of ignore file to read (default: .gitignore).
             dataset_id: Optional dataset ID to add entry to, or None to create new dataset.
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             The `DataStorageResponse` for the created entry. For hierarchical uploads,
@@ -1637,6 +1685,7 @@ class DataStorageMethods:
                         path,
                         ignore_patterns,
                         ignore_filename,
+                        project_id,
                     )
                 responses = await self._aupload_directory_hierarchically(
                     name=name,
@@ -1646,6 +1695,7 @@ class DataStorageMethods:
                     ignore_patterns=ignore_patterns,
                     ignore_filename=ignore_filename,
                     dataset_id=dataset_id,
+                    project_id=project_id,
                 )
                 if not responses:
                     raise DataStorageCreationError(
@@ -1653,11 +1703,11 @@ class DataStorageMethods:
                     )
                 return responses[0]
             return await self._aupload_data_single_file(
-                name, file_path, description, path, dataset_id
+                name, file_path, description, path, dataset_id, project_id
             )
 
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred during async file upload: {e!r}"
@@ -1675,6 +1725,7 @@ class DataStorageMethods:
         existing_location: DataStorageLocationPayload,
         description: str | None = None,
         path: str | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Store content as a string in the data storage system.
 
@@ -1683,6 +1734,7 @@ class DataStorageMethods:
             existing_location: Describes the existing data source location to register
             description: Optional description of the data storage entry
             path: Optional path for the data storage entry
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse containing the created data storage entry and storage locations
@@ -1696,6 +1748,7 @@ class DataStorageMethods:
                 description=description,
                 path=path,
                 existing_location=existing_location,
+                project_id=project_id,
             )
             response = self.client.post(
                 "/v0.1/data-storage", json=payload.model_dump(exclude_none=True)
@@ -1703,7 +1756,7 @@ class DataStorageMethods:
             response.raise_for_status()
             return DataStorageResponse.model_validate(response.json())
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"
@@ -1721,6 +1774,7 @@ class DataStorageMethods:
         existing_location: DataStorageLocationPayload,
         description: str | None = None,
         path: str | None = None,
+        project_id: UUID | None = None,
     ) -> DataStorageResponse:
         """Store content as a string in the data storage system.
 
@@ -1729,6 +1783,7 @@ class DataStorageMethods:
             existing_location: Describes the existing data source location to register
             description: Optional description of the data storage entry
             path: Optional path for the data storage entry
+            project_id: ID of the project this data storage entry belongs to
 
         Returns:
             DataStorageResponse containing the created data storage entry and storage locations
@@ -1742,6 +1797,7 @@ class DataStorageMethods:
                 description=description,
                 path=path,
                 existing_location=existing_location,
+                project_id=project_id,
             )
             response = await self.async_client.post(
                 "/v0.1/data-storage", json=payload.model_dump(exclude_none=True)
@@ -1749,7 +1805,7 @@ class DataStorageMethods:
             response.raise_for_status()
             return DataStorageResponse.model_validate(response.json())
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "creating")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"
@@ -1797,7 +1853,7 @@ class DataStorageMethods:
 
                 return self._download_from_gcs(result.signed_url)
 
-            if storage_type == "raw_content":
+            if storage_type in {"raw_content", "pg_table"}:
                 content = result.data_storage.content
                 if content is None:
                     logger.warning(
@@ -1809,7 +1865,7 @@ class DataStorageMethods:
             raise DataStorageCreationError(f"Unsupported storage type: {storage_type}")
 
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "retrieving")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"
@@ -1857,7 +1913,7 @@ class DataStorageMethods:
 
                 return await self._adownload_from_gcs(result.signed_url)
 
-            if storage_type == "raw_content":
+            if storage_type in {"raw_content", "pg_table"}:
                 content = result.data_storage.content
                 if content is None:
                     logger.warning(
@@ -1869,7 +1925,7 @@ class DataStorageMethods:
             raise DataStorageCreationError(f"Unsupported storage type: {storage_type}")
 
         except HTTPStatusError as e:
-            self._handle_http_errors(e)
+            self._handle_http_errors(e, "retrieving")
         except Exception as e:
             raise DataStorageCreationError(
                 f"An unexpected error occurred: {e!r}"

futurehouse_client/clients/job_client.py

@@ -19,6 +19,7 @@ from futurehouse_client.models.rest import (
     FinalEnvironmentRequest,
     StoreAgentStatePostRequest,
     StoreEnvironmentFrameRequest,
+    TrajectoryPatchRequest,
 )
 from futurehouse_client.utils.monitoring import (
     external_trace,
@@ -318,3 +319,52 @@ class JobClient:
                 f"Unexpected error storing environment frame for state {state_identifier}",
             )
             raise
+
+    async def patch_trajectory(
+        self,
+        public: bool | None = None,
+        shared_with: list[int] | None = None,
+        notification_enabled: bool | None = None,
+        notification_type: str | None = None,
+        min_estimated_time: float | None = None,
+        max_estimated_time: float | None = None,
+    ) -> None:
+        data = TrajectoryPatchRequest(
+            public=public,
+            shared_with=shared_with,
+            notification_enabled=notification_enabled,
+            notification_type=notification_type,
+            min_estimated_time=min_estimated_time,
+            max_estimated_time=max_estimated_time,
+        )
+        try:
+            async with httpx.AsyncClient(timeout=self.REQUEST_TIMEOUT) as client:
+                url = f"{self.base_uri}/v0.1/trajectories/{self.trajectory_id}"
+                headers = {
+                    "Authorization": f"Bearer {self.oauth_jwt}",
+                    "x-trajectory-id": self.trajectory_id,
+                }
+                response = await client.patch(
+                    url=url,
+                    json=data.model_dump(mode="json", exclude_none=True),
+                    headers=headers,
+                )
+                response.raise_for_status()
+                logger.debug("Trajectory updated successfully")
+        except httpx.HTTPStatusError as e:
+            logger.exception(
+                "HTTP error while patching trajectory. "
+                f"Status code: {e.response.status_code}, "
+                f"Response: {e.response.text}",
+            )
+        except httpx.TimeoutException:
+            logger.exception(
+                f"Timeout while patching trajectory after {self.REQUEST_TIMEOUT}s",
+            )
+            raise
+        except httpx.NetworkError:
+            logger.exception("Network error while patching trajectory")
+            raise
+        except Exception:
+            logger.exception("Unexpected error while patching trajectory")
+            raise

futurehouse_client/clients/rest_client.py

@@ -1630,16 +1630,17 @@ class RestClient(DataStorageMethods):
             A list of world model names.
         """
         try:
+            # Use the consolidated endpoint with search parameters
             response = self.client.get(
-                "/v0.1/world-models/search/",
+                "/v0.1/world-models",
                 params={
-                    "query": query,
+                    "q": query,
                     "size": size,
-                    "total_search_size": total_search_size,
                     "search_all_versions": search_all_versions,
                 },
             )
             response.raise_for_status()
+            # The new endpoint returns a list of models directly
             return response.json()
         except HTTPStatusError as e:
             raise WorldModelFetchError(
@@ -1754,22 +1755,19 @@ class RestClient(DataStorageMethods):
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    def get_project_by_name(self, name: str) -> UUID:
+    def get_project_by_name(self, name: str, limit: int = 2) -> UUID | list[UUID]:
         """Get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         try:
-            # Get projects filtered by name (backend now filters by name and owner)
             response = self.client.get(
-                "/v0.1/projects", params={"limit": 2, "name": name}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1782,32 +1780,33 @@ class RestClient(DataStorageMethods):
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    async def aget_project_by_name(self, name: str) -> UUID:
+    async def aget_project_by_name(
+        self, name: str, limit: int = 2
+    ) -> UUID | list[UUID]:
         """Asynchronously get a project UUID by name.
 
         Args:
             name: The name of the project to find
+            limit: Maximum number of projects to return
 
         Returns:
-            UUID of the project as a string
-
-        Raises:
-            ProjectError: If no project is found, multiple projects are found, or there's an error
+            UUID of the project as a string or a list of UUIDs if multiple projects are found
         """
         try:
             response = await self.async_client.get(
-                "/v0.1/projects", params={"limit": 2, "name": name}
+                "/v0.1/projects", params={"limit": limit, "name": name}
             )
             response.raise_for_status()
             projects = response.json()
@@ -1816,11 +1815,12 @@ class RestClient(DataStorageMethods):
         if len(projects) == 0:
             raise ProjectError(f"No project found with name '{name}'")
         if len(projects) > 1:
-            raise ProjectError(
+            logger.warning(
                 f"Multiple projects found with name '{name}'. Found {len(projects)} projects."
             )
 
-        return UUID(projects[0]["id"])
+        ids = [UUID(project["id"]) for project in projects]
+        return ids[0] if len(ids) == 1 else ids
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),

futurehouse_client/models/__init__.py

@@ -13,7 +13,7 @@ from .app import (
     TaskResponse,
     TaskResponseVerbose,
 )
-from .rest import WorldModel, WorldModelResponse
+from .rest import TrajectoryPatchRequest, WorldModel, WorldModelResponse
 
 __all__ = [
     "AuthType",
@@ -29,6 +29,7 @@ __all__ = [
     "TaskRequest",
     "TaskResponse",
     "TaskResponseVerbose",
+    "TrajectoryPatchRequest",
     "WorldModel",
     "WorldModelResponse",
 ]

futurehouse_client/models/app.py

@@ -27,10 +27,7 @@ if TYPE_CHECKING:
 MAX_CROW_JOB_RUN_TIMEOUT = 60 * 60 * 24  # 24 hours in sec
 MIN_CROW_JOB_RUN_TIMEOUT = 0  # sec
 
-
-class PythonVersion(StrEnum):
-    V3_11 = "3.11"
-    V3_12 = "3.12"
+DEFAULT_PYTHON_VERSION_USED_FOR_JOB_BUILDS = "3.13"
 
 
 class AuthType(StrEnum):
@@ -420,9 +417,9 @@ class JobDeploymentConfig(BaseModel):
         description="The configuration for the cloud run container.",
     )
 
-    python_version: PythonVersion = Field(
-        default=PythonVersion.V3_12,
-        description="The python version your docker image should build with.",
+    python_version: str = Field(
+        default=DEFAULT_PYTHON_VERSION_USED_FOR_JOB_BUILDS,
+        description="The python version your docker image should build with (e.g., '3.11', '3.12', '3.13').",
     )
 
     agent: Agent | AgentConfig | str = Field(

futurehouse_client/models/client.py

@@ -27,17 +27,13 @@ class InitialState(BaseState):
 
 class ASVState(BaseState, Generic[T]):
     action: OpResult[T] = Field()
-    next_state: Any = Field()
+    next_agent_state: Any = Field()
     value: float = Field()
 
     @field_serializer("action")
     def serialize_action(self, action: OpResult[T]) -> dict:
         return action.to_dict()
 
-    @field_serializer("next_state")
-    def serialize_next_state(self, state: Any) -> str:
-        return str(state)
-
 
 class EnvResetState(BaseState):
     observations: list[Message] = Field()

futurehouse_client/models/data_storage_methods.py

@@ -34,6 +34,10 @@ class DataStorageEntry(BaseModel):
         default=None,
         description="ID of the parent entry if this is a sub-entry for hierarchical storage",
     )
+    project_id: UUID | None = Field(
+        default=None,
+        description="ID of the project this data storage entry belongs to",
+    )
     dataset_id: UUID | None = Field(
         default=None,
         description="ID of the dataset this entry belongs to",
@@ -131,6 +135,10 @@ class DataStorageRequestPayload(BaseModel):
     parent_id: UUID | None = Field(
         default=None, description="ID of the parent entry for hierarchical storage"
     )
+    project_id: UUID | None = Field(
+        default=None,
+        description="ID of the project this data storage entry belongs to",
+    )
     dataset_id: UUID | None = Field(
         default=None,
         description="ID of existing dataset to add entry to, or None to create new dataset",

futurehouse_client/models/rest.py

@@ -23,6 +23,15 @@ class StoreEnvironmentFrameRequest(BaseModel):
     trajectory_timestep: int
 
 
+class TrajectoryPatchRequest(BaseModel):
+    public: bool | None = None
+    shared_with: list[int] | None = None
+    notification_enabled: bool | None = None
+    notification_type: str | None = None
+    min_estimated_time: float | None = None
+    max_estimated_time: float | None = None
+
+
 class ExecutionStatus(StrEnum):
     QUEUED = auto()
     IN_PROGRESS = "in progress"

futurehouse_client/utils/world_model_tools.py

@@ -46,16 +46,17 @@ class WorldModelTools:
         return WorldModelTools._get_client().create_world_model(world_model)
 
     @staticmethod
-    def search_world_models(query: str) -> list[str]:
+    def search_world_models(query: str, size: int = 10) -> list[str]:
         """Search for world models using a text query.
 
         Args:
             query: The search query string to match against world model content.
+            size: The number of results to return (default: 10).
 
         Returns:
             list[str]: A list of world model IDs that match the search query.
         """
-        return WorldModelTools._get_client().search_world_models(query, size=1)
+        return WorldModelTools._get_client().search_world_models(query, size=size)
 
 
 create_world_model_tool = Tool.from_function(WorldModelTools.create_world_model)

futurehouse_client/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.1.dev95'
-__version_tuple__ = version_tuple = (0, 4, 1, 'dev95')
+__version__ = version = '0.4.2.dev274'
+__version_tuple__ = version_tuple = (0, 4, 2, 'dev274')
+
+__commit_id__ = commit_id = None

{futurehouse_client-0.4.1.dev95.dist-info → futurehouse_client-0.4.2.dev274.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.4.1.dev95
+Version: 0.4.2.dev274
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 License:                                  Apache License

futurehouse_client-0.4.2.dev274.dist-info/RECORD

@@ -0,0 +1,23 @@
+futurehouse_client/__init__.py,sha256=PvFTkocA-hobsWoDEBEdrUgLIbuVbDs_0nvMdImJmHk,707
+futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+futurehouse_client/version.py,sha256=Rysz_q8l0T_Q0y2ULuxn71ApOfUlXV-jxY5p3loPl1E,721
+futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
+futurehouse_client/clients/data_storage_methods.py,sha256=wfvN3GdS0R8IT_b_vizNny6nADbE7ZTVIVAE6MrA5iE,71558
+futurehouse_client/clients/job_client.py,sha256=b5gpzulZpxpv9R337r3UKItnMdtd6CGlI1sV3_VQJso,13985
+futurehouse_client/clients/rest_client.py,sha256=zSQfvS63yzzCnbhvwmJk8Pkyn1442cQNthpIE7Ebd5g,100498
+futurehouse_client/models/__init__.py,sha256=0YlzKGymbY1g4cXxnUc0BUnthTkVBf12bCZlGUcMQqk,701
+futurehouse_client/models/app.py,sha256=UUg17I3zk6cH_7mrdojHGYvQfm_SeDkuUxsPlRyIYz0,31895
+futurehouse_client/models/client.py,sha256=WFD1ddR0O7nD1ErqcJ-kt_miIW22KP6IDOSkaSdVZ8M,1716
+futurehouse_client/models/data_storage_methods.py,sha256=49YXPToxi6AzujtEnIo08GbPh_uHrwaCsvFh9cARArE,12377
+futurehouse_client/models/rest.py,sha256=x0qp8ut628fNBwB29ZJzSsWXdpSsIedsUS-Xq5ctL7c,3671
+futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+futurehouse_client/utils/auth.py,sha256=tgWELjKfg8eWme_qdcRmc8TjQN9DVZuHHaVXZNHLchk,2960
+futurehouse_client/utils/general.py,sha256=Gxy8JJ2g6nO-gphf_kHAlkowb0eP_DqD4MSF58IXExE,1592
+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=Ctiy-EfK7EXrjmKO_nI6V5VhOJyHKWc0sKwa8Q0HAAo,2292
+futurehouse_client-0.4.2.dev274.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.4.2.dev274.dist-info/METADATA,sha256=ZFyppyLGspK7Iz_VovFU5imp5ePeipB2fM-JS0X4x-g,26987
+futurehouse_client-0.4.2.dev274.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.4.2.dev274.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.4.2.dev274.dist-info/RECORD,,

futurehouse_client-0.4.1.dev95.dist-info/RECORD

@@ -1,23 +0,0 @@
-futurehouse_client/__init__.py,sha256=PvFTkocA-hobsWoDEBEdrUgLIbuVbDs_0nvMdImJmHk,707
-futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=xdDIC2zXkSHfX-EzFmKKd4nit_109buO2U_Mou9dyPk,526
-futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
-futurehouse_client/clients/data_storage_methods.py,sha256=Aaq4Azhvi_epfM0sGdv-S87nqoCZ_cIfitUjnBIQ1WM,68995
-futurehouse_client/clients/job_client.py,sha256=D51_qTxya6g5Wfg_ZfJdP031TV_YDJeXkGMiYAJ1qRc,11962
-futurehouse_client/clients/rest_client.py,sha256=hNDSN8amTXSEkiXRtNYcFM942UdvryUsf1q0D_dAOW4,100332
-futurehouse_client/models/__init__.py,sha256=kQ4R7VEuRxO0IQEW_sk9CndBL7zzl8rUKI24ddyYLM0,647
-futurehouse_client/models/app.py,sha256=TGoAeENNPc5mSBkMHjh-Z8VIlnaUNcoWUJLxUhRIkEE,31868
-futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
-futurehouse_client/models/data_storage_methods.py,sha256=ff3l87fT379BKhaHcI3aR8O7p2Vfm0M_qP9cpnhq2Bs,12095
-futurehouse_client/models/rest.py,sha256=ybelLsyTsKYud7DYUCF0sFF6u81bl8WmS_wWAnbX-0M,3382
-futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/utils/auth.py,sha256=tgWELjKfg8eWme_qdcRmc8TjQN9DVZuHHaVXZNHLchk,2960
-futurehouse_client/utils/general.py,sha256=Gxy8JJ2g6nO-gphf_kHAlkowb0eP_DqD4MSF58IXExE,1592
-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=cybA82xD_UzmKN0rdQfhbB8SH4v6cFw8mRr4gFfQF5U,2208
-futurehouse_client-0.4.1.dev95.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.4.1.dev95.dist-info/METADATA,sha256=dXPakUzdA4x3tLQ2-wkOiVdKqsnbczEOh-th5sbSMbY,26986
-futurehouse_client-0.4.1.dev95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.4.1.dev95.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.4.1.dev95.dist-info/RECORD,,