Pin kitconcept.solr to the Plate RAG fix revision (#580)

Backend (uv rev instead of branch) and frontend (mrs.developer tag
instead of branch) both pin kitconcept.solr commit a8953cef - the fix
for GitLab #580 / kitconcept.solr#112 (WikiPage bodies in off-layout
Plate blocks invisible to RAG chunking). Pinning by revision rather
than branch also makes the dependency resolution reproducible: what
gets built no longer depends on when the branch tip was fetched.

Author: reekitconcept

backend/news/+solr-plate-rag-pin.bugfix

@@ -0,0 +1 @@
+Pin kitconcept.solr to the revision with the Plate RAG chunking fix (kitconcept.solr#112, GitLab #580) - and pin by rev instead of branch, so backend dependency resolution is reproducible. @reebalazs

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

backend/uv.lock

@@ -1,148 +1,148 @@
 {
-  "core": {
-    "output": "./",
-    "package": "@plone/volto",
-    "url": "git@github.com:plone/volto.git",
-    "https": "https://github.com/plone/volto.git",
-    "tag": "19.3.0",
-    "filterBlobs": true
-  },
-  "volto-light-theme": {
-    "develop": true,
-    "output": "./packages",
-    "package": "@kitconcept/volto-light-theme",
-    "url": "git@github.com:kitconcept/volto-light-theme.git",
-    "https": "https://github.com/kitconcept/volto-light-theme.git",
-    "tag": "8.0.0a31",
-    "filterBlobs": true
-  },
-  "kitconcept-core": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/core",
-    "url": "git@github.com:kitconcept/kitconcept-core.git",
-    "https": "https://github.com/kitconcept/kitconcept-core.git",
-    "tag": "2.0.0b4"
-  },
-  "volto-banner-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-banner-block",
-    "url": "git@github.com:kitconcept/volto-banner-block.git",
-    "https": "https://github.com/kitconcept/volto-banner-block.git",
-    "tag": "1.2.0"
-  },
-  "volto-bm3-compat": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-bm3-compat",
-    "url": "git@github.com:kitconcept/volto-bm3-compat.git",
-    "https": "https://github.com/kitconcept/volto-bm3-compat.git",
-    "tag": "1.0.0-alpha.1"
-  },
-  "volto-button-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-button-block",
-    "url": "git@github.com:kitconcept/volto-button-block.git",
-    "https": "https://github.com/kitconcept/volto-button-block.git",
-    "tag": "5.0.0-alpha.2"
-  },
-  "volto-calendar-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-calendar-block",
-    "url": "git@github.com:kitconcept/volto-calendar-block.git",
-    "https": "https://github.com/kitconcept/volto-calendar-block.git",
-    "tag": "1.0.0-alpha.9"
-  },
-  "volto-carousel-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-carousel-block",
-    "url": "git@github.com:kitconcept/volto-carousel-block.git",
-    "https": "https://github.com/kitconcept/volto-carousel-block.git",
-    "tag": "3.0.0-alpha.1"
-  },
-  "volto-heading-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-heading-block",
-    "url": "git@github.com:kitconcept/volto-heading-block.git",
-    "https": "https://github.com/kitconcept/volto-heading-block.git",
-    "tag": "2.5.0"
-  },
-  "volto-highlight-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-highlight-block",
-    "url": "git@github.com:kitconcept/volto-highlight-block.git",
-    "https": "https://github.com/kitconcept/volto-highlight-block.git",
-    "tag": "5.0.0-alpha.2"
-  },
-  "volto-introduction-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-introduction-block",
-    "url": "git@github.com:kitconcept/volto-introduction-block.git",
-    "https": "https://github.com/kitconcept/volto-introduction-block.git",
-    "tag": "1.4.1"
-  },
-  "volto-logos-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-logos-block",
-    "url": "git@github.com:kitconcept/volto-logos-block.git",
-    "https": "https://github.com/kitconcept/volto-logos-block.git",
-    "tag": "4.0.0-alpha.1"
-  },
-  "volto-separator-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-separator-block",
-    "url": "git@github.com:kitconcept/volto-separator-block.git",
-    "https": "https://github.com/kitconcept/volto-separator-block.git",
-    "tag": "5.0.0-alpha.0"
-  },
-  "volto-iframe-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-iframe-block",
-    "url": "git@github.com:kitconcept/volto-iframe-block.git",
-    "https": "https://github.com/kitconcept/volto-iframe-block.git",
-    "tag": "2.4.1"
-  },
-  "volto-slider-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-slider-block",
-    "url": "git@github.com:kitconcept/volto-slider-block.git",
-    "https": "https://github.com/kitconcept/volto-slider-block.git",
-    "tag": "7.0.0-alpha.1"
-  },
-  "volto-form-block": {
-    "develop": false,
-    "output": "packages",
-    "package": "@plone/volto-form-block",
-    "url": "git@github.com:plone/form-block.git",
-    "https": "https://github.com/plone/form-block.git",
-    "tag": "1.0.0-alpha.3"
-  },
-  "volto-solr": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-solr",
-    "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"
-  },
-  "volto-contact-block": {
-    "develop": true,
-    "output": "packages",
-    "package": "@kitconcept/volto-contact-block",
-    "url": "git@github.com:kitconcept/volto-contact-block.git",
-    "https": "https://github.com/kitconcept/volto-contact-block.git",
-    "tag": "1.0.0a6"
-  }
+    "core": {
+        "output": "./",
+        "package": "@plone/volto",
+        "url": "git@github.com:plone/volto.git",
+        "https": "https://github.com/plone/volto.git",
+        "tag": "19.3.0",
+        "filterBlobs": true
+    },
+    "volto-light-theme": {
+        "develop": true,
+        "output": "./packages",
+        "package": "@kitconcept/volto-light-theme",
+        "url": "git@github.com:kitconcept/volto-light-theme.git",
+        "https": "https://github.com/kitconcept/volto-light-theme.git",
+        "tag": "8.0.0a31",
+        "filterBlobs": true
+    },
+    "kitconcept-core": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/core",
+        "url": "git@github.com:kitconcept/kitconcept-core.git",
+        "https": "https://github.com/kitconcept/kitconcept-core.git",
+        "tag": "2.0.0b4"
+    },
+    "volto-banner-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-banner-block",
+        "url": "git@github.com:kitconcept/volto-banner-block.git",
+        "https": "https://github.com/kitconcept/volto-banner-block.git",
+        "tag": "1.2.0"
+    },
+    "volto-bm3-compat": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-bm3-compat",
+        "url": "git@github.com:kitconcept/volto-bm3-compat.git",
+        "https": "https://github.com/kitconcept/volto-bm3-compat.git",
+        "tag": "1.0.0-alpha.1"
+    },
+    "volto-button-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-button-block",
+        "url": "git@github.com:kitconcept/volto-button-block.git",
+        "https": "https://github.com/kitconcept/volto-button-block.git",
+        "tag": "5.0.0-alpha.2"
+    },
+    "volto-calendar-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-calendar-block",
+        "url": "git@github.com:kitconcept/volto-calendar-block.git",
+        "https": "https://github.com/kitconcept/volto-calendar-block.git",
+        "tag": "1.0.0-alpha.9"
+    },
+    "volto-carousel-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-carousel-block",
+        "url": "git@github.com:kitconcept/volto-carousel-block.git",
+        "https": "https://github.com/kitconcept/volto-carousel-block.git",
+        "tag": "3.0.0-alpha.1"
+    },
+    "volto-heading-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-heading-block",
+        "url": "git@github.com:kitconcept/volto-heading-block.git",
+        "https": "https://github.com/kitconcept/volto-heading-block.git",
+        "tag": "2.5.0"
+    },
+    "volto-highlight-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-highlight-block",
+        "url": "git@github.com:kitconcept/volto-highlight-block.git",
+        "https": "https://github.com/kitconcept/volto-highlight-block.git",
+        "tag": "5.0.0-alpha.2"
+    },
+    "volto-introduction-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-introduction-block",
+        "url": "git@github.com:kitconcept/volto-introduction-block.git",
+        "https": "https://github.com/kitconcept/volto-introduction-block.git",
+        "tag": "1.4.1"
+    },
+    "volto-logos-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-logos-block",
+        "url": "git@github.com:kitconcept/volto-logos-block.git",
+        "https": "https://github.com/kitconcept/volto-logos-block.git",
+        "tag": "4.0.0-alpha.1"
+    },
+    "volto-separator-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-separator-block",
+        "url": "git@github.com:kitconcept/volto-separator-block.git",
+        "https": "https://github.com/kitconcept/volto-separator-block.git",
+        "tag": "5.0.0-alpha.0"
+    },
+    "volto-iframe-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-iframe-block",
+        "url": "git@github.com:kitconcept/volto-iframe-block.git",
+        "https": "https://github.com/kitconcept/volto-iframe-block.git",
+        "tag": "2.4.1"
+    },
+    "volto-slider-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-slider-block",
+        "url": "git@github.com:kitconcept/volto-slider-block.git",
+        "https": "https://github.com/kitconcept/volto-slider-block.git",
+        "tag": "7.0.0-alpha.1"
+    },
+    "volto-form-block": {
+        "develop": false,
+        "output": "packages",
+        "package": "@plone/volto-form-block",
+        "url": "git@github.com:plone/form-block.git",
+        "https": "https://github.com/plone/form-block.git",
+        "tag": "1.0.0-alpha.3"
+    },
+    "volto-solr": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-solr",
+        "url": "git@github.com:kitconcept/kitconcept.solr.git",
+        "https": "https://github.com/kitconcept/kitconcept.solr.git",
+        "path": "frontend/packages/volto-solr",
+        "tag": "a8953cefb2d250bb83213bef0099ffceda87dc78"
+    },
+    "volto-contact-block": {
+        "develop": true,
+        "output": "packages",
+        "package": "@kitconcept/volto-contact-block",
+        "url": "git@github.com:kitconcept/volto-contact-block.git",
+        "https": "https://github.com/kitconcept/volto-contact-block.git",
+        "tag": "1.0.0a6"
+    }
 }

frontend/mrs.developer.json

@@ -0,0 +1 @@
+Pin volto-solr (mrs.developer) to the same kitconcept.solr revision as the backend instead of tracking the branch tip. @reebalazs