diff --git a/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-completed-gemini-example.jsonl b/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-completed-gemini-example.jsonl
new file mode 100644
index 00000000..3258f8ea
--- /dev/null
+++ b/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-completed-gemini-example.jsonl
@@ -0,0 +1,6 @@
+{"id": 0, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "safety_filter": "none", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-31", "response": "Technology impacts us in profound and multifaceted ways, shaping our lives in every aspect from communication and work to entertainment and healthcare. Here's a breakdown of key impacts:\n\n**Positive Impacts:**\n\n* **Enhanced Communication:** Technology has revolutionized communication. We can connect with people across the globe instantly through video calls, instant messaging, and social media. This fosters stronger relationships, facilitates business, and enables global collaboration.\n* **Increased Efficiency and Productivity:** Technology automates tasks, streamlines processes,", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "MAX_TOKENS"}}
+{"id": 1, "api": "gemini", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "safety_filter": "few", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-33", "response": "**Positive Impacts of Technology**\n\n* **Enhanced Communication:** Social media, messaging apps, and video conferencing facilitate seamless connection and information exchange globally.\n* **Increased Accessibility:** Technology provides equal access to education, healthcare, and information for individuals regardless of location or circumstances.\n* **Improved Productivity:** Automation, artificial intelligence, and data analytics streamline processes, improve efficiency, and reduce time consumption.\n* **Medical Advancements:** Medical devices, surgical robots, and telemedicine enhance patient care, improve", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "MAX_TOKENS"}}
+{"id": 2, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "safety_filter": "some", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-35", "response": ["International trade creates jobs in a multitude of ways, boosting both domestic and global economies. Here's a breakdown of how it works:\n\n**1. Increased Production and Export Jobs:**\n\n* **Specialization and Comparative Advantage:** Countries specialize in producing goods and services where they have a comparative advantage (lower opportunity cost). This leads to increased efficiency and higher production levels.\n* **Export Jobs:**  Producers of these specialized goods and services find new markets abroad, leading to increased demand for their products", "Why did the economist get a job in international trade?\n\nBecause he was tired of being a \"jobless\" economist! \ud83d\ude1c \n"], "safety_attributes": [{"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "MAX_TOKENS"}, {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "2", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}]}
+{"id": 3, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "safety_filter": "default", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-37", "response": "Efforts to preserve Hakka include language schools, cultural festivals, and online resources. \n", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
+{"id": 4, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-39", "response": "TypeError - if api == 'gemini', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'."}
+{"id": 5, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "timestamp_sent": "18-10-2024-09-57-41", "response": "You will be 7 years old next year! \n", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
diff --git a/examples/gemini/data/input/gemini-example.jsonl b/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-input-gemini-example.jsonl
similarity index 100%
rename from examples/gemini/data/input/gemini-example.jsonl
rename to examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-input-gemini-example.jsonl
diff --git a/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-log-gemini-example.txt b/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-log-gemini-example.txt
new file mode 100644
index 00000000..3459ed9a
--- /dev/null
+++ b/examples/gemini/data/output/gemini-example/18-10-2024-09-57-29-log-gemini-example.txt
@@ -0,0 +1,2 @@
+18-10-2024, 09:57: Error (i=5, id=4): TypeError - if api == 'gemini', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.
+18-10-2024, 09:57: Completed experiment: gemini-example.jsonl! Experiment processing time: 12.673 seconds, Average time per query: 2.112 seconds
diff --git a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-completed-gemini-example.jsonl b/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-completed-gemini-example.jsonl
deleted file mode 100644
index 68d780ae..00000000
--- a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-completed-gemini-example.jsonl
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id": 0, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "safety_filter": "none", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": "Technology impacts us in countless ways, both positive and negative. Here's a breakdown of some key areas:\n\n**Positive Impacts:**\n\n* **Enhanced Communication:** Technology has revolutionized how we connect with others. Instant messaging, video calls, and social media platforms allow us to communicate with friends, family, and colleagues across the globe.\n* **Increased Efficiency and Productivity:**  Tools like computers, automation, and artificial intelligence (AI) streamline tasks, increase production, and improve overall efficiency in", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 1, "api": "gemini", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "safety_filter": "few", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": "**Positive Impacts:**\n\n* **Enhanced communication and information access:** Social media, messaging apps, and the internet have facilitated seamless communication, knowledge sharing, and access to vast amounts of information.\n* **Increased productivity and efficiency:** Automation, software tools, and remote work capabilities have enhanced productivity in various industries, saving time and effort.\n* **Improved healthcare:** Medical devices, telemedicine, and wearable health trackers have revolutionized healthcare, allowing for more accessible, personalized, and efficient treatments.\n", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 2, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "safety_filter": "some", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": ["International trade creates jobs in several ways:\n\n**1. Expanding Markets:**\n\n* **Exports:** When a country exports goods or services, it creates demand for those products from other countries. This leads to increased production, which in turn requires more workers to produce and ship those goods. This can be in manufacturing, agriculture, or service sectors.\n* **Imports:** While imports might seem like they take away jobs, they actually stimulate other sectors of the economy. For example, importing cheaper raw materials", "Why did the economist get lost in the forest?\n\nBecause he kept following the path of least resistance, and it led him to a dead end! \n\n(This joke plays on the economic concept of \"following the path of least resistance\", which can be applied to trade and globalization.) \n"], "safety_attributes": [{"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}, {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}]}
-{"id": 3, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "safety_filter": "default", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": "Efforts to preserve Hakka include:\n\n* **Language schools and classes:**  Offering instruction to children and adults.\n* **Cultural events:**  Promoting Hakka music, dance, and literature.\n* **Media:**  Radio stations, online platforms, and publications in Hakka.\n* **Community initiatives:**  Encouraging use of Hakka within families and gatherings. \n", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 4, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": "TypeError - if api == 'gemini', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'."}
-{"id": 5, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}, "response": "You will be 7 years old next year! \n", "safety_attributes": {"HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
diff --git a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-input-gemini-example.jsonl b/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-input-gemini-example.jsonl
deleted file mode 100644
index a8c913a6..00000000
--- a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-input-gemini-example.jsonl
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id": 0, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "safety_filter": "none", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
-{"id": 1, "api": "gemini", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "safety_filter": "few", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
-{"id": 2, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "safety_filter": "some", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
-{"id": 3, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "safety_filter": "default", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
-{"id": 4, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
-{"id": 5, "api": "gemini", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "safety_filter": "most", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
diff --git a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-log-gemini-example.txt b/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-log-gemini-example.txt
deleted file mode 100644
index d6171cda..00000000
--- a/examples/gemini/data/output/gemini-example/25-06-2024-20-17-17-log-gemini-example.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-25-06-2024, 20:21: Error (i=5) [id=4]. TypeError - if api == 'gemini', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.
-25-06-2024, 20:21: Completed experiment gemini-example.jsonl! Experiment processing time: 13.046 seconds, Average time per query: 2.174 seconds
diff --git a/examples/gemini/gemini.ipynb b/examples/gemini/gemini.ipynb
index 2d3d1397..a1d5ef70 100644
--- a/examples/gemini/gemini.ipynb
+++ b/examples/gemini/gemini.ipynb
@@ -289,15 +289,8 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Sending 6 queries  (attempt 1/3):   0%|          | 0/6 [00:00<?, ?query/s]"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "Sending 6 queries  (attempt 1/3): 100%|██████████| 6/6 [00:12<00:00,  2.00s/query]\n",
-      "Waiting for responses  (attempt 1/3): 100%|██████████| 6/6 [00:01<00:00,  5.94query/s]\n"
+      "Sending 6 queries at 30 QPM with RI of 2.0s (attempt 1/3): 100%|██████████| 6/6 [00:12<00:00,  2.00s/query]\n",
+      "Waiting for responses (attempt 1/3): 100%|██████████| 6/6 [00:00<00:00, 10.17query/s]\n"
      ]
     }
    ],
@@ -316,7 +309,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -330,13 +323,14 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
-       "  'response': \"Technology impacts us in countless ways, both positive and negative. Here's a breakdown of some key areas:\\n\\n**Positive Impacts:**\\n\\n* **Enhanced Communication:** Technology has revolutionized how we connect with others. Instant messaging, video calls, and social media platforms allow us to communicate with friends, family, and colleagues across the globe.\\n* **Increased Efficiency and Productivity:**  Tools like computers, automation, and artificial intelligence (AI) streamline tasks, increase production, and improve overall efficiency in\",\n",
+       "  'timestamp_sent': '18-10-2024-09-57-31',\n",
+       "  'response': \"Technology impacts us in profound and multifaceted ways, shaping our lives in every aspect from communication and work to entertainment and healthcare. Here's a breakdown of key impacts:\\n\\n**Positive Impacts:**\\n\\n* **Enhanced Communication:** Technology has revolutionized communication. We can connect with people across the globe instantly through video calls, instant messaging, and social media. This fosters stronger relationships, facilitates business, and enables global collaboration.\\n* **Increased Efficiency and Productivity:** Technology automates tasks, streamlines processes,\",\n",
        "  'safety_attributes': {'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "   'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
        "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "   'blocked': '[False, False, False, False]',\n",
-       "   'finish_reason': 'STOP'}},\n",
+       "   'finish_reason': 'MAX_TOKENS'}},\n",
        " {'id': 1,\n",
        "  'api': 'gemini',\n",
        "  'model_name': 'gemini-1.0-pro',\n",
@@ -345,13 +339,14 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
-       "  'response': '**Positive Impacts:**\\n\\n* **Enhanced communication and information access:** Social media, messaging apps, and the internet have facilitated seamless communication, knowledge sharing, and access to vast amounts of information.\\n* **Increased productivity and efficiency:** Automation, software tools, and remote work capabilities have enhanced productivity in various industries, saving time and effort.\\n* **Improved healthcare:** Medical devices, telemedicine, and wearable health trackers have revolutionized healthcare, allowing for more accessible, personalized, and efficient treatments.\\n',\n",
+       "  'timestamp_sent': '18-10-2024-09-57-33',\n",
+       "  'response': '**Positive Impacts of Technology**\\n\\n* **Enhanced Communication:** Social media, messaging apps, and video conferencing facilitate seamless connection and information exchange globally.\\n* **Increased Accessibility:** Technology provides equal access to education, healthcare, and information for individuals regardless of location or circumstances.\\n* **Improved Productivity:** Automation, artificial intelligence, and data analytics streamline processes, improve efficiency, and reduce time consumption.\\n* **Medical Advancements:** Medical devices, surgical robots, and telemedicine enhance patient care, improve',\n",
        "  'safety_attributes': {'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "   'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
        "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "   'blocked': '[False, False, False, False]',\n",
-       "   'finish_reason': 'STOP'}},\n",
+       "   'finish_reason': 'MAX_TOKENS'}},\n",
        " {'id': 2,\n",
        "  'api': 'gemini',\n",
        "  'model_name': 'gemini-1.5-flash',\n",
@@ -361,17 +356,18 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
-       "  'response': ['International trade creates jobs in several ways:\\n\\n**1. Expanding Markets:**\\n\\n* **Exports:** When a country exports goods or services, it creates demand for those products from other countries. This leads to increased production, which in turn requires more workers to produce and ship those goods. This can be in manufacturing, agriculture, or service sectors.\\n* **Imports:** While imports might seem like they take away jobs, they actually stimulate other sectors of the economy. For example, importing cheaper raw materials',\n",
-       "   'Why did the economist get lost in the forest?\\n\\nBecause he kept following the path of least resistance, and it led him to a dead end! \\n\\n(This joke plays on the economic concept of \"following the path of least resistance\", which can be applied to trade and globalization.) \\n'],\n",
+       "  'timestamp_sent': '18-10-2024-09-57-35',\n",
+       "  'response': [\"International trade creates jobs in a multitude of ways, boosting both domestic and global economies. Here's a breakdown of how it works:\\n\\n**1. Increased Production and Export Jobs:**\\n\\n* **Specialization and Comparative Advantage:** Countries specialize in producing goods and services where they have a comparative advantage (lower opportunity cost). This leads to increased efficiency and higher production levels.\\n* **Export Jobs:**  Producers of these specialized goods and services find new markets abroad, leading to increased demand for their products\",\n",
+       "   'Why did the economist get a job in international trade?\\n\\nBecause he was tired of being a \"jobless\" economist! 😜 \\n'],\n",
        "  'safety_attributes': [{'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "    'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "    'HARM_CATEGORY_HARASSMENT': '1',\n",
        "    'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "    'blocked': '[False, False, False, False]',\n",
-       "    'finish_reason': 'STOP'},\n",
+       "    'finish_reason': 'MAX_TOKENS'},\n",
        "   {'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "    'HARM_CATEGORY_HATE_SPEECH': '1',\n",
-       "    'HARM_CATEGORY_HARASSMENT': '1',\n",
+       "    'HARM_CATEGORY_HARASSMENT': '2',\n",
        "    'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "    'blocked': '[False, False, False, False]',\n",
        "    'finish_reason': 'STOP'}]},\n",
@@ -386,7 +382,8 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
-       "  'response': 'Efforts to preserve Hakka include:\\n\\n* **Language schools and classes:**  Offering instruction to children and adults.\\n* **Cultural events:**  Promoting Hakka music, dance, and literature.\\n* **Media:**  Radio stations, online platforms, and publications in Hakka.\\n* **Community initiatives:**  Encouraging use of Hakka within families and gatherings. \\n',\n",
+       "  'timestamp_sent': '18-10-2024-09-57-37',\n",
+       "  'response': 'Efforts to preserve Hakka include language schools, cultural festivals, and online resources. \\n',\n",
        "  'safety_attributes': {'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "   'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
@@ -404,6 +401,7 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
+       "  'timestamp_sent': '18-10-2024-09-57-39',\n",
        "  'response': \"TypeError - if api == 'gemini', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.\"},\n",
        " {'id': 5,\n",
        "  'api': 'gemini',\n",
@@ -417,6 +415,7 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 100},\n",
+       "  'timestamp_sent': '18-10-2024-09-57-41',\n",
        "  'response': 'You will be 7 years old next year! \\n',\n",
        "  'safety_attributes': {'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "   'HARM_CATEGORY_HATE_SPEECH': '1',\n",
@@ -426,7 +425,7 @@
        "   'finish_reason': 'STOP'}}]"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -457,7 +456,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "prompto",
    "language": "python",
    "name": "python3"
   },
diff --git a/examples/vertexai/data/input/vertexai-example.jsonl b/examples/vertexai/data/input/vertexai-example.jsonl
index 19b006f4..bc534164 100644
--- a/examples/vertexai/data/input/vertexai-example.jsonl
+++ b/examples/vertexai/data/input/vertexai-example.jsonl
@@ -1,6 +1,6 @@
-{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
diff --git a/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-completed-vertexai-example.jsonl b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-completed-vertexai-example.jsonl
new file mode 100755
index 00000000..4cb13c06
--- /dev/null
+++ b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-completed-vertexai-example.jsonl
@@ -0,0 +1,6 @@
+{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-24", "response": "Technology's impact on us is profound and multifaceted, affecting nearly every aspect of our lives.  Here's a breakdown of some key areas:\n\n**Positive Impacts:**\n\n* **Improved Communication:**  Instant communication across vast distances through email, messaging apps, video calls, and social media connects people globally.\n* **Increased Efficiency and Productivity:** Automation, software, and tools streamline tasks in various fields, boosting productivity in work and daily life.\n* **Access to Information:** The internet provides unparalleled access to information, education, and diverse perspectives, empowering individuals and fostering learning.\n* **Advancements in Healthcare:** Medical technology leads to earlier diagnosis, better treatments, minimally invasive surgeries, and improved overall healthcare outcomes.\n* **Economic Growth:** Technological innovation drives economic growth by creating new industries, jobs, and opportunities.\n* **Enhanced Entertainment and Leisure:** Streaming services, gaming, virtual reality, and other technologies offer diverse and engaging entertainment options.\n* **Accessibility for People with Disabilities:** Assistive technologies enhance the lives of individuals with disabilities, providing greater independence and participation.\n* **Environmental Monitoring and Conservation:** Technology helps monitor environmental conditions, track pollution, and develop sustainable solutions.\n\n\n**Negative Impacts:**\n\n* **Job Displacement:** Automation can lead to job losses in certain sectors, requiring workforce retraining and adaptation.\n* **Privacy Concerns:** Data collection and surveillance technologies raise concerns about privacy violation and potential misuse of personal information.\n* **Digital Divide:** Unequal access to technology creates a digital divide, exacerbating existing social and economic inequalities.\n* **Mental Health Issues:** Excessive social media use, cyberbullying, and online harassment can negatively impact mental health and wellbeing.\n* **Spread of Misinformation:** The rapid spread of misinformation and fake news online poses a threat to informed decision-making and social cohesion.\n* **Addiction and Dependence:** Technology can be addictive, leading to dependence and negative consequences for physical and mental health.\n* **Security Risks:** Cyberattacks, data breaches, and online fraud pose significant security risks to individuals and organizations.\n* **Environmental Impact:** The manufacturing and disposal of electronic devices contribute to pollution and resource depletion.\n\n\n**Overall:**\n\nTechnology's impact is neither inherently good nor bad. It's a powerful tool that can be used for positive or negative purposes.  Its effects depend on how we choose to develop, implement, and regulate it.  A responsible approach to technology development and usage, focusing on ethical considerations, inclusivity, and sustainability, is crucial to maximizing its benefits and mitigating its risks.\n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
+{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-30", "response": "Efforts to preserve Hakka include language classes, media production (songs, films), online communities, and integrating Hakka into education.\n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
+{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-32", "response": "TypeError - if api == 'vertexai', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'."}
+{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-28", "response": ["International trade creates jobs in several ways, both directly and indirectly:\n\n**Direct Job Creation:**\n\n* **Export-oriented industries:**  Companies that produce goods or services for export directly hire workers in manufacturing, agriculture, technology, and services (e.g., logistics, marketing, design).  The demand for these goods and services from foreign markets fuels job creation within these sectors.  Think of a clothing manufacturer exporting to Europe, creating jobs for tailors, designers, and shipping personnel.\n* **Import-competing industries:** While often framed negatively, some domestic industries that compete with imports also create jobs.  These industries may adapt and innovate to remain competitive, leading to jobs in research and development, improved efficiency, and specialized production.  A domestic car manufacturer, facing competition from imports, might invest in creating more fuel-efficient vehicles, thus creating engineering and manufacturing jobs.\n* **Trade-related services:**  Many jobs are created in support of international trade. This includes transportation (shipping, trucking, air freight), logistics (warehousing, customs brokerage), finance (international banking, currency exchange), and legal services (international trade law).\n\n\n**Indirect Job Creation:**\n\n* **Increased productivity and efficiency:**  Trade allows countries to specialize in producing goods and services where they have a comparative advantage. This leads to increased productivity and efficiency, creating more output with the same or fewer inputs.  This freed-up labor and capital can then be used to create jobs in other sectors.  For instance, if a country becomes more efficient at producing agricultural goods due to international trade, it frees up workers to pursue jobs in manufacturing or technology.\n* **Lower input costs:** Access to cheaper raw materials, intermediate goods, and components from other countries lowers production costs for domestic firms.  This allows them to be more competitive, expand production, and hire more workers.  A furniture maker, for example, might use cheaper imported wood to lower its costs and expand its workforce.\n* **Increased consumer spending:** Cheaper imports increase consumer purchasing power. This increased demand stimulates economic activity, leading to more jobs in various sectors, from retail to entertainment.  If consumers have more money to spend due to cheaper imports, they might spend it on domestic services, creating jobs in the restaurant or tourism industries.\n* **Foreign direct investment (FDI):**  International trade attracts FDI, as foreign companies invest in establishing operations in countries with access to resources, markets, or skilled labor. This investment creates jobs directly through the establishment of new factories or offices and indirectly through supporting businesses.\n\n\n**However, it's important to note:**\n\n* **Job displacement:**  International trade can also lead to job losses in industries that struggle to compete with imports. This is often a concern that requires retraining and adjustment programs to help displaced workers transition to new jobs.\n* **Wage stagnation:**  Increased competition from low-wage countries can put downward pressure on wages in some sectors, especially for less-skilled workers.\n* **Uneven distribution of benefits:**  The benefits of international trade are not always evenly distributed, with some regions or sectors benefiting more than others.\n\nIn conclusion, while international trade can lead to job displacement in certain sectors, it generally creates more jobs than it destroys, especially when considering both direct and indirect effects.  The overall impact on employment depends on a variety of factors, including government policies, the structure of the economy, and the adaptability of the workforce.\n", "Why did the economist get fired from his job at the import/export company?  Because he kept saying, \"It's a comparative advantage... it's a comparative advantage...\" while laying off half the workforce!\n"], "safety_attributes": [{"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}, {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}]}
+{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-26", "response": "## Technology's Impact on Humans\n\nTechnology has significantly impacted human lives in countless ways, shaping our society, culture, and individual experiences. Here's a brief overview of its impact on various aspects:\n\n**Positive Impacts:**\n\n* **Communication:** Technology has revolutionized communication, allowing us to connect with people across the globe instantly. From email and social media to video conferencing and messaging apps, staying in touch has never been easier.\n* **Information Access:** The internet provides access to a vast pool of information, enabling us to research, learn, and stay informed about various topics. Search engines, online libraries, and educational platforms empower individuals with knowledge and understanding.\n* **Healthcare:** Medical technology has made significant advancements, improving diagnoses, treatment options, and overall healthcare outcomes. From advanced imaging techniques to telemedicine and robotic surgery, technology is saving lives and enhancing the quality of life.\n* **Productivity:** Technology has automated many tasks, increasing efficiency and productivity across various industries. From manufacturing and agriculture to finance and healthcare, automation has streamlined processes, saving time and resources.\n* **Entertainment:** Technology offers endless entertainment options, from streaming services and video games to virtual reality experiences. It provides leisure and enjoyment for people of all ages and interests.\n* **Education:** Technology has transformed education, enabling access to online learning platforms, interactive tools, and personalized learning experiences. It empowers individuals to learn at their own pace and access resources beyond the classroom.\n\n**Negative Impacts:**\n\n* **Privacy Concerns:** With the increasing use of technology, concerns about data privacy and security are rising. Social media platforms, online tracking, and government surveillance raise questions about personal information and how it's used.\n* **Social Isolation:** While technology helps connect people, excessive use can lead to social isolation and loneliness. Social media interactions often lack the depth of face-to-face communication, and individuals may become disconnected from their communities.\n* **Cybersecurity Threats:** As technology advances, so do cyber threats. Hacking, malware, and data breaches pose significant risks to individuals and organizations, highlighting the need for strong cybersecurity measures.\n* **Addiction and Mental Health:** Technology addiction can negatively impact mental health, leading to anxiety, depression, and sleep disturbances. The constant stimulation and comparison-driven culture of social media can be detrimental to well-being.\n* **Environmental Impact:** The production and disposal of electronic devices contribute to environmental pollution and resource depletion. E-waste and energy consumption raise concerns about the sustainability of technological advancements.\n\n**Conclusion:**\n\nTechnology has a profound impact on human society, offering both benefits and challenges. Its impact is multifaceted, affecting how we communicate, learn, work, entertain ourselves, and interact with the world around us. It's crucial to understand both the positive and negative aspects of technology and utilize it responsibly to maximize its benefits while minimizing its potential harms.\n\n**Additionally:**\n\n* Technology has a significant impact on the economy, creating new jobs, industries, and economic opportunities. However, it also poses challenges, such as job displacement and the need for workforce reskilling.\n* Technology has also influenced political landscapes, enabling citizen engagement, information dissemination, and political activism. It raises concerns about privacy, censorship, and the spread of misinformation.\n\nIt's important to consider the ethical implications of technological advancements and ensure they align with human values and societal well-being. \n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
+{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "timestamp_sent": "18-10-2024-10-58-36", "response": "You will be 7 years old next year.\n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
diff --git a/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-input-vertexai-example.jsonl b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-input-vertexai-example.jsonl
new file mode 100644
index 00000000..bc534164
--- /dev/null
+++ b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-input-vertexai-example.jsonl
@@ -0,0 +1,6 @@
+{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro-002", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
+{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash-002", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
diff --git a/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-log-vertexai-example.txt b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-log-vertexai-example.txt
new file mode 100644
index 00000000..2d1f58b2
--- /dev/null
+++ b/examples/vertexai/data/output/vertexai-example/18-10-2024-10-58-17-log-vertexai-example.txt
@@ -0,0 +1,2 @@
+18-10-2024, 10:58: Error (i=5, id=4): TypeError - if api == 'vertexai', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.
+18-10-2024, 10:58: Completed experiment: vertexai-example.jsonl! Experiment processing time: 15.755 seconds, Average time per query: 2.626 seconds
diff --git a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-completed-vertexai-example.jsonl b/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-completed-vertexai-example.jsonl
deleted file mode 100644
index e7de9ee3..00000000
--- a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-completed-vertexai-example.jsonl
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": "Technology impacts us in **profound and multifaceted ways**, shaping our lives in both positive and negative ways. Here's a breakdown:\n\n**Positive Impacts:**\n\n* **Increased Efficiency and Productivity:** Technology automates tasks, allowing us to do more in less time. This applies to everything from simple things like online shopping to complex tasks like medical diagnoses.\n* **Enhanced Communication and Connectivity:** We can connect with people around the world instantly, fostering collaboration, learning, and global understanding. \n* **Access to Information:** The internet provides vast amounts of information, enabling education, research, and personal growth.\n* **Improved Healthcare:** Technology allows for early diagnosis, personalized treatment, and advanced medical procedures, improving overall health and longevity.\n* **Economic Growth and Innovation:** New technologies create jobs, drive innovation, and lead to economic progress.\n* **Entertainment and Recreation:** Technology offers various forms of entertainment, from streaming services to video games, enriching our leisure time.\n\n**Negative Impacts:**\n\n* **Job Displacement:** Automation and AI can replace human jobs, leading to unemployment and economic inequality.\n* **Privacy Concerns:** Data collection and surveillance raise concerns about privacy and security.\n* **Social Isolation:** Excessive technology use can lead to isolation and decreased social interaction.\n* **Digital Divide:** Unequal access to technology can exacerbate existing social inequalities.\n* **Cybersecurity Threats:** Hackers and cyberattacks pose risks to individuals and institutions.\n* **Environmental Impact:** Manufacturing and using technology can contribute to pollution and resource depletion.\n\n**Beyond the Dichotomy:**\n\n* **Ethical Implications:** Technology raises ethical questions about responsibility, bias, and the impact of artificial intelligence on society.\n* **Social and Cultural Change:** Technology influences social norms, values, and cultural expressions.\n\n**Ultimately, the impact of technology is complex and dynamic. It is crucial to:**\n\n* **Promote responsible technology development and use:** By prioritizing ethical considerations, privacy protection, and sustainable practices.\n* **Embrace the benefits while mitigating the risks:** By adapting to technological advancements, fostering digital literacy, and addressing inequalities.\n* **Continuously engage in dialogue and debate:** To shape the future of technology and ensure it serves the needs and values of humanity.\n\nThe impact of technology is ever-evolving, and understanding its nuances is crucial for navigating our increasingly technological world. \n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": "Efforts include language immersion schools, online resources, cultural events, and government support. \n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": "## The impact of technology on our lives: A double-edged sword\n\nTechnology has become an undeniable cornerstone of our lives, shaping nearly every aspect of our existence. Its impact can be observed across various domains, bringing both advantages and disadvantages that deserve careful consideration.\n\n**Positive Impacts:**\n\n* **Communication and Connection:** Technology has revolutionized how we connect with others. From instant messaging to video conferencing, we can now communicate with individuals across the globe in real-time, fostering stronger relationships and bridging geographical barriers.\n* **Access to Information:** The internet has become a vast repository of knowledge, providing instant access to information on virtually any topic imaginable. This empowers individuals to learn, research, and stay informed on various subjects, expanding their horizons and fuelling intellectual growth.\n* **Efficiency and Convenience:** Technology has streamlined numerous tasks, making our lives easier and more efficient. Automation, online shopping, and mobile banking are just a few examples of how technology has simplified daily routines, freeing up time for leisure and other pursuits.\n* **Innovation and Progress:** Technological advancements have driven innovation in various fields, leading to breakthroughs in medicine, science, and engineering. These advancements have improved our quality of life, offering solutions to global challenges and propelling human progress.\n\n**Negative Impacts:**\n\n* **Privacy Concerns:** The widespread use of technology has raised concerns about data privacy and security. Our online activities are constantly tracked and monitored, raising questions about who has access to our information and how it is being used.\n* **Social Isolation:** While technology has connected us in some ways, it can also contribute to social isolation. Excessive screen time can lead to reduced face-to-face interactions and weakened social bonds, potentially impacting mental health and well-being.\n* **Job displacement:** Automation and technological advancements have led to job displacement in various sectors. While new job opportunities may emerge, the transition can be challenging for individuals whose skills become obsolete.\n* **Information Overload:** The sheer volume of information available online can be overwhelming, leading to information overload and difficulty discerning credible sources from misinformation. This can hinder critical thinking and informed decision-making.\n\n**Moving Forward:**\n\nTechnology is a powerful tool that can be harnessed for good or ill. By acknowledging both its positive and negative impacts, we can strive to use it responsibly and ethically, maximizing its benefits while mitigating its potential downsides. Striking a balance between embracing technological advancements and preserving human values is crucial to ensure a future where technology serves as a force for progress and well-being. \n\nIt's important to remember that technology is constantly evolving, and its impact on our lives will continue to change over time. Therefore, ongoing dialogue and critical reflection are essential to ensure that we use technology in a way that benefits humanity as a whole.", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
-{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": "TypeError - if api == 'vertexai', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'."}
-{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": ["International trade creates jobs through a variety of mechanisms:\n\n**1. Increased Demand for Exports:**\n\n* **Production:**  When a country exports goods or services, it needs to produce more of those items to meet the increased demand. This leads to more jobs in manufacturing, agriculture, or the service sector, depending on the type of export. \n* **Transportation and Logistics:** Moving goods internationally requires transportation services (shipping, air freight, trucking), warehousing, and logistics companies, all of which create jobs.\n* **Supporting Industries:**  Exports often stimulate demand for related industries, such as packaging, materials suppliers, and financial services, further boosting employment.\n\n**2. Access to Lower-Cost Inputs:**\n\n* **Imports:** Importing raw materials or intermediate goods from countries with lower production costs can make domestic production cheaper. This allows companies to lower prices, sell more, and potentially hire more workers.\n* **Efficiency:** Access to a wider range of imported goods and services allows businesses to operate more efficiently, reducing costs and potentially creating more jobs.\n\n**3. Specialization and Comparative Advantage:**\n\n* **Focus on Strengths:** International trade allows countries to specialize in producing goods and services where they have a comparative advantage (i.e., where they are relatively more efficient). This leads to greater productivity and potential for economic growth, which translates into more jobs.\n* **Increased Efficiency:** Specializing in certain industries leads to economies of scale, meaning companies can produce more goods at lower costs, potentially leading to more jobs.\n\n**4. Foreign Investment:**\n\n* **Direct Investment:**  International trade often attracts foreign direct investment (FDI), where companies from other countries invest in domestic businesses, creating new jobs and boosting economic growth.\n* **Portfolio Investment:**  International trade can lead to increased portfolio investment, where foreign investors buy stocks and bonds in domestic companies, providing capital that can be used for investment and job creation.\n\n**5. Innovation and Technology:**\n\n* **Competition:**  International trade exposes domestic companies to global competition, forcing them to innovate and improve their products and services. This often leads to technological advancements and increased productivity, creating jobs in research and development, and high-tech industries.\n\n**6. Tourism:**\n\n* **Travel and Hospitality:**  International trade can lead to increased tourism, creating jobs in the travel, hospitality, and leisure industries.\n\n**It's important to note that:**\n\n* **Job displacement:**  While international trade creates jobs, it can also lead to job displacement in some sectors, particularly those that are not competitive on a global scale. \n* **Wage inequality:**  The benefits of international trade may not be evenly distributed, and some workers may experience wage stagnation or even decline.\n* **Policy considerations:** Governments play a crucial role in managing the impact of international trade, through policies such as trade agreements, investment incentives, and worker retraining programs, to ensure that the benefits are shared broadly.\n\nOverall, international trade can be a powerful engine for job creation, but its effects are complex and can vary depending on a country's specific circumstances and policies.\n", "Why did the economist refuse to buy a new car? \n\nBecause he knew it would lead to job losses in the horse-drawn carriage industry! \n \n(This joke highlights the potential for job displacement in some sectors due to international trade and technological advancements.) \n"], "safety_attributes": [{"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}, {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}]}
-{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}, "response": "You will be 7 years old next year. \n", "safety_attributes": {"HARM_CATEGORY_HATE_SPEECH": "1", "HARM_CATEGORY_DANGEROUS_CONTENT": "1", "HARM_CATEGORY_HARASSMENT": "1", "HARM_CATEGORY_SEXUALLY_EXPLICIT": "1", "blocked": "[False, False, False, False]", "finish_reason": "STOP"}}
diff --git a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-input-vertexai-example.jsonl b/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-input-vertexai-example.jsonl
deleted file mode 100644
index 19b006f4..00000000
--- a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-input-vertexai-example.jsonl
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id": 0, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 1, "api": "vertexai", "model_name": "gemini-1.0-pro", "prompt": "How does technology impact us?", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 2, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": ["How does international trade create jobs?", "I want a joke about that"], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 3, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 4, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "user", "parts": "What efforts are being made to keep the hakka language alive?"}, {"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
-{"id": 5, "api": "vertexai", "model_name": "gemini-1.5-flash", "prompt": [{"role": "system", "parts": "You are a helpful assistant designed to answer questions briefly."}, {"role": "user", "parts": "Hello, I'm Bob and I'm 6 years old"}, {"role": "model", "parts": "Hi Bob, how may I assist you?"}, {"role": "user", "parts": "How old will I be next year?"}], "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 1000}}
diff --git a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-log-vertexai-example.txt b/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-log-vertexai-example.txt
deleted file mode 100644
index b8458818..00000000
--- a/examples/vertexai/data/output/vertexai-example/26-06-2024-10-57-06-log-vertexai-example.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-26-06-2024, 10:57: Error (i=5) [id=4]. TypeError - if api == 'vertexai', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.
-26-06-2024, 10:57: Completed experiment vertexai-example.jsonl! Experiment processing time: 12.536 seconds, Average time per query: 2.089 seconds
diff --git a/examples/vertexai/vertexai.ipynb b/examples/vertexai/vertexai.ipynb
index 9c53562f..5cccf13c 100644
--- a/examples/vertexai/vertexai.ipynb
+++ b/examples/vertexai/vertexai.ipynb
@@ -96,7 +96,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Note that when using Vertex AI, you can actually (say something about using the CLI to get IAM permissions rather than using these environment variables). They technically could be ignored and so they are actually optional)"
+    "Note that when using Vertex AI, you can actually set the default project and location using the `gcloud` CLI."
    ]
   },
   {
@@ -195,21 +195,21 @@
       "text/plain": [
        "[{'id': 0,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': 'How does technology impact us?',\n",
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000}},\n",
        " {'id': 1,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.0-pro',\n",
+       "  'model_name': 'gemini-1.0-pro-002',\n",
        "  'prompt': 'How does technology impact us?',\n",
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000}},\n",
        " {'id': 2,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': ['How does international trade create jobs?',\n",
        "   'I want a joke about that'],\n",
        "  'parameters': {'candidate_count': 1,\n",
@@ -217,7 +217,7 @@
        "   'max_output_tokens': 1000}},\n",
        " {'id': 3,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'system',\n",
        "    'parts': 'You are a helpful assistant designed to answer questions briefly.'},\n",
        "   {'role': 'user',\n",
@@ -227,7 +227,7 @@
        "   'max_output_tokens': 1000}},\n",
        " {'id': 4,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'user',\n",
        "    'parts': 'What efforts are being made to keep the hakka language alive?'},\n",
        "   {'role': 'system',\n",
@@ -237,7 +237,7 @@
        "   'max_output_tokens': 1000}},\n",
        " {'id': 5,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'system',\n",
        "    'parts': 'You are a helpful assistant designed to answer questions briefly.'},\n",
        "   {'role': 'user', 'parts': \"Hello, I'm Bob and I'm 6 years old\"},\n",
@@ -275,7 +275,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Safety filters with Vertex AI Gemini API\n",
+    "## Safety filters with VertexAI API\n",
     "\n",
     "With the Gemini API, it is possible to configure the safety filters (see the [safety settings docs](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/configure-safety-attributes)). We can set the `\"safety_filter\"` key in the prompt dict where the options are:\n",
     "- `\"none\"`: corresponds to \"Block none\" or `BLOCK_NONE`\n",
@@ -304,10 +304,8 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Sending 6 queries  (attempt 1/3):  17%|█▋        | 1/6 [00:02<00:10,  2.00s/query]/opt/anaconda3/envs/prompto/lib/python3.11/site-packages/google/auth/_default.py:76: UserWarning: Your application has authenticated using end user credentials from Google Cloud SDK without a quota project. You might receive a \"quota exceeded\" or \"API not enabled\" error. See the following page for troubleshooting: https://cloud.google.com/docs/authentication/adc-troubleshooting/user-creds. \n",
-      "  warnings.warn(_CLOUD_SDK_CREDENTIALS_WARNING)\n",
-      "Sending 6 queries  (attempt 1/3): 100%|██████████| 6/6 [00:12<00:00,  2.00s/query]\n",
-      "Waiting for responses  (attempt 1/3): 100%|██████████| 6/6 [00:00<00:00, 12.11query/s]\n"
+      "Sending 6 queries at 30 QPM with RI of 2.0s (attempt 1/3): 100%|██████████| 6/6 [00:14<00:00,  2.48s/query]\n",
+      "Waiting for responses (attempt 1/3): 100%|██████████| 6/6 [00:00<00:00,  7.46query/s]\n"
      ]
     }
    ],
@@ -334,12 +332,13 @@
       "text/plain": [
        "[{'id': 0,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': 'How does technology impact us?',\n",
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000},\n",
-       "  'response': \"Technology impacts us in **profound and multifaceted ways**, shaping our lives in both positive and negative ways. Here's a breakdown:\\n\\n**Positive Impacts:**\\n\\n* **Increased Efficiency and Productivity:** Technology automates tasks, allowing us to do more in less time. This applies to everything from simple things like online shopping to complex tasks like medical diagnoses.\\n* **Enhanced Communication and Connectivity:** We can connect with people around the world instantly, fostering collaboration, learning, and global understanding. \\n* **Access to Information:** The internet provides vast amounts of information, enabling education, research, and personal growth.\\n* **Improved Healthcare:** Technology allows for early diagnosis, personalized treatment, and advanced medical procedures, improving overall health and longevity.\\n* **Economic Growth and Innovation:** New technologies create jobs, drive innovation, and lead to economic progress.\\n* **Entertainment and Recreation:** Technology offers various forms of entertainment, from streaming services to video games, enriching our leisure time.\\n\\n**Negative Impacts:**\\n\\n* **Job Displacement:** Automation and AI can replace human jobs, leading to unemployment and economic inequality.\\n* **Privacy Concerns:** Data collection and surveillance raise concerns about privacy and security.\\n* **Social Isolation:** Excessive technology use can lead to isolation and decreased social interaction.\\n* **Digital Divide:** Unequal access to technology can exacerbate existing social inequalities.\\n* **Cybersecurity Threats:** Hackers and cyberattacks pose risks to individuals and institutions.\\n* **Environmental Impact:** Manufacturing and using technology can contribute to pollution and resource depletion.\\n\\n**Beyond the Dichotomy:**\\n\\n* **Ethical Implications:** Technology raises ethical questions about responsibility, bias, and the impact of artificial intelligence on society.\\n* **Social and Cultural Change:** Technology influences social norms, values, and cultural expressions.\\n\\n**Ultimately, the impact of technology is complex and dynamic. It is crucial to:**\\n\\n* **Promote responsible technology development and use:** By prioritizing ethical considerations, privacy protection, and sustainable practices.\\n* **Embrace the benefits while mitigating the risks:** By adapting to technological advancements, fostering digital literacy, and addressing inequalities.\\n* **Continuously engage in dialogue and debate:** To shape the future of technology and ensure it serves the needs and values of humanity.\\n\\nThe impact of technology is ever-evolving, and understanding its nuances is crucial for navigating our increasingly technological world. \\n\",\n",
+       "  'timestamp_sent': '18-10-2024-10-58-24',\n",
+       "  'response': \"Technology's impact on us is profound and multifaceted, affecting nearly every aspect of our lives.  Here's a breakdown of some key areas:\\n\\n**Positive Impacts:**\\n\\n* **Improved Communication:**  Instant communication across vast distances through email, messaging apps, video calls, and social media connects people globally.\\n* **Increased Efficiency and Productivity:** Automation, software, and tools streamline tasks in various fields, boosting productivity in work and daily life.\\n* **Access to Information:** The internet provides unparalleled access to information, education, and diverse perspectives, empowering individuals and fostering learning.\\n* **Advancements in Healthcare:** Medical technology leads to earlier diagnosis, better treatments, minimally invasive surgeries, and improved overall healthcare outcomes.\\n* **Economic Growth:** Technological innovation drives economic growth by creating new industries, jobs, and opportunities.\\n* **Enhanced Entertainment and Leisure:** Streaming services, gaming, virtual reality, and other technologies offer diverse and engaging entertainment options.\\n* **Accessibility for People with Disabilities:** Assistive technologies enhance the lives of individuals with disabilities, providing greater independence and participation.\\n* **Environmental Monitoring and Conservation:** Technology helps monitor environmental conditions, track pollution, and develop sustainable solutions.\\n\\n\\n**Negative Impacts:**\\n\\n* **Job Displacement:** Automation can lead to job losses in certain sectors, requiring workforce retraining and adaptation.\\n* **Privacy Concerns:** Data collection and surveillance technologies raise concerns about privacy violation and potential misuse of personal information.\\n* **Digital Divide:** Unequal access to technology creates a digital divide, exacerbating existing social and economic inequalities.\\n* **Mental Health Issues:** Excessive social media use, cyberbullying, and online harassment can negatively impact mental health and wellbeing.\\n* **Spread of Misinformation:** The rapid spread of misinformation and fake news online poses a threat to informed decision-making and social cohesion.\\n* **Addiction and Dependence:** Technology can be addictive, leading to dependence and negative consequences for physical and mental health.\\n* **Security Risks:** Cyberattacks, data breaches, and online fraud pose significant security risks to individuals and organizations.\\n* **Environmental Impact:** The manufacturing and disposal of electronic devices contribute to pollution and resource depletion.\\n\\n\\n**Overall:**\\n\\nTechnology's impact is neither inherently good nor bad. It's a powerful tool that can be used for positive or negative purposes.  Its effects depend on how we choose to develop, implement, and regulate it.  A responsible approach to technology development and usage, focusing on ethical considerations, inclusivity, and sustainability, is crucial to maximizing its benefits and mitigating its risks.\\n\",\n",
        "  'safety_attributes': {'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
@@ -348,7 +347,7 @@
        "   'finish_reason': 'STOP'}},\n",
        " {'id': 3,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'system',\n",
        "    'parts': 'You are a helpful assistant designed to answer questions briefly.'},\n",
        "   {'role': 'user',\n",
@@ -356,21 +355,8 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000},\n",
-       "  'response': 'Efforts include language immersion schools, online resources, cultural events, and government support. \\n',\n",
-       "  'safety_attributes': {'HARM_CATEGORY_HATE_SPEECH': '1',\n",
-       "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
-       "   'HARM_CATEGORY_HARASSMENT': '1',\n",
-       "   'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
-       "   'blocked': '[False, False, False, False]',\n",
-       "   'finish_reason': 'STOP'}},\n",
-       " {'id': 1,\n",
-       "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.0-pro',\n",
-       "  'prompt': 'How does technology impact us?',\n",
-       "  'parameters': {'candidate_count': 1,\n",
-       "   'temperature': 1,\n",
-       "   'max_output_tokens': 1000},\n",
-       "  'response': \"## The impact of technology on our lives: A double-edged sword\\n\\nTechnology has become an undeniable cornerstone of our lives, shaping nearly every aspect of our existence. Its impact can be observed across various domains, bringing both advantages and disadvantages that deserve careful consideration.\\n\\n**Positive Impacts:**\\n\\n* **Communication and Connection:** Technology has revolutionized how we connect with others. From instant messaging to video conferencing, we can now communicate with individuals across the globe in real-time, fostering stronger relationships and bridging geographical barriers.\\n* **Access to Information:** The internet has become a vast repository of knowledge, providing instant access to information on virtually any topic imaginable. This empowers individuals to learn, research, and stay informed on various subjects, expanding their horizons and fuelling intellectual growth.\\n* **Efficiency and Convenience:** Technology has streamlined numerous tasks, making our lives easier and more efficient. Automation, online shopping, and mobile banking are just a few examples of how technology has simplified daily routines, freeing up time for leisure and other pursuits.\\n* **Innovation and Progress:** Technological advancements have driven innovation in various fields, leading to breakthroughs in medicine, science, and engineering. These advancements have improved our quality of life, offering solutions to global challenges and propelling human progress.\\n\\n**Negative Impacts:**\\n\\n* **Privacy Concerns:** The widespread use of technology has raised concerns about data privacy and security. Our online activities are constantly tracked and monitored, raising questions about who has access to our information and how it is being used.\\n* **Social Isolation:** While technology has connected us in some ways, it can also contribute to social isolation. Excessive screen time can lead to reduced face-to-face interactions and weakened social bonds, potentially impacting mental health and well-being.\\n* **Job displacement:** Automation and technological advancements have led to job displacement in various sectors. While new job opportunities may emerge, the transition can be challenging for individuals whose skills become obsolete.\\n* **Information Overload:** The sheer volume of information available online can be overwhelming, leading to information overload and difficulty discerning credible sources from misinformation. This can hinder critical thinking and informed decision-making.\\n\\n**Moving Forward:**\\n\\nTechnology is a powerful tool that can be harnessed for good or ill. By acknowledging both its positive and negative impacts, we can strive to use it responsibly and ethically, maximizing its benefits while mitigating its potential downsides. Striking a balance between embracing technological advancements and preserving human values is crucial to ensure a future where technology serves as a force for progress and well-being. \\n\\nIt's important to remember that technology is constantly evolving, and its impact on our lives will continue to change over time. Therefore, ongoing dialogue and critical reflection are essential to ensure that we use technology in a way that benefits humanity as a whole.\",\n",
+       "  'timestamp_sent': '18-10-2024-10-58-30',\n",
+       "  'response': 'Efforts to preserve Hakka include language classes, media production (songs, films), online communities, and integrating Hakka into education.\\n',\n",
        "  'safety_attributes': {'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
@@ -379,7 +365,7 @@
        "   'finish_reason': 'STOP'}},\n",
        " {'id': 4,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'user',\n",
        "    'parts': 'What efforts are being made to keep the hakka language alive?'},\n",
        "   {'role': 'system',\n",
@@ -387,17 +373,19 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000},\n",
+       "  'timestamp_sent': '18-10-2024-10-58-32',\n",
        "  'response': \"TypeError - if api == 'vertexai', then the prompt must be a str, list[str], or list[dict[str,str]] where the dictionary contains the keys 'role' and 'parts' only, and the values for 'role' must be one of 'user' or 'model', except for the first message in the list of dictionaries can be a system message with the key 'role' set to 'system'.\"},\n",
        " {'id': 2,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': ['How does international trade create jobs?',\n",
        "   'I want a joke about that'],\n",
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000},\n",
-       "  'response': [\"International trade creates jobs through a variety of mechanisms:\\n\\n**1. Increased Demand for Exports:**\\n\\n* **Production:**  When a country exports goods or services, it needs to produce more of those items to meet the increased demand. This leads to more jobs in manufacturing, agriculture, or the service sector, depending on the type of export. \\n* **Transportation and Logistics:** Moving goods internationally requires transportation services (shipping, air freight, trucking), warehousing, and logistics companies, all of which create jobs.\\n* **Supporting Industries:**  Exports often stimulate demand for related industries, such as packaging, materials suppliers, and financial services, further boosting employment.\\n\\n**2. Access to Lower-Cost Inputs:**\\n\\n* **Imports:** Importing raw materials or intermediate goods from countries with lower production costs can make domestic production cheaper. This allows companies to lower prices, sell more, and potentially hire more workers.\\n* **Efficiency:** Access to a wider range of imported goods and services allows businesses to operate more efficiently, reducing costs and potentially creating more jobs.\\n\\n**3. Specialization and Comparative Advantage:**\\n\\n* **Focus on Strengths:** International trade allows countries to specialize in producing goods and services where they have a comparative advantage (i.e., where they are relatively more efficient). This leads to greater productivity and potential for economic growth, which translates into more jobs.\\n* **Increased Efficiency:** Specializing in certain industries leads to economies of scale, meaning companies can produce more goods at lower costs, potentially leading to more jobs.\\n\\n**4. Foreign Investment:**\\n\\n* **Direct Investment:**  International trade often attracts foreign direct investment (FDI), where companies from other countries invest in domestic businesses, creating new jobs and boosting economic growth.\\n* **Portfolio Investment:**  International trade can lead to increased portfolio investment, where foreign investors buy stocks and bonds in domestic companies, providing capital that can be used for investment and job creation.\\n\\n**5. Innovation and Technology:**\\n\\n* **Competition:**  International trade exposes domestic companies to global competition, forcing them to innovate and improve their products and services. This often leads to technological advancements and increased productivity, creating jobs in research and development, and high-tech industries.\\n\\n**6. Tourism:**\\n\\n* **Travel and Hospitality:**  International trade can lead to increased tourism, creating jobs in the travel, hospitality, and leisure industries.\\n\\n**It's important to note that:**\\n\\n* **Job displacement:**  While international trade creates jobs, it can also lead to job displacement in some sectors, particularly those that are not competitive on a global scale. \\n* **Wage inequality:**  The benefits of international trade may not be evenly distributed, and some workers may experience wage stagnation or even decline.\\n* **Policy considerations:** Governments play a crucial role in managing the impact of international trade, through policies such as trade agreements, investment incentives, and worker retraining programs, to ensure that the benefits are shared broadly.\\n\\nOverall, international trade can be a powerful engine for job creation, but its effects are complex and can vary depending on a country's specific circumstances and policies.\\n\",\n",
-       "   'Why did the economist refuse to buy a new car? \\n\\nBecause he knew it would lead to job losses in the horse-drawn carriage industry! \\n \\n(This joke highlights the potential for job displacement in some sectors due to international trade and technological advancements.) \\n'],\n",
+       "  'timestamp_sent': '18-10-2024-10-58-28',\n",
+       "  'response': [\"International trade creates jobs in several ways, both directly and indirectly:\\n\\n**Direct Job Creation:**\\n\\n* **Export-oriented industries:**  Companies that produce goods or services for export directly hire workers in manufacturing, agriculture, technology, and services (e.g., logistics, marketing, design).  The demand for these goods and services from foreign markets fuels job creation within these sectors.  Think of a clothing manufacturer exporting to Europe, creating jobs for tailors, designers, and shipping personnel.\\n* **Import-competing industries:** While often framed negatively, some domestic industries that compete with imports also create jobs.  These industries may adapt and innovate to remain competitive, leading to jobs in research and development, improved efficiency, and specialized production.  A domestic car manufacturer, facing competition from imports, might invest in creating more fuel-efficient vehicles, thus creating engineering and manufacturing jobs.\\n* **Trade-related services:**  Many jobs are created in support of international trade. This includes transportation (shipping, trucking, air freight), logistics (warehousing, customs brokerage), finance (international banking, currency exchange), and legal services (international trade law).\\n\\n\\n**Indirect Job Creation:**\\n\\n* **Increased productivity and efficiency:**  Trade allows countries to specialize in producing goods and services where they have a comparative advantage. This leads to increased productivity and efficiency, creating more output with the same or fewer inputs.  This freed-up labor and capital can then be used to create jobs in other sectors.  For instance, if a country becomes more efficient at producing agricultural goods due to international trade, it frees up workers to pursue jobs in manufacturing or technology.\\n* **Lower input costs:** Access to cheaper raw materials, intermediate goods, and components from other countries lowers production costs for domestic firms.  This allows them to be more competitive, expand production, and hire more workers.  A furniture maker, for example, might use cheaper imported wood to lower its costs and expand its workforce.\\n* **Increased consumer spending:** Cheaper imports increase consumer purchasing power. This increased demand stimulates economic activity, leading to more jobs in various sectors, from retail to entertainment.  If consumers have more money to spend due to cheaper imports, they might spend it on domestic services, creating jobs in the restaurant or tourism industries.\\n* **Foreign direct investment (FDI):**  International trade attracts FDI, as foreign companies invest in establishing operations in countries with access to resources, markets, or skilled labor. This investment creates jobs directly through the establishment of new factories or offices and indirectly through supporting businesses.\\n\\n\\n**However, it's important to note:**\\n\\n* **Job displacement:**  International trade can also lead to job losses in industries that struggle to compete with imports. This is often a concern that requires retraining and adjustment programs to help displaced workers transition to new jobs.\\n* **Wage stagnation:**  Increased competition from low-wage countries can put downward pressure on wages in some sectors, especially for less-skilled workers.\\n* **Uneven distribution of benefits:**  The benefits of international trade are not always evenly distributed, with some regions or sectors benefiting more than others.\\n\\nIn conclusion, while international trade can lead to job displacement in certain sectors, it generally creates more jobs than it destroys, especially when considering both direct and indirect effects.  The overall impact on employment depends on a variety of factors, including government policies, the structure of the economy, and the adaptability of the workforce.\\n\",\n",
+       "   'Why did the economist get fired from his job at the import/export company?  Because he kept saying, \"It\\'s a comparative advantage... it\\'s a comparative advantage...\" while laying off half the workforce!\\n'],\n",
        "  'safety_attributes': [{'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "    'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "    'HARM_CATEGORY_HARASSMENT': '1',\n",
@@ -410,9 +398,24 @@
        "    'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
        "    'blocked': '[False, False, False, False]',\n",
        "    'finish_reason': 'STOP'}]},\n",
+       " {'id': 1,\n",
+       "  'api': 'vertexai',\n",
+       "  'model_name': 'gemini-1.0-pro-002',\n",
+       "  'prompt': 'How does technology impact us?',\n",
+       "  'parameters': {'candidate_count': 1,\n",
+       "   'temperature': 1,\n",
+       "   'max_output_tokens': 1000},\n",
+       "  'timestamp_sent': '18-10-2024-10-58-26',\n",
+       "  'response': \"## Technology's Impact on Humans\\n\\nTechnology has significantly impacted human lives in countless ways, shaping our society, culture, and individual experiences. Here's a brief overview of its impact on various aspects:\\n\\n**Positive Impacts:**\\n\\n* **Communication:** Technology has revolutionized communication, allowing us to connect with people across the globe instantly. From email and social media to video conferencing and messaging apps, staying in touch has never been easier.\\n* **Information Access:** The internet provides access to a vast pool of information, enabling us to research, learn, and stay informed about various topics. Search engines, online libraries, and educational platforms empower individuals with knowledge and understanding.\\n* **Healthcare:** Medical technology has made significant advancements, improving diagnoses, treatment options, and overall healthcare outcomes. From advanced imaging techniques to telemedicine and robotic surgery, technology is saving lives and enhancing the quality of life.\\n* **Productivity:** Technology has automated many tasks, increasing efficiency and productivity across various industries. From manufacturing and agriculture to finance and healthcare, automation has streamlined processes, saving time and resources.\\n* **Entertainment:** Technology offers endless entertainment options, from streaming services and video games to virtual reality experiences. It provides leisure and enjoyment for people of all ages and interests.\\n* **Education:** Technology has transformed education, enabling access to online learning platforms, interactive tools, and personalized learning experiences. It empowers individuals to learn at their own pace and access resources beyond the classroom.\\n\\n**Negative Impacts:**\\n\\n* **Privacy Concerns:** With the increasing use of technology, concerns about data privacy and security are rising. Social media platforms, online tracking, and government surveillance raise questions about personal information and how it's used.\\n* **Social Isolation:** While technology helps connect people, excessive use can lead to social isolation and loneliness. Social media interactions often lack the depth of face-to-face communication, and individuals may become disconnected from their communities.\\n* **Cybersecurity Threats:** As technology advances, so do cyber threats. Hacking, malware, and data breaches pose significant risks to individuals and organizations, highlighting the need for strong cybersecurity measures.\\n* **Addiction and Mental Health:** Technology addiction can negatively impact mental health, leading to anxiety, depression, and sleep disturbances. The constant stimulation and comparison-driven culture of social media can be detrimental to well-being.\\n* **Environmental Impact:** The production and disposal of electronic devices contribute to environmental pollution and resource depletion. E-waste and energy consumption raise concerns about the sustainability of technological advancements.\\n\\n**Conclusion:**\\n\\nTechnology has a profound impact on human society, offering both benefits and challenges. Its impact is multifaceted, affecting how we communicate, learn, work, entertain ourselves, and interact with the world around us. It's crucial to understand both the positive and negative aspects of technology and utilize it responsibly to maximize its benefits while minimizing its potential harms.\\n\\n**Additionally:**\\n\\n* Technology has a significant impact on the economy, creating new jobs, industries, and economic opportunities. However, it also poses challenges, such as job displacement and the need for workforce reskilling.\\n* Technology has also influenced political landscapes, enabling citizen engagement, information dissemination, and political activism. It raises concerns about privacy, censorship, and the spread of misinformation.\\n\\nIt's important to consider the ethical implications of technological advancements and ensure they align with human values and societal well-being. \\n\",\n",
+       "  'safety_attributes': {'HARM_CATEGORY_HATE_SPEECH': '1',\n",
+       "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
+       "   'HARM_CATEGORY_HARASSMENT': '1',\n",
+       "   'HARM_CATEGORY_SEXUALLY_EXPLICIT': '1',\n",
+       "   'blocked': '[False, False, False, False]',\n",
+       "   'finish_reason': 'STOP'}},\n",
        " {'id': 5,\n",
        "  'api': 'vertexai',\n",
-       "  'model_name': 'gemini-1.5-flash',\n",
+       "  'model_name': 'gemini-1.5-flash-002',\n",
        "  'prompt': [{'role': 'system',\n",
        "    'parts': 'You are a helpful assistant designed to answer questions briefly.'},\n",
        "   {'role': 'user', 'parts': \"Hello, I'm Bob and I'm 6 years old\"},\n",
@@ -421,7 +424,8 @@
        "  'parameters': {'candidate_count': 1,\n",
        "   'temperature': 1,\n",
        "   'max_output_tokens': 1000},\n",
-       "  'response': 'You will be 7 years old next year. \\n',\n",
+       "  'timestamp_sent': '18-10-2024-10-58-36',\n",
+       "  'response': 'You will be 7 years old next year.\\n',\n",
        "  'safety_attributes': {'HARM_CATEGORY_HATE_SPEECH': '1',\n",
        "   'HARM_CATEGORY_DANGEROUS_CONTENT': '1',\n",
        "   'HARM_CATEGORY_HARASSMENT': '1',\n",
@@ -461,7 +465,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "prompto",
    "language": "python",
    "name": "python3"
   },
diff --git a/src/prompto/apis/gemini/gemini.py b/src/prompto/apis/gemini/gemini.py
index e3018ce6..b345f5f6 100644
--- a/src/prompto/apis/gemini/gemini.py
+++ b/src/prompto/apis/gemini/gemini.py
@@ -7,8 +7,8 @@
 
 from prompto.apis.base import AsyncAPI
 from prompto.apis.gemini.gemini_utils import (
+    convert_dict_to_input,
     gemini_chat_roles,
-    parse_multimedia,
     process_response,
     process_safety_attributes,
 )
@@ -263,16 +263,7 @@ async def _obtain_model_inputs(
                 f"parameters must be a dictionary, not {type(generation_config)}"
             )
 
-        # parse multimedia data (if any)
-        multimedia_dict = prompt_dict.get("multimedia", None)
-        if multimedia_dict is not None:
-            multimedia = parse_multimedia(
-                multimedia_dict, media_folder=self.settings.media_folder
-            )
-        else:
-            multimedia = None
-
-        return prompt, model_name, model, safety_settings, generation_config, multimedia
+        return prompt, model_name, model, safety_settings, generation_config
 
     async def _query_string(self, prompt_dict: dict, index: int | str):
         """
@@ -280,22 +271,15 @@ async def _query_string(self, prompt_dict: dict, index: int | str):
         (prompt_dict["prompt"] is a string),
         i.e. single-turn completion or chat.
         """
-        prompt, model_name, model, safety_settings, generation_config, multimedia = (
+        prompt, model_name, model, safety_settings, generation_config = (
             await self._obtain_model_inputs(
                 prompt_dict=prompt_dict, system_instruction=None
             )
         )
 
-        # prepare the contents to send to the model
-        if multimedia is not None:
-            # prepend the multimedia to the prompt
-            contents = multimedia + [prompt]
-        else:
-            contents = [prompt]
-
         try:
             response = await model.generate_content_async(
-                contents=contents,
+                contents=prompt,
                 generation_config=generation_config,
                 safety_settings=safety_settings,
                 stream=False,
@@ -368,14 +352,13 @@ async def _query_chat(self, prompt_dict: dict, index: int | str):
         (prompt_dict["prompt"] is a list of strings to sequentially send to the model),
         i.e. multi-turn chat with history.
         """
-        prompt, model_name, model, safety_settings, generation_config, _ = (
+        prompt, model_name, model, safety_settings, generation_config = (
             await self._obtain_model_inputs(
                 prompt_dict=prompt_dict, system_instruction=None
             )
         )
 
         chat = model.start_chat(history=[])
-
         response_list = []
         safety_attributes_list = []
         try:
@@ -472,24 +455,40 @@ async def _query_history(self, prompt_dict: dict, index: int | str) -> dict:
         i.e. multi-turn chat with history.
         """
         if prompt_dict["prompt"][0]["role"] == "system":
-            prompt, model_name, model, safety_settings, generation_config, _ = (
+            prompt, model_name, model, safety_settings, generation_config = (
                 await self._obtain_model_inputs(
                     prompt_dict=prompt_dict,
                     system_instruction=prompt_dict["prompt"][0]["parts"],
                 )
             )
-            chat = model.start_chat(history=prompt[1:-1])
+            chat = model.start_chat(
+                history=[
+                    convert_dict_to_input(
+                        content_dict=x, media_folder=self.settings.media_folder
+                    )
+                    for x in prompt[1:-1]
+                ]
+            )
         else:
-            prompt, model_name, model, safety_settings, generation_config, _ = (
+            prompt, model_name, model, safety_settings, generation_config = (
                 await self._obtain_model_inputs(
                     prompt_dict=prompt_dict, system_instruction=None
                 )
             )
-            chat = model.start_chat(history=prompt[:-1])
+            chat = model.start_chat(
+                history=[
+                    convert_dict_to_input(
+                        content_dict=x, media_folder=self.settings.media_folder
+                    )
+                    for x in prompt[:-1]
+                ]
+            )
 
         try:
             response = await chat.send_message_async(
-                content=prompt[-1],
+                content=convert_dict_to_input(
+                    content_dict=prompt[-1], media_folder=self.settings.media_folder
+                ),
                 generation_config=generation_config,
                 safety_settings=safety_settings,
                 stream=False,
diff --git a/src/prompto/apis/gemini/gemini_utils.py b/src/prompto/apis/gemini/gemini_utils.py
index 509c2a79..7d18c02d 100644
--- a/src/prompto/apis/gemini/gemini_utils.py
+++ b/src/prompto/apis/gemini/gemini_utils.py
@@ -6,7 +6,7 @@
 gemini_chat_roles = set(["user", "model"])
 
 
-def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> any:
+def parse_parts_value(part: dict | str, media_folder: str) -> any:
     """
     Parse multimedia dictionary and create Vertex AI Part object.
     Expected keys:
@@ -15,20 +15,23 @@ def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> any:
 
     Parameters
     ----------
-    multimedia_dict : dict
-        Dictionary with multimedia data to parse and create Part object
+    part : dict | str
+        Either a dictionary or a string which defines a multimodal object.
 
     Returns
     -------
     any
         Multimedia data object
     """
+    if isinstance(part, str):
+        return part
+
     # read multimedia type
-    type = multimedia_dict.get("type")
+    type = part.get("type")
     if type is None:
         raise ValueError("Multimedia type is not specified")
     # read file location
-    media = multimedia_dict.get("media")
+    media = part.get("media")
     if media is None:
         raise ValueError("File location is not specified")
 
@@ -50,7 +53,7 @@ def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> any:
             raise ValueError(f"Unsupported multimedia type: {type}")
 
 
-def parse_multimedia(multimedia: list[dict] | dict, media_folder: str) -> list[any]:
+def parse_parts(parts: list[dict | str] | dict | str, media_folder: str) -> list[any]:
     """
     Parse multimedia data and create a list of multimedia data objects.
     If multimedia is a single dictionary, a list with a single multimedia data object is returned.
@@ -66,10 +69,43 @@ def parse_multimedia(multimedia: list[dict] | dict, media_folder: str) -> list[a
     list[any] | any
         List of multimedia data object(s) created from the input multimedia data
     """
-    if isinstance(multimedia, dict):
-        return [parse_multimedia_dict(multimedia, media_folder=media_folder)]
-    else:
-        return [parse_multimedia_dict(m, media_folder=media_folder) for m in multimedia]
+    # convert to list[dict | str]
+    if isinstance(parts, dict) or isinstance(parts, str):
+        parts = [parts]
+
+    return [parse_parts_value(p, media_folder=media_folder) for p in parts]
+
+
+def convert_dict_to_input(content_dict: dict, media_folder: str) -> dict:
+    """
+    Convert dictionary to an input that can be used by the Gemini API.
+    The output is a dictionary with keys "role" and "parts".
+
+    Parameters
+    ----------
+    content_dict : dict
+        Content dictionary with keys "role" and "parts"strings.
+
+    Returns
+    -------
+    dict
+        dict with keys "role" and "parts"  where the value of
+        role is either "user" or "model" and the value of
+        parts is a list of inputs to make up an input (which can include
+        text or image/video inputs).
+    """
+    if "role" not in content_dict:
+        raise KeyError("Role key is missing in content dictionary")
+    if "parts" not in content_dict:
+        raise KeyError("Parts key is missing in content dictionary")
+
+    return {
+        "role": content_dict["role"],
+        "parts": parse_parts(
+            content_dict["parts"],
+            media_folder=media_folder,
+        ),
+    }
 
 
 def process_response(response: dict) -> str:
diff --git a/src/prompto/apis/vertexai/vertexai.py b/src/prompto/apis/vertexai/vertexai.py
index b9fa9a9e..43db2073 100644
--- a/src/prompto/apis/vertexai/vertexai.py
+++ b/src/prompto/apis/vertexai/vertexai.py
@@ -7,7 +7,6 @@
     GenerativeModel,
     HarmBlockThreshold,
     HarmCategory,
-    Part,
 )
 
 from prompto.apis.base import AsyncAPI
@@ -16,7 +15,7 @@
     process_response,
     process_safety_attributes,
 )
-from prompto.apis.vertexai.vertexai_utils import dict_to_content, parse_multimedia
+from prompto.apis.vertexai.vertexai_utils import convert_dict_to_input
 from prompto.settings import Settings
 from prompto.utils import (
     FILE_WRITE_LOCK,
@@ -287,16 +286,7 @@ async def _obtain_model_inputs(
                 f"parameters must be a dictionary, not {type(generation_config)}"
             )
 
-        # parse multimedia data (if any)
-        multimedia_dict = prompt_dict.get("multimedia", None)
-        if multimedia_dict is not None:
-            multimedia = parse_multimedia(
-                multimedia_dict, media_folder=self.settings.media_folder
-            )
-        else:
-            multimedia = None
-
-        return prompt, model_name, model, safety_settings, generation_config, multimedia
+        return prompt, model_name, model, safety_settings, generation_config
 
     async def _query_string(self, prompt_dict: dict, index: int | str):
         """
@@ -304,22 +294,15 @@ async def _query_string(self, prompt_dict: dict, index: int | str):
         (prompt_dict["prompt"] is a string),
         i.e. single-turn completion or chat.
         """
-        prompt, model_name, model, safety_settings, generation_config, multimedia = (
+        prompt, model_name, model, safety_settings, generation_config = (
             await self._obtain_model_inputs(
                 prompt_dict=prompt_dict, system_instruction=None
             )
         )
 
-        # prepare the contents to send to the model
-        if multimedia is not None:
-            # prepend the multimedia to the prompt
-            contents = multimedia + [Part.from_text(prompt)]
-        else:
-            contents = [Part.from_text(prompt)]
-
         try:
             response = await model.generate_content_async(
-                contents=contents,
+                contents=prompt,
                 generation_config=generation_config,
                 safety_settings=safety_settings,
                 stream=False,
@@ -391,14 +374,13 @@ async def _query_chat(self, prompt_dict: dict, index: int | str):
         (prompt_dict["prompt"] is a list of strings to sequentially send to the model),
         i.e. multi-turn chat with history.
         """
-        prompt, model_name, model, safety_settings, generation_config, _ = (
+        prompt, model_name, model, safety_settings, generation_config = (
             await self._obtain_model_inputs(
                 prompt_dict=prompt_dict, system_instruction=None
             )
         )
 
         chat = model.start_chat(history=[])
-
         response_list = []
         safety_attributes_list = []
         try:
@@ -495,24 +477,40 @@ async def _query_history(self, prompt_dict: dict, index: int | str) -> dict:
         i.e. multi-turn chat with history.
         """
         if prompt_dict["prompt"][0]["role"] == "system":
-            prompt, model_name, model, safety_settings, generation_config, _ = (
+            prompt, model_name, model, safety_settings, generation_config = (
                 await self._obtain_model_inputs(
                     prompt_dict=prompt_dict,
                     system_instruction=prompt_dict["prompt"][0]["parts"],
                 )
             )
-            chat = model.start_chat(history=[dict_to_content(x) for x in prompt[1:-1]])
+            chat = model.start_chat(
+                history=[
+                    convert_dict_to_input(
+                        content_dict=x, media_folder=self.settings.media_folder
+                    )
+                    for x in prompt[1:-1]
+                ]
+            )
         else:
-            prompt, model_name, model, safety_settings, generation_config, _ = (
+            prompt, model_name, model, safety_settings, generation_config = (
                 await self._obtain_model_inputs(
                     prompt_dict=prompt_dict, system_instruction=None
                 )
             )
-            chat = model.start_chat(history=[dict_to_content(x) for x in prompt[:-1]])
+            chat = model.start_chat(
+                history=[
+                    convert_dict_to_input(
+                        content_dict=x, media_folder=self.settings.media_folder
+                    )
+                    for x in prompt[:-1]
+                ]
+            )
 
         try:
             response = await chat.send_message_async(
-                content=dict_to_content(prompt[-1]),
+                content=convert_dict_to_input(
+                    content_dict=prompt[-1], media_folder=self.settings.media_folder
+                ),
                 generation_config=generation_config,
                 safety_settings=safety_settings,
                 stream=False,
diff --git a/src/prompto/apis/vertexai/vertexai_utils.py b/src/prompto/apis/vertexai/vertexai_utils.py
index 53cb9a3b..61279aa2 100644
--- a/src/prompto/apis/vertexai/vertexai_utils.py
+++ b/src/prompto/apis/vertexai/vertexai_utils.py
@@ -3,30 +3,36 @@
 from vertexai.generative_models import Content, Image, Part
 
 
-def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> Part:
+def parse_parts_value(part: dict | str, media_folder: str) -> Part:
     """
-    Parse multimedia dictionary and create Vertex AI Part object.
-    Expected keys:
+    Create Vertex AI Part objects from a dictionary or string.
+    If the parts is a string, a Part object with text is created.
+    Otherwise, parts is a dictionary with the following keys:
     - type: str, multimedia type, one of ["image", "video", "uri" "text"]
-    - media: str, file location (if type is image or video) or text (if type is text)
-    - mime_type: str, mime type of the video file, only required for video and uri types
+    - media: str, file location (if type is image or video) or text (if type is text).
+      This can be either a local file path (relative to the media folder) or a GCS URI.
+    - mime_type: str, mime type of the image orvideo file, only required
+      if using a GCS URI, or using a local video file
 
     Parameters
     ----------
-    multimedia_dict : dict
-        Dictionary with multimedia data to parse and create Part object
+    part : dict | str
+        Either a dictionary or a string which defines a Part object.
 
     Returns
     -------
     Part
         Vertex AI Part object created from multimedia data
     """
+    if isinstance(part, str):
+        return Part.from_text(part)
+
     # read multimedia type
-    type = multimedia_dict.get("type")
+    type = part.get("type")
     if type is None:
         raise ValueError("Multimedia type is not specified")
     # read file location
-    media = multimedia_dict.get("media")
+    media = part.get("media")
     if media is None:
         raise ValueError("File location is not specified")
 
@@ -35,12 +41,24 @@ def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> Part:
         return Part.from_text(media)
     else:
         media_file_path = os.path.join(media_folder, media)
-        mime_type = multimedia_dict.get("mime_type")
+        mime_type = part.get("mime_type")
         if type == "image":
+            if media.startswith("gs://"):
+                if mime_type is None:
+                    raise ValueError(
+                        "Mime type is not specified. Required for image type if media is a GCS URI"
+                    )
+
+                return Part.from_uri(uri=media, mime_type=mime_type)
+
             return Part.from_image(Image.load_from_file(media_file_path))
         elif type == "video":
             if mime_type is None:
-                raise ValueError("Mime type is not specified. Required for video")
+                raise ValueError("Mime type is not specified. Required for video type")
+
+            if media.startswith("gs://"):
+                return Part.from_uri(uri=media, mime_type=mime_type)
+
             return Part.from_data(
                 open(media_file_path, "rb").read(), mime_type="video/mp4"
             )
@@ -52,29 +70,31 @@ def parse_multimedia_dict(multimedia_dict: dict, media_folder: str) -> Part:
             raise ValueError(f"Unsupported multimedia type: {type}")
 
 
-def parse_multimedia(multimedia: list[dict] | dict, media_folder: str) -> list[Part]:
+def parse_parts(parts: list[dict | str] | dict | str, media_folder: str) -> list[Part]:
     """
-    Parse multimedia data and create a list of Vertex AI Part object(s).
-    If multimedia is a single dictionary, a list with a single Part object is returned.
+    Parse "parts" value and create a list of Vertex AI Part object(s).
+    If parts is a single dictionary or a string, a list with a single Part
+    object is returned, otherwise, a list of multiple Part objects is created.
 
     Parameters
     ----------
-    multimedia : list[dict] | dict
-        Multimedia data to parse and create Part object(s).
-        Can be a list of multimedia dictionaries or a single multimedia dictionary.
+    parts : list[dict | str] | dict | str
+        Corresponding to the "parts" value in the prompt.
+        Can be a list of dictionaries and strings, or a single dictionary or string.
 
     Returns
     -------
-    list[Part] | Part
-        List of Vertex AI Part object(s) created from multimedia data
+    list[Part]
+        List of Vertex AI Part object(s) created from "parts" value in a prompt
     """
-    if isinstance(multimedia, dict):
-        return [parse_multimedia_dict(multimedia, media_folder=media_folder)]
-    else:
-        return [parse_multimedia_dict(m, media_folder=media_folder) for m in multimedia]
+    # convert to list[dict | str]
+    if isinstance(parts, dict) or isinstance(parts, str):
+        parts = [parts]
+
+    return [parse_parts_value(p, media_folder=media_folder) for p in parts]
 
 
-def dict_to_content(content_dict: dict) -> Content:
+def convert_dict_to_input(content_dict: dict, media_folder: str) -> Content:
     """
     Convert content dictionary to Vertex AI Content object.
 
@@ -95,5 +115,9 @@ def dict_to_content(content_dict: dict) -> Content:
         raise KeyError("Parts key is missing in content dictionary")
 
     return Content(
-        role=content_dict["role"], parts=[Part.from_text(content_dict["parts"])]
+        role=content_dict["role"],
+        parts=parse_parts(
+            content_dict["parts"],
+            media_folder=media_folder,
+        ),
     )
diff --git a/src/prompto/test_new.jsonl b/src/prompto/test_new.jsonl
new file mode 100644
index 00000000..6d758dfc
--- /dev/null
+++ b/src/prompto/test_new.jsonl
@@ -0,0 +1,2 @@
+{"id": 0, "api": "vertexai", "model_name": "gdm-eval-model-c", "prompt": [{"role": "user", "part": ["what is in this image?", {"type": "image", "mime_type": "video/mp4", "media": "gs://gdm_model_evals_turing_bucket_1/GreatRedSpot.mp4"}]}], "safety_filter": "none", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
+{"id": 1, "api": "vertexai", "model_name": "gdm-eval-model-c", "prompt": [{"role": "user", "part": ["describe what is happening in this video?", {"type": "image", "mime_type": "video/mp4", "media": "gs://gdm_model_evals_turing_bucket_1/GreatRedSpot.mp4"}]}], "safety_filter": "none", "parameters": {"candidate_count": 1, "temperature": 1, "max_output_tokens": 100}}
diff --git a/tests/apis/gemini/test_gemini.py b/tests/apis/gemini/test_gemini.py
index 9100d74f..60846b3e 100644
--- a/tests/apis/gemini/test_gemini.py
+++ b/tests/apis/gemini/test_gemini.py
@@ -363,7 +363,7 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
         }
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "gemini_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -371,7 +371,6 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
     assert test_case[2]._system_instruction is None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {"temperature": 1, "max_output_tokens": 100}
-    assert test_case[5] is None
 
     # test for case where no parameters in prompt_dict
     test_case = await gemini_api._obtain_model_inputs(
@@ -383,7 +382,7 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
         }
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "gemini_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -391,7 +390,6 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
     assert test_case[2]._system_instruction is None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {}
-    assert test_case[5] is None
 
     # test for case where system_instruction is provided
     test_case = await gemini_api._obtain_model_inputs(
@@ -404,7 +402,7 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
         system_instruction="hello",
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "gemini_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -412,7 +410,6 @@ async def test_gemini_obtain_model_inputs(temporary_data_folders, monkeypatch):
     assert test_case[2]._system_instruction is not None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {}
-    assert test_case[5] is None
 
     # test error catching when parameters are not a dictionary
     with pytest.raises(
@@ -472,7 +469,7 @@ async def test_gemini_obtain_model_inputs_safety_filters(
             }
         )
         assert isinstance(test_case, tuple)
-        assert len(test_case) == 6
+        assert len(test_case) == 5
         assert test_case[0] == "test prompt"
         assert test_case[1] == "gemini_model_name"
         assert isinstance(test_case[2], GenerativeModel)
@@ -480,7 +477,6 @@ async def test_gemini_obtain_model_inputs_safety_filters(
         assert test_case[2]._system_instruction is None
         assert isinstance(test_case[3], dict)
         assert test_case[4] == {"temperature": 1, "max_output_tokens": 100}
-        assert test_case[5] is None
 
     # test error if safety filter is not recognised
     with pytest.raises(
diff --git a/tests/apis/gemini/test_gemini_chat_input.py b/tests/apis/gemini/test_gemini_chat_input.py
index 3629341e..b621c112 100644
--- a/tests/apis/gemini/test_gemini_chat_input.py
+++ b/tests/apis/gemini/test_gemini_chat_input.py
@@ -151,7 +151,6 @@ async def test_gemini_query_history_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_chat["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
diff --git a/tests/apis/gemini/test_gemini_history_input.py b/tests/apis/gemini/test_gemini_history_input.py
index cb9a3a6d..5b0f8fe5 100644
--- a/tests/apis/gemini/test_gemini_history_input.py
+++ b/tests/apis/gemini/test_gemini_history_input.py
@@ -77,7 +77,7 @@ async def test_gemini_query_history(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history["prompt"][1],
+        content={"role": "user", "parts": [prompt_dict_history["prompt"][1]["parts"]]},
         generation_config=prompt_dict_history["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -119,7 +119,7 @@ async def test_gemini_query_history_error(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history["prompt"][1],
+        content={"role": "user", "parts": [prompt_dict_history["prompt"][1]["parts"]]},
         generation_config=prompt_dict_history["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -160,7 +160,7 @@ async def test_gemini_query_history_index_error(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history["prompt"][1],
+        content={"role": "user", "parts": [prompt_dict_history["prompt"][1]["parts"]]},
         generation_config=prompt_dict_history["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -206,7 +206,6 @@ async def test_gemini_query_history_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_history["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
@@ -263,7 +262,10 @@ async def test_gemini_query_history_no_system(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history_no_system["prompt"][2],
+        content={
+            "role": "user",
+            "parts": [prompt_dict_history_no_system["prompt"][2]["parts"]],
+        },
         generation_config=prompt_dict_history_no_system["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -309,7 +311,10 @@ async def test_gemini_query_history_error_no_system(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history_no_system["prompt"][2],
+        content={
+            "role": "user",
+            "parts": [prompt_dict_history_no_system["prompt"][2]["parts"]],
+        },
         generation_config=prompt_dict_history_no_system["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -356,7 +361,10 @@ async def test_gemini_query_history_index_error_no_system(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        content=prompt_dict_history_no_system["prompt"][2],
+        content={
+            "role": "user",
+            "parts": [prompt_dict_history_no_system["prompt"][2]["parts"]],
+        },
         generation_config=prompt_dict_history_no_system["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -402,7 +410,6 @@ async def test_gemini_query_history_no_system_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_history_no_system["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
@@ -415,7 +422,13 @@ async def test_gemini_query_history_no_system_check_chat_init(
     )
     mock_start_chat.assert_called_once_with(
         history=[
-            prompt_dict_history_no_system["prompt"][0],
-            prompt_dict_history_no_system["prompt"][1],
+            {
+                "role": "user",
+                "parts": [prompt_dict_history_no_system["prompt"][0]["parts"]],
+            },
+            {
+                "role": "model",
+                "parts": [prompt_dict_history_no_system["prompt"][1]["parts"]],
+            },
         ]
     )
diff --git a/tests/apis/gemini/test_gemini_string_input.py b/tests/apis/gemini/test_gemini_string_input.py
index f5237ca5..0554f50c 100644
--- a/tests/apis/gemini/test_gemini_string_input.py
+++ b/tests/apis/gemini/test_gemini_string_input.py
@@ -74,7 +74,7 @@ async def test_gemini_query_string(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        contents=[prompt_dict_string["prompt"]],
+        contents=prompt_dict_string["prompt"],
         generation_config=prompt_dict_string["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -123,7 +123,7 @@ async def test_gemini_query_string__index_error(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        contents=[prompt_dict_string["prompt"]],
+        contents=prompt_dict_string["prompt"],
         generation_config=prompt_dict_string["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
@@ -164,7 +164,7 @@ async def test_gemini_query_string_error(
     mock_gemini_call.assert_called_once()
     mock_gemini_call.assert_awaited_once()
     mock_gemini_call.assert_awaited_once_with(
-        contents=[prompt_dict_string["prompt"]],
+        contents=prompt_dict_string["prompt"],
         generation_config=prompt_dict_string["parameters"],
         safety_settings=DEFAULT_SAFETY_SETTINGS,
         stream=False,
diff --git a/tests/apis/vertexai/test_vertexai.py b/tests/apis/vertexai/test_vertexai.py
index 04463551..9ac5e921 100644
--- a/tests/apis/vertexai/test_vertexai.py
+++ b/tests/apis/vertexai/test_vertexai.py
@@ -399,7 +399,7 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
         }
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "vertexai_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -407,7 +407,6 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
     assert test_case[2]._system_instruction is None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {"temperature": 1, "max_output_tokens": 100}
-    assert test_case[5] is None
 
     # test for case where no parameters in prompt_dict
     test_case = await vertexai_api._obtain_model_inputs(
@@ -419,7 +418,7 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
         },
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "vertexai_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -427,7 +426,6 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
     assert test_case[2]._system_instruction is None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {}
-    assert test_case[5] is None
 
     # test for case where system_instruction is provided
     test_case = await vertexai_api._obtain_model_inputs(
@@ -440,7 +438,7 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
         system_instruction="hello",
     )
     assert isinstance(test_case, tuple)
-    assert len(test_case) == 6
+    assert len(test_case) == 5
     assert test_case[0] == "test prompt"
     assert test_case[1] == "vertexai_model_name"
     assert isinstance(test_case[2], GenerativeModel)
@@ -448,7 +446,6 @@ async def test_vertexai_obtain_model_inputs(temporary_data_folders, monkeypatch)
     assert test_case[2]._system_instruction is not None
     assert isinstance(test_case[3], dict)
     assert test_case[4] == {}
-    assert test_case[5] is None
 
     # test error catching when parameters are not a dictionary
     with pytest.raises(
@@ -507,7 +504,7 @@ async def test_vertexai_obtain_model_inputs_safety_filters(
             }
         )
         assert isinstance(test_case, tuple)
-        assert len(test_case) == 6
+        assert len(test_case) == 5
         assert test_case[0] == "test prompt"
         assert test_case[1] == "vertexai_model_name"
         assert isinstance(test_case[2], GenerativeModel)
@@ -517,7 +514,6 @@ async def test_vertexai_obtain_model_inputs_safety_filters(
         assert test_case[2]._system_instruction is None
         assert isinstance(test_case[3], dict)
         assert test_case[4] == {"temperature": 1, "max_output_tokens": 100}
-        assert test_case[5] is None
 
     # test error if safety filter is not recognised
     with pytest.raises(
diff --git a/tests/apis/vertexai/test_vertexai_chat_input.py b/tests/apis/vertexai/test_vertexai_chat_input.py
index 5dab0c04..c81ebf8d 100644
--- a/tests/apis/vertexai/test_vertexai_chat_input.py
+++ b/tests/apis/vertexai/test_vertexai_chat_input.py
@@ -135,7 +135,6 @@ async def test_vertexai_query_history_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_chat["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
diff --git a/tests/apis/vertexai/test_vertexai_history_input.py b/tests/apis/vertexai/test_vertexai_history_input.py
index 446f5143..1251a2a9 100644
--- a/tests/apis/vertexai/test_vertexai_history_input.py
+++ b/tests/apis/vertexai/test_vertexai_history_input.py
@@ -227,7 +227,6 @@ async def test_vertexai_query_history_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_history["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
@@ -467,7 +466,6 @@ async def test_vertexai_query_history_no_system_check_chat_init(
         ),
         DEFAULT_SAFETY_SETTINGS,
         prompt_dict_history_no_system["parameters"],
-        None,
     )
 
     # error will be raised as we've mocked the start_chat method
diff --git a/tests/apis/vertexai/test_vertexai_string_input.py b/tests/apis/vertexai/test_vertexai_string_input.py
index 6ba4264d..1266ead6 100644
--- a/tests/apis/vertexai/test_vertexai_string_input.py
+++ b/tests/apis/vertexai/test_vertexai_string_input.py
@@ -56,25 +56,12 @@ async def test_vertexai_query_string(
 
     mock_vertexai_call.assert_called_once()
     mock_vertexai_call.assert_awaited_once()
-    await_kwargs = mock_vertexai_call.await_args.kwargs
-    # assert await arguments - slightly more complicated since "contents" is a
-    # list of Part objects which are not directly comparable so we convert to dict and compare
-    assert (
-        "contents" in await_kwargs.keys()
-        and isinstance(await_kwargs["contents"], list)
-        and len(await_kwargs["contents"]) == 1
-        and await_kwargs["contents"][0].to_dict()
-        == {"text": prompt_dict_string["prompt"]}
+    mock_vertexai_call.assert_awaited_once_with(
+        contents=prompt_dict_string["prompt"],
+        generation_config=prompt_dict_string["parameters"],
+        safety_settings=DEFAULT_SAFETY_SETTINGS,
+        stream=False,
     )
-    assert (
-        "generation_config" in await_kwargs.keys()
-        and await_kwargs["generation_config"] == prompt_dict_string["parameters"]
-    )
-    assert (
-        "safety_settings" in await_kwargs.keys()
-        and await_kwargs["safety_settings"] == DEFAULT_SAFETY_SETTINGS
-    )
-    assert "stream" in await_kwargs.keys() and await_kwargs["stream"] is False
 
     mock_process_response.assert_called_once_with(mock_vertexai_call.return_value)
     mock_process_safety_attr.assert_called_once_with(mock_vertexai_call.return_value)
@@ -120,25 +107,12 @@ async def test_vertexai_query_string__index_error(
 
     mock_vertexai_call.assert_called_once()
     mock_vertexai_call.assert_awaited_once()
-    await_kwargs = mock_vertexai_call.await_args.kwargs
-    # assert await arguments - slightly more complicated since "contents" is a
-    # list of Part objects which are not directly comparable so we convert to dict and compare
-    assert (
-        "contents" in await_kwargs.keys()
-        and isinstance(await_kwargs["contents"], list)
-        and len(await_kwargs["contents"]) == 1
-        and await_kwargs["contents"][0].to_dict()
-        == {"text": prompt_dict_string["prompt"]}
-    )
-    assert (
-        "generation_config" in await_kwargs.keys()
-        and await_kwargs["generation_config"] == prompt_dict_string["parameters"]
+    mock_vertexai_call.assert_awaited_once_with(
+        contents=prompt_dict_string["prompt"],
+        generation_config=prompt_dict_string["parameters"],
+        safety_settings=DEFAULT_SAFETY_SETTINGS,
+        stream=False,
     )
-    assert (
-        "safety_settings" in await_kwargs.keys()
-        and await_kwargs["safety_settings"] == DEFAULT_SAFETY_SETTINGS
-    )
-    assert "stream" in await_kwargs.keys() and await_kwargs["stream"] is False
 
     expected_log_message = (
         f"Error with model VertexAI ({prompt_dict_string['model_name']}) "
@@ -176,25 +150,12 @@ async def test_vertexai_query_string_error(
 
     mock_vertexai_call.assert_called_once()
     mock_vertexai_call.assert_awaited_once()
-    await_kwargs = mock_vertexai_call.await_args.kwargs
-    # assert await arguments - slightly more complicated since "contents" is a
-    # list of Part objects which are not directly comparable so we convert to dict and compare
-    assert (
-        "contents" in await_kwargs.keys()
-        and isinstance(await_kwargs["contents"], list)
-        and len(await_kwargs["contents"]) == 1
-        and await_kwargs["contents"][0].to_dict()
-        == {"text": prompt_dict_string["prompt"]}
-    )
-    assert (
-        "generation_config" in await_kwargs.keys()
-        and await_kwargs["generation_config"] == prompt_dict_string["parameters"]
-    )
-    assert (
-        "safety_settings" in await_kwargs.keys()
-        and await_kwargs["safety_settings"] == DEFAULT_SAFETY_SETTINGS
+    mock_vertexai_call.assert_awaited_once_with(
+        contents=prompt_dict_string["prompt"],
+        generation_config=prompt_dict_string["parameters"],
+        safety_settings=DEFAULT_SAFETY_SETTINGS,
+        stream=False,
     )
-    assert "stream" in await_kwargs.keys() and await_kwargs["stream"] is False
 
     expected_log_message = (
         f"Error with model VertexAI ({prompt_dict_string['model_name']}) "