feat: adapt openai tool_calls

Author: SimsonW

examples/assistant/chat_with_assistant.ipynb

@@ -175,15 +175,15 @@
     "user_input = input(\"User Input: \")\n",
     "while user_input != \"q\":\n",
     "    # create user message\n",
-    "    taskingai.assistant.create_user_message(\n",
+    "    taskingai.assistant.create_message(\n",
     "        assistant_id=assistant.assistant_id,\n",
     "        chat_id=chat.chat_id,\n",
     "        text=user_input,\n",
     "    )\n",
     "    print(f\"User: {user_input}\")\n",
     "    \n",
     "    # generate assistant response\n",
-    "    assistant_message: Message = taskingai.assistant.generate_assistant_message(\n",
+    "    assistant_message: Message = taskingai.assistant.generate_message(\n",
     "        assistant_id=assistant.assistant_id,\n",
     "        chat_id=chat.chat_id,\n",
     "        system_prompt_variables={\n",
@@ -205,42 +205,33 @@
    "execution_count": null,
    "outputs": [],
    "source": [
-    "from taskingai.assistant import MessageGenerationLog\n",
-    "\n",
     "user_input = input(\"User Input: \")\n",
     "while user_input != \"q\":\n",
     "    # create user message\n",
-    "    taskingai.assistant.create_user_message(\n",
+    "    taskingai.assistant.create_message(\n",
     "        assistant_id=assistant.assistant_id,\n",
     "        chat_id=chat.chat_id,\n",
     "        text=user_input,\n",
     "    )\n",
     "    print(f\"User: {user_input}\")\n",
     "    \n",
     "    # generate assistant response\n",
-    "    assistant_message_response = taskingai.assistant.generate_assistant_message(\n",
+    "    assistant_message_response = taskingai.assistant.generate_message(\n",
     "        assistant_id=assistant.assistant_id,\n",
     "        chat_id=chat.chat_id,\n",
     "        system_prompt_variables={\n",
     "            \"language\": \"English\"\n",
     "        },\n",
     "        stream=True,\n",
-    "        debug=True,\n",
     "    )\n",
     "    \n",
     "    print(f\"Assistant:\", end=\" \", flush=True)\n",
     "    for item in assistant_message_response:\n",
-    "        \n",
     "        if isinstance(item, MessageChunk):\n",
     "            print(item.delta, end=\"\", flush=True)\n",
-    "            \n",
-    "        elif isinstance(item, MessageGenerationLog):\n",
-    "            print(f\"\\nlog: {item}\")\n",
-    "            \n",
     "        elif isinstance(item, Message):\n",
     "            print(f\"\\nmessage_id: {item.message_id}\")\n",
     "            \n",
-    "            \n",
     "    time.sleep(2)\n",
     "    # quit by input 'q\n",
     "    user_input = input(\"User: \")"
@@ -270,7 +261,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": null,
    "outputs": [],
    "source": [
     "# delete assistant\n",

examples/inference/chat_completion.ipynb

@@ -197,7 +197,7 @@
     "def plus_a_and_b(a, b):\n",
     "    return a + b\n",
     "\n",
-    "arguments = function_call_assistant_message.function_call.arguments\n",
+    "arguments = function_call_assistant_message.function_calls[0].arguments\n",
     "function_call_result = plus_a_and_b(**arguments)\n",
     "print(f\"function_call_result = {function_call_result}\")"
    ],
@@ -217,7 +217,7 @@
     "    messages=[\n",
     "        UserMessage(\"What is the result of 112 plus 22?\"),\n",
     "        function_call_assistant_message,\n",
-    "        FunctionMessage(name=\"plus_a_and_b\", content=str(function_call_result))\n",
+    "        FunctionMessage(id=\"FUNCTION_ID\", content=str(function_call_result))\n",
     "    ],\n",
     "    functions=[function]\n",
     ")\n",
@@ -240,26 +240,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "1 2 3 4 5 6 7 8 9 10\n",
-      "11 12 13 14 15 16 17 18 19 20\n",
-      "21 22 23 24 25 26 27 28 29 30\n",
-      "31 32 33 34 35 36 37 38 39 40\n",
-      "41 42 43 44 45 46 47 48 49 50\n",
-      "51 52 53 54 55 56 57 58 59 60\n",
-      "61 62 63 64 65 66 67 68 69 70\n",
-      "71 72 73 74 75 76 77 78 79 80\n",
-      "81 82 83 84 85 86 87 88 89 90\n",
-      "91 92 93 94 95 96 97 98 99 100\n",
-      "Finished with reason: stop\n"
-     ]
-    }
-   ],
+   "execution_count": null,
+   "outputs": [],
    "source": [
     "# generate in stream mode\n",
     "chat_completion_result = taskingai.inference.chat_completion(\n",
@@ -278,11 +260,7 @@
     "        print(f\"\\n\\nFinished with reason: {item.finish_reason}\")"
    ],
    "metadata": {
-    "collapsed": false,
-    "ExecuteTime": {
-     "end_time": "2023-12-12T06:29:54.749165Z",
-     "start_time": "2023-12-12T06:29:47.420237Z"
-    }
+    "collapsed": false
    },
    "id": "4f3290f87635152a"
   },

taskingai/assistant/message.py

@@ -25,14 +25,14 @@
     "MessageGenerationLog",
     "get_message",
     "list_messages",
-    "create_user_message",
+    "create_message",
     "update_message",
-    "generate_assistant_message",
+    "generate_message",
     "a_get_message",
     "a_list_messages",
-    "a_create_user_message",
+    "a_create_message",
     "a_update_message",
-    "a_generate_assistant_message",
+    "a_generate_message",
 ]
 
 
@@ -163,7 +163,7 @@ async def a_get_message(
 
 
 
-def create_user_message(
+def create_message(
     assistant_id: str,
     chat_id: str,
     text: str,
@@ -194,7 +194,7 @@ def create_user_message(
     return message
 
 
-async def a_create_user_message(
+async def a_create_message(
     assistant_id: str,
     chat_id: str,
     text: str,
@@ -284,12 +284,11 @@ async def a_update_message(
 
 
 
-def generate_assistant_message(
+def generate_message(
     assistant_id: str,
     chat_id: str,
     system_prompt_variables: Optional[Dict] = None,
     stream: bool = False,
-    debug: bool = False,
 ) -> Union[Message, Stream]:
     """
     Generate a message.
@@ -305,11 +304,10 @@ def generate_assistant_message(
     body = MessageGenerateRequest(
         system_prompt_variables=system_prompt_variables,
         stream=stream,
-        debug=debug,
     )
 
-    if not stream and not debug:
-        response = api_instance.generate_assistant_message(
+    if not stream:
+        response = api_instance.generate_message(
             assistant_id=assistant_id,
             chat_id=chat_id,
             body=body,
@@ -318,7 +316,7 @@ def generate_assistant_message(
         message: Message = Message(**response["data"])
         return message
     else:
-        response: Stream = api_instance.generate_assistant_message(
+        response: Stream = api_instance.generate_message(
             assistant_id=assistant_id,
             chat_id=chat_id,
             body=body,
@@ -327,12 +325,11 @@ def generate_assistant_message(
         )
         return response
 
-async def a_generate_assistant_message(
+async def a_generate_message(
     assistant_id: str,
     chat_id: str,
     system_prompt_variables: Optional[Dict] = None,
     stream: bool = False,
-    debug: bool = False,
 ) -> Union[Message, AsyncStream]:
     """
     Generate a message in async mode.
@@ -348,11 +345,10 @@ async def a_generate_assistant_message(
     body = MessageGenerateRequest(
         system_prompt_variables=system_prompt_variables,
         stream=stream,
-        debug=debug,
     )
 
-    if not stream and not debug:
-        response = await api_instance.generate_assistant_message(
+    if not stream:
+        response = await api_instance.generate_message(
             assistant_id=assistant_id,
             chat_id=chat_id,
             body=body,
@@ -361,7 +357,7 @@ async def a_generate_assistant_message(
         message: Message = Message(**response["data"])
         return message
     else:
-        response: AsyncStream = await api_instance.generate_assistant_message(
+        response: AsyncStream = await api_instance.generate_message(
             assistant_id=assistant_id,
             chat_id=chat_id,
             body=body,

taskingai/client/api/assistant_api.py

@@ -539,7 +539,7 @@ def delete_chat_with_http_info(self, assistant_id, chat_id, **kwargs):  # noqa:
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def generate_assistant_message(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
+    def generate_message(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
         """Generate assistant message  # noqa: E501
 
         Generate a new message with the role of 'assistant'.
@@ -551,15 +551,15 @@ def generate_assistant_message(self, body, stream, assistant_id, chat_id, **kwar
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        return self.generate_assistant_message_with_http_info(body, stream, assistant_id, chat_id, **kwargs)  # noqa: E501
+        return self.generate_message_with_http_info(body, stream, assistant_id, chat_id, **kwargs)  # noqa: E501
 
-    def generate_assistant_message_with_http_info(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
+    def generate_message_with_http_info(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
         """Generate assistant message  # noqa: E501
 
         Generate a new message with the role of 'assistant'.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.generate_assistant_message_with_http_info(body, assistant_id, chat_id, async_req=True)
+        >>> thread = api.generate_message_with_http_info(body, assistant_id, chat_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -582,25 +582,25 @@ def generate_assistant_message_with_http_info(self, body, stream, assistant_id,
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method generate_assistant_message" % key
+                    " to method generate_message" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'body' is set
         if ('body' not in params or
                 params['body'] is None):
             raise ValueError(
-                "Missing the required parameter `body` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `body` when calling `generate_message`")  # noqa: E501
         # verify the required parameter 'assistant_id' is set
         if ('assistant_id' not in params or
                 params['assistant_id'] is None):
             raise ValueError(
-                "Missing the required parameter `assistant_id` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `assistant_id` when calling `generate_message`")  # noqa: E501
         # verify the required parameter 'chat_id' is set
         if ('chat_id' not in params or
                 params['chat_id'] is None):
             raise ValueError(
-                "Missing the required parameter `chat_id` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `chat_id` when calling `generate_message`")  # noqa: E501
 
         collection_formats = {}
 

taskingai/client/api/assistant_async_api.py

@@ -540,7 +540,7 @@ async def delete_chat_with_http_info(self, assistant_id, chat_id, **kwargs):  #
             collection_formats=collection_formats)
 
 
-    async def generate_assistant_message(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
+    async def generate_message(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
         """Generate assistant message  # noqa: E501
 
         Generate a new message with the role of 'assistant'.
@@ -552,16 +552,16 @@ async def generate_assistant_message(self, body, stream, assistant_id, chat_id,
                  returns the request thread.
         """
         kwargs['_return_http_data_only'] = True
-        return await self.generate_assistant_message_with_http_info(body, stream, assistant_id, chat_id, **kwargs)  # noqa: E501
+        return await self.generate_message_with_http_info(body, stream, assistant_id, chat_id, **kwargs)  # noqa: E501
 
 
-    async def generate_assistant_message_with_http_info(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
+    async def generate_message_with_http_info(self, body, stream, assistant_id, chat_id, **kwargs):  # noqa: E501
         """Generate assistant message  # noqa: E501
 
         Generate a new message with the role of 'assistant'.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.generate_assistant_message_with_http_info(body, assistant_id, chat_id, async_req=True)
+        >>> thread = api.generate_message_with_http_info(body, assistant_id, chat_id, async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
@@ -584,25 +584,25 @@ async def generate_assistant_message_with_http_info(self, body, stream, assistan
             if key not in all_params:
                 raise TypeError(
                     "Got an unexpected keyword argument '%s'"
-                    " to method generate_assistant_message" % key
+                    " to method generate_message" % key
                 )
             params[key] = val
         del params['kwargs']
         # verify the required parameter 'body' is set
         if ('body' not in params or
                 params['body'] is None):
             raise ValueError(
-                "Missing the required parameter `body` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `body` when calling `generate_message`")  # noqa: E501
         # verify the required parameter 'assistant_id' is set
         if ('assistant_id' not in params or
                 params['assistant_id'] is None):
             raise ValueError(
-                "Missing the required parameter `assistant_id` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `assistant_id` when calling `generate_message`")  # noqa: E501
         # verify the required parameter 'chat_id' is set
         if ('chat_id' not in params or
                 params['chat_id'] is None):
             raise ValueError(
-                "Missing the required parameter `chat_id` when calling `generate_assistant_message`")  # noqa: E501
+                "Missing the required parameter `chat_id` when calling `generate_message`")  # noqa: E501
 
         collection_formats = {}