together 1.4.4__py3-none-any.whl → 1.4.5__py3-none-any.whl

together/client.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 
 import os
-from typing import Dict
+import sys
+from typing import Dict, TYPE_CHECKING
 
 from together import resources
 from together.constants import BASE_URL, MAX_RETRIES, TIMEOUT_SECS
 from together.error import AuthenticationError
 from together.types import TogetherClient
 from together.utils import enforce_trailing_slash
+from together.utils.api_helpers import get_google_colab_secret
 
 
 class Together:
@@ -44,6 +46,9 @@ class Together:
         if not api_key:
             api_key = os.environ.get("TOGETHER_API_KEY")
 
+        if not api_key and "google.colab" in sys.modules:
+            api_key = get_google_colab_secret("TOGETHER_API_KEY")
+
         if not api_key:
             raise AuthenticationError(
                 "The api_key client option must be set either by passing api_key to the client or by setting the "
@@ -117,6 +122,9 @@ class AsyncTogether:
         if not api_key:
             api_key = os.environ.get("TOGETHER_API_KEY")
 
+        if not api_key and "google.colab" in sys.modules:
+            api_key = get_google_colab_secret("TOGETHER_API_KEY")
+
         if not api_key:
             raise AuthenticationError(
                 "The api_key client option must be set either by passing api_key to the client or by setting the "

together/utils/api_helpers.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import os
+import sys
 import platform
 from typing import TYPE_CHECKING, Any, Dict
 
@@ -12,6 +13,7 @@ if TYPE_CHECKING:
 import together
 from together import error
 from together.utils._log import _console_log_level
+from together.utils import log_info
 
 
 def get_headers(
@@ -82,3 +84,41 @@ def default_api_key(api_key: str | None = None) -> str | None:
         return os.environ.get("TOGETHER_API_KEY")
 
     raise error.AuthenticationError(together.constants.MISSING_API_KEY_MESSAGE)
+
+
+def get_google_colab_secret(secret_name: str = "TOGETHER_API_KEY") -> str | None:
+    """
+    Checks to see if the user is running in Google Colab, and looks for the Together API Key secret.
+
+    Args:
+        secret_name (str, optional). Defaults to TOGETHER_API_KEY
+
+    Returns:
+        str: if the API key is found; None if an error occurred or the secret was not found.
+    """
+    # If running in Google Colab, check for Together in notebook secrets
+    if "google.colab" in sys.modules:
+        if TYPE_CHECKING:
+            from google.colab import userdata  # type: ignore
+        else:
+            from google.colab import userdata
+
+        try:
+            api_key = userdata.get(secret_name)
+            if not isinstance(api_key, str):
+                return None
+            else:
+                return str(api_key)
+        except userdata.NotebookAccessError:
+            log_info(
+                "The TOGETHER_API_KEY Colab secret was found, but notebook access is disabled. Please enable notebook "
+                "access for the secret."
+            )
+        except userdata.SecretNotFoundError:
+            # warn and carry on
+            log_info("Colab: No Google Colab secret named TOGETHER_API_KEY was found.")
+
+        return None
+
+    else:
+        return None

{together-1.4.4.dist-info → together-1.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: together
-Version: 1.4.4
+Version: 1.4.5
 Summary: Python client for Together's Cloud Platform!
 License: Apache-2.0
 Author: Together AI

{together-1.4.4.dist-info → together-1.4.5.dist-info}/RECORD

@@ -12,7 +12,7 @@ together/cli/api/images.py,sha256=GADSeaNUHUVMtWovmccGuKc28IJ9E_v4vAEwYHJhu5o,26
 together/cli/api/models.py,sha256=xWEzu8ZpxM_Pz9KEjRPRVuv_v22RayYZ4QcgiezT5tE,1126
 together/cli/api/utils.py,sha256=IuqYWPnLI38_Bqd7lj8V_SnGdYc59pRmMbQmciS4FsM,1326
 together/cli/cli.py,sha256=YCDzbXpC5is0rs2PEkUPrIhYuzdyrihQ8GVR_TlDv5s,2054
-together/client.py,sha256=vOe9NOgDyDlrT5ppvNfJGzdOHnMWEPmJX2RbXUQXKno,5081
+together/client.py,sha256=KKmO0LadgAyj8AXKrJCYwLDyxR7_CUB4uTmay1eiyFE,5420
 together/constants.py,sha256=UDJhEylJFmdm4bedBDpvqYXBj5Or3k7z9GWtkRY_dZQ,1526
 together/error.py,sha256=HU6247CyzCFjaxL9A0XYbXZ6fY_ebRg0FEYjI4Skogs,5515
 together/filemanager.py,sha256=QHhBn73oVFdgUpSYXYLmJzHJ9c5wYEMJC0ur6ZgDeYo,11269
@@ -54,12 +54,12 @@ together/types/models.py,sha256=nwQIZGHKZpX9I6mK8z56VW70YC6Ry6JGsVa0s99QVxc,1055
 together/types/rerank.py,sha256=qZfuXOn7MZ6ly8hpJ_MZ7OU_Bi1-cgYNSB20Wja8Qkk,1061
 together/utils/__init__.py,sha256=5fqvj4KT2rHxKSQot2TSyV_HcvkvkGiqAiaYuJwqtm0,786
 together/utils/_log.py,sha256=5IYNI-jYzxyIS-pUvhb0vE_Muo3MA7GgBhsu66TKP2w,1951
-together/utils/api_helpers.py,sha256=RSF7SRhbjHzroMOSWAXscflByM1r1ta_1SpxkAT22iE,2407
+together/utils/api_helpers.py,sha256=2K0O6qeEQ2zVFvi5NBN5m2kjZJaS3-JfKFecQ7SmGaw,3746
 together/utils/files.py,sha256=rfp10qU0urtWOXXFeasFtO9xp-1KIhM3S43JxcnHmL0,16438
 together/utils/tools.py,sha256=H2MTJhEqtBllaDvOyZehIO_IVNK3P17rSDeILtJIVag,2964
 together/version.py,sha256=p03ivHyE0SyWU4jAnRTBi_sOwywVWoZPU4g2gzRgG-Y,126
-together-1.4.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-together-1.4.4.dist-info/METADATA,sha256=ICtNOO5v35bKJFEtlgdVg4ORP0ofYO11vANs-QuowxY,14445
-together-1.4.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-together-1.4.4.dist-info/entry_points.txt,sha256=G-b5NKW6lUUf1V1fH8IPTBb7jXnK7lhbX9H1zTEJXPs,50
-together-1.4.4.dist-info/RECORD,,
+together-1.4.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+together-1.4.5.dist-info/METADATA,sha256=vIX519bvnuj6VrksF_aORHUmu4xFgzalx5CZVoFzKYk,14445
+together-1.4.5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+together-1.4.5.dist-info/entry_points.txt,sha256=G-b5NKW6lUUf1V1fH8IPTBb7jXnK7lhbX9H1zTEJXPs,50
+together-1.4.5.dist-info/RECORD,,