fix: update docs and demos for consistency

This commit includes several fixes and updates to the documentation and demo scripts to improve consistency and correctness.

The changes include:
- Adding documentation for the `ollama_messages_last` and `ollama_messages_last_json` functions in `docs/functions.md` and creating their individual doc files.
- Correcting the alias for `ollama_messages_clear` from `omc` to `omclear` in `docs/aliases.md`.
- Updating the function lists in `demos/function.help.sh` and `demos/function.versions.sh` to be complete and accurate, which involved adding `ollama_chat_json`, `ollama_messages_last`, and `ollama_messages_last_json`.
- Re-running the `demos/run.demos.sh` script to regenerate the demo markdown files with the corrected function lists, eliminating "command not found" errors.
- Deleting stray `help.md` and `messages.md` files from the root directory.

These changes ensure that the documentation is up-to-date and that the demo scripts run without errors.

Author: google-labs-jules[bot]

demos/function.help.md

@@ -160,40 +160,28 @@ This function returns the current number of messages stored in the 'OBL_MESSAGES
 It can be used to check if a conversation has started or to monitor the length of the conversation history.
 ```
 
-./function.help.sh: line 62: ollama_tools_add: command not found
-## `ollama_tools_add -h`
+## `ollama_messages_last -h`
 ```
+Usage: ollama_messages_last [-h] [-v]
 
-```
-
-./function.help.sh: line 62: ollama_tools: command not found
-## `ollama_tools -h`
-```
-
-```
-
-./function.help.sh: line 62: ollama_tools_count: command not found
-## `ollama_tools_count -h`
-```
+Get the content of the last message from the session history as a string.
 
-```
-
-./function.help.sh: line 62: ollama_tools_clear: command not found
-## `ollama_tools_clear -h`
-```
+  -h          Show this help and exit.
+  -v          Show version information and exit.
 
+This function retrieves the last message using 'ollama_messages_last_json' and extracts the 'content' field, returning it as a plain string.
 ```
 
-./function.help.sh: line 62: ollama_tools_is_call: command not found
-## `ollama_tools_is_call -h`
+## `ollama_messages_last_json -h`
 ```
+Usage: ollama_messages_last_json [-h] [-v]
 
-```
+Get the last message from the session history in JSON format.
 
-./function.help.sh: line 62: ollama_tools_run: command not found
-## `ollama_tools_run -h`
-```
+  -h          Show this help and exit.
+  -v          Show version information and exit.
 
+This function retrieves the most recent message from the 'OBL_MESSAGES' array and outputs it as a JSON string.
 ```
 
 ## `ollama_chat -h`
@@ -211,6 +199,21 @@ It handles the JSON parsing and returns only the content of the model\'s message
 It is ideal for simple, non-streaming chat interactions.
 ```
 
+## `ollama_chat_json -h`
+```
+Usage: ollama_chat_json -m <model> [-h] [-v]
+
+Request a chat completion from a model, receiving JSON output.
+
+  -m <model>  Name of the model to use (required).
+  -h          Show this help and exit.
+  -v          Show version information and exit.
+
+This function sends the entire message history ('OBL_MESSAGES') to the specified model and returns the model's response as a raw JSON object.
+It serves as the foundation for 'ollama_chat_stream', which provides more user-friendly text-based outputs.
+If 'OBL_STREAM' is 0, it adds the assistant's response to the message history.
+```
+
 ## `ollama_chat_stream -h`
 ```
 Usage: ollama_chat_stream -m <model> [-h] [-v]

demos/function.help.sh

@@ -27,13 +27,10 @@ functions=(
   ollama_messages_add
   ollama_messages_clear
   ollama_messages_count
-  ollama_tools_add
-  ollama_tools
-  ollama_tools_count
-  ollama_tools_clear
-  ollama_tools_is_call
-  ollama_tools_run
+  ollama_messages_last
+  ollama_messages_last_json
   ollama_chat
+  ollama_chat_json
   ollama_chat_stream
   ollama_chat_stream_json
   ollama_list

demos/function.versions.md

@@ -57,45 +57,24 @@ ollama_messages_clear version 0.46.3
 ollama_messages_count version 0.46.3
 ```
 
-./function.versions.sh: line 62: ollama_tools_add: command not found
-## `ollama_tools_add -v`
+## `ollama_messages_last -v`
 ```
-
-```
-
-./function.versions.sh: line 62: ollama_tools: command not found
-## `ollama_tools -v`
-```
-
+ollama_messages_last version 0.46.3
 ```
 
