futurehouse-client 0.3.18.dev184__py3-none-any.whl → 0.3.18.dev186__py3-none-any.whl

futurehouse_client/clients/rest_client.py

@@ -358,12 +358,12 @@ class RestClient:
         if not files:
             raise TaskFetchError(f"No files found in {path}")
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    @refresh_token_on_auth_error()
     def get_task(
         self, task_id: str | None = None, history: bool = False, verbose: bool = False
     ) -> "TaskResponse":
@@ -385,6 +385,7 @@ class RestClient:
                 ),
                 self.client.stream("GET", url, params={"history": history}) as response,
             ):
+                response.raise_for_status()
                 json_data = "".join(response.iter_text(chunk_size=1024))
                 data = json.loads(json_data)
                 if "id" not in data:
@@ -411,12 +412,12 @@ class RestClient:
         except Exception as e:
             raise TaskFetchError(f"Error getting task: {e!s}") from e
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    @refresh_token_on_auth_error()
     async def aget_task(
         self, task_id: str | None = None, history: bool = False, verbose: bool = False
     ) -> "TaskResponse":
@@ -504,12 +505,12 @@ class RestClient:
             raise TaskFetchError(f"Error creating task: {e!s}") from e
         return trajectory_id
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    @refresh_token_on_auth_error()
     async def acreate_task(self, task_data: TaskRequest | dict[str, Any]):
         """Create a new futurehouse task."""
         if isinstance(task_data, dict):
@@ -682,12 +683,12 @@ class RestClient:
             for task_id in trajectory_ids
         ]
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    @refresh_token_on_auth_error()
     def get_build_status(self, build_id: UUID | None = None) -> dict[str, Any]:
         """Get the status of a build."""
         try:
@@ -706,12 +707,12 @@ class RestClient:
         return response.json()
 
     # TODO: Refactor later so we don't have to ignore PLR0915
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
         retry=retry_if_connection_error,
     )
-    @refresh_token_on_auth_error()
     def create_job(self, config: JobDeploymentConfig) -> dict[str, Any]:  # noqa: PLR0915
         """Creates a futurehouse job deployment from the environment and environment files.
 
@@ -973,6 +974,7 @@ class RestClient:
         except Exception as e:
             raise FileUploadError(f"Error uploading directory {dir_path}: {e}") from e
 
+    @refresh_token_on_auth_error()
     def _upload_single_file(
         self,
         job_name: str,
@@ -1046,11 +1048,20 @@ class RestClient:
                         )
 
             logger.info(f"Successfully uploaded {file_name}")
-
+        except HTTPStatusError as e:
+            if e.response.status_code in AUTH_ERRORS_TO_RETRY_ON:
+                raise AuthError(
+                    e.response.status_code,
+                    f"Authentication failed: {e}",
+                    request=e.request,
+                    response=e.response,
+                ) from e
+            raise
         except Exception as e:
             logger.exception(f"Error uploading file {file_path}")
             raise FileUploadError(f"Error uploading file {file_path}: {e}") from e
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
@@ -1087,6 +1098,13 @@ class RestClient:
             response.raise_for_status()
             return response.json()
         except HTTPStatusError as e:
+            if e.response.status_code in AUTH_ERRORS_TO_RETRY_ON:
+                raise AuthError(
+                    e.response.status_code,
+                    f"Authentication failed: {e}",
+                    request=e.request,
+                    response=e.response,
+                ) from e
             logger.exception(
                 f"Error listing files for job {job_name}, trajectory {trajectory_id}, upload_id {upload_id}: {e.response.text}"
             )
@@ -1099,6 +1117,7 @@ class RestClient:
             )
             raise RestClientError(f"Error listing files: {e!s}") from e
 
+    @refresh_token_on_auth_error()
     @retry(
         stop=stop_after_attempt(MAX_RETRY_ATTEMPTS),
         wait=wait_exponential(multiplier=RETRY_MULTIPLIER, max=MAX_RETRY_WAIT),
@@ -1146,6 +1165,13 @@ class RestClient:
 
             logger.info(f"File {file_path} downloaded to {destination_path}")
         except HTTPStatusError as e:
+            if e.response.status_code in AUTH_ERRORS_TO_RETRY_ON:
+                raise AuthError(
+                    e.response.status_code,
+                    f"Authentication failed: {e}",
+                    request=e.request,
+                    response=e.response,
+                ) from e
             logger.exception(
                 f"Error downloading file {file_path} for job {job_name}, trajectory_id {trajectory_id}: {e.response.text}"
             )

{futurehouse_client-0.3.18.dev184.dist-info → futurehouse_client-0.3.18.dev186.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.18.dev184
+Version: 0.3.18.dev186
 Summary: A client for interacting with endpoints of the FutureHouse service.
 Author-email: FutureHouse technical staff <hello@futurehouse.org>
 Classifier: Operating System :: OS Independent

{futurehouse_client-0.3.18.dev184.dist-info → futurehouse_client-0.3.18.dev186.dist-info}/RECORD

@@ -1,7 +1,7 @@
 futurehouse_client/__init__.py,sha256=ddxO7JE97c6bt7LjNglZZ2Ql8bYCGI9laSFeh9MP6VU,344
 futurehouse_client/clients/__init__.py,sha256=tFWqwIAY5PvwfOVsCje4imjTpf6xXNRMh_UHIKVI1_0,320
 futurehouse_client/clients/job_client.py,sha256=uNkqQbeZw7wbA0qDWcIOwOykrosza-jev58paJZ_mbA,11150
-futurehouse_client/clients/rest_client.py,sha256=0SN9cNy2QFVUS9U1L1KDf_ncSx2IV7phbGatdbNlY9w,46814
+futurehouse_client/clients/rest_client.py,sha256=W9ASP1ZKYS7UL5J9b-Km77YXEiDQ9hCf4X_9PqaZZZc,47914
 futurehouse_client/models/__init__.py,sha256=5x-f9AoM1hGzJBEHcHAXSt7tPeImST5oZLuMdwp0mXc,554
 futurehouse_client/models/app.py,sha256=w_1e4F0IiC-BKeOLqYkABYo4U-Nka1S-F64S_eHB2KM,26421
 futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
@@ -11,7 +11,7 @@ futurehouse_client/utils/auth.py,sha256=Lq9mjSGc7iuRP6fmLICCS6KjzLHN6-tJUuhYp0XX
 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.18.dev184.dist-info/METADATA,sha256=ckn5Ucj4fuMFejVZTtAuw3H7gSqj4NUiIpdLzp8W16I,12767
-futurehouse_client-0.3.18.dev184.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-futurehouse_client-0.3.18.dev184.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.3.18.dev184.dist-info/RECORD,,
+futurehouse_client-0.3.18.dev186.dist-info/METADATA,sha256=PvjehEQZu2ihl7kG1uDvWJVUxyYbV7J-VmAe42Ml3zo,12767
+futurehouse_client-0.3.18.dev186.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+futurehouse_client-0.3.18.dev186.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.3.18.dev186.dist-info/RECORD,,