python-dropbox-api 0.1.3__tar.gz → 0.1.5__tar.gz

{python_dropbox_api-0.1.3 → python_dropbox_api-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-dropbox-api
-Version: 0.1.3
+Version: 0.1.5
 Summary: This is a lightweight wrapper for the Dropbox API intended for use in Home Assistant.
 License-Expression: MIT
 License-File: LICENSE
@@ -10,6 +10,7 @@ Requires-Python: >=3.13
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: aiohttp (>=3.13.0,<4.0.0)
 Description-Content-Type: text/markdown
 

{python_dropbox_api-0.1.3 → python_dropbox_api-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-dropbox-api"
-version = "0.1.3"
+version = "0.1.5"
 description = "This is a lightweight wrapper for the Dropbox API intended for use in Home Assistant."
 authors = [
     {name = "Brandon Rothweiler",email = "2292715+bdr99@users.noreply.github.com"}

{python_dropbox_api-0.1.3 → python_dropbox_api-0.1.5}/python_dropbox_api/client.py

@@ -1,4 +1,4 @@
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Callable
 import json
 
 from aiohttp import ClientResponse
@@ -38,15 +38,24 @@ def parse_property_groups(property_groups: list[dict]) -> list[PropertyGroup]:
 
 async def handle_common_errors(response: ClientResponse) -> None:
     """Handle common errors."""
-    response_json = await response.json()
+    if response.ok:
+        return
 
-    error_summary = response_json.get("error_summary")
+    try:
+        response_json = await response.json(content_type=None)
 
-    if error_summary is not None:
-        if error_summary.startswith("invalid_access_token/"):
-            raise DropboxAuthException("Unauthorized")
-        if error_summary.startswith("path/not_found/"):
-            raise DropboxFileOrFolderNotFoundException("File or folder not found")
+        error_summary = response_json.get("error_summary") if isinstance(response_json, dict) else None
+
+        if error_summary is not None:
+            if error_summary.startswith("invalid_access_token/"):
+                raise DropboxAuthException("Unauthorized")
+            if error_summary.startswith("path/not_found/"):
+                raise DropboxFileOrFolderNotFoundException("File or folder not found")
+    except (DropboxAuthException, DropboxFileOrFolderNotFoundException):
+        raise
+    except json.JSONDecodeError:
+        text = await response.text()
+        raise DropboxUnknownException(f"{response.status}: {text}")
 
     response.raise_for_status()
 
@@ -229,6 +238,7 @@ class DropboxAPIClient:
         path: str,
         file_stream: AsyncIterator[bytes],
         property_groups: list[PropertyGroup] | None = None,
+        progress_callback: Callable[[int], None] | None = None,
     ) -> None:
         """Upload a file to Dropbox using chunked upload sessions.
 
@@ -236,13 +246,19 @@ class DropboxAPIClient:
             path: The Dropbox path where the file should be uploaded.
             file_stream: An async iterator of bytes to upload.
             property_groups: Optional list of property groups to attach to the uploaded file.
+            progress_callback: Optional callback called with the total number of bytes uploaded after each chunk is sent.
         """
         try:
             CHUNK_SIZE = 16 * 1024 * 1024  # 16MB chunks
 
             # Always use chunked upload approach
             await self._upload_file_chunked(
-                CONTENT_API_BASE_URL, path, file_stream, CHUNK_SIZE, property_groups
+                CONTENT_API_BASE_URL,
+                path,
+                file_stream,
+                CHUNK_SIZE,
+                property_groups,
+                progress_callback,
             )
         except (DropboxAuthException, DropboxFileOrFolderNotFoundException):
             raise
@@ -256,6 +272,7 @@ class DropboxAPIClient:
         file_stream: AsyncIterator[bytes],
         chunk_size: int,
         property_groups: list[PropertyGroup] | None = None,
+        progress_callback: Callable[[int], None] | None = None,
     ) -> None:
         """Upload a file using chunked upload sessions, streaming chunks without loading entire file into memory."""
         session_id = None
@@ -286,6 +303,8 @@ class DropboxAPIClient:
                     )
 
                 offset += len(chunk_data)
+                if progress_callback:
+                    progress_callback(offset)
 
         # Handle remaining data in buffer (final partial chunk)
         if buffer:
@@ -298,6 +317,13 @@ class DropboxAPIClient:
                     content_api_url, session_id, offset, buffer
                 )
             offset += len(buffer)
+            if progress_callback:
+                progress_callback(offset)
+
+        # Empty file (or a stream that yielded no bytes): no session was ever
+        # started, so open one with no data before finishing.
+        if session_id is None:
+            session_id = await self._start_upload_session(content_api_url, b"")
 
         # Finish upload session
         await self._finish_upload_session(
@@ -429,7 +455,7 @@ class DropboxAPIClient:
             chunk_size = 1024 * 1024  # 1MB
 
             async with self._websession.post(url, headers=headers) as response:
-                response.raise_for_status()
+                await handle_common_errors(response)
                 async for chunk in response.content.iter_chunked(chunk_size):
                     if chunk:
                         yield chunk
@@ -465,6 +491,18 @@ class DropboxAPIClient:
                 url, headers=headers, json=payload
             ) as response:
                 await handle_common_errors(response)
+
+                response_json = await response.json()
+
+                # create_folder_v2 wraps the folder metadata under "metadata".
+                metadata = response_json["metadata"]
+
+                return FileOrFolderInfo(
+                    is_folder=True,
+                    name=metadata["name"],
+                    size=None,
+                    property_groups=None,
+                )
         except (DropboxAuthException, DropboxFileOrFolderNotFoundException):
             raise
         except Exception as err: