together 0.2.8__tar.gz → 0.2.10__tar.gz

{together-0.2.8 → together-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: together
-Version: 0.2.8
+Version: 0.2.10
 Summary: Python client for Together's Cloud Platform!
 Home-page: https://github.com/togethercomputer/together
 License: Apache-2.0
@@ -481,16 +481,6 @@ print(output_text)
 Space Robots are a great way to get your kids interested in science. After all, they are the future!
 ```
 
-## Embeddings API
-
-Embeddings are vector representations of sequences. You can use these vectors for measuring the overall similarity between texts. Embeddings are useful for tasks such as search and retrieval. 
-
-```python
-resp = together.Embeddings.create("embed this sentence into a single vector", model="togethercomputer/bert-base-uncased")
-
-print(resp['data'][0]['embedding']) # [0.06659205, 0.07896972, 0.007910785 ........]
-```
-
 ## Colab Tutorial
 
 Follow along in our Colab (Google Colaboratory) Notebook Tutorial [Example Finetuning Project](https://colab.research.google.com/drive/11DwtftycpDSgp3Z1vnV-Cy68zvkGZL4K?usp=sharing).

{together-0.2.8 → together-0.2.10}/README.md

@@ -453,16 +453,6 @@ print(output_text)
 Space Robots are a great way to get your kids interested in science. After all, they are the future!
 ```
 
-## Embeddings API
-
-Embeddings are vector representations of sequences. You can use these vectors for measuring the overall similarity between texts. Embeddings are useful for tasks such as search and retrieval. 
-
-```python
-resp = together.Embeddings.create("embed this sentence into a single vector", model="togethercomputer/bert-base-uncased")
-
-print(resp['data'][0]['embedding']) # [0.06659205, 0.07896972, 0.007910785 ........]
-```
-
 ## Colab Tutorial
 
 Follow along in our Colab (Google Colaboratory) Notebook Tutorial [Example Finetuning Project](https://colab.research.google.com/drive/11DwtftycpDSgp3Z1vnV-Cy68zvkGZL4K?usp=sharing).

{together-0.2.8 → together-0.2.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "0.2.8"
+version = "0.2.10"
 authors = [
   "Together AI <support@together.ai>"
 ]

{together-0.2.8 → together-0.2.10}/src/together/__init__.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import urllib.parse
+from typing import Type
 
 from .version import VERSION
 
@@ -41,6 +42,27 @@ from .image import Image
 from .models import Models
 
 
+class Together:
+    complete: Type[Complete]
+    completion: Type[Completion]
+    embeddings: Type[Embeddings]
+    files: Type[Files]
+    finetune: Type[Finetune]
+    image: Type[Image]
+    models: Type[Models]
+
+    def __init__(
+        self,
+    ) -> None:
+        self.complete = Complete
+        self.completion = Completion
+        self.embeddings = Embeddings
+        self.files = Files
+        self.finetune = Finetune
+        self.image = Image
+        self.models = Models
+
+
 __all__ = [
     "api_key",
     "api_base",
@@ -63,4 +85,5 @@ __all__ = [
     "MISSING_API_KEY_MESSAGE",
     "BACKOFF_FACTOR",
     "min_samples",
+    "Together",
 ]

{together-0.2.8 → together-0.2.10}/src/together/commands/complete.py

@@ -90,6 +90,13 @@ def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser])
         action="store_true",
         help="temperature for the LM",
     )
+    subparser.add_argument(
+        "--safety-model",
+        "-sm",
+        default=None,
+        type=str,
+        help="The name of the safety model to use for moderation.",
+    )
     subparser.set_defaults(func=_run_complete)
 
 
@@ -142,6 +149,7 @@ def _run_complete(args: argparse.Namespace) -> None:
                 top_k=args.top_k,
                 repetition_penalty=args.repetition_penalty,
                 logprobs=args.logprobs,
+                safety_model=args.safety_model,
             )
         except together.AuthenticationError:
             logger.critical(together.MISSING_API_KEY_MESSAGE)
@@ -159,6 +167,7 @@ def _run_complete(args: argparse.Namespace) -> None:
                 top_p=args.top_p,
                 top_k=args.top_k,
                 repetition_penalty=args.repetition_penalty,
+                safety_model=args.safety_model,
                 raw=args.raw,
             ):
                 if not args.raw:

{together-0.2.8 → together-0.2.10}/src/together/commands/embeddings.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import argparse
-import json
 
 import together
 from together import Embeddings
@@ -42,7 +41,7 @@ def _run_complete(args: argparse.Namespace) -> None:
             model=args.model,
         )
 
-        print(json.dumps(response, indent=4))
+        print([e.embedding for e in response.data])
     except together.AuthenticationError:
         logger.critical(together.MISSING_API_KEY_MESSAGE)
         exit(0)

{together-0.2.8 → together-0.2.10}/src/together/complete.py

@@ -24,6 +24,7 @@ class Complete:
         logprobs: Optional[int] = None,
         api_key: Optional[str] = None,
         cast: bool = False,
+        safety_model: Optional[str] = None,
     ) -> Union[Dict[str, Any], TogetherResponse]:
         if model == "":
             model = together.default_text_model
@@ -38,6 +39,7 @@ class Complete:
             "stop": stop,
             "repetition_penalty": repetition_penalty,
             "logprobs": logprobs,
+            "safety_model": safety_model,
         }
 
         # send request
@@ -70,6 +72,7 @@ class Complete:
         raw: Optional[bool] = False,
         api_key: Optional[str] = None,
         cast: Optional[bool] = False,
+        safety_model: Optional[str] = None,
     ) -> Union[Iterator[str], Iterator[TogetherResponse]]:
         """
         Prints streaming responses and returns the completed text.
@@ -88,6 +91,7 @@ class Complete:
             "stop": stop,
             "repetition_penalty": repetition_penalty,
             "stream_tokens": True,
+            "safety_model": safety_model,
         }
 
         # send request

together-0.2.10/src/together/embeddings.py

@@ -0,0 +1,64 @@
+import concurrent.futures
+from typing import Any, Dict, List, Optional, Union
+
+import together
+from together.utils import create_post_request, get_logger
+
+
+logger = get_logger(str(__name__))
+
+
+class DataItem:
+    def __init__(self, embedding: List[float]):
+        self.embedding = embedding
+
+
+class EmbeddingsOutput:
+    def __init__(self, data: List[DataItem]):
+        self.data = data
+
+
+class Embeddings:
+    @classmethod
+    def create(
+        cls,
+        input: Union[str, List[str]],
+        model: Optional[str] = "",
+    ) -> EmbeddingsOutput:
+        if model == "":
+            model = together.default_embedding_model
+
+        if isinstance(input, str):
+            parameter_payload = {
+                "input": input,
+                "model": model,
+            }
+
+            response = cls._process_input(parameter_payload)
+
+            return EmbeddingsOutput([DataItem(response["data"][0]["embedding"])])
+
+        elif isinstance(input, list):
+            # If input is a list, process each string concurrently
+            with concurrent.futures.ThreadPoolExecutor() as executor:
+                parameter_payloads = [{"input": item, "model": model} for item in input]
+                results = list(executor.map(cls._process_input, parameter_payloads))
+
+            return EmbeddingsOutput(
+                [DataItem(item["data"][0]["embedding"]) for item in results]
+            )
+
+    @classmethod
+    def _process_input(cls, parameter_payload: Dict[str, Any]) -> Dict[str, Any]:
+        # send request
+        response = create_post_request(
+            url=together.api_base_embeddings, json=parameter_payload
+        )
+
+        # return the json as a DotDict
+        try:
+            response_json = dict(response.json())
+        except Exception as e:
+            raise together.JSONError(e, http_status=response.status_code)
+
+        return response_json

{together-0.2.8 → together-0.2.10}/src/together/utils.py

@@ -75,6 +75,18 @@ 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 create_post_request(
     url: str,
     headers: Optional[Dict[Any, Any]] = None,
@@ -99,15 +111,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
 
@@ -139,15 +143,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
 

together-0.2.8/src/together/embeddings.py

@@ -1,35 +0,0 @@
-from typing import Any, Dict, Optional
-
-import together
-from together.utils import create_post_request, get_logger
-
-
-logger = get_logger(str(__name__))
-
-
-class Embeddings:
-    @classmethod
-    def create(
-        self,
-        input: str,
-        model: Optional[str] = "",
-    ) -> Dict[str, Any]:
-        if model == "":
-            model = together.default_embedding_model
-
-        parameter_payload = {
-            "input": input,
-            "model": model,
-        }
-
-        # send request
-        response = create_post_request(
-            url=together.api_base_embeddings, json=parameter_payload
-        )
-
-        try:
-            response_json = dict(response.json())
-
-        except Exception as e:
-            raise together.JSONError(e, http_status=response.status_code)
-        return response_json