[0.5.6] protobuf removed as a dependency

Author: yashbonde

docs/changelog.rst

@@ -7,6 +7,17 @@ minor versions.
 
 All relevant steps to be taken will be mentioned here.
 
+0.5.6
+-----
+
+- Remove protobuf as a dependency in because bunch of other packages break. The functions are still present
+
+0.5.5
+-----
+
+- In all implmenetations of ``tuneapi.types.chats.ModelInterface`` add new input to the API endpoints called ``extra_headers``
+  which is a dictionary to update the outgoing headers.
+
 0.5.4
 -----
 

docs/conf.py

@@ -13,7 +13,7 @@
 project = "tuneapi"
 copyright = "2024, Frello Technologies"
 author = "Frello Technologies"
-release = "0.5.4"
+release = "0.5.6"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tuneapi"
-version = "0.5.4"
+version = "0.5.6"
 description = "Tune AI APIs."
 authors = ["Frello Technology Private Limited <[email protected]>"]
 license = "MIT"
@@ -12,16 +12,18 @@ python = "^3.10"
 fire = "0.5.0"
 requests = "^2.31.0"
 cloudpickle = "3.0.0"
-protobuf = "^5.27.3"
 cryptography = ">=42.0.5"
 tqdm = "^4.66.1"
 snowflake_id = "1.0.2"
 nutree = "0.8.0"
 pillow = "^10.2.0"
+protobuf = { version = "^5.27.3", optional = true }
 boto3 = { version = "1.29.6", optional = true }
 
 [tool.poetry.extras]
 boto3 = ["boto3"]
+protobuf = ["protobuf"]
+all = ["boto3", "protobuf"]
 
 # [tool.poetry.scripts]
 # tuneapi = "tuneapi.__main__:main"

tuneapi/apis/model_anthropic.py

@@ -114,6 +114,7 @@ def chat(
         temperature: Optional[float] = None,
         token: Optional[str] = None,
         return_message: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ):
         output = ""
@@ -124,6 +125,7 @@ def chat(
             max_tokens=max_tokens,
             temperature=temperature,
             token=token,
+            extra_headers=extra_headers,
             raw=False,
             **kwargs,
         ):
