Merge pull request #6 from cloud-py-api/release/3.0.0

chore: prepare v3.0.0 release

Author: edward-ly

.run/AssistantTalkBot.run.xml

@@ -4,12 +4,12 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="AE_VERSION" value="1.0.0" />
+      <env name="AA_VERSION" value="3.1.0" />
       <env name="APP_ID" value="talk_bot_ai" />
       <env name="APP_PORT" value="10034" />
       <env name="APP_SECRET" value="12345" />
-      <env name="APP_VERSION" value="1.0.0" />
-      <env name="NEXTCLOUD_URL" value="http://stable27.local" />
+      <env name="APP_VERSION" value="3.0.0" />
+      <env name="NEXTCLOUD_URL" value="http://stable30.local" />
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-bookworm
+FROM python:3.12-bookworm
 
 COPY requirements.txt /
 ADD /src/ /app/

Makefile

@@ -1,36 +1,32 @@
 .DEFAULT_GOAL := help
 
 APP_ID := talk_bot_ai
-JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"Assistant Talk Bot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":10034,\"scopes\":[\"TALK\", \"TALK_BOT\"],\"system\":0}"
+APP_NAME := AssistantTalkBot
+APP_VERSION := 3.0.0
+JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"Assistant Talk Bot\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":10034,\"scopes\":[\"TALK\", \"TALK_BOT\"]}"
 
 .PHONY: help
 help:
-	@echo "Welcome to the Nextcloud Assistant talk bot. Please use \`make <target>\` where <target> is one of"
+	@echo "Welcome to the Nextcloud Assistant talk bot. Please use \`make <target>\` where <target> is one of:"
 	@echo " "
 	@echo "  Next commands are only for dev environment with nextcloud-docker-dev!"
-	@echo "  They should run from the host you are developing on(with activated venv) and not in the container with Nextcloud!"
+	@echo "  They should run from the host you are developing on (with activated venv) and not in the container with Nextcloud!"
 	@echo "  "
 	@echo "  build-push        build image and upload to ghcr.io"
 	@echo "  "
-	@echo "  run               install nextcloud_talk_bot for Nextcloud Latest"
-	@echo "  run30             install nextcloud_talk_bot for Nextcloud 30"
-	@echo "  run29             install nextcloud_talk_bot for Nextcloud 29"
-	@echo "  run28             install nextcloud_talk_bot for Nextcloud 28"
-	@echo "  run27             install nextcloud_talk_bot for Nextcloud 27"
+	@echo "  run               install $(APP_NAME) for Nextcloud Latest"
+	@echo "  run30             install $(APP_NAME) for Nextcloud 30"
 	@echo "  "
 	@echo "  For development of this app use PyCharm run configurations. Development is always set for last Nextcloud."
-	@echo "  First run 'nextcloud_talk_bot' and then 'make register', after that you can use/debug/develop it and easy test."
+	@echo "  First run '$(APP_NAME)' and then 'make register', after that you can use/debug/develop it and easy test."
 	@echo "  "
-	@echo "  register          perform registration of running 'nextcloud_talk_bot' into the 'manual_install' deploy daemon."
-	@echo "  register30        perform registration of running 'nextcloud_talk_bot' into the 'manual_install' deploy daemon."
-	@echo "  register29        perform registration of running 'nextcloud_talk_bot' into the 'manual_install' deploy daemon."
-	@echo "  register28        perform registration of running 'nextcloud_talk_bot' into the 'manual_install' deploy daemon."
-	@echo "  register27        perform registration of running 'nextcloud_talk_bot' into the 'manual_install' deploy daemon."
+	@echo "  register          perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
+	@echo "  register30        perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
 
 .PHONY: build-push
 build-push:
 	docker login ghcr.io
-	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):2.1.0 --tag ghcr.io/cloud-py-api/$(APP_ID):latest .
+	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(APP_VERSION) --tag ghcr.io/cloud-py-api/$(APP_ID):latest .
 
 .PHONY: run
 run:
@@ -44,24 +40,6 @@ run30:
 	docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
 
-.PHONY: run29
-run29:
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
-
-.PHONY: run28
-run28:
-	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
-
-.PHONY: run27
-run27:
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
-
 .PHONY: register
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
@@ -71,18 +49,3 @@ register:
 register30:
 	docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
 	docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish
-
-.PHONY: register29
-register29:
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish
-
-.PHONY: register28
-register28:
-	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish
-
-.PHONY: register27
-register27:
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish

README.md

@@ -4,4 +4,4 @@
 
 The bot is capable of answering questions in chat depending on the model set by Nextcloud Assistant.
 
-Refer to [How to install](https://github.com/edward-ly/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.
+Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.

appinfo/info.xml

@@ -9,27 +9,27 @@
 
 The bot is capable of answering questions in chat depending on the model set by Nextcloud Assistant.
 
-Refer to [How to install](https://github.com/edward-ly/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.
+Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.
 	]]></description>
-	<version>1.0.0</version>
+	<version>3.0.0</version>
 	<licence>MIT</licence>
 	<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
 	<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
 	<author mail="[email protected]" homepage="https://github.com/edward-ly">Edward Ly</author>
 	<namespace>AssistantTalkBot</namespace>
 	<category>tools</category>
-	<screenshot>https://raw.githubusercontent.com/edward-ly/talk_bot_ai/main/screenshots/talk_bot_ai.png</screenshot>
-	<website>https://github.com/edward-ly/talk_bot_ai</website>
-	<bugs>https://github.com/edward-ly/talk_bot_ai/issues</bugs>
-	<repository type="git">https://github.com/edward-ly/talk_bot_ai.git</repository>
+	<screenshot>https://raw.githubusercontent.com/cloud-py-api/talk_bot_ai/main/screenshots/talk_bot_ai.png</screenshot>
+	<website>https://github.com/cloud-py-api/talk_bot_ai</website>
+	<bugs>https://github.com/cloud-py-api/talk_bot_ai/issues</bugs>
+	<repository type="git">https://github.com/cloud-py-api/talk_bot_ai.git</repository>
 	<dependencies>
 		<nextcloud min-version="30" max-version="31"/>
 	</dependencies>
 	<external-app>
 		<docker-install>
 			<registry>ghcr.io</registry>
-			<image>edward-ly/talk_bot_ai</image>
-			<image-tag>1.0.0</image-tag>
+			<image>cloud-py-api/talk_bot_ai</image>
+			<image-tag>3.0.0</image-tag>
 		</docker-install>
 		<scopes>
 			<value>TALK</value>