added ttl to other object upload helpers, and moved 'name' from positional to keyword argument.

Author: sid-rl

src/runloop_api_client/sdk/async_.py

@@ -351,10 +351,11 @@ async def list(
     async def upload_from_file(
         self,
         file_path: str | Path,
-        name: str | None = None,
         *,
+        name: str | None = None,
         content_type: ContentType | None = None,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> AsyncStorageObject:
         """Create and upload an object from a local file path.
@@ -381,16 +382,17 @@ async def upload_from_file(
 
         name = name or path.name
         content_type = content_type or detect_content_type(str(file_path))
-        obj = await self.create(name=name, content_type=content_type, metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = await self.create(name=name, content_type=content_type, metadata=metadata, ttl_ms=ttl_ms, **options)
         await obj.upload_content(content)
         await obj.complete()
         return obj
 
     async def upload_from_dir(
         self,
         dir_path: str | Path,
-        name: str | None = None,
         *,
+        name: str | None = None,
         metadata: Optional[Dict[str, str]] = None,
         ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
@@ -433,9 +435,10 @@ def synchronous_io() -> bytes:
     async def upload_from_text(
         self,
         text: str,
-        name: str,
         *,
+        name: str,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> AsyncStorageObject:
         """Create and upload an object from a text payload.
@@ -449,7 +452,8 @@ async def upload_from_text(
         Returns:
             AsyncStorageObject: Wrapper for the uploaded object.
         """
-        obj = await self.create(name=name, content_type="text", metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = await self.create(name=name, content_type="text", metadata=metadata, ttl_ms=ttl_ms, **options)
         await obj.upload_content(text)
         await obj.complete()
         return obj
@@ -461,6 +465,7 @@ async def upload_from_bytes(
         *,
         content_type: ContentType,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> AsyncStorageObject:
         """Create and upload an object from a bytes payload.
@@ -475,7 +480,8 @@ async def upload_from_bytes(
         Returns:
             AsyncStorageObject: Wrapper for the uploaded object.
         """
-        obj = await self.create(name=name, content_type=content_type, metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = await self.create(name=name, content_type=content_type, metadata=metadata, ttl_ms=ttl_ms, **options)
         await obj.upload_content(data)
         await obj.complete()
         return obj

src/runloop_api_client/sdk/sync.py

@@ -341,10 +341,11 @@ def list(
     def upload_from_file(
         self,
         file_path: str | Path,
-        name: str | None = None,
         *,
+        name: str | None = None,
         content_type: ContentType | None = None,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> StorageObject:
         """Create and upload an object from a local file path.
@@ -371,16 +372,17 @@ def upload_from_file(
 
         name = name or path.name
         content_type = content_type or detect_content_type(str(file_path))
-        obj = self.create(name=name, content_type=content_type, metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = self.create(name=name, content_type=content_type, metadata=metadata, ttl_ms=ttl_ms, **options)
         obj.upload_content(content)
         obj.complete()
         return obj
 
     def upload_from_dir(
         self,
         dir_path: str | Path,
-        name: str | None = None,
         *,
+        name: str | None = None,
         metadata: Optional[Dict[str, str]] = None,
         ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
@@ -419,9 +421,10 @@ def upload_from_dir(
     def upload_from_text(
         self,
         text: str,
-        name: str,
         *,
+        name: str,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> StorageObject:
         """Create and upload an object from a text payload.
@@ -435,7 +438,8 @@ def upload_from_text(
         Returns:
             StorageObject: Wrapper for the uploaded object.
         """
-        obj = self.create(name=name, content_type="text", metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = self.create(name=name, content_type="text", metadata=metadata, ttl_ms=ttl_ms, **options)
         obj.upload_content(text)
         obj.complete()
         return obj
@@ -447,6 +451,7 @@ def upload_from_bytes(
         *,
         content_type: ContentType,
         metadata: Optional[Dict[str, str]] = None,
+        ttl: timedelta | None = None,
         **options: Unpack[LongRequestOptions],
     ) -> StorageObject:
         """Create and upload an object from a bytes payload.
@@ -461,7 +466,8 @@ def upload_from_bytes(
         Returns:
             StorageObject: Wrapper for the uploaded object.
         """
-        obj = self.create(name=name, content_type=content_type, metadata=metadata, **options)
+        ttl_ms = int(ttl.total_seconds()) * 1000 if ttl else None
+        obj = self.create(name=name, content_type=content_type, metadata=metadata, ttl_ms=ttl_ms, **options)
         obj.upload_content(data)
         obj.complete()
         return obj