diff --git a/.run/TalkBotAI.run.xml b/.run/TalkBotAI.run.xml
index 2d8c941..2b9a58b 100644
--- a/.run/TalkBotAI.run.xml
+++ b/.run/TalkBotAI.run.xml
@@ -4,14 +4,14 @@
-
+
-
+
-
+
diff --git a/Makefile b/Makefile
index 735412b..5907b06 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ help:
.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/talk_bot_ai_example:1.0.2 --tag ghcr.io/cloud-py-api/talk_bot_ai_example:latest .
+ docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/talk_bot_ai_example:1.0.3 --tag ghcr.io/cloud-py-api/talk_bot_ai_example:latest .
.PHONY: deploy
deploy:
@@ -45,5 +45,5 @@ run27:
manual_register:
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai_example --silent || true
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_ai_example manual_install --json-info \
- "{\"appid\":\"talk_bot_ai_example\",\"name\":\"TalkBotAI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+ "{\"appid\":\"talk_bot_ai_example\",\"name\":\"TalkBotAI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":10034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
-e --force-scopes
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 747d8f7..7aab037 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -15,7 +15,7 @@ It shouldn't be too difficult to use a more advanced model based on this example
Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai_example/blob/main/HOW_TO_INSTALL.md) to try it.
]]>
- 1.0.2
+ 1.0.3
MIT
Andrey Borysenko
Alexander Piskun
@@ -32,7 +32,7 @@ Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai_example/bl
ghcr.io
cloud-py-api/talk_bot_ai_example
- 1.0.2
+ 1.0.3
diff --git a/src/main.py b/src/main.py
index 6743f2e..63db56f 100644
--- a/src/main.py
+++ b/src/main.py
@@ -68,6 +68,10 @@ def conversation_name(self) -> str:
return self._raw_data["target"]["name"]
+def get_nc_url() -> str:
+ return os.environ["NEXTCLOUD_URL"].removesuffix("/index.php").removesuffix("/")
+
+
def sign_request(headers: dict, user="") -> None:
headers["AUTHORIZATION-APP-API"] = b64encode(f"{user}:{os.environ['APP_SECRET']}".encode("UTF=8"))
headers["EX-APP-ID"] = os.environ["APP_ID"]
@@ -115,7 +119,7 @@ def ocs_call(
sign_request(headers, kwargs.get("user", ""))
return httpx.request(
method,
- url=os.environ["NEXTCLOUD_URL"] + path,
+ url=get_nc_url() + path,
params=params,
content=data_bytes,
headers=headers,
@@ -155,7 +159,7 @@ def _sign_send_request(method: str, url_suffix: str, data: dict, data_to_sign: s
}
return httpx.request(
method,
- url=os.environ["NEXTCLOUD_URL"] + "/ocs/v2.php/apps/spreed/api/v1/bot" + url_suffix,
+ url=get_nc_url() + "/ocs/v2.php/apps/spreed/api/v1/bot" + url_suffix,
json=data,
headers=headers,
)