Skip to content

Commit 6b7889f

Browse files
committed
Merge remote-tracking branch 'origin/main' into claude/resolve-issue-1333-22Y0E
# Conflicts: # docs/assets/images/screenshots/auto/admin--pipeline-settings--secrets-modal.png # docs/assets/images/screenshots/auto/annotations--pdf-canvas--with-labels.png # docs/assets/images/screenshots/auto/annotations--pdf-feed--with-soft-highlights.png # docs/assets/images/screenshots/auto/annotations--txt-document--with-spans.png # docs/assets/images/screenshots/auto/annotator--enhanced-label-selector--collapsed.png # docs/assets/images/screenshots/auto/annotator--enhanced-label-selector--expanded.png # docs/assets/images/screenshots/auto/badges--celebration-modal--manual-award.png # docs/assets/images/screenshots/auto/badges--management--create-modal.png # docs/assets/images/screenshots/auto/caml--editor--full-template.png # docs/assets/images/screenshots/auto/caml--editor--new-article.png # docs/assets/images/screenshots/auto/chat--approval-modal--pending.png # docs/assets/images/screenshots/auto/chat--context-meter--compacted.png # docs/assets/images/screenshots/auto/chat--context-meter--compaction-underway.png # docs/assets/images/screenshots/auto/chat--context-meter--green.png # docs/assets/images/screenshots/auto/chat--context-meter--red.png # docs/assets/images/screenshots/auto/chat--context-meter--yellow.png # docs/assets/images/screenshots/auto/chat--tool-badge--single.png # docs/assets/images/screenshots/auto/chat--tool-popover--multi-tool.png # docs/assets/images/screenshots/auto/chat--tool-popover--single-tool.png # docs/assets/images/screenshots/auto/context-menu--default--with-items.png # docs/assets/images/screenshots/auto/cookie-consent--modal--default.png # docs/assets/images/screenshots/auto/corpus--analytics--dashboard.png # docs/assets/images/screenshots/auto/corpus--bulk-import-modal--file-selected.png # docs/assets/images/screenshots/auto/corpus--bulk-import-modal--progress-step.png # docs/assets/images/screenshots/auto/corpus--bulk-import-modal--upload-step.png # docs/assets/images/screenshots/auto/corpus--bulk-upload-modal--initial.png # docs/assets/images/screenshots/auto/corpus--corpus-modal--initial.png # docs/assets/images/screenshots/auto/corpus--document-relationship-modal--initial.png # docs/assets/images/screenshots/auto/corpus--landing--clean-view.png # docs/assets/images/screenshots/auto/corpus--power-user--with-sidebar.png # docs/assets/images/screenshots/auto/corpus--toc--hybrid-index.png # docs/assets/images/screenshots/auto/corpus--upload-modal--initial.png # docs/assets/images/screenshots/auto/corpus--worker-tokens--create-modal.png # docs/assets/images/screenshots/auto/corpus--worker-tokens--key-display.png # docs/assets/images/screenshots/auto/corpus-actions--create-modal--initial.png # docs/assets/images/screenshots/auto/corpus-actions--run-action-modal--initial.png # docs/assets/images/screenshots/auto/corpus-settings--template-picker-open.png # docs/assets/images/screenshots/auto/crud--modal-document--edit-prefilled.png # docs/assets/images/screenshots/auto/crud--modal-document--edit-with-changes.png # docs/assets/images/screenshots/auto/discussions--global--all-tabs.png # docs/assets/images/screenshots/auto/discussions--global--corpus-tab.png # docs/assets/images/screenshots/auto/discussions--global--document-tab.png # docs/assets/images/screenshots/auto/export--config-modal--default.png # docs/assets/images/screenshots/auto/export--config-modal--mobile.png # docs/assets/images/screenshots/auto/export--config-modal--rjsf-processor-form.png # docs/assets/images/screenshots/auto/extracts--cell-editor--string-input.png # docs/assets/images/screenshots/auto/extracts--create-column-modal--custom-model.png # docs/assets/images/screenshots/auto/extracts--create-column-modal--default.png # docs/assets/images/screenshots/auto/extracts--create-column-modal--edit-mode.png # docs/assets/images/screenshots/auto/extracts--create-column-modal--filled.png # docs/assets/images/screenshots/auto/extracts--detail-content--documents-tab.png # docs/assets/images/screenshots/auto/extracts--detail-content--schema-tab.png # docs/assets/images/screenshots/auto/folders--create-folder-modal--initial.png # docs/assets/images/screenshots/auto/folders--edit-folder-modal--initial.png # docs/assets/images/screenshots/auto/folders--move-folder-modal--initial.png # docs/assets/images/screenshots/auto/knowledge-base--docx-document--rendered.png # docs/assets/images/screenshots/auto/knowledge-base--index-tab--open.png # docs/assets/images/screenshots/auto/knowledge-base--relationship-action-modal--initial.png # docs/assets/images/screenshots/auto/knowledge-base--sidebar-control-bar--sort-options.png # docs/assets/images/screenshots/auto/knowledge-base--sidebar-tabs--with-index.png # docs/assets/images/screenshots/auto/landing--call-to-action--anonymous.png # docs/assets/images/screenshots/auto/metadata--column-modal--initial.png # docs/assets/images/screenshots/auto/modals--select-documents--open.png # docs/assets/images/screenshots/auto/nav--corpus-home--desktop.png # docs/assets/images/screenshots/auto/readme--document-annotator--with-pdf.png # docs/assets/images/screenshots/auto/threads--edit-message-modal--initial.png # docs/assets/images/screenshots/auto/versioning--history-panel--with-versions.png # docs/assets/images/screenshots/auto/widgets--chat-message--markdown.png # docs/assets/images/screenshots/auto/widgets--fieldset-modal--create-empty.png # docs/assets/images/screenshots/auto/widgets--fieldset-modal--edit-populated.png # docs/assets/images/screenshots/auto/widgets--model-field-builder--type-dropdown.png # docs/assets/images/screenshots/auto/widgets--model-field-builder--with-fields.png # docs/assets/images/screenshots/auto/widgets--radial-button-cloud--collapsed.png # docs/assets/images/screenshots/auto/widgets--radial-button-cloud--confirmation-modal.png # docs/assets/images/screenshots/auto/widgets--select-analyzer-modal--analyzer-grid.png
2 parents 65de797 + 2d7033f commit 6b7889f

