From 0b978f1860a2d27c9ca270122f08f8ee23669132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Re=C3=A9?= Date: Thu, 13 Aug 2026 20:07:39 +0200 Subject: [PATCH] Pin kitconcept.solr to a revision instead of the branch (#580) Backend ([tool.uv.sources] rev + uv.lock), frontend (mrs.developer tag) and the solr image default tag (sha-826383b, content-identical: solr/ unchanged since that revision) now all reference a fixed kitconcept.solr revision instead of the moving feature-ai-rag branch, making checkouts reproducible. The pinned backend/frontend revision a8953cef carries the fix for GitLab #580 / kitconcept.solr#112: WikiPage bodies stored in off-layout Plate blocks were invisible to the RAG chunking. This branch is the verification vehicle for the reporter. --- backend/news/+solr-rev-pin.bugfix | 1 + backend/pyproject.toml | 2 +- backend/uv.lock | 4 ++-- devops/stacks/demo.yml | 2 +- devops/stacks/persistent.yml | 2 +- docker-compose-dev.yml | 2 +- frontend/mrs.developer.json | 2 +- .../packages/kitconcept-intranet/news/+solr-rev-pin.bugfix | 1 + news/+solr-rev-pin.bugfix | 1 + 9 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 backend/news/+solr-rev-pin.bugfix create mode 100644 frontend/packages/kitconcept-intranet/news/+solr-rev-pin.bugfix create mode 100644 news/+solr-rev-pin.bugfix diff --git a/backend/news/+solr-rev-pin.bugfix b/backend/news/+solr-rev-pin.bugfix new file mode 100644 index 00000000..e84a1af1 --- /dev/null +++ b/backend/news/+solr-rev-pin.bugfix @@ -0,0 +1 @@ +Pin kitconcept.solr to a revision instead of the branch: backend, frontend and the solr image. Includes the Plate RAG chunking fix (kitconcept.solr#112). @reebalazs diff --git a/backend/pyproject.toml b/backend/pyproject.toml index e757a9c8..b137332c 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -67,7 +67,7 @@ container = [ [tool.uv.sources] kitconcept-plate = { path = "container/kitconcept-plate.tar.gz" } -kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", branch = "feature-ai-rag" } +kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", rev = "a8953cefb2d250bb83213bef0099ffceda87dc78" } [tool.hatch.metadata] allow-direct-references = true diff --git a/backend/uv.lock b/backend/uv.lock index 1ab04c16..497016b4 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -1520,7 +1520,7 @@ requires-dist = [ { name = "kitconcept-contactblock", specifier = "==1.0.0a6" }, { name = "kitconcept-core", specifier = "==2.0.0b4" }, { name = "kitconcept-plate", path = "container/kitconcept-plate.tar.gz" }, - { name = "kitconcept-solr", git = "https://github.com/kitconcept/kitconcept.solr.git?subdirectory=backend&branch=feature-ai-rag" }, + { name = "kitconcept-solr", git = "https://github.com/kitconcept/kitconcept.solr.git?subdirectory=backend&rev=a8953cefb2d250bb83213bef0099ffceda87dc78" }, { name = "pas-plugins-authomatic", specifier = "==2.0.0" }, { name = "pas-plugins-keycloakgroups", specifier = "==1.0.0b1" }, { name = "pas-plugins-oidc", specifier = "==2.0.0" }, @@ -1589,7 +1589,7 @@ provides-extras = ["test"] [[package]] name = "kitconcept-solr" version = "2.0.0a14" -source = { git = "https://github.com/kitconcept/kitconcept.solr.git?subdirectory=backend&branch=feature-ai-rag#fcae6395075556a040c7b9972d1e4a8cbefdacc6" } +source = { git = "https://github.com/kitconcept/kitconcept.solr.git?subdirectory=backend&rev=a8953cefb2d250bb83213bef0099ffceda87dc78#a8953cefb2d250bb83213bef0099ffceda87dc78" } dependencies = [ { name = "collective-solr" }, { name = "plone-api" }, diff --git a/devops/stacks/demo.yml b/devops/stacks/demo.yml index de615c8f..16f74a05 100644 --- a/devops/stacks/demo.yml +++ b/devops/stacks/demo.yml @@ -97,7 +97,7 @@ services: - ${STACK_NAME}-tika solr: - image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag} + image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b} command: - solr-precreate - plone diff --git a/devops/stacks/persistent.yml b/devops/stacks/persistent.yml index 58c4cb0c..854aa5c2 100644 --- a/devops/stacks/persistent.yml +++ b/devops/stacks/persistent.yml @@ -132,7 +132,7 @@ services: - ${STACK_NAME}-tika solr: - image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag} + image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b} command: - solr-precreate - plone diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 0f5f999b..24e56c08 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -52,7 +52,7 @@ x-tika: &tika - 9998:9998 x-solr: &solr - image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag} + image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b} platform: linux/amd64 ports: - 8983:8983 diff --git a/frontend/mrs.developer.json b/frontend/mrs.developer.json index 046a6d24..18907bb6 100644 --- a/frontend/mrs.developer.json +++ b/frontend/mrs.developer.json @@ -135,7 +135,7 @@ "url": "git@github.com:kitconcept/kitconcept.solr.git", "https": "https://github.com/kitconcept/kitconcept.solr.git", "path": "frontend/packages/volto-solr", - "branch": "feature-ai-rag" + "tag": "a8953cefb2d250bb83213bef0099ffceda87dc78" }, "volto-contact-block": { "develop": true, diff --git a/frontend/packages/kitconcept-intranet/news/+solr-rev-pin.bugfix b/frontend/packages/kitconcept-intranet/news/+solr-rev-pin.bugfix new file mode 100644 index 00000000..e84a1af1 --- /dev/null +++ b/frontend/packages/kitconcept-intranet/news/+solr-rev-pin.bugfix @@ -0,0 +1 @@ +Pin kitconcept.solr to a revision instead of the branch: backend, frontend and the solr image. Includes the Plate RAG chunking fix (kitconcept.solr#112). @reebalazs diff --git a/news/+solr-rev-pin.bugfix b/news/+solr-rev-pin.bugfix new file mode 100644 index 00000000..e84a1af1 --- /dev/null +++ b/news/+solr-rev-pin.bugfix @@ -0,0 +1 @@ +Pin kitconcept.solr to a revision instead of the branch: backend, frontend and the solr image. Includes the Plate RAG chunking fix (kitconcept.solr#112). @reebalazs