together 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

together/finetune.py

@@ -4,7 +4,9 @@ import urllib.parse
 from typing import Any, Dict, List, Optional, Union
 
 import requests
+from requests.adapters import HTTPAdapter
 from tqdm import tqdm
+from urllib3.util import Retry
 
 import together
 from together import Files
@@ -28,24 +30,17 @@ class Finetune:
     def create(
         self,
         training_file: str,  # training file_id
-        # validation_file: Optional[str] = None,  # validation file_id
         model: str,
         n_epochs: int = 1,
         n_checkpoints: Optional[int] = 1,
         batch_size: Optional[int] = 32,
         learning_rate: Optional[float] = 0.00001,
-        # warmup_steps: Optional[int] = 0,
-        # train_warmup_steps: Optional[int] = 0,
-        # seq_length: Optional[int] = 2048,
-        # seed: Optional[int] = 42,
-        # fp16: Optional[bool] = True,
-        # checkpoint_steps: Optional[int] = None,
         suffix: Optional[
             str
         ] = None,  # resulting finetuned model name will include the suffix
         estimate_price: bool = False,
         wandb_api_key: Optional[str] = None,
-        confirm_inputs: bool = True,
+        confirm_inputs: bool = False,
     ) -> Dict[Any, Any]:
         adjusted_inputs = False
 
@@ -175,24 +170,21 @@ class Finetune:
         response = create_post_request(
             together.api_base_finetune, json=parameter_payload
         )
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
-    def list(self) -> Dict[Any, Any]:
+    def list(self) -> Dict[str, List[Dict[str, Any]]]:
         # send request
         response = create_get_request(together.api_base_finetune)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
-    def retrieve(self, fine_tune_id: str) -> Dict[Any, Any]:
+    def retrieve(self, fine_tune_id: str) -> Dict[str, Any]:
         retrieve_url = urllib.parse.urljoin(together.api_base_finetune, fine_tune_id)
         response = create_get_request(retrieve_url)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
@@ -200,8 +192,7 @@ class Finetune:
         relative_path = posixpath.join(fine_tune_id, "cancel")
         retrieve_url = urllib.parse.urljoin(together.api_base_finetune, relative_path)
         response = create_post_request(retrieve_url)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
@@ -210,8 +201,7 @@ class Finetune:
         relative_path = posixpath.join(fine_tune_id, "events")
         retrieve_url = urllib.parse.urljoin(together.api_base_finetune, relative_path)
         response = create_get_request(retrieve_url)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
@@ -274,16 +264,23 @@ class Finetune:
             "User-Agent": together.user_agent,
         }
 
-        try:
-            session = requests.Session()
+        session = requests.Session()
+
+        retry_strategy = Retry(
+            total=together.MAX_CONNECTION_RETRIES,
+            backoff_factor=together.BACKOFF_FACTOR,
+        )
+        retry_adapter = HTTPAdapter(max_retries=retry_strategy)
+        session.mount("https://", retry_adapter)
 
+        try:
             response = session.get(model_file_path, headers=headers, stream=True)
             response.raise_for_status()
 
             if output is None:
                 content_type = str(response.headers.get("content-type"))
 
-                output = self.retrieve(fine_tune_id)["model_output_path"].split("/")[-1]
+                output = self.retrieve(fine_tune_id)["model_output_name"].split("/")[-1]
 
                 if step != -1:
                     output += f"-checkpoint-{step}"
@@ -311,30 +308,8 @@ class Finetune:
                     "Caution: Downloaded file size does not match remote file size."
                 )
         except requests.exceptions.RequestException as e:  # This is the correct syntax
-            logger.critical(f"Response error raised: {e}")
             raise together.ResponseError(e)
+        finally:
+            session.close()
 
-        return output  # this should be null
-
-    # def delete_finetune_model(self, model: str) -> Dict[Any, Any]:
-    #     model_url = "https://api.together.xyz/api/models"
-    #     delete_url = urllib.parse.urljoin(model_url, model)
-
-    #     headers = {
-    #         "Authorization": f"Bearer {together.api_key}",
-    #     }
-
-    #     # send request
-    #     try:
-    #         response = requests.delete(delete_url, headers=headers)
-    #     except requests.exceptions.RequestException as e:
-    #         raise ValueError(f"Error raised by finetune endpoint: {e}")
-
-    #     try:
-    #         response_json = dict(response.json())
-    #     except Exception as e:
-    #         raise ValueError(
-    #             f"JSON Error raised. \nResponse status code: {str(response.status_code)}"
-    #         )
-
-    #     return response_json
+        return output  # this should be output file name

together/image.py

@@ -39,6 +39,5 @@ class Image:
         response = create_post_request(
             together.api_base_complete, json=parameter_payload
         )
-        if not response:
-            return {}
+
         return response_to_dict(response)

together/models.py

