Merge branch 'main' into chore/fetcher/sync-changes

nextcloud · Oct 18, 2024 · 3daaf25 · 3daaf25
2 parents 0af760a + db15f5b
commit 3daaf25
Show file tree

Hide file tree

Showing 16 changed files with 483 additions and 131 deletions.
diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml
@@ -90,25 +90,25 @@ jobs:
         run: |
           PHP_CLI_SERVER_WORKERS=2 php -S 127.0.0.1:8080 &
           ./occ app_api:daemon:register docker_local_sock Docker docker-install http /var/run/docker.sock http://127.0.0.1:8080/index.php
-          ./occ app_api:app:register skeleton docker_local_sock \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          ./occ app_api:app:enable skeleton
-          ./occ app_api:app:disable skeleton
+          ./occ app_api:app:register app-skeleton-python docker_local_sock \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          ./occ app_api:app:enable app-skeleton-python
+          ./occ app_api:app:disable app-skeleton-python
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' data/nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' data/nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' data/nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' data/nextcloud.log || error
 
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect nc_app_app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          ./occ app_api:app:unregister skeleton
+          ./occ app_api:app:unregister app-skeleton-python
           ./occ app_api:daemon:unregister docker_local_sock
 
       - name: Test OCC commands(docker)
@@ -142,7 +142,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: NC In Julius Docker • 🐘8.3
     env:
-      docker-image: ghcr.io/juliushaertl/nextcloud-dev-php83:master
+      docker-image: ghcr.io/juliusknorr/nextcloud-dev-php83:master
 
     steps:
       - name: Set app env
@@ -165,29 +165,29 @@ jobs:
             docker_local_sock Docker docker-install http /var/run/docker.sock http://nextcloud/index.php \
             --net=master_bridge
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:list
-          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_local_sock \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python docker_local_sock \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable app-skeleton-python
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable app-skeleton-python
 
       - name: Copy NC log to host
         if: always()
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' nextcloud.log || error
 
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_local_sock
 
       - name: Upload Container info
@@ -218,7 +218,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: NC In Julius Docker(DSP-HTTP) • 🐘8.3
     env:
-      docker-image: ghcr.io/juliushaertl/nextcloud-dev-php83:master
+      docker-image: ghcr.io/juliusknorr/nextcloud-dev-php83:master
 
     steps:
       - name: Set app env
@@ -230,7 +230,7 @@ jobs:
           docker run -v /var/run/docker.sock:/var/run/docker.sock \
             -e NC_HAPROXY_PASSWORD="some_secure_password" \
             --net master_bridge --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
-            --privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest
+            --privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest
           docker run --net master_bridge --name nextcloud --rm -d ${{ env.docker-image }}
           sleep 60s
 
@@ -244,29 +244,29 @@ jobs:
             docker_by_port Docker docker-install http nextcloud-appapi-dsp:2375 http://nextcloud/index.php \
             --net=master_bridge --haproxy_password=some_secure_password
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:list
-          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_by_port \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python docker_by_port \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable app-skeleton-python
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable app-skeleton-python
 
       - name: Copy NC log to host
         if: always()
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' nextcloud.log || error
 
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect nc_app_app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_by_port
 
       - name: Upload Container info
@@ -297,7 +297,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: NC In Julius Docker(DSP-HTTPS) • 🐘8.3
     env:
-      docker-image: ghcr.io/juliushaertl/nextcloud-dev-php83:master
+      docker-image: ghcr.io/juliusknorr/nextcloud-dev-php83:master
 
     steps:
       - name: Set app env
@@ -317,7 +317,7 @@ jobs:
             -e BIND_ADDRESS="172.17.0.1" \
             -e EX_APPS_NET="ipv4@localhost" \
             --net host --name nextcloud-appapi-dsp -h nextcloud-appapi-dsp \
-            --privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest
+            --privileged -d ghcr.io/nextcloud/nextcloud-appapi-dsp:latest
           docker run --net=bridge --name=nextcloud -p 8080:80 --rm -d ${{ env.docker-image }}
           sleep 60s
           hostname -I
@@ -335,19 +335,19 @@ jobs:
             docker_by_port Docker docker-install https host.docker.internal:2375 http://localhost:8080/index.php \
             --net=host --haproxy_password=some_secure_password
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:list
-          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_by_port \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register app-skeleton-python docker_by_port \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable app-skeleton-python
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable app-skeleton-python
 
       - name: Copy NC log to host
         if: always()
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' nextcloud.log || error
 
       - name: Save HaProxy logs
         if: always()
@@ -356,12 +356,12 @@ jobs:
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect nc_app_app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister app-skeleton-python
           docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_by_port
 
       - name: Upload HaProxy logs
@@ -484,25 +484,25 @@ jobs:
           PHP_CLI_SERVER_WORKERS=2 php -S 127.0.0.1:8080 &
           ./occ app_api:daemon:register docker_local_sock Docker docker-install http /var/run/docker.sock http://127.0.0.1:8080/index.php
           ./occ app_api:daemon:list
-          ./occ app_api:app:register skeleton docker_local_sock \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          ./occ app_api:app:enable skeleton
-          ./occ app_api:app:disable skeleton
+          ./occ app_api:app:register app-skeleton-python docker_local_sock \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          ./occ app_api:app:enable app-skeleton-python
+          ./occ app_api:app:disable app-skeleton-python
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' data/nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' data/nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' data/nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' data/nextcloud.log || error
 
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect nc_app_app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          ./occ app_api:app:unregister skeleton
+          ./occ app_api:app:unregister app-skeleton-python
           ./occ app_api:daemon:unregister docker_local_sock
 
       - name: Test OCC commands(docker)
