Merge pull request #156 from deepset-ai/chatmessage-use-text

`ChatMessage` - access `text` instead of `content`
deepset-ai · Dec 12, 2024 · c4d34b3 · c4d34b3
2 parents 1ea2fd2 + 329f644
commit c4d34b3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/notebooks/charactercodex_llamafile.ipynb b/notebooks/charactercodex_llamafile.ipynb
@@ -552,7 +552,7 @@
         "\n",
         "for hint_number in range(1, MAX_HINTS + 1):\n",
         "    res = hint_generation_pipeline.run({\"character\": random_character, \"previous_hints\": previous_hints})\n",
-        "    hint = res[\"generator\"][\"replies\"][0].content\n",
+        "    hint = res[\"generator\"][\"replies\"][0].text\n",
         "\n",
         "    previous_hints.append(hint)\n",
         "    print(f\"✨ Hint {hint_number}: {hint}\")\n",
@@ -692,9 +692,9 @@
         "    inverted_messages = []\n",
         "    for message in messages:\n",
         "        if message.is_from(ChatRole.USER):\n",
-        "            inverted_messages.append(ChatMessage.from_assistant(message.content))\n",
+        "            inverted_messages.append(ChatMessage.from_assistant(message.text))\n",
         "        elif message.is_from(ChatRole.ASSISTANT):\n",
-        "            inverted_messages.append(ChatMessage.from_user(message.content))\n",
+        "            inverted_messages.append(ChatMessage.from_user(message.text))\n",
         "        else:\n",
         "          inverted_messages.append(message)\n",
         "    return inverted_messages"
@@ -1338,21 +1338,21 @@
         "second_character_messages = [system_message]\n",
         "\n",
         "turn = 1\n",
-        "print(f\"{first_name} 🕺: {start_message.content}\")\n",
+        "print(f\"{first_name} 🕺: {start_message.text}\")\n",
         "\n",
         "while turn < MAX_TURNS:\n",
         "    second_character_messages=invert_roles(first_character_messages)\n",
         "    new_message = character_pipeline.run({\"template\":second_character_messages, \"template_variables\":{\"character_data\":second_character_data}})[\"generator\"][\"replies\"][0]\n",
         "    second_character_messages.append(new_message)\n",
-        "    print(f\"\\n\\n{second_name} 🪖: {new_message.content}\")\n",
+        "    print(f\"\\n\\n{second_name} 🪖: {new_message.text}\")\n",
         "\n",
         "    turn += 1\n",
         "    print(\"-\"*20)\n",
         "\n",
         "    first_character_messages=invert_roles(second_character_messages)\n",
         "    new_message = character_pipeline.run({\"template\":first_character_messages, \"template_variables\":{\"character_data\":first_character_data}})[\"generator\"][\"replies\"][0]\n",
         "    first_character_messages.append(new_message)\n",
-        "    print(f\"\\n\\n{first_name} 🕺: {new_message.content}\")\n",
+        "    print(f\"\\n\\n{first_name} 🕺: {new_message.text}\")\n",
         "\n",
         "    turn += 1"
       ]

diff --git a/notebooks/chat_with_SQL_3_ways.ipynb b/notebooks/chat_with_SQL_3_ways.ipynb
@@ -689,7 +689,7 @@
         "import json\n",
         "\n",
         "## Parse function calling information\n",
-        "function_call = json.loads(response[\"replies\"][0].content)[0]\n",
+        "function_call = json.loads(response[\"replies\"][0].text)[0]\n",
         "function_name = function_call[\"function\"][\"name\"]\n",
         "function_args = json.loads(function_call[\"function\"][\"arguments\"])\n",
         "print(\"Function Name:\", function_name)\n",
@@ -759,7 +759,7 @@
         "    while True:\n",
         "        # if OpenAI response is a tool call\n",
         "        if response and response[\"replies\"][0].meta[\"finish_reason\"] == \"tool_calls\":\n",
-        "            function_calls = json.loads(response[\"replies\"][0].content)\n",
+        "            function_calls = json.loads(response[\"replies\"][0].text)\n",
         "            for function_call in function_calls:\n",
         "                ## Parse function calling information\n",
         "                function_name = function_call[\"function\"][\"name\"]\n",
@@ -776,7 +776,7 @@
         "        else:\n",
         "            messages.append(response[\"replies\"][0])\n",
         "            break\n",