141 files changed

Lines changed: 2229 additions & 567 deletions

File tree

Some content is hidden

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

CHANGELOG.md

Lines changed: 74 additions & 3 deletions

compose/production/traefik/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM traefik:v3.6.13
1+
FROM traefik:v3.6.14
22
RUN mkdir -p /etc/traefik/acme \
33
&& touch /etc/traefik/acme/acme.json \
44
&& chmod 600 /etc/traefik/acme/acme.json

config/graphql/label_mutations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,12 @@ def mutate(root, info, label_ids, labelset_id):
293293
Q(pk=from_global_id(labelset_id)[1])
294294
& (Q(creator=user) | Q(is_public=True))
295295
)
296-
labelset_labels = labelset.documents.filter(pk__in=label_pks)
297-
labelset.annotation_labels.remove(*labelset_labels)
296+
labelset.annotation_labels.remove(*label_pks)
298297
ok = True
299298
message = "Success"
300299

301300
except Exception as e:
301+
logger.exception("RemoveLabelsFromLabelsetMutation failed")
302302
message = f"Error removing label(s) from labelset: {e}"
303303

304304
return RemoveLabelsFromLabelsetMutation(message=message, ok=ok)
-70 Bytes
1 Byte
-1.81 KB
265 Bytes
117 Bytes
2.45 KB
-176 Bytes

0 commit comments

Comments
 (0)