[0.4.11][fix] TuneModel function calling error

Author: yashbonde

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tuneapi"
-version = "0.4.10"
+version = "0.4.11"
 description = "Tune AI APIs."
 authors = ["Frello Technology Private Limited <[email protected]>"]
 license = "MIT"

tuneapi/__init__.py

@@ -1,3 +1,3 @@
 # Copyright © 2023- Frello Technology Private Limited
 
-__version__ = "0.4.10"
+__version__ = "0.4.11"

tuneapi/apis/model_tune.py

@@ -154,7 +154,7 @@ def stream_chat(
         }
         if stop_sequence:
             data["stop_sequence"] = stop_sequence
-        if isinstance(chats, tt.Thread):
+        if isinstance(chats, tt.Thread) and len(chats.tools):
             data["tools"] = [
                 {"type": "function", "function": x.to_dict()} for x in chats.tools
             ]
@@ -185,15 +185,20 @@ def stream_chat(
             line = line.decode().strip()
             if line:
                 try:
-                    x = json.loads(line.replace("data: ", ""))["choices"][0]["delta"]
-                    if "tool_calls" in x:
-                        y = x["tool_calls"][0]["function"]
+                    delta = json.loads(line.replace("data: ", ""))["choices"][0][
+                        "delta"
+                    ]
+                    if "tool_calls" in delta:
+                        y = delta["tool_calls"][0]["function"]
                         if fn_call is None:
-                            fn_call = {"name": y["name"], "arguments": y["arguments"]}
+                            fn_call = {
+                                "name": y["name"],
+                                "arguments": y.get("arguments", ""),
+                            }
                         else:
                             fn_call["arguments"] += y["arguments"]
-                    elif "content" in x:
-                        yield x["content"]
+                    elif "content" in delta:
+                        yield delta["content"]
                 except:
                     break
         if fn_call:

tuneapi/utils/fs.py

@@ -33,7 +33,8 @@ def get_files_in_folder(
             if _all:
                 for f in files:
                     _fp = joinp(root, f)
-                    if not ignore_pat.search(_fp).group():
+                    _ig_pat = ignore_pat.search(_fp)
+                    if not _ig_pat or not _ig_pat.group():
                         all_paths.append(_fp)
                 continue
 
@@ -42,21 +43,24 @@ def get_files_in_folder(
                     print(e)
                     if f.endswith(e):
                         _fp = joinp(root, f)
-                        if not ignore_pat.search(_fp).group():
+                        _ig_pat = ignore_pat.search(_fp)
+                        if not _ig_pat or not _ig_pat.group():
                             all_paths.append(_fp)
 
     else:
         for f in os.listdir(folder_abs):
             if _all:
                 _fp = joinp(folder_abs, f)
-                if not ignore_pat.search(_fp).group():
+                _ig_pat = ignore_pat.search(_fp)
+                if not _ig_pat or not _ig_pat.group():
                     all_paths.append(_fp)
                 continue
 
             for e in ext:
                 if f.endswith(e):
                     _fp = joinp(folder_abs, f)
-                    if not ignore_pat.search(_fp).group():
+                    _ig_pat = ignore_pat.search(_fp)
+                    if not _ig_pat or not _ig_pat.group():
                         all_paths.append(_fp)
 
     return all_paths