futurehouse-client 0.3.18.dev25__py3-none-any.whl → 0.3.18.dev80__py3-none-any.whl

futurehouse_client/clients/rest_client.py

@@ -8,6 +8,7 @@ import inspect
 import json
 import logging
 import os
+import sys
 import tempfile
 import time
 import uuid
@@ -63,24 +64,14 @@ from futurehouse_client.utils.monitoring import (
 )
 
 logger = logging.getLogger(__name__)
-
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    stream=sys.stdout,
+)
+logging.getLogger("httpx").setLevel(logging.WARNING)
 TaskRequest.model_rebuild()
 
-retry_if_connection_error = retry_if_exception_type((
-    # From requests
-    Timeout,
-    ConnectionError,
-    RequestException,
-    # From httpx
-    ConnectError,
-    ConnectTimeout,
-    ReadTimeout,
-    ReadError,
-    NetworkError,
-    RemoteProtocolError,
-    CloseError,
-))
-
 FILE_UPLOAD_IGNORE_PARTS = {
     ".ruff_cache",
     "__pycache__",
@@ -111,6 +102,27 @@ class InvalidTaskDescriptionError(Exception):
     """Raised when the task description is invalid or empty."""
 
 
+class FileUploadError(RestClientError):
+    """Raised when there's an error uploading a file."""
+
+
+retry_if_connection_error = retry_if_exception_type((
+    # From requests
+    Timeout,
+    ConnectionError,
+    RequestException,
+    # From httpx
+    ConnectError,
+    ConnectTimeout,
+    ReadTimeout,
+    ReadError,
+    NetworkError,
+    RemoteProtocolError,
+    CloseError,
+    FileUploadError,
+))
+
+
 class SimpleOrganization(BaseModel):
     id: int
     name: str
@@ -207,10 +219,6 @@ class TaskResponseVerbose(TaskResponse):
     shared_with: list[SimpleOrganization] | None = None
 
 
-class FileUploadError(RestClientError):
-    """Raised when there's an error uploading a file."""
-
-
 class RestClient:
     REQUEST_TIMEOUT: ClassVar[float] = 30.0  # sec
     MAX_RETRY_ATTEMPTS: ClassVar[int] = 3
@@ -999,6 +1007,12 @@ class RestClient:
         """
         file_name = file_name or file_path.name
         file_size = file_path.stat().st_size
+
+        # Skip empty files
+        if file_size == 0:
+            logger.warning(f"Skipping upload of empty file: {file_path}")
+            return
+
         total_chunks = (file_size + self.CHUNK_SIZE - 1) // self.CHUNK_SIZE
 
         logger.info(f"Uploading {file_path} as {file_name} ({total_chunks} chunks)")
@@ -1122,7 +1136,7 @@ class RestClient:
 
         Raises:
             RestClientError: If there is an error downloading the file.
-            FileNotFoundError: If the destination directory does not exist.
+            FileNotFoundError: If the destination directory does not exist or if the file is not found.
         """
         destination_path = Path(destination_path)
         # Ensure the destination directory exists
@@ -1137,6 +1151,13 @@ class RestClient:
                 with open(destination_path, "wb") as f:
                     for chunk in response.iter_bytes(chunk_size=8192):
                         f.write(chunk)
+
+            # Check if the downloaded file is empty
+            if destination_path.stat().st_size == 0:
+                # Remove the empty file
+                destination_path.unlink()
+                raise FileNotFoundError(f"File not found or is empty: {file_path}")
+
             logger.info(f"File {file_path} downloaded to {destination_path}")
         except HTTPStatusError as e:
             logger.exception(

{futurehouse_client-0.3.18.dev25.dist-info → futurehouse_client-0.3.18.dev80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: futurehouse-client
-Version: 0.3.18.dev25
+Version: 0.3.18.dev80
 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.dev25.dist-info → futurehouse_client-0.3.18.dev80.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=Fi3YvN4k82AuXCe8vlwxhkK8CXS164NQrs7paj9qIek,11096
-futurehouse_client/clients/rest_client.py,sha256=d1D87Uz6bJ-VgXSOHbt6XphXOH0pbe6scW9wcih7uxI,46542
+futurehouse_client/clients/rest_client.py,sha256=Qv54VFcGnCDbOoGFmfx8AZsXyAyZyZ4weK9RGKVePOE,47214
 futurehouse_client/models/__init__.py,sha256=ta3jFLM_LsDz1rKDmx8rja8sT7WtSKoFvMgLF0yFpvA,342
 futurehouse_client/models/app.py,sha256=yfZ9tyw4VATVAfYrU7aTdCNPSljLEho09_nIbh8oZDY,23174
 futurehouse_client/models/client.py,sha256=n4HD0KStKLm6Ek9nL9ylP-bkK10yzAaD1uIDF83Qp_A,1828
@@ -10,7 +10,7 @@ futurehouse_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 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.dev25.dist-info/METADATA,sha256=jTqBZCR7ekzDc5vHGk0y114k_TheT4tcHbxRT7amY7U,12766
-futurehouse_client-0.3.18.dev25.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-futurehouse_client-0.3.18.dev25.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
-futurehouse_client-0.3.18.dev25.dist-info/RECORD,,
+futurehouse_client-0.3.18.dev80.dist-info/METADATA,sha256=XVCM841O8K4E7OWwDGUZPI3c1Odio5nnBk-HOCHBj4Q,12766
+futurehouse_client-0.3.18.dev80.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+futurehouse_client-0.3.18.dev80.dist-info/top_level.txt,sha256=TRuLUCt_qBnggdFHCX4O_BoCu1j2X43lKfIZC-ElwWY,19
+futurehouse_client-0.3.18.dev80.dist-info/RECORD,,

{futurehouse_client-0.3.18.dev25.dist-info → futurehouse_client-0.3.18.dev80.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any