corrections for AppAPI 1.4 (1)

Author: bigcat88

Makefile

@@ -9,51 +9,51 @@ help:
 	@echo "  "
 	@echo "  build-push        build image and upload to ghcr.io"
 	@echo "  "
-	@echo "  deploy28          deploy example to registered 'docker_dev' for Nextcloud 28"
+	@echo "  deploy            deploy example to registered 'docker_dev' for Nextcloud Last"
 	@echo "  deploy27          deploy example to registered 'docker_dev' for Nextcloud 27"
 	@echo "  "
-	@echo "  run28             install UpScaler for Nextcloud 28"
+	@echo "  run               install UpScaler for Nextcloud Last"
 	@echo "  run27             install UpScaler for Nextcloud 27"
 	@echo "  "
 	@echo "  For development of this example use PyCharm run configurations. Development is always set for last Nextcloud."
 	@echo "  First run 'upscaler_example' and then 'make register', after that you can use/debug/develop it and easy test."
 	@echo "  "
-	@echo "  register28        perform registration of running 'upscaler_example' into 'manual_install' deploy daemon."
+	@echo "  register          perform registration of running 'upscaler_example' into 'manual_install' deploy daemon."
 	@echo "  register27        perform registration of running 'upscaler_example' into '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/upscaler_example:1.2.0 --tag ghcr.io/cloud-py-api/upscaler_example:latest .
+	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/upscaler_example:1.3.0 --tag ghcr.io/cloud-py-api/upscaler_example:latest .
 
-.PHONY: deploy28
-deploy28:
+.PHONY: deploy
+deploy:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
 
-.PHONY: run28
-run28:
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
-	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
-		--force-scopes \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
-
 .PHONY: deploy27
 deploy27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
 
+.PHONY: run
+run:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
+		--force-scopes \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
+
 .PHONY: run27
 run27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
 		--force-scopes \
 		--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
 
-.PHONY: register28
-register28:
+.PHONY: register
+register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example manual_install --json-info \
   "{\"appid\":\"upscaler_example\",\"name\":\"upscaler_example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":10050,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \

src/main.py

@@ -35,12 +35,6 @@ class UiActionFileInfo(BaseModel):
     instanceId: typing.Optional[str]
 
 
-class UiFileActionHandlerInfo(BaseModel):
-    actionName: str
-    actionHandler: str
-    actionFile: UiActionFileInfo
-
-
 def random_string(size: int) -> str:
     return "".join(choice(ascii_lowercase + ascii_uppercase + digits) for _ in range(size))
 
@@ -166,7 +160,7 @@ def gfpgan_background(input_file: UiActionFileInfo, user_id: str):
 
 @APP.post("/gfpgan_upscale")
 async def gfpgan_upscale(
-        file: UiFileActionHandlerInfo,
+        file: UiActionFileInfo,
         request: Request,
         background_tasks: BackgroundTasks,
 ):
@@ -190,7 +184,7 @@ def enabled_handler(enabled: bool, request: Request):
         if enabled:
             result = ocs_call(
                 "POST",
-                "/ocs/v1.php/apps/app_api/api/v1/files/actions/menu",
+                "/ocs/v1.php/apps/app_api/api/v1/ui/files-actions-menu",
                 json_data={
                     "fileActionMenuParams": {
                         "name": "upscale",
@@ -208,7 +202,7 @@ def enabled_handler(enabled: bool, request: Request):
         else:
             ocs_call(
                 "DELETE",
-                "/ocs/v1.php/apps/app_api/api/v1/files/actions/menu",
+                "/ocs/v1.php/apps/app_api/api/v1/ui/files-actions-menu",
                 json_data={"fileActionMenuName": "upscale"},
             )
     except Exception as e: