together 0.1.1__tar.gz → 0.1.2__tar.gz

{together-0.1.1 → together-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: together
-Version: 0.1.1
+Version: 0.1.2
 Summary: Python client for Together's Cloud Platform!
 Project-URL: Homepage, https://github.com/togethercomputer/together
 Project-URL: Bug Tracker, https://github.com/togethercomputer/together/issues
@@ -235,6 +235,8 @@ pip install --upgrade together
 
 # Usage
 
+> 🚧 You will need to create a free account with [together.ai](https://api.together.xyz/) to obtain a Together API Key.
+
 The Python Library requires your Together API Key to be configured. This key can be found in your Account's settings on the Playground. Simply click on and navigate to Profile Button > Settings > API Keys.
 
 The API Key can be configured by either setting the `TOGETHER_API_KEY` environment variable, like this:
@@ -250,7 +252,26 @@ import together
 together.api_key = "xxxxx"
 ```
 
-> 🚧 You will need to start a model instance from the Playground before you can query it from the API
+Once you've provided your API key, you can browse our list of available models:
+
+```python
+import together
+
+# set your API key
+together.api_key = "xxxxx"
+
+# list available models and descriptons
+models = together.Models.list()
+
+# print the first model's name
+print(models[0]['name'])
+```
+
+Let's start an instance of one of the models in the list above. You can also start an instance by clicking play on any model in the [models playground](https://api.together.xyz/playground).
+
+```python
+together.Models.start("togethercomputer/RedPajama-INCITE-7B-Base")
+```
 
 Once you've started a model instance, you can start querying:
 
@@ -272,6 +293,18 @@ output = together.Complete.create("Space robots", model="togethercomputer/RedPaj
 print(output['output']['choices'][0]['text'])
 ```
 
+Check which models have been started or stopped:
+
+```python
+together.Models.instances()
+```
+
+To stop your model instance:
+
+```python
+together.Models.stop("togethercomputer/RedPajama-INCITE-7B-Base")
+```
+
 ## Chat
 
 The `chat` command is a CLI-based chat application that can be used for back-and-forth conversations with models in a pre-defined format.
@@ -313,9 +346,19 @@ together --help
 # list available models
 together models list
 
+# start a model
+together models start togethercomputer/RedPajama-INCITE-7B-Base
+
 # create completion
 together complete "Space robots" -m togethercomputer/RedPajama-INCITE-7B-Base
+
+# check which models are running
+together models instances
+
+# stop a model
+together models stop togethercomputer/RedPajama-INCITE-7B-Base
 ```
+
 ## Contributing
 1. Clone the repo and make your changes
 2. Run `pip install together['quality']`

{together-0.1.1 → together-0.1.2}/README.md

@@ -10,6 +10,8 @@ pip install --upgrade together
 
 # Usage
 
+> 🚧 You will need to create a free account with [together.ai](https://api.together.xyz/) to obtain a Together API Key.
+
 The Python Library requires your Together API Key to be configured. This key can be found in your Account's settings on the Playground. Simply click on and navigate to Profile Button > Settings > API Keys.
 
 The API Key can be configured by either setting the `TOGETHER_API_KEY` environment variable, like this:
@@ -25,7 +27,26 @@ import together
 together.api_key = "xxxxx"
 ```
 
-> 🚧 You will need to start a model instance from the Playground before you can query it from the API
+Once you've provided your API key, you can browse our list of available models:
+
+```python
+import together
+
+# set your API key
+together.api_key = "xxxxx"
+
+# list available models and descriptons
+models = together.Models.list()
+
+# print the first model's name
+print(models[0]['name'])
+```
+
+Let's start an instance of one of the models in the list above. You can also start an instance by clicking play on any model in the [models playground](https://api.together.xyz/playground).
+
+```python
+together.Models.start("togethercomputer/RedPajama-INCITE-7B-Base")
+```
 
 Once you've started a model instance, you can start querying:
 
@@ -47,6 +68,18 @@ output = together.Complete.create("Space robots", model="togethercomputer/RedPaj
 print(output['output']['choices'][0]['text'])
 ```
 
+Check which models have been started or stopped:
+
+```python
+together.Models.instances()
+```
+
+To stop your model instance:
+
+```python
+together.Models.stop("togethercomputer/RedPajama-INCITE-7B-Base")
+```
+
 ## Chat
 
 The `chat` command is a CLI-based chat application that can be used for back-and-forth conversations with models in a pre-defined format.
@@ -88,9 +121,19 @@ together --help
 # list available models
 together models list
 
+# start a model
+together models start togethercomputer/RedPajama-INCITE-7B-Base
+
 # create completion
 together complete "Space robots" -m togethercomputer/RedPajama-INCITE-7B-Base
+
+# check which models are running
+together models instances
+
+# stop a model
+together models stop togethercomputer/RedPajama-INCITE-7B-Base
 ```
+
 ## Contributing
 1. Clone the repo and make your changes
 2. Run `pip install together['quality']`

{together-0.1.1 → together-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "together"
-version = "0.1.1"
+version = "0.1.2"
 authors = [
   { name="Together Computer", email="community@together.xyz" },
 ]

{together-0.1.1 → together-0.1.2}/src/together/__init__.py

@@ -14,6 +14,7 @@ api_base = "https://api.together.xyz/"
 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/")
 
 default_text_model = "togethercomputer/RedPajama-INCITE-7B-Chat"
 default_image_model = "runwayml/stable-diffusion-v1-5"
@@ -34,6 +35,7 @@ __all__ = [
     "api_base_complete",
     "api_base_files",
     "api_base_finetune",
+    "api_base_instances",
     "default_text_model",
     "default_image_model",
     "get_logger",

{together-0.1.1 → together-0.1.2}/src/together/cli/cli.py

@@ -12,6 +12,13 @@ def main() -> None:
         prog="together",
     )
 
+    parser.add_argument(
+        "-V",
+        "--version",
+        action="version",
+        version="%(prog)s " + together.version,
+    )
+
     parser.add_argument(
         "--endpoint",
         "-e",

{together-0.1.1 → together-0.1.2}/src/together/commands/image.py

@@ -33,19 +33,19 @@ def add_parser(subparsers: argparse._SubParsersAction[argparse.ArgumentParser])
 
     subparser.add_argument(
         "--height",
-        default=512,
+        default=256,
         type=int,
         help="Pixel height for generated image results",
     )
     subparser.add_argument(
         "--width",
-        default=512,
+        default=256,
         type=int,
         help="Pixel width for generated image results",
     )
     subparser.add_argument(
         "--steps",
-        default=50,
+        default=20,
         type=int,
         help="Number of steps",
     )

{together-0.1.1 → together-0.1.2}/src/together/commands/models.py

@@ -16,6 +16,9 @@ def add_parser(
 
     _add_list(child_parsers)
     _add_info(child_parsers)
+    _add_instances(child_parsers)
+    _add_start(child_parsers)
+    _add_stop(child_parsers)
 
 
 def _add_list(
@@ -50,6 +53,45 @@ def _add_info(
     subparser.set_defaults(func=_run_info)
 
 
+def _add_instances(
+    parser: argparse._SubParsersAction[argparse.ArgumentParser],
+) -> None:
+    subparser = parser.add_parser("instances")
+    subparser.add_argument(
+        "--raw",
+        help="Raw list of instances",
+        default=False,
+        action="store_true",
+    )
+    subparser.set_defaults(func=_run_instances)
+
+
+def _add_start(
+    parser: argparse._SubParsersAction[argparse.ArgumentParser],
+) -> None:
+    subparser = parser.add_parser("start")
+    subparser.add_argument(
+        "model",
+        metavar="MODEL",
+        help="Proper Model API string name",
+        type=str,
+    )
+    subparser.set_defaults(func=_run_start)
+
+
+def _add_stop(
+    parser: argparse._SubParsersAction[argparse.ArgumentParser],
+) -> None:
+    subparser = parser.add_parser("stop")
+    subparser.add_argument(
+        "model",
+        metavar="MODEL",
+        help="Proper Model API string name",
+        type=str,
+    )
+    subparser.set_defaults(func=_run_stop)
+
+
 def _run_list(args: argparse.Namespace) -> None:
     models = Models()
     response = models.list()
@@ -87,3 +129,25 @@ def _run_info(args: argparse.Namespace) -> None:
                 model_info = {key: i[key] for key in visible_keys if key in i}
                 print(json.dumps(model_info, indent=4))
             break
+
+
+def _run_instances(args: argparse.Namespace) -> None:
+    models = Models()
+    response = models.instances()
+    if args.raw:
+        print(json.dumps(response, indent=4))
+    else:
+        started_instances = [key for key in response.keys() if response[key] is True]
+        print(json.dumps(started_instances, indent=4))
+
+
+def _run_start(args: argparse.Namespace) -> None:
+    models = Models()
+    response = models.start(args.model)
+    print(json.dumps(response, indent=4))
+
+
+def _run_stop(args: argparse.Namespace) -> None:
+    models = Models()
+    response = models.stop(args.model)
+    print(json.dumps(response, indent=4))

{together-0.1.1 → together-0.1.2}/src/together/complete.py

@@ -1,5 +1,5 @@
 import json
-from typing import Any, Dict, Iterator, Optional
+from typing import Any, Dict, Iterator, List, Optional
 
 import requests
 import sseclient  # type: ignore
@@ -23,7 +23,7 @@ class Complete:
         prompt: str,
         model: Optional[str] = "",
         max_tokens: Optional[int] = 128,
-        stop: Optional[str] = None,
+        stop: Optional[List[str]] = [],
         temperature: Optional[float] = 0.7,
         top_p: Optional[float] = 0.7,
         top_k: Optional[int] = 50,

{together-0.1.1 → together-0.1.2}/src/together/image.py

@@ -20,7 +20,7 @@ class Image:
         self,
         prompt: str,
         model: Optional[str] = "",
-        steps: Optional[int] = 50,
+        steps: Optional[int] = 20,
         seed: Optional[int] = 42,
         results: Optional[int] = 1,
         height: Optional[int] = 256,

together-0.1.2/src/together/models.py

@@ -0,0 +1,128 @@
+import urllib.parse
+from typing import Any, Dict, List
+
+import requests
+
+import together
+from together import get_logger, verify_api_key
+
+
+logger = get_logger(str(__name__), log_level=together.log_level)
+
+
+class Models:
+    def __init__(
+        self,
+    ) -> None:
+        verify_api_key(logger)
+
+    @classmethod
+    def list(self) -> List[Any]:
+        model_url = urllib.parse.urljoin(together.api_base, "models/info?=")
+        headers = {
+            "Authorization": f"Bearer {together.api_key}",
+            "User-Agent": together.user_agent,
+        }
+        try:
+            response = requests.get(
+                model_url,
+                headers=headers,
+            )
+            response.raise_for_status()
+        except requests.exceptions.RequestException as e:
+            logger.critical(f"Response error raised: {e}")
+            raise together.ResponseError(e)
+
+        try:
+            response_list = list(response.json())
+        except Exception as e:
+            logger.critical(
+                f"JSON Error raised: {e}\nResponse status code = {response.status_code}"
+            )
+            raise together.JSONError(e, http_status=response.status_code)
+
+        return response_list
+
+    @classmethod
+    def instances(self) -> Dict[str, bool]:
+        headers = {
+            "Authorization": f"Bearer {together.api_key}",
+            "accept": "application/json",
+        }
+        try:
+            response = requests.get(
+                together.api_base_instances,
+                headers=headers,
+            )
+            response.raise_for_status()
+        except requests.exceptions.RequestException as e:
+            logger.critical(f"Response error raised: {e}")
+            raise together.ResponseError(e)
+
+        try:
+            response_dict = response.json()
+        except Exception as e:
+            logger.critical(
+                f"JSON Error raised: {e}\nResponse status code = {response.status_code}"
+            )
+            raise together.JSONError(e, http_status=response.status_code)
+
+        return dict(response_dict)
+
+    @classmethod
+    def start(self, model: str) -> Dict[str, str]:
+        model_url = urllib.parse.urljoin(
+            together.api_base_instances, f"start?model={model}"
+        )
+        headers = {
+            "Authorization": f"Bearer {together.api_key}",
+            "accept": "application/json",
+        }
+        try:
+            response = requests.post(
+                model_url,
+                headers=headers,
+            )
+            response.raise_for_status()
+        except requests.exceptions.RequestException as e:
+            logger.critical(f"Response error raised: {e}")
+            raise together.ResponseError(e)
+
+        try:
+            response_dict = response.json()
+        except Exception as e:
+            logger.critical(
+                f"JSON Error raised: {e}\nResponse status code = {response.status_code}"
+            )
+            raise together.JSONError(e, http_status=response.status_code)
+
+        return dict(response_dict)
+
+    @classmethod
+    def stop(self, model: str) -> Dict[str, str]:
+        model_url = urllib.parse.urljoin(
+            together.api_base_instances, f"stop?model={model}"
+        )
+        headers = {
+            "Authorization": f"Bearer {together.api_key}",
+            "accept": "application/json",
+        }
+        try:
+            response = requests.post(
+                model_url,
+                headers=headers,
+            )
+            response.raise_for_status()
+        except requests.exceptions.RequestException as e:
+            logger.critical(f"Response error raised: {e}")
+            raise together.ResponseError(e)
+
+        try:
+            response_dict = response.json()
+        except Exception as e:
+            logger.critical(
+                f"JSON Error raised: {e}\nResponse status code = {response.status_code}"
+            )
+            raise together.JSONError(e, http_status=response.status_code)
+
+        return dict(response_dict)

together-0.1.2/src/together/version.py

@@ -0,0 +1 @@
+VERSION = "0.1.2"

together-0.1.1/src/together/models.py

@@ -1,44 +0,0 @@
-import urllib.parse
-from typing import Any, List
-
-import requests
-
-import together
-from together import get_logger, verify_api_key
-
-
-logger = get_logger(str(__name__), log_level=together.log_level)
-
-
-class Models:
-    def __init__(
-        self,
-    ) -> None:
-        verify_api_key(logger)
-
-    @classmethod
-    def list(self) -> List[Any]:
-        model_url = urllib.parse.urljoin(together.api_base, "models/info?=")
-        headers = {
-            "Authorization": f"Bearer {together.api_key}",
-            "User-Agent": together.user_agent,
-        }
-        try:
-            response = requests.get(
-                model_url,
-                headers=headers,
-            )
-            response.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            logger.critical(f"Response error raised: {e}")
-            raise together.ResponseError(e)
-
-        try:
-            response_list = list(response.json())
-        except Exception as e:
-            logger.critical(
-                f"JSON Error raised: {e}\nResponse status code = {response.status_code}"
-            )
-            raise together.JSONError(e, http_status=response.status_code)
-
-        return response_list

together-0.1.1/src/together/version.py

@@ -1 +0,0 @@
-VERSION = "0.1.0"