From 33ba197fd0d46b5773367795ad8598105191a18d Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Sat, 23 Mar 2024 01:21:59 +0530 Subject: [PATCH 1/4] update integration-test.yml back to the self-hosted runner and reduced load on the runner by using the cpu pip requirements Signed-off-by: Anupam Kumar --- .github/workflows/integration-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 692ec51..fca0291 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -20,7 +20,7 @@ concurrency: jobs: transcription: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: # do not stop on another job's failure @@ -150,12 +150,12 @@ jobs: with: python-version: '3.11' cache: 'pip' - cache-dependency-path: context_chat_backend/reqs.txt + cache-dependency-path: context_chat_backend/requirements.cpu.txt - name: Install and init backend run: | cd context_chat_backend - pip install --no-deps -r requirements.txt + pip install --no-deps -r requirements.cpu.txt pip install --upgrade pip setuptools wheel CMAKE_ARGS="-DLLAMA_OPENBLAS=on" pip install llama-cpp-python cp example.env .env @@ -166,7 +166,7 @@ jobs: - name: Register backend run: | ./occ app_api:daemon:register --net host manual_install "Manual Install" manual-install http localhost http://localhost:8080 - ./occ app_api:app:register context_chat_backend manual_install --json-info "{\"appid\":\"context_chat_backend\",\"name\":\"Context Chat Backend\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.2.0\",\"secret\":\"12345\",\"port\":10034,\"scopes\":[],\"system_app\":0}" --force-scopes --wait-finish + ./occ app_api:app:register context_chat_backend manual_install --json-info "{\"appid\":\"context_chat_backend\",\"name\":\"Context Chat Backend\",\"daemon_config_name\":\"manual_install\",\"version\":\"2.0.1\",\"secret\":\"12345\",\"port\":10034,\"scopes\":[],\"system_app\":0}" --force-scopes --wait-finish - name: Scan files run: | From 64b35f131b6a728ef720f872a9bc7fe408f27d30 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Sat, 23 Mar 2024 01:39:37 +0530 Subject: [PATCH 2/4] update readme Signed-off-by: Anupam Kumar --- README.md | 12 +++++++++++- appinfo/info.xml | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74773ee..ad7b405 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ # Nextcloud Assistant Context Chat -NYI +## Install +1. Install two other mandatory apps for this app to work as desired in your Nextcloud install from the "Apps" page: +- AppAPI (>= v2.0.x): https://apps.nextcloud.com/apps/app_api +- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assitant app.) +2. Install this app (Nextcloud Assistant Context Chat): https://apps.nextcloud.com/apps/context_chat +3. Install the Context Chat Backend app (https://apps.nextcloud.com/apps/context_chat_backend) from the "External Apps" page. It is important to note here that the backend app should have the same major and minor version as this app (context_chat) +4. Start using Context Chat from the Assistant UI + +> [!NOTE] +> Refer to the [Context Chat Backend's readme](https://github.com/nextcloud/context_chat_backend/?tab=readme-ov-file) and the [AppAPI's documentation](https://cloud-py-api.github.io/app_api/) for help with setup of AppAPI's deploy daemon. +> Please open an issue if you need help :) diff --git a/appinfo/info.xml b/appinfo/info.xml index abb5c78..0787df5 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,6 +5,17 @@ Chat with your documents = v2.0.x): https://apps.nextcloud.com/apps/app_api +- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assitant app.) +2. Install this app (Nextcloud Assistant Context Chat): https://apps.nextcloud.com/apps/context_chat +3. Install the Context Chat Backend app (https://apps.nextcloud.com/apps/context_chat_backend) from the "External Apps" page. It is important to note here that the backend app should have the same major and minor version as this app (context_chat) +4. Start using Context Chat from the Assistant UI + +Note: +Refer to the [Context Chat Backend's readme](https://github.com/nextcloud/context_chat_backend/?tab=readme-ov-file) and the [AppAPI's documentation](https://cloud-py-api.github.io/app_api/) for help with setup of AppAPI's deploy daemon. ]]> 2.0.0 agpl From e86e151f971d270e10e32276262ba88b715142cb Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Sat, 23 Mar 2024 01:42:27 +0530 Subject: [PATCH 3/4] v2.0.1 Signed-off-by: Anupam Kumar --- CHANGELOG.md | 8 ++++++++ appinfo/info.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15285b9..f847bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## 2.0.1 – 2024-03-23 + +### Fixed +- update integration-test.yml +- separate ProviderConfigService +- IndexerJob: Avoid sending the same resource multiple times + + ## 2.0.0 – 2024-03-21 ### Changed diff --git a/appinfo/info.xml b/appinfo/info.xml index 0787df5..8b3dbda 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -17,7 +17,7 @@ Note: Refer to the [Context Chat Backend's readme](https://github.com/nextcloud/context_chat_backend/?tab=readme-ov-file) and the [AppAPI's documentation](https://cloud-py-api.github.io/app_api/) for help with setup of AppAPI's deploy daemon. ]]> - 2.0.0 + 2.0.1 agpl Julien Veyssier ContextChat From 8f9e456466853bc37036e8201c12065c37e69d8a Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 23 Mar 2024 11:20:52 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Daniel Signed-off-by: Marcel Klehr --- README.md | 2 +- appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ad7b405..48fc77d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Install 1. Install two other mandatory apps for this app to work as desired in your Nextcloud install from the "Apps" page: - AppAPI (>= v2.0.x): https://apps.nextcloud.com/apps/app_api -- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assitant app.) +- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assistant app.) 2. Install this app (Nextcloud Assistant Context Chat): https://apps.nextcloud.com/apps/context_chat 3. Install the Context Chat Backend app (https://apps.nextcloud.com/apps/context_chat_backend) from the "External Apps" page. It is important to note here that the backend app should have the same major and minor version as this app (context_chat) 4. Start using Context Chat from the Assistant UI diff --git a/appinfo/info.xml b/appinfo/info.xml index 8b3dbda..5a36446 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -9,7 +9,7 @@ ## Install 1. Install two other mandatory apps for this app to work as desired in your Nextcloud install from the "Apps" page: - AppAPI (>= v2.0.x): https://apps.nextcloud.com/apps/app_api -- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assitant app.) +- Assistant: https://apps.nextcloud.com/apps/assistant (The OCS API or the `occ` commands can also be used to interact with this app but it recommended to do that through a Text Processing OCP API consumer like the Assistant app.) 2. Install this app (Nextcloud Assistant Context Chat): https://apps.nextcloud.com/apps/context_chat 3. Install the Context Chat Backend app (https://apps.nextcloud.com/apps/context_chat_backend) from the "External Apps" page. It is important to note here that the backend app should have the same major and minor version as this app (context_chat) 4. Start using Context Chat from the Assistant UI