From 7e1408ea65c2aaf162c887087c9ed403d615fcde Mon Sep 17 00:00:00 2001 From: bertybuttface <110790513+bertybuttface@users.noreply.github.com> Date: Fri, 27 Jan 2023 18:55:13 +0000 Subject: [PATCH 1/3] Bump ChatGPT version and add new config settings matrix_bot_chatgpt_context=thread --- roles/custom/matrix-bot-chatgpt/defaults/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index 86d185b7..3ba8ba7a 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -9,7 +9,7 @@ matrix_bot_chatgpt_docker_repo: "https://github.com/matrixgpt/matrix-chatgpt-bot matrix_bot_chatgpt_docker_repo_version: "{{ 'latest' if matrix_bot_chatgpt_version == 'latest' else matrix_bot_chatgpt_version }}" matrix_bot_chatgpt_docker_src_files_path: "{{ matrix_base_data_path }}/chatgpt/docker-src" -matrix_bot_chatgpt_version: 1.3.2 +matrix_bot_chatgpt_version: 1.4.1 matrix_bot_chatgpt_docker_image: "{{ matrix_bot_chatgpt_docker_image_name_prefix }}matrixgpt/matrix-chatgpt-bot:{{ matrix_bot_chatgpt_version }}" matrix_bot_chatgpt_docker_image_name_prefix: "{{ 'localhost/' if matrix_bot_chatgpt_container_image_self_build else 'ghcr.io/' }}" matrix_bot_chatgpt_docker_image_force_pull: "{{ matrix_bot_chatgpt_docker_image.endswith(':latest') }}" @@ -33,6 +33,8 @@ matrix_bot_chatgpt_openai_password: '' # OPENAI_PASSWORD= matrix_bot_chatgpt_openai_login_type: 'google' # OPENAI_LOGIN_TYPE="google" matrix_bot_chatgpt_openai_pro: false # OPENAI_PRO +matrix_bot_chatgpt_context: 'thread' # CHATGPT_CONTEXT="thread" + # Matrix Static Settings (required, see notes) # Defaults to "https://matrix.org" matrix_bot_chatgpt_matrix_homeserver_url: "{{ matrix_homeserver_container_url }}" # MATRIX_HOMESERVER_URL= From d66a2949f6b6a3e09a50f4da45f0d832b898d205 Mon Sep 17 00:00:00 2001 From: bertybuttface <110790513+bertybuttface@users.noreply.github.com> Date: Fri, 27 Jan 2023 18:57:24 +0000 Subject: [PATCH 2/3] Update env.j2 Use matrix_bot_chatgpt_context for CHATGPT_CONTEXT --- roles/custom/matrix-bot-chatgpt/templates/env.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/custom/matrix-bot-chatgpt/templates/env.j2 b/roles/custom/matrix-bot-chatgpt/templates/env.j2 index 1315ddf5..faf6be71 100644 --- a/roles/custom/matrix-bot-chatgpt/templates/env.j2 +++ b/roles/custom/matrix-bot-chatgpt/templates/env.j2 @@ -6,6 +6,8 @@ OPENAI_PASSWORD={{ matrix_bot_chatgpt_openai_password }} OPENAI_LOGIN_TYPE={{ matrix_bot_chatgpt_openai_login_type }} OPENAI_PRO={{ matrix_bot_chatgpt_openai_pro | to_json }} +CHATGPT_CONTEXT={{ matrix_bot_chatgpt_context }} + # With the @ and :DOMAIN, ie @SOMETHING:DOMAIN MATRIX_BOT_USERNAME={{ matrix_bot_chatgpt_matrix_bot_username }} MATRIX_BOT_PASSWORD={{ matrix_bot_chatgpt_matrix_bot_password }} From 7b5ced3037e16613f040d1044cf93a964eb3c439 Mon Sep 17 00:00:00 2001 From: bertybuttface <110790513+bertybuttface@users.noreply.github.com> Date: Fri, 27 Jan 2023 19:02:14 +0000 Subject: [PATCH 3/3] Fix linting issue. --- roles/custom/matrix-bot-chatgpt/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/custom/matrix-bot-chatgpt/defaults/main.yml b/roles/custom/matrix-bot-chatgpt/defaults/main.yml index 3ba8ba7a..324e64ab 100644 --- a/roles/custom/matrix-bot-chatgpt/defaults/main.yml +++ b/roles/custom/matrix-bot-chatgpt/defaults/main.yml @@ -33,7 +33,7 @@ matrix_bot_chatgpt_openai_password: '' # OPENAI_PASSWORD= matrix_bot_chatgpt_openai_login_type: 'google' # OPENAI_LOGIN_TYPE="google" matrix_bot_chatgpt_openai_pro: false # OPENAI_PRO -matrix_bot_chatgpt_context: 'thread' # CHATGPT_CONTEXT="thread" +matrix_bot_chatgpt_context: 'thread' # CHATGPT_CONTEXT="thread" # Matrix Static Settings (required, see notes) # Defaults to "https://matrix.org"