[0.4.18] fix function response API call

yashbonde · yashbonde · commit 2fabdae461f4 · 2024-08-08T20:15:35.000+05:30
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -7,6 +7,16 @@ minor versions.
 
 All relevant steps to be taken will be mentioned here.
 
+0.4.18
+------
+
+- Fix bug where function response was tried to be deserialised to the JSON and then sent to the different APIs.
+
+0.4.17
+------
+
+- Fix error in ``tuneapi.utils.serdeser.to_s3`` function where content type key was incorrect
+
 0.4.16
 ------
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,7 +13,7 @@
 project = "tuneapi"
 copyright = "2024, Frello Technologies"
 author = "Frello Technologies"
-release = "0.4.16"
+release = "0.4.18"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tuneapi"
-version = "0.4.16"
+version = "0.4.18"
 description = "Tune AI APIs."
 authors = ["Frello Technology Private Limited <engineering@nimblebox.ai>"]
 license = "MIT"
diff --git a/tuneapi/__init__.py b/tuneapi/__init__.py
@@ -1,3 +1,3 @@
 # Copyright © 2023- Frello Technology Private Limited
 
-__version__ = "0.4.16"
+__version__ = "0.4.18"
diff --git a/tuneapi/apis/model_anthropic.py b/tuneapi/apis/model_anthropic.py
@@ -114,14 +114,14 @@ def _process_input(self, chats, token: Optional[str] = None):
                     ],
                 }
             elif m.role == Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 msg = {
                     "role": "user",
                     "content": [
                         {
                             "type": "tool_result",
                             "tool_use_id": prev_tool_id,
-                            "content": tu.to_json(_m, tight=True),
+                            "content": tu.to_json(m.value, tight=True),
                         }
                     ],
                 }
diff --git a/tuneapi/apis/model_gemini.py b/tuneapi/apis/model_gemini.py
@@ -76,7 +76,7 @@ def _process_input(self, chats, token: Optional[str] = None):
                     }
                 )
             elif m.role == tt.Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 messages.append(
                     {
                         "role": "function",
@@ -86,7 +86,7 @@ def _process_input(self, chats, token: Optional[str] = None):
                                     "name": prev_fn_name,
                                     "response": {
                                         "name": prev_fn_name,
-                                        "content": _m,
+                                        "content": m.value,
                                     },
                                 }
                             }
diff --git a/tuneapi/apis/model_groq.py b/tuneapi/apis/model_groq.py
@@ -70,12 +70,12 @@ def _process_input(self, chats, token: Optional[str] = None):
                     }
                 )
             elif m.role == tt.Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 final_messages.append(
                     {
                         "role": "tool",
                         "tool_call_id": prev_tool_id,
-                        "content": tu.to_json(_m, tight=True),
+                        "content": tu.to_json(m.value, tight=True),
                     }
                 )
                 prev_tool_id = tu.get_random_string(5)  # reset tool id
diff --git a/tuneapi/apis/model_mistral.py b/tuneapi/apis/model_mistral.py
@@ -73,12 +73,12 @@ def _process_input(self, chats, token: Optional[str] = None):
                     }
                 )
             elif m.role == tt.Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 final_messages.append(
                     {
                         "role": "tool",
                         "tool_call_id": prev_tool_id,
-                        "content": tu.to_json(_m, tight=True),
+                        "content": tu.to_json(m.value, tight=True),
                     }
                 )
                 prev_tool_id = tu.get_random_string(5)  # reset tool id
diff --git a/tuneapi/apis/model_openai.py b/tuneapi/apis/model_openai.py
@@ -70,12 +70,12 @@ def _process_input(self, chats, token: Optional[str] = None):
                     }
                 )
             elif m.role == tt.Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 final_messages.append(
                     {
                         "role": "tool",
                         "tool_call_id": prev_tool_id,
-                        "content": tu.to_json(_m, tight=True),
+                        "content": tu.to_json(m.value, tight=True),
                     }
                 )
                 prev_tool_id = tu.get_random_string(5)  # reset tool id
diff --git a/tuneapi/apis/model_tune.py b/tuneapi/apis/model_tune.py
@@ -85,12 +85,12 @@ def _process_input(self, chats, token: Optional[str] = None):
                     }
                 )
             elif m.role == tt.Message.FUNCTION_RESP:
-                _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
+                # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value
                 final_messages.append(
                     {
                         "role": "tool",
                         "tool_call_id": prev_tool_id,
-                        "content": tu.to_json(_m, tight=True),
+                        "content": tu.to_json(m.value, tight=True),
                     }
                 )
                 prev_tool_id = tu.get_random_string(5)  # reset tool id
diff --git a/tuneapi/utils/serdeser.py b/tuneapi/utils/serdeser.py
@@ -140,7 +140,12 @@ def to_s3(
         if os.path.exists(x):
             if not content_type:
                 content_type = get_mime_type(x)
-            return s3.upload_file(x, aws_s3_bucket, key, ContentType=content_type)
+            return s3.upload_file(
+                x,
+                aws_s3_bucket,
+                key,
+                ExtraArgs={"ContentType": content_type},
+            )
         else:
             x = x.encode("utf-8")
     return s3.put_object(

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`# Copyright © 2023- Frello Technology Private Limited`
`2`	`2`
`3`		`-__version__ = "0.4.16"`
	`3`	`+__version__ = "0.4.18"`
Original file line number	Diff line number	Diff line change
`@@ -114,14 +114,14 @@ def _process_input(self, chats, token: Optional[str] = None):`
`114`	`114`	`],`
`115`	`115`	`}`
`116`	`116`	`elif m.role == Message.FUNCTION_RESP:`
`117`		`- _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
	`117`	`+ # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
`118`	`118`	`msg = {`
`119`	`119`	`"role": "user",`
`120`	`120`	`"content": [`
`121`	`121`	`{`
`122`	`122`	`"type": "tool_result",`
`123`	`123`	`"tool_use_id": prev_tool_id,`
`124`		`- "content": tu.to_json(_m, tight=True),`
	`124`	`+ "content": tu.to_json(m.value, tight=True),`
`125`	`125`	`}`
`126`	`126`	`],`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def _process_input(self, chats, token: Optional[str] = None):`
`76`	`76`	`}`
`77`	`77`	`)`
`78`	`78`	`elif m.role == tt.Message.FUNCTION_RESP:`
`79`		`- _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
	`79`	`+ # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
`80`	`80`	`messages.append(`
`81`	`81`	`{`
`82`	`82`	`"role": "function",`
`@@ -86,7 +86,7 @@ def _process_input(self, chats, token: Optional[str] = None):`
`86`	`86`	`"name": prev_fn_name,`
`87`	`87`	`"response": {`
`88`	`88`	`"name": prev_fn_name,`
`89`		`- "content": _m,`
	`89`	`+ "content": m.value,`
`90`	`90`	`},`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ def _process_input(self, chats, token: Optional[str] = None):`
`70`	`70`	`}`
`71`	`71`	`)`
`72`	`72`	`elif m.role == tt.Message.FUNCTION_RESP:`
`73`		`- _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
	`73`	`+ # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
`74`	`74`	`final_messages.append(`
`75`	`75`	`{`
`76`	`76`	`"role": "tool",`
`77`	`77`	`"tool_call_id": prev_tool_id,`
`78`		`- "content": tu.to_json(_m, tight=True),`
	`78`	`+ "content": tu.to_json(m.value, tight=True),`
`79`	`79`	`}`
`80`	`80`	`)`
`81`	`81`	`prev_tool_id = tu.get_random_string(5) # reset tool id`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ def _process_input(self, chats, token: Optional[str] = None):`
`73`	`73`	`}`
`74`	`74`	`)`
`75`	`75`	`elif m.role == tt.Message.FUNCTION_RESP:`
`76`		`- _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
	`76`	`+ # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
`77`	`77`	`final_messages.append(`
`78`	`78`	`{`
`79`	`79`	`"role": "tool",`
`80`	`80`	`"tool_call_id": prev_tool_id,`
`81`		`- "content": tu.to_json(_m, tight=True),`
	`81`	`+ "content": tu.to_json(m.value, tight=True),`
`82`	`82`	`}`
`83`	`83`	`)`
`84`	`84`	`prev_tool_id = tu.get_random_string(5) # reset tool id`
Original file line number	Diff line number	Diff line change
`@@ -85,12 +85,12 @@ def _process_input(self, chats, token: Optional[str] = None):`
`85`	`85`	`}`
`86`	`86`	`)`
`87`	`87`	`elif m.role == tt.Message.FUNCTION_RESP:`
`88`		`- _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
	`88`	`+ # _m = tu.from_json(m.value) if isinstance(m.value, str) else m.value`
`89`	`89`	`final_messages.append(`
`90`	`90`	`{`
`91`	`91`	`"role": "tool",`
`92`	`92`	`"tool_call_id": prev_tool_id,`
`93`		`- "content": tu.to_json(_m, tight=True),`
	`93`	`+ "content": tu.to_json(m.value, tight=True),`
`94`	`94`	`}`
`95`	`95`	`)`
`96`	`96`	`prev_tool_id = tu.get_random_string(5) # reset tool id`