-        "    return response[\"replies\"][0].content\n"
+        "    return response[\"replies\"][0].text\n"
       ]
     },
     {

diff --git a/notebooks/conversational_rag_using_memory.ipynb b/notebooks/conversational_rag_using_memory.ipynb
@@ -269,7 +269,7 @@
         "\n",
         "    Conversation history:\n",
         "    {% for memory in memories %}\n",
-        "        {{ memory.content }}\n",
+        "        {{ memory.text }}\n",
         "    {% endfor %}\n",
         "\n",
         "    Supporting documents:\n",
@@ -519,7 +519,7 @@
         "\n",
         "        Conversation history:\n",
         "        {% for memory in memories %}\n",
-        "            {{ memory.content }}\n",
+        "            {{ memory.text }}\n",
         "        {% endfor %}\n",
         "\n",
         "        User Query: {{query}}\n",
@@ -679,7 +679,7 @@
         "    search_query = res['query_rephrase_llm']['replies'][0]\n",
         "    print(f\"   🔎 Search Query: {search_query}\")\n",
         "    assistant_resp = res['llm']['replies'][0]\n",
-        "    print(f\"🤖 {assistant_resp.content}\")"
+        "    print(f\"🤖 {assistant_resp.text}\")"
       ]
     },
     {

diff --git a/notebooks/gemma_chat_rag.ipynb b/notebooks/gemma_chat_rag.ipynb
@@ -192,7 +192,7 @@
         "  messages.append(ChatMessage.from_user(msg))\n",
         "  response = generator.run(messages=messages)\n",
         "  assistant_resp = response['replies'][0]\n",
-        "  print(\"🤖 \"+assistant_resp.content)\n",
+        "  print(\"🤖 \"+assistant_resp.text)\n",
         "  messages.append(assistant_resp)"
       ]
     },

diff --git a/notebooks/prompt_customization_for_Anthropic.ipynb b/notebooks/prompt_customization_for_Anthropic.ipynb
@@ -844,7 +844,7 @@
         }
       ],
       "source": [
-        "print(result[\"llm\"][\"replies\"][0].content)"
+        "print(result[\"llm\"][\"replies\"][0].text)"
       ]
     },
     {
@@ -882,7 +882,7 @@
       "source": [
         "import re\n",
         "\n",
-        "re.findall(r'<quote .*?>([\\s\\S]*?)<\\/quote>', result[\"llm\"][\"replies\"][0].content)"
+        "re.findall(r'<quote .*?>([\\s\\S]*?)<\\/quote>', result[\"llm\"][\"replies\"][0].text)"
       ]
     },
     {
@@ -919,7 +919,7 @@
       "source": [
         "import re\n",
         "\n",
-        "re.findall(r'<answer>([\\s\\S]*?)<\\/answer>', result[\"llm\"][\"replies\"][0].content)"
+        "re.findall(r'<answer>([\\s\\S]*?)<\\/answer>', result[\"llm\"][\"replies\"][0].text)"
       ]
     }
   ],

diff --git a/notebooks/vertexai-gemini-examples.ipynb b/notebooks/vertexai-gemini-examples.ipynb
@@ -361,12 +361,12 @@
       "outputs": [],
       "source": [
         "\n",
-        "weather = get_current_weather(**res[\"replies\"][0].content)\n",
+        "weather = get_current_weather(**res[\"replies\"][0].text)\n",
         "\n",
         "messages += res[\"replies\"] + [ChatMessage.from_function(content=weather, name=\"get_current_weather\")]\n",
         "\n",
         "res = gemini_chat.run(messages = messages)\n",
-        "res[\"replies\"][0].content"
+        "res[\"replies\"][0].text"
       ]
     },
     {

diff --git a/notebooks/vllm_inference_engine.ipynb b/notebooks/vllm_inference_engine.ipynb
@@ -267,7 +267,7 @@
         "  messages.append(ChatMessage.from_user(msg))\n",
         "  response = generator.run(messages=messages)\n",
         "  assistant_resp = response['replies'][0]\n",
-        "  print(\"🤖 \"+assistant_resp.content)\n",
+        "  print(\"🤖 \"+assistant_resp.text)\n",
         "  messages.append(assistant_resp)"
       ]
     }