адк

Author: newokaerinasai

src/together/cli/api/finetune.py

@@ -31,20 +31,19 @@
 
 _CONFIRMATION_MESSAGE = (
     "You are about to create a fine-tuning job. "
-    "The cost of your job will be determined by the model size, the number of tokens "
+    "The estimated price of this job is {price}. "
+    "The actual cost of your job will be determined by the model size, the number of tokens "
     "in the training file, the number of tokens in the validation file, the number of epochs, and "
-    "the number of evaluations. Visit https://www.together.ai/pricing to get a price estimate.\n"
+    "the number of evaluations. Visit https://www.together.ai/pricing to learn more about pricing.\n"
+    "{warning}"
     "You can pass `-y` or `--confirm` to your command to skip this message.\n\n"
     "Do you want to proceed?"
 )
 
-_PRICE_ESTIMATION_CONFIRMATION_MESSAGE = (
-    "The estimated price of the fine-tuning job is {} which is significantly "
-    "greater than your current credit limit and balance. "
+_WARNING_MESSAGE_INSUFFICIENT_FUNDS = (
+    "The estimated price of this job is significantly greater than your current credit limit and balance. "
     "It will likely fail due to insufficient funds. "
     "Please consider increasing your credit limit at https://api.together.xyz/settings/profile\n"
-    "You can pass `-y` or `--confirm` to your command to skip this message.\n\n"
-    "Do you want to proceed?"
 )
 
 
@@ -368,52 +367,47 @@ def create(
             "You have specified a number of evaluation loops but no validation file."
         )
 
-    if confirm or click.confirm(_CONFIRMATION_MESSAGE, default=True, show_default=True):
-        price_estimation_response = client.fine_tuning.estimate_price(
-            training_file=training_file,
-            validation_file=validation_file,
-            model=model,
-            n_epochs=n_epochs,
-            n_evals=n_evals,
-            training_type="lora" if lora else "full",
-            training_method=training_method,
+    finetune_price_estimation_result = client.fine_tuning.estimate_price(
+        training_file=training_file,
+        validation_file=validation_file,
+        model=model,
+        n_epochs=n_epochs,
+        n_evals=n_evals,
+        training_type="lora" if lora else "full",
+        training_method=training_method,
+    )
+    
+    price = click.style(
+        f"${finetune_price_estimation_result.estimated_total_price:.2f}",
+        bold=True,
+    )
+    
+    if not finetune_price_estimation_result.allowed_to_proceed:
+        warning = click.style(_WARNING_MESSAGE_INSUFFICIENT_FUNDS, fg="red", bold=True)
+    else:
+        warning = ""
+    
+    confirmation_message = _CONFIRMATION_MESSAGE.format(
+        price=price,
+        warning=warning,
+    )
+
+    if confirm or click.confirm(confirmation_message, default=True, show_default=True):
+        response = client.fine_tuning.create(
+            **training_args,
+            verbose=True,
         )
-        proceed = (
-            confirm
-            or price_estimation_response.allowed_to_proceed
-            or (
-                not price_estimation_response.allowed_to_proceed
-                and click.confirm(
-                    click.style(
-                        _PRICE_ESTIMATION_CONFIRMATION_MESSAGE.format(
-                            price_estimation_response.estimated_total_price
-                        ),
-                        fg="red",
-                        bold=True,
-                    ),
-                    default=True,
-                    show_default=True,
-                )
+        report_string = f"Successfully submitted a fine-tuning job {response.id}"
+        if response.created_at is not None:
+            created_time = datetime.strptime(
+                response.created_at, "%Y-%m-%dT%H:%M:%S.%f%z"
             )
-        )
-        if proceed:
-            response = client.fine_tuning.create(
-                **training_args,
-                verbose=True,
+            # created_at reports UTC time, we use .astimezone() to convert to local time
+            formatted_time = created_time.astimezone().strftime(
+                "%m/%d/%Y, %H:%M:%S"
             )
-            report_string = f"Successfully submitted a fine-tuning job {response.id}"
-            if response.created_at is not None:
-                created_time = datetime.strptime(
-                    response.created_at, "%Y-%m-%dT%H:%M:%S.%f%z"
-                )
-                # created_at reports UTC time, we use .astimezone() to convert to local time
-                formatted_time = created_time.astimezone().strftime(
-                    "%m/%d/%Y, %H:%M:%S"
-                )
-                report_string += f" at {formatted_time}"
-            rprint(report_string)
-        else:
-            click.echo("No confirmation received, stopping job launch")
+            report_string += f" at {formatted_time}"
+        rprint(report_string)
     else:
         click.echo("No confirmation received, stopping job launch")
 

src/together/resources/finetune.py

@@ -44,7 +44,7 @@
     TrainingMethodSFT().method,
     TrainingMethodDPO().method,
 }
-_CONFIRMATION_MESSAGE_INSUFFICIENT_FUNDS = (
+_WARNING_MESSAGE_INSUFFICIENT_FUNDS = (
     "The estimated price of the fine-tuning job is {} which is significantly "
     "greater than your current credit limit and balance. "
     "It will likely fail due to insufficient funds. "
@@ -500,7 +500,7 @@ def create(
             if not price_estimation_result.allowed_to_proceed:
                 rprint(
                     "[red]"
-                    + _CONFIRMATION_MESSAGE_INSUFFICIENT_FUNDS.format(
+                    + _WARNING_MESSAGE_INSUFFICIENT_FUNDS.format(
                         price_estimation_result.estimated_total_price
                     )
                     + "[/red]",
@@ -1054,7 +1054,7 @@ async def create(
             if not price_estimation_result.allowed_to_proceed:
                 rprint(
                     "[red]"
-                    + _CONFIRMATION_MESSAGE_INSUFFICIENT_FUNDS.format(
+                    + _WARNING_MESSAGE_INSUFFICIENT_FUNDS.format(
                         price_estimation_result.estimated_total_price
                     )
                     + "[/red]",