Skip to content

Commit 38dc81c

Browse files
bigcat88bigcat88
committed
corrections for AppAPI 1.4 (3)
1 parent 8dde0fa commit 38dc81c

22 files changed

+53
-25
lines changed

‎.run/upscaler_example (27).run.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@
44
<option name="INTERPRETER_OPTIONS" value="" />
55
<option name="PARENT_ENVS" value="true" />
66
<envs>
7-
<env name="PYTHONUNBUFFERED" value="1" />
7+
<env name="APP_HOST" value="0.0.0.0" />
88
<env name="APP_ID" value="upscaler_example" />
99
<env name="APP_PORT" value="10050" />
1010
<env name="APP_SECRET" value="12345" />
1111
<env name="APP_VERSION" value="1.0.0" />
1212
<env name="NEXTCLOUD_URL" value="http://stable27.local/index.php" />
13+
<env name="PYTHONUNBUFFERED" value="1" />
1314
</envs>
1415
<option name="SDK_HOME" value="$PROJECT_DIR$/venv/bin/python" />
1516
<option name="SDK_NAME" value="Python 3.10 (upscaler_example)" />
16-
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
17+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/lib" />
1718
<option name="IS_MODULE_SDK" value="false" />
1819
<option name="ADD_CONTENT_ROOTS" value="true" />
1920
<option name="ADD_SOURCE_ROOTS" value="true" />
2021
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
21-
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/main.py" />
22+
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/lib/main.py" />
2223
<option name="PARAMETERS" value="" />
2324
<option name="SHOW_COMMAND_LINE" value="false" />
2425
<option name="EMULATE_TERMINAL" value="false" />

‎.run/upscaler_example (28).run.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<option name="INTERPRETER_OPTIONS" value="" />
55
<option name="PARENT_ENVS" value="true" />
66
<envs>
7+
<env name="APP_HOST" value="0.0.0.0" />
78
<env name="APP_ID" value="upscaler_example" />
89
<env name="APP_PORT" value="10050" />
910
<env name="APP_SECRET" value="12345" />
@@ -13,12 +14,12 @@
1314
</envs>
1415
<option name="SDK_HOME" value="$PROJECT_DIR$/venv/bin/python" />
1516
<option name="SDK_NAME" value="Python 3.10 (upscaler_example)" />
16-
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
17+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/lib" />
1718
<option name="IS_MODULE_SDK" value="false" />
1819
<option name="ADD_CONTENT_ROOTS" value="true" />
1920
<option name="ADD_SOURCE_ROOTS" value="true" />
2021
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
21-
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/main.py" />
22+
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/lib/main.py" />
2223
<option name="PARAMETERS" value="" />
2324
<option name="SHOW_COMMAND_LINE" value="false" />
2425
<option name="EMULATE_TERMINAL" value="false" />

‎.run/upscaler_example (Last).run.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<option name="INTERPRETER_OPTIONS" value="" />
55
<option name="PARENT_ENVS" value="true" />
66
<envs>
7+
<env name="APP_HOST" value="0.0.0.0" />
78
<env name="APP_ID" value="upscaler_example" />
89
<env name="APP_PORT" value="10050" />
910
<env name="APP_SECRET" value="12345" />
@@ -13,12 +14,12 @@
1314
</envs>
1415
<option name="SDK_HOME" value="$PROJECT_DIR$/venv/bin/python" />
1516
<option name="SDK_NAME" value="Python 3.10 (upscaler_example)" />
16-
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src" />
17+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/lib" />
1718
<option name="IS_MODULE_SDK" value="false" />
1819
<option name="ADD_CONTENT_ROOTS" value="true" />
1920
<option name="ADD_SOURCE_ROOTS" value="true" />
2021
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
21-
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/main.py" />
22+
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/lib/main.py" />
2223
<option name="PARAMETERS" value="" />
2324
<option name="SHOW_COMMAND_LINE" value="false" />
2425
<option name="EMULATE_TERMINAL" value="false" />

‎Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
FROM python:3.10-slim-bookworm
22

33
COPY requirements.txt /
4-
ADD /src/ /app/
4+
5+
ADD cs[s] /app/css
6+
ADD im[g] /app/img
7+
ADD j[s] /app/js
8+
ADD l10[n] /app/l10n
9+
ADD li[b] /app/lib
510

611
RUN apt-get update && apt-get install -y libgl1 libgl1-mesa-glx libglib2.0-0
712

813
RUN \
914
python3 -m pip install -r requirements.txt && rm -rf ~/.cache && rm requirements.txt
1015

11-
WORKDIR /app
16+
WORKDIR /app/lib
1217
ENTRYPOINT ["python3", "main.py"]

‎Makefile‎

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,22 @@ build-push:
2626
docker login ghcr.io
2727
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 .
2828

29-
.PHONY: deploy
30-
deploy:
31-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
32-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
33-
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
34-
3529
.PHONY: deploy27
3630
deploy27:
3731
docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
3832
docker exec master-stable27-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
3933
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
4034

41-
.PHONY: run
42-
run:
35+
.PHONY: deploy28
36+
deploy28:
37+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
38+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
39+
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
40+
41+
.PHONY: deploy
42+
deploy:
4343
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
44-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
45-
--force-scopes \
44+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:deploy upscaler_example docker_dev \
4645
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
4746

4847
.PHONY: run27
@@ -52,16 +51,37 @@ run27:
5251
--force-scopes \
5352
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
5453

55-
.PHONY: register
56-
register:
54+
.PHONY: run28
55+
run28:
56+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
57+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
58+
--force-scopes \
59+
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
60+
61+
.PHONY: run
62+
run:
5763
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
58-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example manual_install --json-info \
59-
"{\"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}" \
60-
--force-scopes --wait-finish
64+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example docker_dev \
65+
--force-scopes \
66+
--info-xml https://raw.githubusercontent.com/cloud-py-api/upscaler_example/main/appinfo/info.xml
6167

6268
.PHONY: register27
6369
register27:
6470
docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
6571
docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register upscaler_example manual_install --json-info \
6672
"{\"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}" \
6773
--force-scopes --wait-finish
74+
75+
.PHONY: register28
76+
register28:
77+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
78+
docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register upscaler_example manual_install --json-info \
79+
"{\"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}" \
80+
--force-scopes --wait-finish
81+
82+
.PHONY: register
83+
register:
84+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister upscaler_example --silent || true
85+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register upscaler_example manual_install --json-info \
86+
"{\"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}" \
87+
--force-scopes --wait-finish

‎appinfo/info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It shouldn't be difficult to use an even more advanced model based on this examp
1313
1414
Refer to [How to install](https://github.com/cloud-py-api/upscaler_example/blob/main/HOW_TO_INSTALL.md) to try it.
1515
]]></description>
16-
<version>1.2.0</version>
16+
<version>1.3.0</version>
1717
<licence>agpl</licence>
1818
<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
1919
<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>

‎src/inference_gfpgan.py‎ renamed to ‎lib/inference_gfpgan.py‎

File renamed without changes.

‎src/main.py‎ renamed to ‎lib/main.py‎

File renamed without changes.

‎src/realesrgan/LICENSE-2.txt‎ renamed to ‎lib/realesrgan/LICENSE-2.txt‎

File renamed without changes.

‎src/realesrgan/__init__.py‎ renamed to ‎lib/realesrgan/__init__.py‎

File renamed without changes.

0 commit comments

Comments
 (0)