Fix bugs in the single returns

luyaxi · Aug 23, 2024 · ecdeda9 · ecdeda9
1 parent be024c8
commit ecdeda9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/codelinker/request/objGen.py b/codelinker/request/objGen.py
@@ -98,10 +98,10 @@ async def _chatcompletion_with_tool_call(
                         "parameters": schemas.parameters
                     }
                 }]
-                kwargs["tool_choice"] = [{
+                kwargs["tool_choice"] = {
                     "type": "function",
                     "function": {"name": schemas.name}
-                }]
+                }
 
                 constructed_schema = {
                     "name": schemas.name,
@@ -139,7 +139,7 @@ async def _chatcompletion_with_tool_call(
                         req_template["required"].append(combine_name)
 
                 constructed_schema = {
-                    "name": "structuredRet",
+                    "name": "structuredRets",
                     "description": "Follow the schema",
                     "parameters": req_template
                 }
@@ -151,7 +151,7 @@ async def _chatcompletion_with_tool_call(
                 kwargs["tool_choice"] = {
                     "type": "function",
                     "function": {
-                        "name": "structuredRet"
+                        "name": "structuredRets"
                     }
                 }
 
@@ -190,18 +190,17 @@ async def _chatcompletion_with_tool_call(
                             else:
                                 d = json.loads(
                                     tool_call["function"]["arguments"])
-
-                            for k, v in d.items():
+                            if constructed_schema["name"] == "structuredRets":
+                                for k, v in d.items():
+                                    structuredRets.append(StructuredRet(
+                                        name=k,
+                                        content=v
+                                    ))
+                            else:
                                 structuredRets.append(StructuredRet(
-                                    name=k,
-                                    content=v
+                                    name=constructed_schema["name"],
+                                    content=d
                                 ))
-                        # TODO: Find a better way to insert content
-                        # if len(choice["message"]["content"].strip()) > 0:
-                        #     structuredRets.append(StructuredRet(
-                        #         name="content",
-                        #         content=choice["message"]["content"]
-                        #     ))
                         if len(structuredRets) == 1:
                             rets.append(structuredRets[0])
                         else:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codelinker"
-version = "0.2.9"
+version = "0.2.10"
 description = ""
 authors = ["luyaxi <[email protected]>"]
 readme = "README.md"