Skip to content

Commit ac56846

Browse files
authored
Merge branch 'master' into dependabot/pip/master/docutils-0.22
Signed-off-by: rakekniven <[email protected]>
2 parents f6a95b2 + 04549bc commit ac56846

File tree

73 files changed

+900
-653
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+900
-653
lines changed

.github/workflows/check-occ-command.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Check occ command syntax
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Run script
1616
run: |

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: self-hosted
1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1616
with:
1717
persist-credentials: false
1818

.github/workflows/generate_catalog_templates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1717
with:
1818
persist-credentials: false
1919

.github/workflows/openapi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1919
with:
2020
submodules: true
2121

2222
- name: Set up php
23-
uses: shivammathur/setup-php@0f7f1d08e3e32076e51cae65eb0b0c871405b16e # v2
23+
uses: shivammathur/setup-php@20529878ed81ef8e78ddf08b480401e6101a850f # v2
2424
with:
2525
php-version: '8.1'
2626
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/sphinxbuild.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
user_manual:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
14+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
1515
- uses: actions/setup-python@v5
1616
with:
1717
python-version: '3.10'
@@ -32,7 +32,7 @@ jobs:
3232
user_manual-en:
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
35+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
3636
- uses: actions/setup-python@v5
3737
with:
3838
python-version: '3.10'
@@ -45,7 +45,7 @@ jobs:
4545
developer_manual:
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
48+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
4949
- uses: actions/setup-python@v5
5050
with:
5151
python-version: '3.10'
@@ -66,7 +66,7 @@ jobs:
6666
admin_manual:
6767
runs-on: ubuntu-latest
6868
steps:
69-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
69+
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
7070
- uses: actions/setup-python@v5
7171
with:
7272
python-version: '3.10'

admin_manual/ai/app_assistant.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,14 @@ Set 1 to enable and 0 to disable an implemented task type.
193193
194194
shows statistics for all task processing Tasks.
195195

196+
5. Clean-up old tasks
197+
198+
.. code-block::
199+
200+
occ taskprocessing:task:cleanup
201+
202+
delete tasks that are older than this number of seconds, defaults to 4 months.
203+
196204
Image storage
197205
~~~~~~~~~~~~~
198206

admin_manual/ai/app_context_agent.rst

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,21 @@ These tools can also be combined by the agent to fulfil tasks like the following
143143

144144
* Uses contacts to look up Andrew's email and then sends an email
145145

146+
Custom Tools using MCP
147+
-----------------------
148+
149+
Model Context Protocol (MCP) is a protocol that enables Large Language Models (LLMs) to interact with external data sources and tools.
150+
The Context Agent app allows administrators to extend its capabilities by adding custom services via MCP. This can be configured in the admin settings under "MCP Config," where you can provide a JSON configuration in the following format:
151+
152+
.. code-block:: json
153+
154+
{
155+
"service-name": {
156+
"url": "https://service-url.com/endpoint",
157+
"transport": "streamable_http"
158+
}
159+
}
160+
146161
Requirements
147162
------------
148163

@@ -176,6 +191,13 @@ Other models that may give good results are:
176191

177192
See :ref:`llm2 documentation <ai-app-llm2>` on how to configure alternate models.
178193

194+
Using Nextcloud MCP Server
195+
--------------------------
196+
197+
Context Agent exposes an MCP server that can be used by other large language models or applications to access the tools provided by Context Agent.
198+
The server will be available at `https://your-nextcloud-domain.com/index.php/apps/app_api/proxy/context_agent/mcp/`, and
199+
it requires authentication via an app password passed in the `Authorization` header. Ex: `Authorization: Bearer <app-password>`.
200+
179201
Scaling
180202
-------
181203

@@ -198,4 +220,7 @@ Known Limitations
198220
* Make sure to test the language model you are using in concert with this app for whether they meet the use-case's quality requirements
199221
* Most models have difficulties with languages other than English. Some sometimes answer in another language than used by the user.
200222
* Customer support is available upon request, however we can't solve false or problematic output, most performance issues, or other problems caused by the underlying model.
201-
Support is thus limited only to bugs directly caused by the implementation of the app (connectors, API, front-end, AppAPI). We still try to optimize this as far as possible, so if you encounter any false or problematic output, you can report it `in a dedicated Github issue <https://github.com/nextcloud/context_agent/issues/51>`_ to help us improve this app.
223+
Support is thus limited only to bugs directly caused by the implementation of the app (connectors, API, front-end, AppAPI). We still try to optimize this as far as possible, so if you encounter any false or problematic output, you can report it `in a dedicated Github issue <https://github.com/nextcloud/context_agent/issues/51>`_ to help us improve this app.
224+
* When multiple MCP services are configured that have tools with the same name undefined behavior will occur.
225+
* Only remote MCP services are supported (streamable_http transport).
226+
* MCP services that require different access tokens for each user are not currently supported.

admin_manual/ai/overview.rst

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,21 @@ Provider apps
244244

245245
See *Context Chat* section above.
246246

247+
Document generation
248+
^^^^^^^^^^^^^^^^^^^
249+
Since Hub 11 you can let Nextcloud automatically generate Office documents with content.
250+
This functionality is available in the assistant app and made possible by the Nextcloud Office app.
251+
252+
Frontend apps
253+
~~~~~~~~~~~~~
254+
255+
* `Assistant <https://apps.nextcloud.com/apps/assistant>`_ for offering a graphical UI for the context chat search tasks
256+
257+
Backend apps
258+
~~~~~~~~~~~~
259+
260+
* `Nextcloud Office <https://apps.nextcloud.com/apps/richdocuments>`_
261+
247262

248263
.. _ai-overview_improve-ai-task-pickup-speed:
249264

admin_manual/configuration_files/encryption_configuration.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,19 @@ Encryption settings can be configured in the mount options for an external
131131
storage mount, see :ref:`external_storage_mount_options_label`
132132
(:doc:`external_storage_configuration_gui`)
133133

134+
135+
Encrypting team folders
136+
-----------------------
137+
138+
By default team folder are not encrypted. If you want to encrypt your team folders
139+
as well you need to run following occ command:
140+
141+
occ config:app:set groupfolders enable_encryption --value=true
142+
143+
Like for all other files and server-side-encryption in general, this will not encrypt
144+
already existing files in team folders but only new or updated files after
145+
the occ command was executed.
146+
134147
.. _occ_encryption_label:
135148

136149
occ encryption commands

admin_manual/configuration_files/encryption_details.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
==================
2-
Encryption details
3-
==================
1+
==============================
2+
Server-side encryption details
3+
==============================
44

55
This document - provided by `SysEleven <https://syseleven.de>`_ - describes the server-side encryption scheme implemented by Nextcloud's default encryption module. This includes:
66

0 commit comments

Comments
 (0)