abandon trying to support other upload file types for devbox file uploads (sticks to base api FileType)

Author: sid-rl

src/runloop_api_client/sdk/_helpers.py

@@ -2,14 +2,10 @@
 
 import io
 import os
-from typing import IO, Dict, Union, Literal, Callable, cast
+from typing import Dict, Union, Literal, Callable
 from pathlib import Path
 
-from .._types import FileTypes
-from .._utils import file_from_path
-
 LogCallback = Callable[[str], None]
-UploadInput = Union[FileTypes, str, os.PathLike[str], Path, bytes, bytearray, io.IOBase]
 
 ContentType = Literal["unspecified", "text", "binary", "gzip", "tar", "tgz"]
 UploadData = Union[str, bytes, bytearray, Path, os.PathLike[str], io.IOBase]
@@ -59,28 +55,3 @@ def read_upload_data(data: UploadData) -> bytes:
             return result.encode("utf-8")
         return result
     raise TypeError("Unsupported upload data type. Provide str, bytes, path, or file-like object.")
-
-
-def normalize_upload_input(file: UploadInput) -> FileTypes:
-    """
-    Normalize a variety of Python file representations into the generated client's FileTypes.
-    """
-    if isinstance(file, tuple):
-        return file
-    if isinstance(file, bytes):
-        return file
-    if isinstance(file, bytearray):
-        return bytes(file)
-    if isinstance(file, (str, Path, os.PathLike)):
-        path_str = str(file)
-        return file_from_path(path_str)
-    if isinstance(file, io.TextIOBase):
-        return file.read().encode("utf-8")
-    if isinstance(file, io.BufferedIOBase) or isinstance(file, io.RawIOBase):
-        return cast(IO[bytes], file)
-    if isinstance(file, io.IOBase) and hasattr(file, "read"):
-        data = file.read()
-        if isinstance(data, str):
-            return data.encode("utf-8")
-        return data
-    raise TypeError("Unsupported file type for upload. Provide path, bytes, or file-like object.")

src/runloop_api_client/sdk/async_devbox.py

@@ -11,9 +11,9 @@
     DevboxExecutionDetailView,
     DevboxCreateSSHKeyResponse,
 )
-from .._types import Body, Omit, Query, Headers, Timeout, NotGiven, omit, not_given
+from .._types import Body, Omit, Query, Headers, Timeout, NotGiven, FileTypes, omit, not_given
 from .._client import AsyncRunloop
-from ._helpers import LogCallback, UploadInput, normalize_upload_input
+from ._helpers import LogCallback
 from .._streaming import AsyncStream
 from ..lib.polling import PollingConfig
 from .async_execution import AsyncExecution, _AsyncStreamingGroup
@@ -505,19 +505,18 @@ async def download(
     async def upload(
         self,
         path: str,
-        file: UploadInput,
+        file: FileTypes,
         *,
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         idempotency_key: str | None = None,
     ) -> object:
-        file_param = normalize_upload_input(file)
         return await self._devbox._client.devboxes.upload_file(
             self._devbox.id,
             path=path,
-            file=file_param,
+            file=file,
             extra_headers=extra_headers,
             extra_query=extra_query,
             extra_body=extra_body,

src/runloop_api_client/sdk/devbox.py

@@ -11,9 +11,9 @@
     DevboxExecutionDetailView,
     DevboxCreateSSHKeyResponse,
 )
-from .._types import Body, Omit, Query, Headers, Timeout, NotGiven, omit, not_given
+from .._types import Body, Omit, Query, Headers, Timeout, NotGiven, FileTypes, omit, not_given
 from .._client import Runloop
-from ._helpers import LogCallback, UploadInput, normalize_upload_input
+from ._helpers import LogCallback
 from .execution import Execution, _StreamingGroup
 from .._streaming import Stream
 from ..lib.polling import PollingConfig
@@ -498,19 +498,18 @@ def download(
     def upload(
         self,
         path: str,
-        file: UploadInput,
+        file: FileTypes,
         *,
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | Timeout | None | NotGiven = not_given,
         idempotency_key: str | None = None,
     ) -> object:
-        file_param = normalize_upload_input(file)
         return self._devbox._client.devboxes.upload_file(
             self._devbox.id,
             path=path,
-            file=file_param,
+            file=file,
             extra_headers=extra_headers,
             extra_query=extra_query,
             extra_body=extra_body,