Merge branch 'main' into no-glm

google-gemini · Jun 6, 2024 · 53c1f2c · 53c1f2c
2 parents ddcb0a8 + 4f7fd25
commit 53c1f2c
Show file tree

Hide file tree

Showing 36 changed files with 4,782 additions and 5,020 deletions.
diff --git a/examples/Agents_Function_Calling_Barista_Bot.ipynb b/examples/Agents_Function_Calling_Barista_Bot.ipynb
@@ -59,7 +59,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 11,
+      "execution_count": null,
       "metadata": {
         "id": "3IzLYKxmTHd5"
       },
@@ -79,7 +79,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 12,
+      "execution_count": null,
       "metadata": {
         "id": "0gOuwcCUTNAO"
       },
@@ -112,7 +112,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 13,
+      "execution_count": 2,
       "metadata": {
         "id": "wMltPyUpTu3h"
       },
@@ -191,7 +191,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 14,
+      "execution_count": 3,
       "metadata": {
         "id": "jg1LjYNUWnsC"
       },
@@ -204,8 +204,14 @@
             "  Latte\n",
             "   - Extra shot\n",
             "  Tea\n",
-            "   - Earl Grey, hot\n",
-            "Is this correct? yes it is!\n"
+            "   - Earl Grey, hot\n"
+          ]
+        },
+        {
+          "name": "stdin",
+          "output_type": "stream",
+          "text": [
+            "Is this correct?  yes\n"
           ]
         }
       ],
@@ -237,7 +243,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 15,
+      "execution_count": 4,
       "metadata": {
         "id": "IoBvZ1JYXgn5"
       },
@@ -296,7 +302,7 @@
         "\"Regular milk\" is the same as 'whole milk'.\n",
         "\"Sweetened\" means add some regular sugar, not a sweetener.\n",
         "\n",
-        "We have run out of Soy milk today, so soy is not available.\n",
+        "Soy milk has run out of stock today, so soy is not available.\n",
         "\"\"\""
       ]
     },
@@ -317,7 +323,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 17,
+      "execution_count": 5,
       "metadata": {
         "id": "8vmtzAlPaQH-"
       },
@@ -328,7 +334,7 @@
         "# Toggle this to switch between Gemini 1.5 with a system instruction, or Gemini 1.0 Pro.\n",
         "use_sys_inst = False\n",
         "\n",
-        "model_name = 'gemini-1.5-pro-latest' if use_sys_inst else 'gemini-1.0-pro-latest'\n",
+        "model_name = 'gemini-1.5-flash' if use_sys_inst else 'gemini-1.0-pro'\n",
         "\n",
         "if use_sys_inst:\n",
         "  model = genai.GenerativeModel(\n",
@@ -371,7 +377,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 19,
+      "execution_count": 6,
       "metadata": {
         "id": "38SAyrNNVhvE"
       },
@@ -382,14 +388,20 @@
           "text": [
             "Welcome to Barista bot!\n",
             "\n",
-            "\n",
-            "> Tea, Earl Grey, Hot.\n"
+            "\n"
+          ]
+        },
+        {
+          "name": "stdin",
+          "output_type": "stream",
+          "text": [
+            ">  I would like a capuccino with almond milk\n"
           ]
         },
         {
           "data": {
             "text/markdown": [
-              "OK, I have added an Earl Grey tea, hot, to your order."
+              "I have added a Cappuccino with Almond Milk to your order."
             ],
             "text/plain": [
               "<IPython.core.display.Markdown object>"
@@ -399,16 +411,16 @@
           "output_type": "display_data"
         },
         {
-          "name": "stdout",
+          "name": "stdin",
           "output_type": "stream",
           "text": [
-            "> and a strong latte please\n"
+            ">  do you have stone milk?\n"
           ]
         },
         {
           "data": {
             "text/markdown": [
-              "OK, and I have added a latte with double espresso to your order."
+              "I'm sorry, we do not have Stone Milk on the menu. Would you like any other type of milk with your cappuccino?"
             ],
             "text/plain": [
               "<IPython.core.display.Markdown object>"
@@ -417,23 +429,52 @@
           "metadata": {},
           "output_type": "display_data"
         },
+        {
+          "name": "stdin",
+          "output_type": "stream",
+          "text": [
+            ">  no, that's all\n"
+          ]
+        },
         {
           "name": "stdout",
           "output_type": "stream",
           "text": [
-            "> great, that's all thanks\n",
             "Your order:\n",
-            "  Earl Grey\n",
-            "   - Hot\n",
-            "  Latte\n",
-            "   - Double\n",
-            "Is this correct? make it so!\n"
+            "  Cappuccino\n",
+            "   - Almond Milk\n"
+          ]
+        },
+        {
+          "name": "stdin",
+          "output_type": "stream",
+          "text": [
+            "Is this correct?  yes\n"
+          ]
+        },
+        {
+          "data": {
+            "text/markdown": [
+              "Ok, I will place the order now."
+            ],
+            "text/plain": [
+              "<IPython.core.display.Markdown object>"
+            ]
+          },
+          "metadata": {},
+          "output_type": "display_data"
+        },
+        {
+          "name": "stdin",
+          "output_type": "stream",
+          "text": [
+            ">  thanks\n"
           ]
         },
         {
           "data": {
             "text/markdown": [
-              "Your order is confirmed, and it will be ready in about 4 minutes."
+              "Your order will be ready in about 10 minutes."
             ],
             "text/plain": [
               "<IPython.core.display.Markdown object>"
@@ -452,7 +493,7 @@
             "[barista bot session over]\n",
             "\n",
             "Your order:\n",
-            "  [('Earl Grey', ['Hot']), ('Latte', ['Double'])]\n",
+            "  [('Cappuccino', ['Almond Milk'])]\n",
             "\n",
             "- Thanks for using Barista Bot!\n"
           ]