Skip to content

Commit 0b978f1

Browse files
committed
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.
1 parent 83b22da commit 0b978f1

9 files changed

Lines changed: 10 additions & 7 deletions

File tree

backend/news/+solr-rev-pin.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

backend/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ container = [
6767

6868
[tool.uv.sources]
6969
kitconcept-plate = { path = "container/kitconcept-plate.tar.gz" }
70-
kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", branch = "feature-ai-rag" }
70+
kitconcept-solr = { git = "https://github.com/kitconcept/kitconcept.solr.git", subdirectory = "backend", rev = "a8953cefb2d250bb83213bef0099ffceda87dc78" }
7171

7272
[tool.hatch.metadata]
7373
allow-direct-references = true

backend/uv.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

devops/stacks/demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ services:
9797
- ${STACK_NAME}-tika
9898

9999
solr:
100-
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
100+
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
101101
command:
102102
- solr-precreate
103103
- plone

devops/stacks/persistent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ services:
132132
- ${STACK_NAME}-tika
133133

134134
solr:
135-
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
135+
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
136136
command:
137137
- solr-precreate
138138
- plone

docker-compose-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ x-tika: &tika
5252
- 9998:9998
5353

5454
x-solr: &solr
55-
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-feature-ai-rag}
55+
image: ghcr.io/kitconcept/solr:${SOLR_TAG:-sha-826383b}
5656
platform: linux/amd64
5757
ports:
5858
- 8983:8983

frontend/mrs.developer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"url": "git@github.com:kitconcept/kitconcept.solr.git",
136136
"https": "https://github.com/kitconcept/kitconcept.solr.git",
137137
"path": "frontend/packages/volto-solr",
138-
"branch": "feature-ai-rag"
138+
"tag": "a8953cefb2d250bb83213bef0099ffceda87dc78"
139139
},
140140
"volto-contact-block": {
141141
"develop": true,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

news/+solr-rev-pin.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

0 commit comments

Comments
 (0)