-./function.versions.sh: line 62: ollama_tools_count: command not found
-## `ollama_tools_count -v`
+## `ollama_messages_last_json -v`
 ```
-
-```
-
-./function.versions.sh: line 62: ollama_tools_clear: command not found
-## `ollama_tools_clear -v`
-```
-
+ollama_messages_last_json version 0.46.3
 ```
 
-./function.versions.sh: line 62: ollama_tools_is_call: command not found
-## `ollama_tools_is_call -v`
-```
-
-```
-
-./function.versions.sh: line 62: ollama_tools_run: command not found
-## `ollama_tools_run -v`
+## `ollama_chat -v`
 ```
-
+ollama_chat version 0.46.3
 ```
 
-## `ollama_chat -v`
+## `ollama_chat_json -v`
 ```
-ollama_chat version 0.46.3
+ollama_chat_json version 0.46.3
 ```
 
 ## `ollama_chat_stream -v`

demos/function.versions.sh

@@ -27,13 +27,10 @@ functions=(
   ollama_messages_add
   ollama_messages_clear
   ollama_messages_count
-  ollama_tools_add
-  ollama_tools
-  ollama_tools_count
-  ollama_tools_clear
-  ollama_tools_is_call
-  ollama_tools_run
+  ollama_messages_last
+  ollama_messages_last_json
   ollama_chat
+  ollama_chat_json
   ollama_chat_stream
   ollama_chat_stream_json
   ollama_list

demos/ollama_api_get.md

@@ -42,10 +42,10 @@ result: output:
 ```
 ollama_api_get
 
-[DEBUG] 08:56:32:132169642: ollama_api_get: []
-[DEBUG] 08:56:32:136351987: _call_curl: [GET] []
-[DEBUG] 08:56:32:140557638: _call_curl: OBL_API: http://localhost:11434
-[DEBUG] 08:56:32:145635787: _call_curl: args: -s -N --max-time 300 -H Content-Type: application/json -w \n%{http_code} -X GET http://localhost:11434
+[DEBUG] 09:19:59:810703001: ollama_api_get: []
+[DEBUG] 09:19:59:814668080: _call_curl: [GET] []
+[DEBUG] 09:19:59:818738818: _call_curl: OBL_API: http://localhost:11434
+[DEBUG] 09:19:59:822687260: _call_curl: args: -s -N --max-time 300 -H Content-Type: application/json -w \n%{http_code} -X GET http://localhost:11434
 [ERROR] _call_curl: curl command failed with exit code 7
 [ERROR] ollama_api_get: curl error: 7
 result: lines: 1
@@ -55,10 +55,10 @@ result: output:
 ```
 ollama_api_get -P "/api/version"
 
-[DEBUG] 08:56:32:170477904: ollama_api_get: [/api/version]
-[DEBUG] 08:56:32:174525069: _call_curl: [GET] [/api/version]
-[DEBUG] 08:56:32:178898298: _call_curl: OBL_API: http://localhost:11434
-[DEBUG] 08:56:32:183166557: _call_curl: args: -s -N --max-time 300 -H Content-Type: application/json -w \n%{http_code} -X GET http://localhost:11434/api/version
+[DEBUG] 09:19:59:845616034: ollama_api_get: [/api/version]
+[DEBUG] 09:19:59:849564874: _call_curl: [GET] [/api/version]
+[DEBUG] 09:19:59:853601526: _call_curl: OBL_API: http://localhost:11434
+[DEBUG] 09:19:59:857615585: _call_curl: args: -s -N --max-time 300 -H Content-Type: application/json -w \n%{http_code} -X GET http://localhost:11434/api/version
 [ERROR] _call_curl: curl command failed with exit code 7
 [ERROR] ollama_api_get: curl error: 7
 result: lines: 1

demos/ollama_generate.md

@@ -27,12 +27,12 @@ Usage: ollama_generate -m <model> [-p <prompt>] [-h] [-v]
 OBL_DEBUG=1 ollama_generate -m "$model" -p "$prompt"
 ```
 ```
-[DEBUG] 08:56:32:453675433: ollama_generate: [-m] [] [-p] [Describe a rabbit in 3 words]
-[DEBUG] 08:56:32:460585286: ollama_generate: init: model: [] prompt: []
-[DEBUG] 08:56:32:464624490: ollama_generate: while getopts: OPTARG: [] opt: [m]
-[DEBUG] 08:56:32:468640145: ollama_generate: while getopts: OPTARG: [Describe a rabbit in 3 words] opt: [p]
-[DEBUG] 08:56:32:472894514: ollama_generate: final: model: [] prompt: [Describe a rabbit in 3 words]
-[DEBUG] 08:56:32:477071622: ollama_generate: checking: model: []
+[DEBUG] 09:20:00:100747999: ollama_generate: [-m] [] [-p] [Describe a rabbit in 3 words]
+[DEBUG] 09:20:00:107865338: ollama_generate: init: model: [] prompt: []
+[DEBUG] 09:20:00:111836228: ollama_generate: while getopts: OPTARG: [] opt: [m]
+[DEBUG] 09:20:00:115975905: ollama_generate: while getopts: OPTARG: [Describe a rabbit in 3 words] opt: [p]
+[DEBUG] 09:20:00:120008900: ollama_generate: final: model: [] prompt: [Describe a rabbit in 3 words]
+[DEBUG] 09:20:00:124161118: ollama_generate: checking: model: []
 [ERROR] ollama_model_random: ollama is not installed
 Error: -m <model> is required
 

demos/ollama_generate_json.md

@@ -32,9 +32,9 @@ Usage: ollama_generate_json -m <model> [-p <prompt>] [-h] [-v]
 OBL_DEBUG=1 ollama_generate_json -m "" -p "Describe a rabbit in 3 words"
 ```
 ```json
-[DEBUG] 08:56:32:571665461: _is_valid_model: Model name empty: getting random model
+[DEBUG] 09:20:00:219094469: _is_valid_model: Model name empty: getting random model
 [ERROR] ollama_model_random: ollama is not installed
-[DEBUG] 08:56:32:584244373: _is_valid_model: Model Not Found: ollama_model_random failed
+[DEBUG] 09:20:00:232228468: _is_valid_model: Model Not Found: ollama_model_random failed
 Error: -m <model> is required
 
 Usage: ollama_generate_json -m <model> [-p <prompt>] [-h] [-v]

demos/ollama_generate_stream_json.md

@@ -27,9 +27,9 @@ OBL_DEBUG=1 ollama_generate_stream_json -m "" -p "Describe a rabbit in 3 words"
 
 ```
 ```json
-[DEBUG] 08:56:32:727784230: _is_valid_model: Model name empty: getting random model
+[DEBUG] 09:20:00:378266058: _is_valid_model: Model name empty: getting random model
 [ERROR] ollama_model_random: ollama is not installed
-[DEBUG] 08:56:32:740385750: _is_valid_model: Model Not Found: ollama_model_random failed
+[DEBUG] 09:20:00:390400325: _is_valid_model: Model Not Found: ollama_model_random failed
 Error: -m <model> is required
 
 Usage: ollama_generate_stream_json -m <model> [-p <prompt>] [-h] [-v]

docs/aliases.md

@@ -18,7 +18,7 @@ Many functions in Ollama Bash Lib have shorter aliases for convenience.
 | [`ollama_messages`](./ollama_messages.md) | `om` |
 | [`ollama_messages_add`](./ollama_messages_add.md) | `oma` |
 | [`ollama_messages_count`](./ollama_messages_count.md) | `omco` |
-| [`ollama_messages_clear`](./ollama_messages_clear.md) | `omc` |
+| [`ollama_messages_clear`](./ollama_messages_clear.md) | `omclear` |
 | [`ollama_model_random`](./ollama_model_random.md) | `omr` |
 | [`ollama_model_unload`](./ollama_model_unload.md) | `omu` |
 | [`ollama_show`](./ollama_show.md) | `os` |

docs/functions.md

@@ -31,6 +31,8 @@ This file contains a full list of all functions available in the Ollama Bash Lib
 | [`ollama_messages_add`](ollama_messages_add.md)<br />`oma`      | Add a message to chat context      | `ollama_messages_add -r "role" -c "message"` | none                                        | `0`/`1` |
 | [`ollama_messages_count`](ollama_messages_count.md)<br />`omco`   | Count of messages in chat context  | `ollama_messages_count`                | number of messages to `stdout`              | `0`/`1` |
 | [`ollama_messages_clear`](ollama_messages_clear.md)<br />`omc`    | Clear all messages in chat context | `ollama_messages_clear`                | none                                        | `0`/`1` |
+| [`ollama_messages_last`](ollama_messages_last.md) | Get content of the last message as a string | `ollama_messages_last` | string to `stdout` | `0`/`1` |
+| [`ollama_messages_last_json`](ollama_messages_last_json.md) | Get the last message as JSON | `ollama_messages_last_json` | json to `stdout` | `0`/`1` |
 
 
 ## Model Functions