Check uploaded files by default (#132)

Author: mryab

pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "1.1.5"
+version = "1.2.0"
 authors = [
     "Together AI <[email protected]>"
 ]

src/together/cli/api/files.py

@@ -32,12 +32,17 @@ def files(ctx: click.Context) -> None:
     default=FilePurpose.FineTune.value,
     help="Purpose of file upload. Acceptable values in enum `together.types.FilePurpose`. Defaults to `fine-tunes`.",
 )
-def upload(ctx: click.Context, file: pathlib.Path, purpose: str) -> None:
+@click.option(
+    "--check/--no-check",
+    default=True,
+    help="Whether to check the file before uploading.",
+)
+def upload(ctx: click.Context, file: pathlib.Path, purpose: str, check: bool) -> None:
     """Upload file"""
 
     client: Together = ctx.obj
 
-    response = client.files.upload(file=file, purpose=purpose)
+    response = client.files.upload(file=file, purpose=purpose, check=check)
 
     click.echo(json.dumps(response.model_dump(), indent=4))
 

src/together/error.py

@@ -23,9 +23,12 @@ def __init__(
             if isinstance(message, TogetherErrorResponse)
             else message
         )
-        self._message = f"Error code: {http_status} - {_message}"
+        if http_status is not None:
+            self._message = f"Error code: {http_status} - {_message}"
+        else:
+            self._message = str(_message)
 
-        super(TogetherException, self).__init__(self._message)
+        super().__init__(self._message)
 
         self.http_status = http_status
         self.headers = headers or {}

src/together/legacy/files.py

@@ -53,9 +53,11 @@ def upload(
 
         client = together.Together(api_key=api_key)
 
-        response = client.files.upload(file=file).model_dump()
+        # disabling the check, because it was run previously
+        response = client.files.upload(file=file, check=False).model_dump()
 
-        response["report_dict"] = report_dict
+        if check:
+            response["report_dict"] = report_dict
 
         return response
 

src/together/resources/files.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
 from pathlib import Path
+from pprint import pformat
 
 from together.abstract import api_requestor
+from together.error import FileTypeError
 from together.filemanager import DownloadManager, UploadManager
 from together.together_response import TogetherResponse
 from together.types import (
@@ -14,18 +16,29 @@
     TogetherClient,
     TogetherRequest,
 )
-from together.utils import normalize_key
+from together.utils import check_file, normalize_key
 
 
 class Files:
     def __init__(self, client: TogetherClient) -> None:
         self._client = client
 
     def upload(
-        self, file: Path | str, *, purpose: FilePurpose | str = FilePurpose.FineTune
+        self,
+        file: Path | str,
+        *,
+        purpose: FilePurpose | str = FilePurpose.FineTune,
+        check: bool = True,
     ) -> FileResponse:
         upload_manager = UploadManager(self._client)
 
+        if check:
+            report_dict = check_file(file)
+            if not report_dict["is_check_passed"]:
+                raise FileTypeError(
+                    f"Invalid file supplied, failed to upload. Report:\n{pformat(report_dict)}"
+                )
+
         if isinstance(file, str):
             file = Path(file)