futurehouse-client 0.3.20.dev208__py3-none-any.whl → 0.3.20.dev225__py3-none-any.whl

futurehouse_client/clients/rest_client.py

@@ -37,6 +37,7 @@ from httpx import (
 from ldp.agent import AgentConfig
 from requests.exceptions import RequestException, Timeout
 from tenacity import (
+    before_sleep_log,
     retry,
     retry_if_exception_type,
     stop_after_attempt,
@@ -295,7 +296,7 @@ class RestClient:
             response.raise_for_status()
             return response.json()
         except Exception as e:
-            raise JobFetchError(f"Error checking job: {e!s}") from e
+            raise JobFetchError(f"Error checking job: {e!r}.") from e
 
     def _fetch_my_orgs(self) -> list[str]:
         response = self.client.get(f"/v0.1/organizations?filter={True}")
@@ -325,7 +326,7 @@ class RestClient:
             response.raise_for_status()
             return response.json()
         except Exception as e:
-            raise RestClientError(f"Error checking assembly status: {e}") from e
+            raise RestClientError(f"Error checking assembly status: {e!r}.") from e
 
     def _wait_for_all_assemblies_completion(
         self,
@@ -375,7 +376,7 @@ class RestClient:
                     elif status == ExecutionStatus.FAIL.value:
                         error_msg = status_data.get("error", "Unknown assembly error")
                         raise RestClientError(
-                            f"Assembly failed for {file_name}: {error_msg}"
+                            f"Assembly failed for {file_name}: {error_msg}."
                         )
                     elif status == ExecutionStatus.IN_PROGRESS.value:
                         logger.debug(f"Assembly in progress for {file_name}...")
@@ -384,7 +385,7 @@ class RestClient:
                     raise  # Re-raise assembly errors
                 except Exception as e:
                     logger.warning(
-                        f"Error checking assembly status for {file_name}: {e}"
+                        f"Error checking assembly status for {file_name}: {e!r}."
                     )
 
             # Don't sleep if all files are complete
@@ -394,7 +395,7 @@ class RestClient:
         if len(completed_files) < len(file_names):
             remaining_files = set(file_names) - completed_files
             logger.warning(
-                f"Assembly timeout for files: {remaining_files} after {timeout} seconds"
+                f"Assembly timeout for files: {remaining_files} after {timeout} seconds."
             )
             return False
 
@@ -413,7 +414,7 @@ class RestClient:
 
         """
         if not path.is_dir():
-            raise JobFetchError(f"Path {path} is not a directory")
+            raise JobFetchError(f"Path {path} is not a directory.")
 
     @staticmethod
     def _validate_template_path(template_path: str | os.PathLike) -> None:
@@ -450,12 +451,13 @@ class RestClient:
 
         """
         if not files:
-            raise TaskFetchError(f"No files found in {path}")
+            raise TaskFetchError(f"No files found in {path}.")
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def get_task(
         self, task_id: str | None = None, history: bool = False, verbose: bool = False
@@ -496,6 +498,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     async def aget_task(
         self, task_id: str | None = None, history: bool = False, verbose: bool = False
@@ -519,7 +522,7 @@ class RestClient:
             ) as response:
                 if response.status_code in {401, 403}:
                     raise PermissionError(
-                        f"Error getting task: Permission denied for task {task_id}"
+                        f"Error getting task: Permission denied for task {task_id}."
                     )
                 response.raise_for_status()
                 json_data = "".join([chunk async for chunk in response.aiter_text()])
@@ -536,6 +539,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def create_task(
         self,
@@ -560,7 +564,7 @@ class RestClient:
         )
         if response.status_code in {401, 403}:
             raise PermissionError(
-                f"Error creating task: Permission denied for task {task_data.name}"
+                f"Error creating task: Permission denied for task {task_data.name}."
             )
         response.raise_for_status()
         trajectory_id = response.json()["trajectory_id"]
@@ -571,6 +575,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     async def acreate_task(
         self,
@@ -595,7 +600,7 @@ class RestClient:
         )
         if response.status_code in {401, 403}:
             raise PermissionError(
-                f"Error creating task: Permission denied for task {task_data.name}"
+                f"Error creating task: Permission denied for task {task_data.name}."
             )
         response.raise_for_status()
         trajectory_id = response.json()["trajectory_id"]
@@ -747,6 +752,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def get_build_status(self, build_id: UUID | None = None) -> dict[str, Any]:
         """Get the status of a build."""
@@ -755,7 +761,7 @@ class RestClient:
             response = self.client.get(f"/v0.1/builds/{build_id}")
             response.raise_for_status()
         except Exception as e:
-            raise JobFetchError(f"Error getting build status: {e!s}") from e
+            raise JobFetchError(f"Error getting build status: {e!r}.") from e
         return response.json()
 
     # TODO: Refactor later so we don't have to ignore PLR0915
@@ -763,6 +769,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def create_job(self, config: JobDeploymentConfig) -> dict[str, Any]:  # noqa: PLR0915
         """Creates a futurehouse job deployment from the environment and environment files.
@@ -940,10 +947,10 @@ class RestClient:
                 error_detail = response.json()
                 error_message = error_detail.get("detail", str(e))
                 raise JobCreationError(
-                    f"Server validation error: {error_message}"
+                    f"Server validation error: {error_message}."
                 ) from e
         except Exception as e:
-            raise JobCreationError(f"Error generating docker image: {e!s}") from e
+            raise JobCreationError(f"Error generating docker image: {e!r}.") from e
         return build_context
 
     # TODO: we should have have an async upload_file, check_assembly_status,
@@ -952,6 +959,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def upload_file(
         self,
@@ -999,7 +1007,7 @@ class RestClient:
             )
             if not success:
                 raise RestClientError(
-                    f"Assembly failed or timed out for one or more files: {uploaded_files}"
+                    f"Assembly failed or timed out for one or more files: {uploaded_files}."
                 )
 
         logger.info(f"Successfully uploaded {file_path} to {upload_id}")
@@ -1044,7 +1052,9 @@ class RestClient:
                     )
                     uploaded_files.append(file_name)
         except Exception as e:
-            raise FileUploadError(f"Error uploading directory {dir_path}: {e}") from e
+            raise FileUploadError(
+                f"Error uploading directory {dir_path}: {e!r}."
+            ) from e
 
         return uploaded_files
 
@@ -1095,7 +1105,7 @@ class RestClient:
             logger.info(f"Successfully uploaded {file_name}")
         except Exception as e:
             logger.exception(f"Error uploading file {file_path}")
-            raise FileUploadError(f"Error uploading file {file_path}: {e}") from e
+            raise FileUploadError(f"Error uploading file {file_path}: {e!r}.") from e
         return status_url
 
     def _upload_chunks_parallel(
@@ -1156,9 +1166,9 @@ class RestClient:
                                 f"Uploaded chunk {chunk_index + 1}/{total_chunks} of {file_name}"
                             )
                         except Exception as e:
-                            logger.error(f"Error uploading chunk {chunk_index}: {e}")
+                            logger.error(f"Error uploading chunk {chunk_index}: {e!r}.")
                             raise FileUploadError(
-                                f"Error uploading chunk {chunk_index} of {file_name}: {e}"
+                                f"Error uploading chunk {chunk_index} of {file_name}: {e!r}."
                             ) from e
 
         # Upload the final chunk with retry logic
@@ -1224,11 +1234,11 @@ class RestClient:
             except Exception as e:
                 if retries >= max_retries - 1:
                     raise FileUploadError(
-                        f"Error uploading final chunk of {file_name}: {e}"
+                        f"Error uploading final chunk of {file_name}: {e!r}."
                     ) from e
                 retries += 1
                 logger.warning(
-                    f"Error uploading final chunk of {file_name}, retrying in {retry_delay}s... (attempt {retries}/{max_retries}): {e}"
+                    f"Error uploading final chunk of {file_name}, retrying in {retry_delay}s... (attempt {retries}/{max_retries}): {e!r}."
                 )
                 time.sleep(retry_delay)
 
@@ -1296,6 +1306,7 @@ class RestClient:
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def list_files(
         self,
@@ -1318,7 +1329,7 @@ class RestClient:
         """
         if not bool(trajectory_id) ^ bool(upload_id):
             raise RestClientError(
-                "Must at least specify one of trajectory_id or upload_id, but not both"
+                "Must at least specify one of trajectory_id or upload_id, but not both."
             )
         try:
             url = f"/v0.1/crows/{job_name}/list-files"
@@ -1332,18 +1343,19 @@ class RestClient:
                 f"Error listing files for job {job_name}, trajectory {trajectory_id}, upload_id {upload_id}: {e.response.text}"
             )
             raise RestClientError(
-                f"Error listing files: {e.response.status_code} - {e.response.text}"
+                f"Error listing files: {e.response.status_code} - {e.response.text}."
             ) from e
         except Exception as e:
             logger.exception(
                 f"Error listing files for job {job_name}, trajectory {trajectory_id}, upload_id {upload_id}"
             )
-            raise RestClientError(f"Error listing files: {e!s}") from e
+            raise RestClientError(f"Error listing files: {e!r}.") from e
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def download_file(
         self,
@@ -1394,7 +1406,7 @@ class RestClient:
             if destination_path.exists():
                 destination_path.unlink()
             raise RestClientError(
-                f"Error downloading file: {e.response.status_code} - {e.response.text}"
+                f"Error downloading file: {e.response.status_code} - {e.response.text}."
             ) from e
         except RemoteProtocolError as e:
             logger.error(
@@ -1413,12 +1425,13 @@ class RestClient:
             )
             if destination_path.exists():
                 destination_path.unlink()  # Clean up partial file
-            raise RestClientError(f"Error downloading file: {e!s}") from e
+            raise RestClientError(f"Error downloading file: {e!r}.") from e
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def get_world_model(
         self, world_model_id: UUID | None = None, name: str | None = None
@@ -1450,15 +1463,16 @@ class RestClient:
                     "World model not found with the specified identifier."
                 ) from e
             raise WorldModelFetchError(
-                f"Error fetching world model: {e.response.status_code} - {e.response.text}"
+                f"Error fetching world model: {e.response.status_code} - {e.response.text}."
             ) from e
         except Exception as e:
-            raise WorldModelFetchError(f"An unexpected error occurred: {e}") from e
+            raise WorldModelFetchError(f"An unexpected error occurred: {e!r}.") from e
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     async def aget_world_model(
         self, world_model_id: UUID | None = None, name: str | None = None
@@ -1490,15 +1504,16 @@ class RestClient:
                     "World model not found with the specified identifier."
                 ) from e
             raise WorldModelFetchError(
-                f"Error fetching world model: {e.response.status_code} - {e.response.text}"
+                f"Error fetching world model: {e.response.status_code} - {e.response.text}."
             ) from e
         except Exception as e:
-            raise WorldModelFetchError(f"An unexpected error occurred: {e}") from e
+            raise WorldModelFetchError(f"An unexpected error occurred: {e!r}.") from e
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     def create_world_model(self, payload: WorldModel) -> UUID:
         """Create a new, immutable world model snapshot.
@@ -1522,20 +1537,21 @@ class RestClient:
         except HTTPStatusError as e:
             if e.response.status_code == codes.BAD_REQUEST:
                 raise WorldModelCreationError(
-                    f"Invalid payload for world model creation: {e.response.text}"
+                    f"Invalid payload for world model creation: {e.response.text}."
                 ) from e
             raise WorldModelCreationError(
-                f"Error creating world model: {e.response.status_code} - {e.response.text}"
+                f"Error creating world model: {e.response.status_code} - {e.response.text}."
             ) from e
         except Exception as e:
             raise WorldModelCreationError(
-                f"An unexpected error occurred during world model creation: {e}"
+                f"An unexpected error occurred during world model creation: {e!r}."
             ) from e
 
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
+        before_sleep=before_sleep_log(logger, logging.WARNING),
     )
     async def acreate_world_model(self, payload: WorldModel) -> UUID:
         """Asynchronously create a new, immutable world model snapshot.
@@ -1558,14 +1574,14 @@ class RestClient:
         except HTTPStatusError as e:
             if e.response.status_code == codes.BAD_REQUEST:
                 raise WorldModelCreationError(
-                    f"Invalid payload for world model creation: {e.response.text}"
+                    f"Invalid payload for world model creation: {e.response.text}."
                 ) from e
             raise WorldModelCreationError(
-                f"Error creating world model: {e.response.status_code} - {e.response.text}"
+                f"Error creating world model: {e.response.status_code} - {e.response.text}."
             ) from e
         except Exception as e:
             raise WorldModelCreationError(
-                f"An unexpected error occurred during world model creation: {e}"
+                f"An unexpected error occurred during world model creation: {e!r}."
             ) from e
 
     @retry(

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/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.20.dev208'
-__version_tuple__ = version_tuple = (0, 3, 20, 'dev208')
+__version__ = version = '0.3.20.dev225'
+__version_tuple__ = version_tuple = (0, 3, 20, 'dev225')

{futurehouse_client-0.3.20.dev208.dist-info → futurehouse_client-0.3.20.dev225.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.20.dev208
+Version: 0.3.20.dev225
 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.3.20.dev208.dist-info → futurehouse_client-0.3.20.dev225.dist-info}/RECORD

@@ -1,20 +1,20 @@
 futurehouse_client/__init__.py,sha256=BztM_ntbgmIEjzvnBWcvPhvLjM8xGDFCK0Upf3-nIn8,488
 futurehouse_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-futurehouse_client/version.py,sha256=Q9A-Uuc0KS3oj8dhvFHWadX__nXqTHy-htzKO30lPiU,530
+futurehouse_client/version.py,sha256=UzQXVtwR5aOM-s9sEJYt5xEHWLIMFYPuR7s_I_I9-sI,530
 futurehouse_client/clients/__init__.py,sha256=-HXNj-XJ3LRO5XM6MZ709iPs29YpApss0Q2YYg1qMZw,280
 futurehouse_client/clients/job_client.py,sha256=D51_qTxya6g5Wfg_ZfJdP031TV_YDJeXkGMiYAJ1qRc,11962
-futurehouse_client/clients/rest_client.py,sha256=v5INQ9Wsb3A3U2zdLfRUP2H1hXpsZHtiZdVEav3Sv6o,69215
+futurehouse_client/clients/rest_client.py,sha256=m4izsMCwq2V_oR-zkzxdLE-4y6Z0mm5ArWvpvtuaBKY,70158
 futurehouse_client/models/__init__.py,sha256=kQ4R7VEuRxO0IQEW_sk9CndBL7zzl8rUKI24ddyYLM0,647
 futurehouse_client/models/app.py,sha256=SvkXOu5Qx28_jCS84XKKepnpGyfrQUEVnxS-JGqmsaE,29128
-futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
+futurehouse_client/models/client.py,sha256=WFD1ddR0O7nD1ErqcJ-kt_miIW22KP6IDOSkaSdVZ8M,1716
 futurehouse_client/models/rest.py,sha256=AwPMcB1ruoqaI8NIhX2ZzN8UuX6XsaQ7uzeSE8EpwKk,1573
 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=A_rtTiYW30ELGEZlWCIArO7q1nEmqi8hUlmBRYkMQ_c,767
 futurehouse_client/utils/module_utils.py,sha256=aFyd-X-pDARXz9GWpn8SSViUVYdSbuy9vSkrzcVIaGI,4955
 futurehouse_client/utils/monitoring.py,sha256=UjRlufe67kI3VxRHOd5fLtJmlCbVA2Wqwpd4uZhXkQM,8728
-futurehouse_client-0.3.20.dev208.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
-futurehouse_client-0.3.20.dev208.dist-info/METADATA,sha256=JwxHWSPvfSXwCJAtDcPlHhv5YiLOgv8YQT3OKsZbZoY,26805
-futurehouse_client-0.3.20.dev208.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-futurehouse_client-0.3.20.dev208.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.3.20.dev208.dist-info/RECORD,,
+futurehouse_client-0.3.20.dev225.dist-info/licenses/LICENSE,sha256=oQ9ZHjUi-_6GfP3gs14FlPb0OlGwE1QCCKFGnJ4LD2I,11341
+futurehouse_client-0.3.20.dev225.dist-info/METADATA,sha256=Ns45fN-WRg5MFzEERIfrHHHIsSB-cLXIVMyPY3a-R1c,26805
+futurehouse_client-0.3.20.dev225.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+futurehouse_client-0.3.20.dev225.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.3.20.dev225.dist-info/RECORD,,