@@ -608,25 +608,25 @@ jobs:
             docker_socket_local Docker docker-install http /var/run/docker.sock http://127.0.0.1:8080/index.php \
             --net=host --set-default
           ./occ app_api:daemon:list
-          ./occ app_api:app:register skeleton \
-            --info-xml https://raw.githubusercontent.com/cloud-py-api/app-skeleton-python/main/appinfo/info.xml
-          ./occ app_api:app:enable skeleton
-          ./occ app_api:app:disable skeleton
+          ./occ app_api:app:register app-skeleton-python \
+            --info-xml https://raw.githubusercontent.com/nextcloud/app-skeleton-python/main/appinfo/info.xml
+          ./occ app_api:app:enable app-skeleton-python
+          ./occ app_api:app:disable app-skeleton-python
 
       - name: Check logs
         run: |
-          grep -q 'Hello from skeleton :)' data/nextcloud.log || error
-          grep -q 'Bye bye from skeleton :(' data/nextcloud.log || error
+          grep -q 'Hello from app-skeleton-python :)' data/nextcloud.log || error
+          grep -q 'Bye bye from app-skeleton-python :(' data/nextcloud.log || error
 
       - name: Save container info & logs
         if: always()
         run: |
-          docker inspect nc_app_skeleton | json_pp > container.json
-          docker logs nc_app_skeleton > container.log 2>&1
+          docker inspect nc_app_app-skeleton-python | json_pp > container.json
+          docker logs nc_app_app-skeleton-python > container.log 2>&1
 
       - name: Unregister Skeleton & Daemon
         run: |
-          ./occ app_api:app:unregister skeleton
+          ./occ app_api:app:unregister app-skeleton-python
           ./occ app_api:daemon:unregister docker_socket_local
 
       - name: Test OCC commands(docker)

diff --git a/APPS.md b/APPS.md
@@ -1,14 +1,27 @@
-## List of the Nextcloud ExApps, using AppAPI:
-
-| Name                   | Language | Type        | Description                  | Link                                                             |
-|------------------------|----------|-------------|------------------------------|------------------------------------------------------------------|
-| SummarAI               | Python   | application | Talk chat summarize bot      | [GitHub](https://github.com/nextcloud/sumupbot)                  |
-| talk_bot_ai_example    | Python   | application | Talk Bot demonstration       | [GitHub](https://github.com/cloud-py-api/talk_bot_ai_example)    |	
-| to_gif_example         | Python   | application | Simple FileAction API demo   | [GitHub](https://github.com/cloud-py-api/to_gif_example)         |
-| upscaler_example       | Python   | application | Image UpScaler demonstration | [GitHub](https://github.com/cloud-py-api/upscaler_example)       |
-| file_to_text_example   | Go       | application | Optical image recognition    | [GitHub](https://github.com/cloud-py-api/file_to_text_example)   |
-| ai_image_generator_bot | Python   | application | Stable Diffusion Talk Bot    | [GitHub](https://github.com/cloud-py-api/ai_image_generator_bot) |
-| nc_py_api              | Python   | library     | Python library for Nextcloud | [GitHub](https://github.com/cloud-py-api/nc_py_api)              |
+## List of Nextcloud ExApps using AppAPI:
 
+| Name         | Language | Description                  | Link                                                  |
+|--------------|----------|------------------------------|-------------------------------------------------------|
+| flow         | Python   | Nextcloud Flow Engine        | [GitHub](https://github.com/nextcloud/flow)           |
+| llm2         | Python   | Local Large Language Model   | [GitHub](https://github.com/nextcloud/llm2)           |	
+| stt_whisper2 | Python   | Local Whisper Speech-To-Text | [GitHub](https://github.com/nextcloud/stt_whisper2)   |
+| summary_bot  | Python   | Summary Bot                  | [GitHub](https://github.com/nextcloud/summary_bot)    |
+| talk_bot_ai  | Python   | Assistant Talk Bot           | [GitHub](https://github.com/nextcloud/talk_bot_ai)    |
+| translate2   | Python   | Local Machine Translation    | [GitHub](https://github.com/nextcloud/translate2)     |	
+| visionatrix  | Python   | Scalable AI Provider         | [GitHub](https://github.com/cloud-py-api/visionatrix) |
+
+## Example ExApps:
+
+| Name                 | Language | Description               | Link                                                        |
+|----------------------|----------|---------------------------|-------------------------------------------------------------|
+| file_to_text_example | Go       | Optical image recognition | [GitHub](https://github.com/nextcloud/file_to_text_example) |
+| to_gif_example       | Python   | Simple Files API demo     | [GitHub](https://github.com/nextcloud/to_gif_example)       |
+| upscaler_example     | Python   | Image upscaler demo       | [GitHub](https://github.com/cloud-py-api/upscaler_example)  |
+
+## Wrapper Libraries for ExApps:
+
+| Name                 | Language | Description                  | Link                                                           |
+|----------------------|----------|------------------------------|----------------------------------------------------------------|
+| nc_py_api            | Python   | Python library for Nextcloud | [GitHub](https://github.com/cloud-py-api/nc_py_api)            |
 
 _If you wish to develop an application or library, we will gladly help and assist you._
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,5 +1,5 @@
-Sphinx>=4.5.0
-sphinx-rtd-theme>=1.2.2
+Sphinx<8
+sphinx-rtd-theme<3
 sphinx-copybutton>=0.5.2
 sphinx_issues>=3.0.1
 sphinx-inline-tabs