together 0.2.9__tar.gz → 0.2.11__tar.gz

{together-0.2.9 → together-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: together
-Version: 0.2.9
+Version: 0.2.11
 Summary: Python client for Together's Cloud Platform!
 Home-page: https://github.com/togethercomputer/together
 License: Apache-2.0
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: aiohttp (>=3.7.4,<4.0.0)
 Requires-Dist: pydantic (>=2.5.0,<3.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: sseclient-py (>=1.7.2,<2.0.0)

{together-0.2.9 → together-0.2.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "0.2.9"
+version = "0.2.11"
 authors = [
   "Together AI <support@together.ai>"
 ]
@@ -27,6 +27,7 @@ tqdm = "^4.66.1"
 sseclient-py = "^1.7.2"
 tabulate = "^0.9.0"
 pydantic = "^2.5.0"
+aiohttp = "^3.7.4"
 
 [tool.poetry.group.quality]
 optional = true

{together-0.2.9 → together-0.2.11}/src/together/__init__.py

@@ -33,7 +33,7 @@ BACKOFF_FACTOR = 0.2
 
 min_samples = 100
 
-from .complete import Complete, Completion
+from .complete import AsyncComplete, Complete, Completion
 from .embeddings import Embeddings
 from .error import *
 from .files import Files
@@ -77,6 +77,7 @@ __all__ = [
     "Models",
     "Complete",
     "Completion",
+    "AsyncComplete",
     "Files",
     "Finetune",
     "Image",

{together-0.2.9 → together-0.2.11}/src/together/complete.py

@@ -1,9 +1,11 @@
 import json
 from typing import Any, Dict, Iterator, List, Optional, Union
 
+from aiohttp import ClientSession, ClientTimeout
+
 import together
 from together.types import TogetherResponse
-from together.utils import create_post_request, get_logger, sse_client
+from together.utils import create_post_request, get_headers, get_logger, sse_client
 
 
 logger = get_logger(str(__name__))
@@ -12,7 +14,7 @@ logger = get_logger(str(__name__))
 class Complete:
     @classmethod
     def create(
-        self,
+        cls,
         prompt: str,
         model: Optional[str] = "",
         max_tokens: Optional[int] = 128,
@@ -60,7 +62,7 @@ class Complete:
 
     @classmethod
     def create_streaming(
-        self,
+        cls,
         prompt: str,
         model: Optional[str] = "",
         max_tokens: Optional[int] = 128,
@@ -130,7 +132,7 @@ class Complete:
 class Completion:
     @classmethod
     def create(
-        self,
+        cls,
         prompt: str,
         model: Optional[str] = "",
         max_tokens: Optional[int] = 128,
@@ -172,3 +174,80 @@ class Completion:
                 api_key=api_key,
                 cast=True,
             )
+
+
+class AsyncComplete:
+    @classmethod
+    async def create(
+        cls,
+        prompt: str,
+        model: Optional[str],
+        max_tokens: int = 20,
+        repetition_penalty: Optional[float] = None,
+        stop: Optional[List[str]] = None,
+        temperature: Optional[float] = None,
+        top_k: Optional[int] = None,
+        top_p: Optional[float] = None,
+        raw: Optional[bool] = False,
+        logprobs: Optional[int] = None,
+        safety_model: Optional[str] = None,
+        stream: Optional[bool] = False,
+        timeout: Optional[int] = 10,
+    ) -> Any:
+        if model == "":
+            model = together.default_text_model
+
+        headers = get_headers()
+
+        # Provide a default value for timeout if it is None
+        timeout = timeout or 10
+        client_timeout = ClientTimeout(timeout * 60)
+
+        parameter_payload = {
+            "model": model,
+            "prompt": prompt,
+            "top_p": top_p,
+            "top_k": top_k,
+            "temperature": temperature,
+            "max_tokens": max_tokens,
+            "stop": stop,
+            "repetition_penalty": repetition_penalty,
+            "logprobs": logprobs,
+            "safety_model": safety_model,
+        }
+
+        async with ClientSession(headers=headers, timeout=client_timeout) as session:
+            async with session.post(
+                together.api_base_complete, json=parameter_payload
+            ) as resp:
+
+                async def streamer() -> Any:
+                    # Parse ServerSentEvents
+                    async for byte_payload in resp.content:
+                        # Skip line
+                        if byte_payload == b"\n":
+                            continue
+
+                        payload = byte_payload.decode("utf-8")
+
+                        # Event data
+                        if payload.startswith("data:"):
+                            # Decode payload
+                            json_payload = json.loads(
+                                payload.lstrip("data:").rstrip("/n")
+                            )
+
+                            if raw:
+                                yield json_payload
+                            else:
+                                # Parse payload
+                                response = TogetherResponse(**json_payload)
+
+                                yield response
+
+                if stream:
+                    return await streamer()
+                else:
+                    payload = await resp.json()
+                    response = TogetherResponse(**payload)
+                    return response

{together-0.2.9 → together-0.2.11}/src/together/files.py

@@ -60,6 +60,9 @@ class Files:
                     f"Invalid file supplied. Failed to upload.\nReport:\n {report_dict}"
                 )
         else:
+            logger.warning(
+                "Caution: File check is disabled. Together.ai will not be able to detect errors in your file."
+            )
             report_dict = {}
 
         session = requests.Session()
@@ -256,6 +259,7 @@ def check_json(
     if not os.path.isfile(file):
         report_dict["file_present"] = f"File not found at given file path {file}"
         report_dict["is_check_passed"] = False
+        return report_dict
     else:
         report_dict["file_present"] = "File found"
 
@@ -266,10 +270,28 @@ def check_json(
             "file_size"
         ] = f"File size {round(file_size / NUM_BYTES_IN_GB ,3)} GB is greater than our limit of 4.9 GB"
         report_dict["is_check_passed"] = False
+    elif file_size == 0:
+        report_dict["file_size"] = "File is empty"
+        report_dict["is_check_passed"] = False
+        return report_dict
     else:
         report_dict["file_size"] = f"File size {round(file_size / (2**30) ,3)} GB"
 
+    # Check that the file is UTF-8 encoded. If not report where the error occurs.
+    try:
+        with open(file, "r", encoding="utf-8") as f:
+            f.read()
+    except UnicodeDecodeError as e:
+        report_dict["utf8"] = (
+            f"File is not UTF-8 encoded. Error raised: {e}."
+            f"See https://docs.together.ai/docs/fine-tuning for more information."
+        )
+        report_dict["is_check_passed"] = False
+        return report_dict
+
     with open(file) as f:
+        # idx must be instantiated so decode errors (e.g. file is a tar) or empty files are caught
+        idx = -1
         try:
             for idx, line in enumerate(f):
                 json_line = json.loads(line)  # each line in jsonlines should be a json
@@ -316,14 +338,20 @@ def check_json(
                 report_dict["num_samples"] = idx + 1
 
         except ValueError:
-            report_dict["load_json"] = (
-                f"File should be a valid jsonlines (.jsonl) with a json in each line."
-                'Example of valid json: {"text":"my sample string"}'
-                "Valid json not found in one or more lines in file."
-                "see https://docs.together.ai/docs/fine-tuning."
-                f"The first line where this occur is line {idx+1}, where 1 is the first line."
-                f"{str(line)}"
-            )
+            if idx < 0:
+                report_dict["load_json"] = (
+                    "Unable to decode file. "
+                    "File may be empty or in an unsupported format."
+                )
+            else:
+                report_dict["load_json"] = (
+                    f"File should be a valid jsonlines (.jsonl) with a json in each line."
+                    'Example of valid json: {"text":"my sample string"}'
+                    "Valid json not found in one or more lines in file."
+                    "see https://docs.together.ai/docs/fine-tuning."
+                    f"The first line where this occur is line {idx+1}, where 1 is the first line."
+                    f"{str(line)}"
+                )
             report_dict["is_check_passed"] = False
 
     return report_dict

{together-0.2.9 → together-0.2.11}/src/together/utils.py

@@ -75,6 +75,27 @@ def parse_timestamp(timestamp: str) -> datetime:
     raise ValueError("Timestamp does not match any expected format")
 
 
+def response_status_exception(response: requests.Response) -> None:
+    if response.status_code == 429:
+        raise together.RateLimitError(
+            message="Too many requests received. Please pace your requests."
+        )
+    elif response.status_code == 500:
+        raise Exception("server encountered an unexpected condition")
+    elif response.status_code == 401:
+        raise Exception("invalid authentication credentials")
+    response.raise_for_status()
+
+
+def get_headers() -> Dict[str, str]:
+    headers = {
+        "Authorization": f"Bearer {together.api_key}",
+        "Content-Type": "application/json",
+        "User-Agent": together.user_agent,
+    }
+    return headers
+
+
 def create_post_request(
     url: str,
     headers: Optional[Dict[Any, Any]] = None,
@@ -87,11 +108,7 @@ def create_post_request(
         verify_api_key()
 
     if not headers:
-        headers = {
-            "Authorization": f"Bearer {api_key or together.api_key}",
-            "Content-Type": "application/json",
-            "User-Agent": together.user_agent,
-        }
+        headers = get_headers()
 
     # send request
     try:
@@ -99,15 +116,7 @@ def create_post_request(
     except requests.exceptions.RequestException as e:
         raise together.ResponseError(e)
 
-    if response.status_code == 429:
-        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()
+    response_status_exception(response)
 
     return response
 
@@ -127,11 +136,7 @@ def create_get_request(
         verify_api_key()
 
     if not headers:
-        headers = {
-            "Authorization": f"Bearer {together.api_key}",
-            "Content-Type": "application/json",
-            "User-Agent": together.user_agent,
-        }
+        headers = get_headers()
 
     # send request
     try:
@@ -139,15 +144,7 @@ def create_get_request(
     except requests.exceptions.RequestException as e:
         raise together.ResponseError(e)
 
-    if response.status_code == 429:
-        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()
+    response_status_exception(response)
 
     return response