@@ -147,6 +149,7 @@ def stream_chat(
         timeout=(5, 30),
         raw: bool = False,
         debug: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> Any:
 
@@ -156,6 +159,8 @@ def stream_chat(
             for t in tools:
                 t["input_schema"] = t.pop("parameters")
         headers, system, claude_messages = self._process_input(chats=chats, token=token)
+        if extra_headers:
+            headers.update(extra_headers)
 
         data = {
             "model": model or self.model_id,

tuneapi/apis/model_gemini.py

@@ -7,7 +7,7 @@
 
 import json
 import requests
-from typing import Optional, Any
+from typing import Optional, Any, Dict
 
 import tuneapi.utils as tu
 import tuneapi.types as tt
@@ -114,7 +114,7 @@ def chat(
         temperature: float = 1,
         token: Optional[str] = None,
         timeout=None,
-        raw: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> Any:
         output = ""
@@ -125,7 +125,8 @@ def chat(
             temperature=temperature,
             token=token,
             timeout=timeout,
-            raw=raw,
+            extra_headers=extra_headers,
+            raw=False,
             **kwargs,
         ):
             if isinstance(x, dict):
@@ -144,12 +145,15 @@ def stream_chat(
         timeout=(5, 60),
         raw: bool = False,
         debug: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ):
         tools = []
         if isinstance(chats, tt.Thread):
             tools = [x.to_dict() for x in chats.tools]
         headers, system, messages, params = self._process_input(chats, token)
+        if extra_headers:
+            headers.update(extra_headers)
         data = {
             "systemInstruction": {
                 "parts": [{"text": system}],

tuneapi/apis/model_groq.py

@@ -96,6 +96,7 @@ def chat(
         temperature: float = 1,
         token: Optional[str] = None,
         timeout=(5, 30),
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> str | Dict[str, Any]:
         output = ""
@@ -106,6 +107,8 @@ def chat(
             temperature=temperature,
             token=token,
             timeout=timeout,
+            extra_headers=extra_headers,
+            raw=False,
             **kwargs,
         ):
             if isinstance(x, dict):
@@ -123,12 +126,15 @@ def stream_chat(
         token: Optional[str] = None,
         timeout=(5, 60),
         debug: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         raw: bool = False,
     ):
         tools = []
         if isinstance(chats, tt.Thread):
             tools = [{"type": "function", "function": x.to_dict()} for x in chats.tools]
         headers, messages = self._process_input(chats, token)
+        if extra_headers:
+            headers.update(extra_headers)
         data = {
             "temperature": temperature,
             "messages": messages,

tuneapi/apis/model_mistral.py

@@ -99,6 +99,7 @@ def chat(
         temperature: float = 1,
         token: Optional[str] = None,
         timeout=(5, 30),
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> str | Dict[str, Any]:
         output = ""
@@ -109,6 +110,8 @@ def chat(
             temperature=temperature,
             token=token,
             timeout=timeout,
+            extra_headers=extra_headers,
+            raw=False,
             **kwargs,
         ):
             if isinstance(x, dict):
@@ -127,11 +130,14 @@ def stream_chat(
         timeout=(5, 60),
         raw: bool = False,
         debug: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
     ):
         tools = []
         if isinstance(chats, Thread):
             tools = [{"type": "function", "function": x.to_dict()} for x in chats.tools]
         headers, messages = self._process_input(chats, token)
+        if extra_headers:
+            headers.update(extra_headers)
         data = {
             "messages": messages,
             "model": model or self.model_id,

tuneapi/apis/model_openai.py

@@ -6,8 +6,8 @@
 
 import json
 import requests
-from typing import Optional, Any, List
 
+from typing import Optional, Any, List, Dict
 
 import tuneapi.utils as tu
 import tuneapi.types as tt
@@ -98,6 +98,7 @@ def chat(
         max_tokens: int = 1024,
         temperature: float = 1,
         token: Optional[str] = None,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> Any:
         output = ""
@@ -107,6 +108,8 @@ def chat(
             max_tokens=max_tokens,
             temperature=temperature,
             token=token,
+            extra_headers=extra_headers,
+            raw=False,
             **kwargs,
         ):
             if isinstance(x, dict):
@@ -123,10 +126,13 @@ def stream_chat(
         temperature: float = 1,
         token: Optional[str] = None,
         timeout=(5, 60),
-        raw: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
         debug: bool = False,
+        raw: bool = False,
     ):
         headers, messages = self._process_input(chats, token)
+        if extra_headers:
+            headers.update(extra_headers)
         data = {
             "temperature": temperature,
             "messages": messages,
@@ -191,11 +197,14 @@ def embedding(
         token: Optional[str] = None,
         timeout=(5, 60),
         raw: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
     ):
         """If you pass a list then returned items are in the insertion order"""
         text = []
 
         headers = self._process_header(token)
+        if extra_headers:
+            headers.update(extra_headers)
         if isinstance(chats, tt.Thread):
             _, messages = self._process_input(chats, token)
             for i, m in enumerate(messages):

tuneapi/apis/model_tune.py

@@ -115,6 +115,7 @@ def chat(
         token: Optional[str] = None,
         timeout=(5, 60),
         stop: Optional[List[str]] = None,
+        extra_headers: Optional[Dict[str, str]] = None,
         **kwargs,
     ) -> str | Dict[str, Any]:
         output = ""
@@ -126,6 +127,8 @@ def chat(
             token=token,
             timeout=timeout,
             stop=stop,
+            extra_headers=extra_headers,
+            raw=False,
             **kwargs,
         ):
             if isinstance(x, dict):
@@ -145,13 +148,16 @@ def stream_chat(
         stop: Optional[List[str]] = None,
         raw: bool = False,
         debug: bool = False,
+        extra_headers: Optional[Dict[str, str]] = None,
     ):
         model = model or self.model_id
         if not model:
             raise Exception(
                 "Tune Model ID not found. Please set TUNEAPI_MODEL environment variable or pass through function"
             )
         headers, messages = self._process_input(chats, token)
+        if extra_headers:
+            headers.update(extra_headers)
         data = {
             "temperature": temperature,
             "messages": messages,

tuneapi/utils/misc.py

@@ -9,7 +9,6 @@
 from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 
 from datetime import datetime, timezone, timedelta
-from google.protobuf.timestamp_pb2 import Timestamp as Timestamp_pb
 
 from tuneapi.utils.logger import logger
 from tuneapi.utils.serdeser import to_json
@@ -54,7 +53,9 @@ def get_now_human(date: bool = True, tz=None) -> str:
             dt = dt.astimezone(tz)
         return dt.strftime(fmt_str)
 
-    def get_now_pb() -> Timestamp_pb:
+    def get_now_pb():
+        from google.protobuf.timestamp_pb2 import Timestamp as Timestamp_pb
+
         ts = Timestamp_pb()
         ts.GetCurrentTime()
         return ts