@@ -18,8 +18,7 @@ class Models:
     def list(self) -> List[Any]:
         model_url = urllib.parse.urljoin(together.api_base, "models/info?=")
         response = create_get_request(model_url)
-        if not response:
-            return []
+
         try:
             response_list = list(response.json())
         except Exception as e:
@@ -46,8 +45,7 @@ class Models:
     @classmethod
     def instances(self) -> Dict[str, bool]:
         response = create_get_request(together.api_base_instances)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
@@ -56,8 +54,7 @@ class Models:
             together.api_base_instances, f"start?model={model}"
         )
         response = create_post_request(model_url)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
@@ -66,16 +63,14 @@ class Models:
             together.api_base_instances, f"stop?model={model}"
         )
         response = create_post_request(model_url)
-        if not response:
-            return {}
+
         return response_to_dict(response)
 
     @classmethod
     def ready(self, model: str) -> List[Any]:
         ready_url = urllib.parse.urljoin(together.api_base, "models/info?name=" + model)
         response = create_get_request(ready_url)
-        if not response:
-            return []
+
         try:
             response_list = list(response.json())
         except Exception as e:

together/utils.py

@@ -1,10 +1,10 @@
 import logging
 import sys
 from datetime import datetime
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional
 
 import requests
-import sseclient  # type: ignore
+import sseclient
 
 import together
 
@@ -53,19 +53,9 @@ def get_logger(
     return logger
 
 
-def verify_api_key(logger: Optional[logging.Logger] = None) -> bool:
-    if logger is None:
-        logger = get_logger(str(__name__), log_level=together.log_level)
+def verify_api_key() -> None:
     if together.api_key is None:
-        msg = (
-            "TOGETHER_API_KEY not found \n"
-            "Please set it as an environment variable or set it as together.api_key \n"
-            "Find your TOGETHER_API_KEY at https://api.together.xyz/settings/api-keys"
-        )
-        print(msg)
-        return False
-    else:
-        return True
+        raise together.AuthenticationError(together.MISSING_API_KEY_MESSAGE)
 
 
 def extract_time(json_obj: Dict[str, Any]) -> int:
@@ -91,10 +81,9 @@ def create_post_request(
     json: Optional[Dict[Any, Any]] = None,
     stream: Optional[bool] = False,
     check_auth: Optional[bool] = True,
-) -> Union[requests.Response, None]:
+) -> requests.Response:
     if check_auth:
-        if not verify_api_key():
-            return None
+        verify_api_key()
 
     if not headers:
         headers = {
@@ -110,16 +99,20 @@ def create_post_request(
         raise together.ResponseError(e)
 
     if response.status_code == 429:
-        raise together.InstanceError()
+        raise together.RateLimitError(
+            message="Too many requests received. Please pace your requests."
+        )
     elif response.status_code == 500:
         raise Exception("Invalid API key supplied.")
+    elif response.status_code == 401:
+        raise Exception("API Key not supplied")
     response.raise_for_status()
 
     return response
 
 
 def sse_client(response: requests.Response) -> sseclient.SSEClient:
-    return sseclient.SSEClient(response)
+    return sseclient.SSEClient(response)  # type: ignore
 
 
 def create_get_request(
@@ -128,10 +121,9 @@ def create_get_request(
     json: Optional[Dict[Any, Any]] = None,
     stream: Optional[bool] = False,
     check_auth: Optional[bool] = True,
-) -> Union[requests.Response, None]:
+) -> requests.Response:
     if check_auth:
-        if not verify_api_key():
-            return None
+        verify_api_key()
 
     if not headers:
         headers = {
@@ -147,9 +139,13 @@ def create_get_request(
         raise together.ResponseError(e)
 
     if response.status_code == 429:
-        raise together.InstanceError()
+        raise together.RateLimitError(
+            message="Too many requests received. Please pace your requests."
+        )
     elif response.status_code == 500:
         raise Exception("Invalid API key supplied.")
+    elif response.status_code == 401:
+        raise Exception("API Key not supplied")
     response.raise_for_status()
 
     return response
@@ -173,3 +169,19 @@ def round_to_closest_multiple_of_32(batch_size: Optional[int]) -> int:
     elif batch_size > 256:
         return 256
     return 32 * ((batch_size + 31) // 32)
+
+
+def bytes_to_human_readable(num: float, suffix: Optional[str] = "B") -> str:
+    for unit in ("", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"):
+        if abs(num) < 1024.0:
+            return f"{num:3.1f}{unit}{suffix}"
+        num /= 1024.0
+    return f"{num:.1f}Yi{suffix}"
+
+
+def finetune_price_to_dollars(price: float) -> float:
+    return price / 1000000000
+
+
+def nanodollars_to_dollars(price: int) -> float:
+    return (price * 4000) / 1000000000

together/version.py

@@ -1 +1,6 @@
-VERSION = "0.2.5"
+import importlib.metadata
+
+
+VERSION = importlib.metadata.version(
+    "together"
+)  # gets version number from pyproject.toml