Compare commits

..
19 Commits
Author SHA1 Message Date
bachirandClaude Opus 5.5 7b6c9d74f3 Bump public_html submodule: tab title and old URLs (F3)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 21:14:09 +01:00
bachirandClaude Opus 5.5 f4394b86cd Bump public_html submodule: former search form removed (F2)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 21:11:18 +01:00
bachirandClaude Opus 5.5 ac2aab293e Bump public_html submodule: Vue search field (F1)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 20:50:21 +01:00
bachirandClaude Opus 5.5 ce476a04a0 Bump public_html submodule: relative neighbour cut, OR fallback (H6)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 19:56:53 +01:00
bachirandClaude Opus 5.5 484498223b Bump public_html submodule: ranking cache for pagination (H9)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 19:10:11 +01:00
bachirandClaude Opus 5.5 1892693eb3 Bump public_html submodule: search vector cache, delay and fallback (H8)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 18:26:19 +01:00
bachirandClaude Opus 5.5 0ed4143a68 Bump public_html submodule: drupal/core-dev, PHPUnit (T1)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 12:57:44 +01:00
bachirandClaude Opus 5.5 3541eb8d26 Bump public_html submodule: hybrid search with RRF fusion (H5)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 12:43:06 +01:00
bachirandClaude Opus 5.5 290767309d Bump public_html submodule: references as exact matches (H4)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 12:17:10 +01:00
bachirandClaude Opus 5.5 613007a8d8 Bump public_html submodule: OR query in terms mode (H3)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 12:10:01 +01:00
bachirandClaude Opus 5.5 6d4a26c66d Bump public_html submodule: phrase search and keyword queries (H1, H2)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 11:53:14 +01:00
bachirandClaude Opus 5.5 151e4932a7 Bump solr_cores submodule: luceneMatchVersion 9.12.3
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 11:15:38 +01:00
bachirandClaude Opus 5.5 361a859961 Bump public_html and solr_cores submodules to stage: vectors in Solr (lot I)
public_html stage: materio_ai V1 to V7 and I1 to I4 (dense vector field,
vectors written at indexing, reindex on vector change, kNN neighbour search).
solr_cores stage: knn_vector_1024 field type and knn1024_* dynamic field.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 10:53:22 +01:00
bachirandClaude Opus 5.5 d8b555c7c3 update_solr_config.sh: no more drush dre materio_sapi (I0)
Uninstalling materio_sapi removed the search block, the role permissions and
six fields of the database index from the active config, and put back ASCII
field types older than config/sync. The configset is now generated from the
active config. solr_cores_stage worktree removed: solr_cores is on stage.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 09:43:22 +01:00
bachirandClaude Opus 5.5 05b3e23770 Ollama limited to 4 cores and 2 GB, matching the planned CT-materio_embed
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
2026-11-17 09:12:35 +01:00
bachirandClaude Opus 5.5 6440eb8d9b Local Solr aligned with prod/stage: single Solr 9.11 service, Solr 8 and switch removed
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-16 16:15:14 +01:00
bachirandClaude Opus 5.5 458d852ef0 Ollama service with bge-m3 for embeddings (M1, internal network only)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-16 16:08:22 +01:00
bachirandClaude Opus 5.5 8757bf65fa Bump public_html and solr_cores submodules: prod on Solr 9.11 (S7)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-16 16:08:21 +01:00
bachirandClaude Opus 5.5 842765d31a Solr 9 local instance (solr9, :8986, configsets from solr_cores_stage worktree)
- make solr8 / make solr9 switches local Drupal via untracked settings.solr.php
- update_solr_config.sh clears conf/ before unzipping the generated config

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-11 20:33:53 +01:00
7 changed files with 40 additions and 23 deletions
+2 -1
View File
@@ -10,6 +10,7 @@ var_solr/*
ressources/xdebug.ini
ressources/*.sql.gz
ai-docs/
solr_cores_stage/
AGENTS.md
.vibe/
var_solr8/
var_ollama/
-3
View File
@@ -1,3 +0,0 @@
FROM solr:8.10.1
# COPY --chown=solr:solr ./server /opt/solr/server/solr/
+1 -4
View File
@@ -20,9 +20,6 @@ build:
buildnc:
docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME)
buildsolrnc:
docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) solr
buildphp:
docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php
@@ -112,4 +109,4 @@ dump_d8_db:
docker exec materiod8-mysql-1 sh -c 'exec mariadb-dump -uroot -pmaterio materio_d8' > ./ressources/materio-d8-$(DATE_NOW)-local.sql
sish:
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
ssh -p 2222 -R materio:80:dev:8890 CT-sish.me
+8 -6
View File
@@ -2,8 +2,8 @@
# Régénère la config Solr depuis Drupal (search_api_solr) et l'écrit dans un arbre du dépôt solr_cores,
# puis recharge les cores (RELOAD, sans restart).
#
# bin/update_solr_config.sh -> solr_cores (branche prod, Solr 8, :8985)
# bin/update_solr_config.sh solr_cores_stage URL -> worktree stage (Solr 9, phase 2)
# bin/update_solr_config.sh -> solr_cores (Solr 9 local, :8985)
# (solr_cores sur la branche stage pendant le projet IA ; plus de worktree solr_cores_stage)
#
# Les modifications restent à relire / committer dans l'arbre visé (git diff).
@@ -15,15 +15,17 @@ CORES="materio_base materio_autocomplete"
[ -d "$TREE/materio_base/conf" ] || { echo "arbre $TREE invalide" >&2; exit 1; }
docker exec -i materiod8-php-1 drush cdel search_api_solr.solr_field_type.text_edgestring_ascii_und_6_0_0
docker exec -i materiod8-php-1 drush cdel search_api_solr.solr_field_type.text_string_ascii_und_6_0_0
docker exec -i materiod8-php-1 drush dre materio_sapi
# Généré depuis la config active : la garder alignée sur config/sync (drush cim) avant de lancer.
# Pas de « drush dre materio_sapi » : la désinstallation retire le bloc de recherche, les permissions
# et des champs de l'index database, et remet les types ASCII de config/install, plus anciens que ceux de config/sync.
docker exec -i materiod8-php-1 drush solr-gsc database_search_autocomplete config.zip || exit 1
mkdir -p ressources/solr/
mv public_html/web/config.zip ressources/solr/ || exit 1
# conf/ entièrement généré : on vide avant de décompresser (les fichiers retirés apparaissent dans git status)
for core in $CORES; do
unzip -o ressources/solr/config.zip -d "$TREE/$core/conf"
find "$TREE/$core/conf" -type f -delete
unzip -q -o ressources/solr/config.zip -d "$TREE/$core/conf"
done
for core in $CORES; do
+27 -7
View File
@@ -56,24 +56,41 @@ services:
# - "6388"
solr:
build: ./Docker/solr/
# user: ${USER_UID}:${USER_GID}
# même structure que CT-materio (prod) : SOLR_HOME = /var/solr/data (solr.xml + core.properties + index),
image: solr:9.11.0
# même structure que CT-materio (prod et stage, Solr 9.11 depuis le 16/11/2026) :
# SOLR_HOME = /var/solr/data (solr.xml + core.properties + index),
# configsets = dépôt solr_cores (branche prod), monté en lecture seule (configSetBaseDir dans solr.xml)
environment:
- SOLR_HOME=/var/solr/data
- SOLR_MODULES=extraction,langid,ltr,analysis-extras
# Solr 9 (security manager) : autorise la lecture des configsets hors SOLR_HOME
- SOLR_OPTS=-Dsolr.allowPaths=/opt/configsets
volumes:
- ./var_solr:/var/solr
- ./solr_cores:/opt/configsets:ro
# - solr-data: /var/solr
# - "${SOLR_CORES}:/var/solr/data"
# - "${SOLR_DATA}:/var/solr"
# - "${SOLR_CORES}:/opt/solr/server/solr"
networks:
- solr
ports:
- 8985:8983
# Modèle d'embedding bge-m3 servi par Ollama (projet recherche IA, M1).
# Pas de port publié : joignable seulement depuis php (réseau ollama), http://ollama:11434
ollama:
image: ollama/ollama:0.40.16
environment:
# garde le modèle chargé en mémoire (pas de rechargement à froid entre deux appels)
- OLLAMA_KEEP_ALIVE=-1
# Ressources du futur CT-materio_embed (E4) : 4 cœurs, 2 Go. Cœurs physiques 0-3 du
# laptop (lscpu -e=CPU,CORE) ; Ollama ignore cette limite pour ses threads, le module
# envoie options.num_thread (materio_ai.settings:num_thread = 4).
cpuset: "0-3"
mem_limit: 2g
memswap_limit: 2g
volumes:
- ./var_ollama:/root/.ollama
networks:
- ollama
# solr-legacy:
# build: ./Docker/solr-legacy/
# volumes:
@@ -103,6 +120,7 @@ services:
- redis
- server
- solr
- ollama
# for xdebug
# https://github.com/docker/for-linux/issues/264#issuecomment-965465879
extra_hosts:
@@ -113,6 +131,7 @@ services:
# - mysql-legacy
- redis
- solr
- ollama
# php-legacy:
# build: ./Docker/php-legacy/
@@ -204,3 +223,4 @@ networks:
redis:
server:
solr:
ollama: