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

together/__init__.py

@@ -16,14 +16,24 @@ api_base_complete = urllib.parse.urljoin(api_base, "/api/inference")
 api_base_files = urllib.parse.urljoin(api_base, "/v1/files/")
 api_base_finetune = urllib.parse.urljoin(api_base, "/v1/fine-tunes/")
 api_base_instances = urllib.parse.urljoin(api_base, "instances/")
+api_base_embeddings = urllib.parse.urljoin(api_base, "api/v1/embeddings")
 
 default_text_model = "togethercomputer/RedPajama-INCITE-7B-Chat"
 default_image_model = "runwayml/stable-diffusion-v1-5"
+default_embedding_model = "togethercomputer/bert-base-uncased"
 log_level = "WARNING"
 
+MISSING_API_KEY_MESSAGE = """TOGETHER_API_KEY not found.
+Please set it as an environment variable or set it as together.api_key
+Find your TOGETHER_API_KEY at https://api.together.xyz/settings/api-keys"""
+
+MAX_CONNECTION_RETRIES = 2
+BACKOFF_FACTOR = 0.2
+
 min_samples = 100
 
 from .complete import Complete
+from .embeddings import Embeddings
 from .error import *
 from .files import Files
 from .finetune import Finetune
@@ -38,12 +48,18 @@ __all__ = [
     "api_base_files",
     "api_base_finetune",
     "api_base_instances",
+    "api_base_embeddings",
     "default_text_model",
     "default_image_model",
+    "default_embedding_model",
     "Models",
     "Complete",
     "Files",
     "Finetune",
     "Image",
+    "Embeddings",
+    "MAX_CONNECTION_RETRIES",
+    "MISSING_API_KEY_MESSAGE",
+    "BACKOFF_FACTOR",
     "min_samples",
 ]

together/cli/cli.py

@@ -2,7 +2,7 @@
 import argparse
 
 import together
-from together.commands import chat, complete, files, finetune, image, models
+from together.commands import chat, complete, embeddings, files, finetune, image, models
 from together.utils import get_logger
 
 
@@ -49,6 +49,7 @@ def main() -> None:
     image.add_parser(subparser)
     files.add_parser(subparser)
     finetune.add_parser(subparser)
+    embeddings.add_parser(subparser)
 
     args = parser.parse_args()
 

together/commands/chat.py

@@ -6,6 +6,10 @@ import cmd
 import together
 import together.tools.conversation as convo
 from together import Complete
+from together.utils import get_logger
+
+
+logger = get_logger(str(__name__))
 
 
 def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
@@ -99,18 +103,22 @@ class OpenChatKitShell(cmd.Cmd):
     def do_say(self, arg: str) -> None:
         self._convo.push_human_turn(arg)
         output = ""
-        for token in self.infer.create_streaming(
-            prompt=self._convo.get_raw_prompt(),
-            model=self.args.model,
-            max_tokens=self.args.max_tokens,
-            stop=self.args.stop,
-            temperature=self.args.temperature,
-            top_p=self.args.top_p,
-            top_k=self.args.top_k,
-            repetition_penalty=self.args.repetition_penalty,
-        ):
-            print(token, end="", flush=True)
-            output += token
+        try:
+            for token in self.infer.create_streaming(
+                prompt=self._convo.get_raw_prompt(),
+                model=self.args.model,
+                max_tokens=self.args.max_tokens,
+                stop=self.args.stop,
+                temperature=self.args.temperature,
+                top_p=self.args.top_p,
+                top_k=self.args.top_k,
+                repetition_penalty=self.args.repetition_penalty,
+            ):
+                print(token, end="", flush=True)
+                output += token
+        except together.AuthenticationError:
+            logger.critical(together.MISSING_API_KEY_MESSAGE)
+            exit(0)
         print("\n")
         self._convo.push_model_response(output)
 

together/commands/complete.py

@@ -131,33 +131,41 @@ def _run_complete(args: argparse.Namespace) -> None:
     complete = Complete()
 
     if args.no_stream:
-        response = complete.create(
-            prompt=args.prompt,
-            model=args.model,
-            max_tokens=args.max_tokens,
-            stop=args.stop,
-            temperature=args.temperature,
-            top_p=args.top_p,
-            top_k=args.top_k,
-            repetition_penalty=args.repetition_penalty,
-            logprobs=args.logprobs,
-        )
+        try:
+            response = complete.create(
+                prompt=args.prompt,
+                model=args.model,
+                max_tokens=args.max_tokens,
+                stop=args.stop,
+                temperature=args.temperature,
+                top_p=args.top_p,
+                top_k=args.top_k,
+                repetition_penalty=args.repetition_penalty,
+                logprobs=args.logprobs,
+            )
+        except together.AuthenticationError:
+            logger.critical(together.MISSING_API_KEY_MESSAGE)
+            exit(0)
         no_streamer(args, response)
     else:
-        for text in complete.create_streaming(
-            prompt=args.prompt,
-            model=args.model,
-            max_tokens=args.max_tokens,
-            stop=args.stop,
-            temperature=args.temperature,
-            top_p=args.top_p,
-            top_k=args.top_k,
-            repetition_penalty=args.repetition_penalty,
-            raw=args.raw,
-        ):
-            if not args.raw:
-                print(text, end="", flush=True)
-            else:
-                print(text)
+        try:
+            for text in complete.create_streaming(
+                prompt=args.prompt,
+                model=args.model,
+                max_tokens=args.max_tokens,
+                stop=args.stop,
+                temperature=args.temperature,
+                top_p=args.top_p,
+                top_k=args.top_k,
+                repetition_penalty=args.repetition_penalty,
+                raw=args.raw,
+            ):
+                if not args.raw:
+                    print(text, end="", flush=True)
+                else:
+                    print(text)
+        except together.AuthenticationError:
+            logger.critical(together.MISSING_API_KEY_MESSAGE)
+            exit(0)
         if not args.raw:
             print("\n")

together/commands/embeddings.py

@@ -0,0 +1,48 @@
+from __future__ import annotations
+
+import argparse
+import json
+
+import together
+from together import Embeddings
+from together.utils import get_logger
+
+
+logger = get_logger(str(__name__))
+
+
+def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
+    COMMAND_NAME = "embeddings"
+    subparser = subparsers.add_parser(COMMAND_NAME)
+
+    subparser.add_argument(
+        "input",
+        metavar="INPUT",
+        default=None,
+        type=str,
+        help="A string providing context for the model to embed",
+    )
+
+    subparser.add_argument(
+        "--model",
+        "-m",
+        default=together.default_embedding_model,
+        type=str,
+        help=f"The name of the model to query. Default={together.default_text_model}",
+    )
+    subparser.set_defaults(func=_run_complete)
+
+
+def _run_complete(args: argparse.Namespace) -> None:
+    embeddings = Embeddings()
+
+    try:
+        response = embeddings.create(
+            input=args.input,
+            model=args.model,
+        )
+
+        print(json.dumps(response, indent=4))
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)

together/commands/files.py

@@ -3,8 +3,14 @@ from __future__ import annotations
 import argparse
 import json
 
+from tabulate import tabulate
+
+import together
 from together import Files
-from together.utils import extract_time
+from together.utils import bytes_to_human_readable, extract_time, get_logger
+
+
+logger = get_logger(str(__name__))
 
 
 def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
@@ -23,6 +29,12 @@ def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser])
 
 def _add_list(parser: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
     subparser = parser.add_parser("list")
+    subparser.add_argument(
+        "--raw",
+        help="Raw JSON dump of response",
+        default=False,
+        action="store_true",
+    )
     subparser.set_defaults(func=_run_list)
 
 
@@ -82,6 +94,12 @@ def _add_retrieve(parser: argparse._SubParsersAction[argparse.ArgumentParser]) -
         help="File ID of remote file",
         type=str,
     )
+    subparser.add_argument(
+        "--raw",
+        help="Raw JSON dump of response",
+        default=False,
+        action="store_true",
+    )
     subparser.set_defaults(func=_run_retrieve)
 
 
@@ -109,31 +127,79 @@ def _add_retrieve_content(
 
 
 def _run_list(args: argparse.Namespace) -> None:
-    response = Files.list()
+    try:
+        response = Files.list()
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
     response["data"].sort(key=extract_time)
-    print(json.dumps(response, indent=4))
+    if args.raw:
+        print(json.dumps(response, indent=4))
+    else:
+        display_list = []
+        for i in response["data"]:
+            display_list.append(
+                {
+                    "File name": i.get("filename"),
+                    "File ID": i.get("id"),
+                    "Size": bytes_to_human_readable(
+                        float(str(i.get("bytes")))
+                    ),  # convert to string for mypy typing
+                    "Created At": i.get("created_at"),
+                    "Line Count": i.get("LineCount"),
+                }
+            )
+        table = tabulate(display_list, headers="keys", tablefmt="grid", showindex=True)
+        print(table)
 
 
 def _run_check(args: argparse.Namespace) -> None:
-    response = Files.check(args.file)
+    try:
+        response = Files.check(args.file)
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
     print(json.dumps(response, indent=4))
 
 
 def _run_upload(args: argparse.Namespace) -> None:
-    response = Files.upload(file=args.file, check=not args.no_check, model=args.model)
+    try:
+        response = Files.upload(
+            file=args.file, check=not args.no_check, model=args.model
+        )
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
     print(json.dumps(response, indent=4))
 
 
 def _run_delete(args: argparse.Namespace) -> None:
-    response = Files.delete(args.file_id)
+    try:
+        response = Files.delete(args.file_id)
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
     print(json.dumps(response, indent=4))
 
 
 def _run_retrieve(args: argparse.Namespace) -> None:
-    response = Files.retrieve(args.file_id)
-    print(json.dumps(response, indent=4))
+    try:
+        response = Files.retrieve(args.file_id)
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
+    if args.raw:
+        print(json.dumps(response, indent=4))
+    else:
+        table_data = [{"Key": key, "Value": value} for key, value in response.items()]
+        table = tabulate(table_data, tablefmt="grid")
+        print(table)
 
 
 def _run_retrieve_content(args: argparse.Namespace) -> None:
-    output = Files.retrieve_content(args.file_id, args.output)
+    try:
+        output = Files.retrieve_content(args.file_id, args.output)
+    except together.AuthenticationError:
+        logger.critical(together.MISSING_API_KEY_MESSAGE)
+        exit(0)
     print(output)