Skip to content

Commit 00ea14f

Browse files
marcelklehrmarcelklehr
committed
v2.2.2
Signed-off-by: Marcel Klehr <[email protected]>
1 parent 7e64bdb commit 00ea14f

File tree

3 files changed

+58
-45
lines changed

3 files changed

+58
-45
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ All notable changes to this project will be documented in this file.
99
The format is based on [Keep a Changelog](http://keepachangelog.com/)
1010
and this project adheres to [Semantic Versioning](http://semver.org/).
1111

12+
## [2.2.2] - 2024-12-20
13+
14+
### Fixed
15+
16+
* fix(chatwithtools): Expect a list of tool messages
17+
* fix(main): Don't drop background task when app is disabled
18+
* fix: Only run background thread once
19+
* fix(summarize): Improve prompt
20+
* fix(chat): Expect json-stringified messages in history {role, content}
21+
1222
## [2.2.1] - 2024-12-16
1323

1424
### Fixed

‎Makefile

Lines changed: 46 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,67 @@
1-
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
2-
# SPDX-License-Identifier: AGPL-3.0-or-later
31
.DEFAULT_GOAL := help
42

3+
APP_ID := llm2
4+
APP_NAME := Local large language model
5+
APP_VERSION := 2.2.2
6+
JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":9081}"
7+
8+
59
.PHONY: help
610
help:
7-
@echo "Welcome to Txt2TxtProvider development. Please use \`make <target>\` where <target> is one of"
11+
@echo " Welcome to $(APP_NAME) $(APP_VERSION)!"
12+
@echo " "
13+
@echo " Please use \`make <target>\` where <target> is one of"
14+
@echo " "
15+
@echo " build-push builds CPU images and uploads them to ghcr.io"
16+
@echo " "
17+
@echo " > Next commands are only for the dev environment with nextcloud-docker-dev!"
18+
@echo " > They must be run from the host you are developing on, not in a Nextcloud container!"
19+
@echo " "
20+
@echo " run29 installs $(APP_NAME) for Nextcloud 29"
21+
@echo " run30 installs $(APP_NAME) for Nextcloud 30"
22+
@echo " run installs $(APP_NAME) for Nextcloud Latest"
823
@echo " "
9-
@echo " Next commands are only for dev environment with nextcloud-docker-dev!"
10-
@echo " They should run from the host you are developing on(with activated venv) and not in the container with Nextcloud!"
11-
@echo " "
12-
@echo " build-push build image and upload to ghcr.io"
13-
@echo " "
14-
@echo " run29 install Txt2TxtProvider for Nextcloud 29"
15-
@echo " run install Txt2TxtProvider for Nextcloud Last"
16-
@echo " "
17-
@echo " For development of this example use PyCharm run configurations. Development is always set for last Nextcloud."
18-
@echo " First run 'Txt2TxtProvider' and then 'make registerXX', after that you can use/debug/develop it and easy test."
19-
@echo " "
20-
@echo " register29 perform registration of running Txt2TxtProvider into the 'manual_install' deploy daemon."
21-
@echo " register perform registration of running Txt2TxtProvider into the 'manual_install' deploy daemon."
24+
@echo " > Commands for manual registration of ExApp($(APP_NAME) should be running!):"
25+
@echo " "
26+
@echo " register29 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
27+
@echo " register30 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
28+
@echo " register performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
29+
2230

2331
.PHONY: build-push
2432
build-push:
2533
docker login ghcr.io
26-
docker build --push --platform linux/amd64 --tag ghcr.io/nextcloud/llm2:2.2.1 --tag ghcr.io/nextcloud/llm2:latest .
27-
28-
.PHONY: download-models
29-
download-models:
30-
cd models && \
31-
wget -nc https://download.nextcloud.com/server/apps/llm/leo-hessianai-13B-chat-bilingual-GGUF/leo-hessianai-13b-chat-bilingual.Q4_K_M.gguf \
32-
&& wget -nc https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/tinyllama-1.1b-chat-v1.0.Q4_0.gguf \
33-
&& wget -nc https://download.nextcloud.com/server/apps/llm/llama-2-7b-chat-ggml/llama-2-7b-chat.Q4_K_M.gguf \
34-
&& wget -nc https://huggingface.co/Nextcloud-AI/llm_neuralbeagle_14_7b_gguf/resolve/main/neuralbeagle14-7b.Q4_K_M.gguf
34+
docker buildx build --push --platform linux/amd64 --tag ghcr.io/nextcloud/$(APP_ID):$(APP_VERSION) --tag ghcr.io/nextcloud/$(APP_ID):latest .
3535

3636
.PHONY: run29
3737
run29:
38-
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister llm2 --silent || true
39-
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register llm2 --force-scopes \
40-
--info-xml https://raw.githubusercontent.com/cloud-py-api/llm2/appinfo/info.xml
38+
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
39+
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
40+
--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
41+
42+
.PHONY: run30
43+
run30:
44+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
45+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
46+
--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
4147

4248
.PHONY: run
4349
run:
44-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister llm2 --silent || true
45-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register llm2 --force-scopes \
46-
--info-xml https://raw.githubusercontent.com/cloud-py-api/llm2/appinfo/info.xml
50+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
51+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
52+
--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
4753

4854
.PHONY: register29
4955
register29:
50-
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister llm2 --silent || true
51-
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register llm2 manual_install --json-info \
52-
"{\"id\":\"llm2\",\"name\":\"Local large language model\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9081,\"scopes\":[\"AI_PROVIDERS\"],\"system\":0}" \
53-
--force-scopes --wait-finish
56+
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
57+
docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish
58+
59+
.PHONY: register30
60+
register30:
61+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
62+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish
5463

5564
.PHONY: register
5665
register:
57-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister llm2 --silent || true
58-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register llm2 manual_install --json-info \
59-
"{\"id\":\"llm2\",\"name\":\"Local large language model\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9081,\"scopes\":[\"AI_PROVIDERS\"],\"system\":0}" \
60-
--force-scopes --wait-finish
66+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
67+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish

‎appinfo/info.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
1414
See [the nextcloud admin docs](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for more information.
1515
]]></description>
16-
<version>2.2.1</version>
16+
<version>2.2.2</version>
1717
<licence>MIT</licence>
1818
<author mail="[email protected]" homepage="https://github.com/marcelklehr">Marcel Klehr</author>
1919
<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
@@ -30,12 +30,8 @@ See [the nextcloud admin docs](https://docs.nextcloud.com/server/latest/admin_ma
3030
<docker-install>
3131
<registry>ghcr.io</registry>
3232
<image>nextcloud/llm2</image>
33-
<image-tag>2.2.1</image-tag>
33+
<image-tag>2.2.2</image-tag>
3434
</docker-install>
35-
<scopes>
36-
<value>AI_PROVIDERS</value>
37-
<value>TASK_PROCESSING</value>
38-
</scopes>
3935
<system>false</system>
4036
</external-app>
4137
</info>

0 commit comments

Comments
 (0)