diff --git a/docs/examples/simplebot.ipynb b/docs/examples/simplebot.ipynb
index b16aff1b3..6868e63af 100644
--- a/docs/examples/simplebot.ipynb
+++ b/docs/examples/simplebot.ipynb
@@ -38,18 +38,7 @@
"metadata": {
"keep_output": true
},
- "outputs": [
- {
- "data": {
- "text/plain": [
- "\"# Automatically write awesome commit messages\\n\\nAs a data scientist, I work with Git.\\n\\nIf you're anyt...\""
- ]
- },
- "execution_count": null,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
+ "outputs": [],
"source": [
"with open(\"../../data/blog_text.txt\", \"r+\") as f:\n",
" blog_text = f.read()\n",
@@ -75,645 +64,7 @@
"metadata": {
"keep_output": true
},
- "outputs": [
- {
- "data": {
- "application/javascript": [
- "(function(root) {\n",
- " function now() {\n",
- " return new Date();\n",
- " }\n",
- "\n",
- " var force = true;\n",
- " var py_version = '3.3.4'.replace('rc', '-rc.').replace('.dev', '-dev.');\n",
- " var reloading = false;\n",
- " var Bokeh = root.Bokeh;\n",
- "\n",
- " if (typeof (root._bokeh_timeout) === \"undefined\" || force) {\n",
- " root._bokeh_timeout = Date.now() + 5000;\n",
- " root._bokeh_failed_load = false;\n",
- " }\n",
- "\n",
- " function run_callbacks() {\n",
- " try {\n",
- " root._bokeh_onload_callbacks.forEach(function(callback) {\n",
- " if (callback != null)\n",
- " callback();\n",
- " });\n",
- " } finally {\n",
- " delete root._bokeh_onload_callbacks;\n",
- " }\n",
- " console.debug(\"Bokeh: all callbacks have finished\");\n",
- " }\n",
- "\n",
- " function load_libs(css_urls, js_urls, js_modules, js_exports, callback) {\n",
- " if (css_urls == null) css_urls = [];\n",
- " if (js_urls == null) js_urls = [];\n",
- " if (js_modules == null) js_modules = [];\n",
- " if (js_exports == null) js_exports = {};\n",
- "\n",
- " root._bokeh_onload_callbacks.push(callback);\n",
- "\n",
- " if (root._bokeh_is_loading > 0) {\n",
- " console.debug(\"Bokeh: BokehJS is being loaded, scheduling callback at\", now());\n",
- " return null;\n",
- " }\n",
- " if (js_urls.length === 0 && js_modules.length === 0 && Object.keys(js_exports).length === 0) {\n",
- " run_callbacks();\n",
- " return null;\n",
- " }\n",
- " if (!reloading) {\n",
- " console.debug(\"Bokeh: BokehJS not loaded, scheduling load and callback at\", now());\n",
- " }\n",
- "\n",
- " function on_load() {\n",
- " root._bokeh_is_loading--;\n",
- " if (root._bokeh_is_loading === 0) {\n",
- " console.debug(\"Bokeh: all BokehJS libraries/stylesheets loaded\");\n",
- " run_callbacks()\n",
- " }\n",
- " }\n",
- " window._bokeh_on_load = on_load\n",
- "\n",
- " function on_error() {\n",
- " console.error(\"failed to load \" + url);\n",
- " }\n",
- "\n",
- " var skip = [];\n",
- " if (window.requirejs) {\n",
- " window.requirejs.config({'packages': {}, 'paths': {'jspanel': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/jspanel', 'jspanel-modal': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/modal/jspanel.modal', 'jspanel-tooltip': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/tooltip/jspanel.tooltip', 'jspanel-hint': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/hint/jspanel.hint', 'jspanel-layout': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/layout/jspanel.layout', 'jspanel-contextmenu': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/contextmenu/jspanel.contextmenu', 'jspanel-dock': 'https://cdn.jsdelivr.net/npm/jspanel4@4.12.0/dist/extensions/dock/jspanel.dock', 'gridstack': 'https://cdn.jsdelivr.net/npm/gridstack@7.2.3/dist/gridstack-all', 'notyf': 'https://cdn.jsdelivr.net/npm/notyf@3/notyf.min'}, 'shim': {'jspanel': {'exports': 'jsPanel'}, 'gridstack': {'exports': 'GridStack'}}});\n",
- " require([\"jspanel\"], function(jsPanel) {\n",
- "\twindow.jsPanel = jsPanel\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-modal\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-tooltip\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-hint\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-layout\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-contextmenu\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"jspanel-dock\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " require([\"gridstack\"], function(GridStack) {\n",
- "\twindow.GridStack = GridStack\n",
- "\ton_load()\n",
- " })\n",
- " require([\"notyf\"], function() {\n",
- "\ton_load()\n",
- " })\n",
- " root._bokeh_is_loading = css_urls.length + 9;\n",
- " } else {\n",
- " root._bokeh_is_loading = css_urls.length + js_urls.length + js_modules.length + Object.keys(js_exports).length;\n",
- " }\n",
- "\n",
- " var existing_stylesheets = []\n",
- " var links = document.getElementsByTagName('link')\n",
- " for (var i = 0; i < links.length; i++) {\n",
- " var link = links[i]\n",
- " if (link.href != null) {\n",
- "\texisting_stylesheets.push(link.href)\n",
- " }\n",
- " }\n",
- " for (var i = 0; i < css_urls.length; i++) {\n",
- " var url = css_urls[i];\n",
- " if (existing_stylesheets.indexOf(url) !== -1) {\n",
- "\ton_load()\n",
- "\tcontinue;\n",
- " }\n",
- " const element = document.createElement(\"link\");\n",
- " element.onload = on_load;\n",
- " element.onerror = on_error;\n",
- " element.rel = \"stylesheet\";\n",
- " element.type = \"text/css\";\n",
- " element.href = url;\n",
- " console.debug(\"Bokeh: injecting link tag for BokehJS stylesheet: \", url);\n",
- " document.body.appendChild(element);\n",
- " } if (((window['jsPanel'] !== undefined) && (!(window['jsPanel'] instanceof HTMLElement))) || window.requirejs) {\n",
- " var urls = ['https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/jspanel.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/modal/jspanel.modal.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/tooltip/jspanel.tooltip.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/hint/jspanel.hint.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/layout/jspanel.layout.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/contextmenu/jspanel.contextmenu.js', 'https://cdn.holoviz.org/panel/1.3.8/dist/bundled/floatpanel/jspanel4@4.12.0/dist/extensions/dock/jspanel.dock.js'];\n",
- " for (var i = 0; i < urls.length; i++) {\n",
- " skip.push(urls[i])\n",
- " }\n",
- " } if (((window['GridStack'] !== undefined) && (!(window['GridStack'] instanceof HTMLElement))) || window.requirejs) {\n",
- " var urls = ['https://cdn.holoviz.org/panel/1.3.8/dist/bundled/gridstack/gridstack@7.2.3/dist/gridstack-all.js'];\n",
- " for (var i = 0; i < urls.length; i++) {\n",
- " skip.push(urls[i])\n",
- " }\n",
- " } if (((window['Notyf'] !== undefined) && (!(window['Notyf'] instanceof HTMLElement))) || window.requirejs) {\n",
- " var urls = ['https://cdn.holoviz.org/panel/1.3.8/dist/bundled/notificationarea/notyf@3/notyf.min.js'];\n",
- " for (var i = 0; i < urls.length; i++) {\n",
- " skip.push(urls[i])\n",
- " }\n",
- " } var existing_scripts = []\n",
- " var scripts = document.getElementsByTagName('script')\n",
- " for (var i = 0; i < scripts.length; i++) {\n",
- " var script = scripts[i]\n",
- " if (script.src != null) {\n",
- "\texisting_scripts.push(script.src)\n",
- " }\n",
- " }\n",
- " for (var i = 0; i < js_urls.length; i++) {\n",
- " var url = js_urls[i];\n",
- " if (skip.indexOf(url) !== -1 || existing_scripts.indexOf(url) !== -1) {\n",
- "\tif (!window.requirejs) {\n",
- "\t on_load();\n",
- "\t}\n",
- "\tcontinue;\n",
- " }\n",
- " var element = document.createElement('script');\n",
- " element.onload = on_load;\n",
- " element.onerror = on_error;\n",
- " element.async = false;\n",
- " element.src = url;\n",
- " console.debug(\"Bokeh: injecting script tag for BokehJS library: \", url);\n",
- " document.head.appendChild(element);\n",
- " }\n",
- " for (var i = 0; i < js_modules.length; i++) {\n",
- " var url = js_modules[i];\n",
- " if (skip.indexOf(url) !== -1 || existing_scripts.indexOf(url) !== -1) {\n",
- "\tif (!window.requirejs) {\n",
- "\t on_load();\n",
- "\t}\n",
- "\tcontinue;\n",
- " }\n",
- " var element = document.createElement('script');\n",
- " element.onload = on_load;\n",
- " element.onerror = on_error;\n",
- " element.async = false;\n",
- " element.src = url;\n",
- " element.type = \"module\";\n",
- " console.debug(\"Bokeh: injecting script tag for BokehJS library: \", url);\n",
- " document.head.appendChild(element);\n",
- " }\n",
- " for (const name in js_exports) {\n",
- " var url = js_exports[name];\n",
- " if (skip.indexOf(url) >= 0 || root[name] != null) {\n",
- "\tif (!window.requirejs) {\n",
- "\t on_load();\n",
- "\t}\n",
- "\tcontinue;\n",
- " }\n",
- " var element = document.createElement('script');\n",
- " element.onerror = on_error;\n",
- " element.async = false;\n",
- " element.type = \"module\";\n",
- " console.debug(\"Bokeh: injecting script tag for BokehJS library: \", url);\n",
- " element.textContent = `\n",
- " import ${name} from \"${url}\"\n",
- " window.${name} = ${name}\n",
- " window._bokeh_on_load()\n",
- " `\n",
- " document.head.appendChild(element);\n",
- " }\n",
- " if (!js_urls.length && !js_modules.length) {\n",
- " on_load()\n",
- " }\n",
- " };\n",
- "\n",
- " function inject_raw_css(css) {\n",
- " const element = document.createElement(\"style\");\n",
- " element.appendChild(document.createTextNode(css));\n",
- " document.body.appendChild(element);\n",
- " }\n",
- "\n",
- " var js_urls = [\"https://cdn.bokeh.org/bokeh/release/bokeh-3.3.4.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.3.4.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.3.4.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.3.4.min.js\", \"https://cdn.holoviz.org/panel/1.3.8/dist/panel.min.js\"];\n",
- " var js_modules = [];\n",
- " var js_exports = {};\n",
- " var css_urls = [];\n",
- " var inline_js = [ function(Bokeh) {\n",
- " Bokeh.set_log_level(\"info\");\n",
- " },\n",
- "function(Bokeh) {} // ensure no trailing comma for IE\n",
- " ];\n",
- "\n",
- " function run_inline_js() {\n",
- " if ((root.Bokeh !== undefined) || (force === true)) {\n",
- " for (var i = 0; i < inline_js.length; i++) {\n",
- "\ttry {\n",
- " inline_js[i].call(root, root.Bokeh);\n",
- "\t} catch(e) {\n",
- "\t if (!reloading) {\n",
- "\t throw e;\n",
- "\t }\n",
- "\t}\n",
- " }\n",
- " // Cache old bokeh versions\n",
- " if (Bokeh != undefined && !reloading) {\n",
- "\tvar NewBokeh = root.Bokeh;\n",
- "\tif (Bokeh.versions === undefined) {\n",
- "\t Bokeh.versions = new Map();\n",
- "\t}\n",
- "\tif (NewBokeh.version !== Bokeh.version) {\n",
- "\t Bokeh.versions.set(NewBokeh.version, NewBokeh)\n",
- "\t}\n",
- "\troot.Bokeh = Bokeh;\n",
- " }} else if (Date.now() < root._bokeh_timeout) {\n",
- " setTimeout(run_inline_js, 100);\n",
- " } else if (!root._bokeh_failed_load) {\n",
- " console.log(\"Bokeh: BokehJS failed to load within specified timeout.\");\n",
- " root._bokeh_failed_load = true;\n",
- " }\n",
- " root._bokeh_is_initializing = false\n",
- " }\n",
- "\n",
- " function load_or_wait() {\n",
- " // Implement a backoff loop that tries to ensure we do not load multiple\n",
- " // versions of Bokeh and its dependencies at the same time.\n",
- " // In recent versions we use the root._bokeh_is_initializing flag\n",
- " // to determine whether there is an ongoing attempt to initialize\n",
- " // bokeh, however for backward compatibility we also try to ensure\n",
- " // that we do not start loading a newer (Panel>=1.0 and Bokeh>3) version\n",
- " // before older versions are fully initialized.\n",
- " if (root._bokeh_is_initializing && Date.now() > root._bokeh_timeout) {\n",
- " root._bokeh_is_initializing = false;\n",
- " root._bokeh_onload_callbacks = undefined;\n",
- " console.log(\"Bokeh: BokehJS was loaded multiple times but one version failed to initialize.\");\n",
- " load_or_wait();\n",
- " } else if (root._bokeh_is_initializing || (typeof root._bokeh_is_initializing === \"undefined\" && root._bokeh_onload_callbacks !== undefined)) {\n",
- " setTimeout(load_or_wait, 100);\n",
- " } else {\n",
- " root._bokeh_is_initializing = true\n",
- " root._bokeh_onload_callbacks = []\n",
- " var bokeh_loaded = Bokeh != null && (Bokeh.version === py_version || (Bokeh.versions !== undefined && Bokeh.versions.has(py_version)));\n",
- " if (!reloading && !bokeh_loaded) {\n",
- "\troot.Bokeh = undefined;\n",
- " }\n",
- " load_libs(css_urls, js_urls, js_modules, js_exports, function() {\n",
- "\tconsole.debug(\"Bokeh: BokehJS plotting callback run at\", now());\n",
- "\trun_inline_js();\n",
- " });\n",
- " }\n",
- " }\n",
- " // Give older versions of the autoload script a head-start to ensure\n",
- " // they initialize before we start loading newer version.\n",
- " setTimeout(load_or_wait, 100)\n",
- "}(window));"
- ],
- "application/vnd.holoviews_load.v0+json": ""
- },
- "metadata": {},
- "output_type": "display_data"
- },
- {
- "data": {
- "application/javascript": [
- "\n",
- "if ((window.PyViz === undefined) || (window.PyViz instanceof HTMLElement)) {\n",
- " window.PyViz = {comms: {}, comm_status:{}, kernels:{}, receivers: {}, plot_index: []}\n",
- "}\n",
- "\n",
- "\n",
- " function JupyterCommManager() {\n",
- " }\n",
- "\n",
- " JupyterCommManager.prototype.register_target = function(plot_id, comm_id, msg_handler) {\n",
- " if (window.comm_manager || ((window.Jupyter !== undefined) && (Jupyter.notebook.kernel != null))) {\n",
- " var comm_manager = window.comm_manager || Jupyter.notebook.kernel.comm_manager;\n",
- " comm_manager.register_target(comm_id, function(comm) {\n",
- " comm.on_msg(msg_handler);\n",
- " });\n",
- " } else if ((plot_id in window.PyViz.kernels) && (window.PyViz.kernels[plot_id])) {\n",
- " window.PyViz.kernels[plot_id].registerCommTarget(comm_id, function(comm) {\n",
- " comm.onMsg = msg_handler;\n",
- " });\n",
- " } else if (typeof google != 'undefined' && google.colab.kernel != null) {\n",
- " google.colab.kernel.comms.registerTarget(comm_id, (comm) => {\n",
- " var messages = comm.messages[Symbol.asyncIterator]();\n",
- " function processIteratorResult(result) {\n",
- " var message = result.value;\n",
- " console.log(message)\n",
- " var content = {data: message.data, comm_id};\n",
- " var buffers = []\n",
- " for (var buffer of message.buffers || []) {\n",
- " buffers.push(new DataView(buffer))\n",
- " }\n",
- " var metadata = message.metadata || {};\n",
- " var msg = {content, buffers, metadata}\n",
- " msg_handler(msg);\n",
- " return messages.next().then(processIteratorResult);\n",
- " }\n",
- " return messages.next().then(processIteratorResult);\n",
- " })\n",
- " }\n",
- " }\n",
- "\n",
- " JupyterCommManager.prototype.get_client_comm = function(plot_id, comm_id, msg_handler) {\n",
- " if (comm_id in window.PyViz.comms) {\n",
- " return window.PyViz.comms[comm_id];\n",
- " } else if (window.comm_manager || ((window.Jupyter !== undefined) && (Jupyter.notebook.kernel != null))) {\n",
- " var comm_manager = window.comm_manager || Jupyter.notebook.kernel.comm_manager;\n",
- " var comm = comm_manager.new_comm(comm_id, {}, {}, {}, comm_id);\n",
- " if (msg_handler) {\n",
- " comm.on_msg(msg_handler);\n",
- " }\n",
- " } else if ((plot_id in window.PyViz.kernels) && (window.PyViz.kernels[plot_id])) {\n",
- " var comm = window.PyViz.kernels[plot_id].connectToComm(comm_id);\n",
- " comm.open();\n",
- " if (msg_handler) {\n",
- " comm.onMsg = msg_handler;\n",
- " }\n",
- " } else if (typeof google != 'undefined' && google.colab.kernel != null) {\n",
- " var comm_promise = google.colab.kernel.comms.open(comm_id)\n",
- " comm_promise.then((comm) => {\n",
- " window.PyViz.comms[comm_id] = comm;\n",
- " if (msg_handler) {\n",
- " var messages = comm.messages[Symbol.asyncIterator]();\n",
- " function processIteratorResult(result) {\n",
- " var message = result.value;\n",
- " var content = {data: message.data};\n",
- " var metadata = message.metadata || {comm_id};\n",
- " var msg = {content, metadata}\n",
- " msg_handler(msg);\n",
- " return messages.next().then(processIteratorResult);\n",
- " }\n",
- " return messages.next().then(processIteratorResult);\n",
- " }\n",
- " }) \n",
- " var sendClosure = (data, metadata, buffers, disposeOnDone) => {\n",
- " return comm_promise.then((comm) => {\n",
- " comm.send(data, metadata, buffers, disposeOnDone);\n",
- " });\n",
- " };\n",
- " var comm = {\n",
- " send: sendClosure\n",
- " };\n",
- " }\n",
- " window.PyViz.comms[comm_id] = comm;\n",
- " return comm;\n",
- " }\n",
- " window.PyViz.comm_manager = new JupyterCommManager();\n",
- " \n",
- "\n",
- "\n",
- "var JS_MIME_TYPE = 'application/javascript';\n",
- "var HTML_MIME_TYPE = 'text/html';\n",
- "var EXEC_MIME_TYPE = 'application/vnd.holoviews_exec.v0+json';\n",
- "var CLASS_NAME = 'output';\n",
- "\n",
- "/**\n",
- " * Render data to the DOM node\n",
- " */\n",
- "function render(props, node) {\n",
- " var div = document.createElement(\"div\");\n",
- " var script = document.createElement(\"script\");\n",
- " node.appendChild(div);\n",
- " node.appendChild(script);\n",
- "}\n",
- "\n",
- "/**\n",
- " * Handle when a new output is added\n",
- " */\n",
- "function handle_add_output(event, handle) {\n",
- " var output_area = handle.output_area;\n",
- " var output = handle.output;\n",
- " if ((output.data == undefined) || (!output.data.hasOwnProperty(EXEC_MIME_TYPE))) {\n",
- " return\n",
- " }\n",
- " var id = output.metadata[EXEC_MIME_TYPE][\"id\"];\n",
- " var toinsert = output_area.element.find(\".\" + CLASS_NAME.split(' ')[0]);\n",
- " if (id !== undefined) {\n",
- " var nchildren = toinsert.length;\n",
- " var html_node = toinsert[nchildren-1].children[0];\n",
- " html_node.innerHTML = output.data[HTML_MIME_TYPE];\n",
- " var scripts = [];\n",
- " var nodelist = html_node.querySelectorAll(\"script\");\n",
- " for (var i in nodelist) {\n",
- " if (nodelist.hasOwnProperty(i)) {\n",
- " scripts.push(nodelist[i])\n",
- " }\n",
- " }\n",
- "\n",
- " scripts.forEach( function (oldScript) {\n",
- " var newScript = document.createElement(\"script\");\n",
- " var attrs = [];\n",
- " var nodemap = oldScript.attributes;\n",
- " for (var j in nodemap) {\n",
- " if (nodemap.hasOwnProperty(j)) {\n",
- " attrs.push(nodemap[j])\n",
- " }\n",
- " }\n",
- " attrs.forEach(function(attr) { newScript.setAttribute(attr.name, attr.value) });\n",
- " newScript.appendChild(document.createTextNode(oldScript.innerHTML));\n",
- " oldScript.parentNode.replaceChild(newScript, oldScript);\n",
- " });\n",
- " if (JS_MIME_TYPE in output.data) {\n",
- " toinsert[nchildren-1].children[1].textContent = output.data[JS_MIME_TYPE];\n",
- " }\n",
- " output_area._hv_plot_id = id;\n",
- " if ((window.Bokeh !== undefined) && (id in Bokeh.index)) {\n",
- " window.PyViz.plot_index[id] = Bokeh.index[id];\n",
- " } else {\n",
- " window.PyViz.plot_index[id] = null;\n",
- " }\n",
- " } else if (output.metadata[EXEC_MIME_TYPE][\"server_id\"] !== undefined) {\n",
- " var bk_div = document.createElement(\"div\");\n",
- " bk_div.innerHTML = output.data[HTML_MIME_TYPE];\n",
- " var script_attrs = bk_div.children[0].attributes;\n",
- " for (var i = 0; i < script_attrs.length; i++) {\n",
- " toinsert[toinsert.length - 1].childNodes[1].setAttribute(script_attrs[i].name, script_attrs[i].value);\n",
- " }\n",
- " // store reference to server id on output_area\n",
- " output_area._bokeh_server_id = output.metadata[EXEC_MIME_TYPE][\"server_id\"];\n",
- " }\n",
- "}\n",
- "\n",
- "/**\n",
- " * Handle when an output is cleared or removed\n",
- " */\n",
- "function handle_clear_output(event, handle) {\n",
- " var id = handle.cell.output_area._hv_plot_id;\n",
- " var server_id = handle.cell.output_area._bokeh_server_id;\n",
- " if (((id === undefined) || !(id in PyViz.plot_index)) && (server_id !== undefined)) { return; }\n",
- " var comm = window.PyViz.comm_manager.get_client_comm(\"hv-extension-comm\", \"hv-extension-comm\", function () {});\n",
- " if (server_id !== null) {\n",
- " comm.send({event_type: 'server_delete', 'id': server_id});\n",
- " return;\n",
- " } else if (comm !== null) {\n",
- " comm.send({event_type: 'delete', 'id': id});\n",
- " }\n",
- " delete PyViz.plot_index[id];\n",
- " if ((window.Bokeh !== undefined) & (id in window.Bokeh.index)) {\n",
- " var doc = window.Bokeh.index[id].model.document\n",
- " doc.clear();\n",
- " const i = window.Bokeh.documents.indexOf(doc);\n",
- " if (i > -1) {\n",
- " window.Bokeh.documents.splice(i, 1);\n",
- " }\n",
- " }\n",
- "}\n",
- "\n",
- "/**\n",
- " * Handle kernel restart event\n",
- " */\n",
- "function handle_kernel_cleanup(event, handle) {\n",
- " delete PyViz.comms[\"hv-extension-comm\"];\n",
- " window.PyViz.plot_index = {}\n",
- "}\n",
- "\n",
- "/**\n",
- " * Handle update_display_data messages\n",
- " */\n",
- "function handle_update_output(event, handle) {\n",
- " handle_clear_output(event, {cell: {output_area: handle.output_area}})\n",
- " handle_add_output(event, handle)\n",
- "}\n",
- "\n",
- "function register_renderer(events, OutputArea) {\n",
- " function append_mime(data, metadata, element) {\n",
- " // create a DOM node to render to\n",
- " var toinsert = this.create_output_subarea(\n",
- " metadata,\n",
- " CLASS_NAME,\n",
- " EXEC_MIME_TYPE\n",
- " );\n",
- " this.keyboard_manager.register_events(toinsert);\n",
- " // Render to node\n",
- " var props = {data: data, metadata: metadata[EXEC_MIME_TYPE]};\n",
- " render(props, toinsert[0]);\n",
- " element.append(toinsert);\n",
- " return toinsert\n",
- " }\n",
- "\n",
- " events.on('output_added.OutputArea', handle_add_output);\n",
- " events.on('output_updated.OutputArea', handle_update_output);\n",
- " events.on('clear_output.CodeCell', handle_clear_output);\n",
- " events.on('delete.Cell', handle_clear_output);\n",
- " events.on('kernel_ready.Kernel', handle_kernel_cleanup);\n",
- "\n",
- " OutputArea.prototype.register_mime_type(EXEC_MIME_TYPE, append_mime, {\n",
- " safe: true,\n",
- " index: 0\n",
- " });\n",
- "}\n",
- "\n",
- "if (window.Jupyter !== undefined) {\n",
- " try {\n",
- " var events = require('base/js/events');\n",
- " var OutputArea = require('notebook/js/outputarea').OutputArea;\n",
- " if (OutputArea.prototype.mime_types().indexOf(EXEC_MIME_TYPE) == -1) {\n",
- " register_renderer(events, OutputArea);\n",
- " }\n",
- " } catch(err) {\n",
- " }\n",
- "}\n"
- ],
- "application/vnd.holoviews_load.v0+json": ""
- },
- "metadata": {},
- "output_type": "display_data"
- },
- {
- "data": {
- "text/html": [
- ""
- ]
- },
- "metadata": {},
- "output_type": "display_data"
- },
- {
- "data": {
- "application/vnd.holoviews_exec.v0+json": "",
- "text/html": [
- "\n",
- ""
- ]
- },
- "metadata": {
- "application/vnd.holoviews_exec.v0+json": {
- "id": "98a8039b-929d-45c8-934c-184d221b59d7"
- }
- },
- "output_type": "display_data"
- }
- ],
+ "outputs": [],
"source": [
"from llamabot import SimpleBot\n",
"\n",
@@ -728,7 +79,8 @@
"\n",
"linkedin = SimpleBot(\n",
" system_prompt=system_prompt,\n",
- " stream_target=\"stdout\", # this is the default!\n",
+ " stream_target=\"stdout\", # this is the default!,\n",
+ " model_name=\"gpt-4-0125-preview\",\n",
")"
]
},
@@ -756,21 +108,7 @@
"metadata": {
"keep_output": true
},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "🚀 Excited to share my latest blog post on crafting meaningful commit messages!\n",
- "👀 Are your commit messages lacking detail and clarity?\n",
- "🤔 Ever wished for a tool that could automatically generate informative commit messages for you?\n",
- "🌟 Introducing my CLI tool within `llamabot` that crafts commit messages according to the Conventional Commits specification.\n",
- "🔍 With an OpenAI API key, GPT-4-32k will write a commit message that provides detailed insights into the changes made.\n",
- "🎉 The benefits of using meaningful commit messages are manifold - from improving collaboration to aiding in debugging and issue resolution.\n",
- "🔗 Check out the full blog post to learn more about the impact of meaningful commit messages and how to install `llamabot`! #Git #DataScience #Productivity"
- ]
- }
- ],
+ "outputs": [],
"source": [
"linkedin_post = linkedin(blog_text)"
]
@@ -910,7 +248,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.11.7"
+ "version": "3.11.8"
}
},
"nbformat": 4,
diff --git a/docs/releases/v0.2.5.md b/docs/releases/v0.2.5.md
index 623ff881d..ba686871b 100644
--- a/docs/releases/v0.2.5.md
+++ b/docs/releases/v0.2.5.md
@@ -16,4 +16,4 @@ There are no new features in this release.
There are no deprecations in this release.
-Note: The commit `48bb8c4` is related to version bump and does not introduce any new features or bug fixes. The commit `faa971d` is related to adding release notes and does not introduce any new features or bug fixes. Therefore, they are not included in the release notes.
\ No newline at end of file
+Note: The commit `48bb8c4` is related to version bump and does not introduce any new features or bug fixes. The commit `faa971d` is related to adding release notes and does not introduce any new features or bug fixes. Therefore, they are not included in the release notes.
diff --git a/environment.yml b/environment.yml
index 27864cccd..b69d69864 100644
--- a/environment.yml
+++ b/environment.yml
@@ -61,3 +61,4 @@ dependencies:
- litellm
- pydantic>=2.0
- pdfminer.six
+ - rank-bm25
diff --git a/llamabot/bot/querybot.py b/llamabot/bot/querybot.py
index b2ec74977..270c3e0e1 100644
--- a/llamabot/bot/querybot.py
+++ b/llamabot/bot/querybot.py
@@ -9,7 +9,7 @@
from llamabot.bot.simplebot import SimpleBot
from llamabot.components.messages import AIMessage, HumanMessage
from llamabot.components.docstore import DocumentStore
-from llamabot.components.api import APIMixin
+from llamabot.components.chatui import ChatUIMixin
from llamabot.components.messages import (
RetrievedMessage,
retrieve_messages_up_to_budget,
@@ -24,16 +24,18 @@
prompt_recorder_var = contextvars.ContextVar("prompt_recorder")
-class QueryBot(SimpleBot, DocumentStore, APIMixin):
- """QueryBot is a bot that uses simple RAG to answer questions about a document."""
+class QueryBot(SimpleBot, DocumentStore, ChatUIMixin):
+ """QueryBot is a bot that uses the DocumentStore to answer questions about a document."""
def __init__(
self,
system_prompt: str,
collection_name: str,
+ initial_message: Optional[str] = None,
document_paths: Optional[Path | list[Path]] = None,
temperature: float = 0.0,
model_name: str = default_language_model(),
+ stream_target: str = "stdout",
**kwargs,
):
SimpleBot.__init__(
@@ -41,7 +43,7 @@ def __init__(
system_prompt=system_prompt,
temperature=temperature,
model_name=model_name,
- stream_target="stdout",
+ stream_target=stream_target,
**kwargs,
)
DocumentStore.__init__(self, collection_name=slugify(collection_name))
@@ -49,7 +51,9 @@ def __init__(
self.add_documents(document_paths=document_paths)
self.response_budget = 2_000
- def __call__(self, query: str, n_results: int = 20) -> AIMessage:
+ ChatUIMixin.__init__(self, initial_message)
+
+ def __call__(self, query: str, n_results: int = 10) -> AIMessage:
"""Query documents within QueryBot's document store.
We use RAG to query out documents.
@@ -70,5 +74,8 @@ def __call__(self, query: str, n_results: int = 20) -> AIMessage:
)
messages.extend(retrieved)
messages.append(HumanMessage(content=query))
- response: AIMessage = self.stream_stdout(messages)
- return response
+ if self.stream_target == "stdout":
+ response: AIMessage = self.stream_stdout(messages)
+ return response
+ elif self.stream_target == "panel":
+ return self.stream_panel(messages)
diff --git a/llamabot/cli/doc.py b/llamabot/cli/doc.py
index d4bd7845c..ea2fc651b 100644
--- a/llamabot/cli/doc.py
+++ b/llamabot/cli/doc.py
@@ -12,20 +12,35 @@
@app.command()
def chat(
+ model_name: str = typer.Option(
+ "mistral/mistral-medium", help="Name of the LLM to use."
+ ),
+ initial_message: str = typer.Option(..., help="Initial message for the bot."),
+ panel: bool = typer.Option(True, help="Whether to use Panel or not."),
doc_path: Path = typer.Argument(
"", help="Path to the document you wish to chat with."
- )
+ ),
):
"""Chat with your document.
+ :param model_name: Name of the LLM to use.
+ :param panel: Whether to use Panel or not. If not, we default to using CLI chat.
+ :param initial_message: The initial message to send to the user.
:param doc_path: Path to the document you wish to chat with.
"""
+ stream_target = "stdout"
+ if panel:
+ stream_target = "panel"
+
bot = QueryBot(
system_prompt=(
"You are a bot that can answer questions about a document provided to you."
),
collection_name=doc_path.stem.lower().replace(" ", "-"),
document_paths=[doc_path],
+ model_name=model_name,
+ initial_message=initial_message,
+ stream_target=stream_target,
)
typer.echo(
(
@@ -35,6 +50,10 @@ def chat(
)
)
+ if panel:
+ print("Serving your document in a panel...")
+ bot.serve()
+
while True:
query = uniform_prompt()
exit_if_asked(query)
diff --git a/llamabot/components/chatui.py b/llamabot/components/chatui.py
index 4b72aa3fd..853140815 100644
--- a/llamabot/components/chatui.py
+++ b/llamabot/components/chatui.py
@@ -7,7 +7,11 @@
class ChatUIMixin:
"""A mixin for a chat user interface."""
- def __init__(self, callback_function: Optional[Callable] = None):
+ def __init__(
+ self,
+ initial_message: Optional[str] = None,
+ callback_function: Optional[Callable] = None,
+ ):
self.callback_function = callback_function
if callback_function is None:
self.callback_function = lambda ai_message, user, instance: self(ai_message)
@@ -15,6 +19,8 @@ def __init__(self, callback_function: Optional[Callable] = None):
self.chat_interface = pn.chat.ChatInterface(
callback=self.callback_function, callback_exception="verbose"
)
+ if initial_message is not None:
+ self.chat_interface.send(initial_message, user="System", respond=False)
def servable(self):
"""Return the chat interface as a Panel servable object.
@@ -22,3 +28,10 @@ def servable(self):
:returns: The chat interface as a Panel servable object.
"""
return self.chat_interface.servable()
+
+ def serve(self):
+ """Serve the chat interface.
+
+ :returns: None
+ """
+ self.chat_interface.show()
diff --git a/llamabot/components/docstore.py b/llamabot/components/docstore.py
index 8a854eb73..2afc5886f 100644
--- a/llamabot/components/docstore.py
+++ b/llamabot/components/docstore.py
@@ -9,12 +9,14 @@
ChromaDB is a great default choice because of its simplicity and FOSS nature.
Hence we use it by default.
"""
+
from pathlib import Path
import chromadb
from hashlib import sha256
from chromadb import QueryResult
from llamabot.doc_processor import magic_load_doc, split_document
from tqdm.auto import tqdm
+from rank_bm25 import BM25Okapi
class DocumentStore:
@@ -63,10 +65,24 @@ def retrieve(self, query: str, n_results: int = 10) -> list[str]:
:param query: The query to use to retrieve documents.
"""
+ # Use BM25 to get documents.
+ self.existing_records = self.collection.get()
+ tokenized_documents = [
+ doc.split() for doc in self.existing_records["documents"]
+ ]
+ search_engine = BM25Okapi(tokenized_documents)
+ bm25_documents: list[str] = search_engine.get_top_n(
+ query.split(), self.existing_records["documents"], n=n_results
+ )
+ # Use Vectordb to get documents.
results: QueryResult = self.collection.query(
query_texts=query, n_results=n_results
)
- return results["documents"][0]
+ vectordb_documents: list[str] = results["documents"][0]
+
+ # Return the union of the retrieved documents
+ union = set(vectordb_documents).union(bm25_documents)
+ return list(union)
def reset(self):
"""Reset the document store."""
diff --git a/llamabot/prompt_library/git.py b/llamabot/prompt_library/git.py
index 12662a3de..2da1d2514 100644
--- a/llamabot/prompt_library/git.py
+++ b/llamabot/prompt_library/git.py
@@ -14,7 +14,7 @@ def commitbot():
"""
return SimpleBot(
"You are an expert user of Git.",
- model_name="mistral/mistral-medium",
+ model_name="gpt-4-0125-preview",
stream_target="stdout",
)
diff --git a/pyproject.toml b/pyproject.toml
index 2bd12ddb2..bcfdcb6be 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,7 +88,8 @@ dependencies = [
"chromadb",
"python-slugify",
"pydantic>=2.0",
- "pdfminer.six"
+ "pdfminer.six",
+ "rank-bm25",
]
requires-python = ">3.10"
description = "A Pythonic interface to LLMs."
diff --git a/tests/bot/test_querybot.py b/tests/bot/test_querybot.py
index 13d3cc0ce..e2f029c86 100644
--- a/tests/bot/test_querybot.py
+++ b/tests/bot/test_querybot.py
@@ -8,21 +8,25 @@
collection_name=st.text(
alphabet="abcdefghijklmnopqrstuvwxyz0123456789", min_size=4, max_size=63
),
- dummy_text=st.text(),
- mock_response=st.text(),
- human_message=st.text(),
+ dummy_text=st.text(min_size=400),
+ mock_response=st.text(min_size=4),
+ stream_target=st.one_of(st.just("panel"), st.just("stdout")),
)
@settings(suppress_health_check=[HealthCheck.function_scoped_fixture], deadline=None)
-def test_querybot_init(
- tmp_path, system_prompt, collection_name, dummy_text, mock_response, human_message
+def test_querybot(
+ tmp_path, system_prompt, collection_name, dummy_text, mock_response, stream_target
):
"""Test initialization of QueryBot."""
tempfile = tmp_path / "test.txt"
tempfile.write_text(dummy_text)
- QueryBot(
+ bot = QueryBot(
system_prompt=system_prompt,
collection_name=collection_name,
document_paths=tempfile,
mock_response=mock_response,
+ stream_target=stream_target,
)
+
+ bot("How are you doing?")
+ bot.reset()
diff --git a/tests/components/test_docstore.py b/tests/components/test_docstore.py
index 62766d9b4..851bc9a02 100644
--- a/tests/components/test_docstore.py
+++ b/tests/components/test_docstore.py
@@ -46,7 +46,9 @@ def test_add_documents(tmp_path: Path):
retrieved_documents = docstore.retrieve("query", n_results=2)
# Assert that the retrieved documents match the added documents
- assert retrieved_documents == ["content of document1", "content of document2"]
+ assert set(retrieved_documents) == set(
+ ["content of document1", "content of document2"]
+ )
# Clean up the temporary collection
docstore.client.delete_collection(collection_name)