Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fcba907438 | |||
| 5739602702 | |||
| addf78f01d | |||
| 5e04e84ee4 | |||
| 8d5c2e2b7f | |||
| 788d2c12f2 | |||
| b25a9746cf | |||
| 41fda9aeee |
12
.env.example
12
.env.example
@@ -38,3 +38,15 @@ LLM_MODEL=gemma4:26b
|
|||||||
# 1min.ai (si LLM_PROVIDER=onemin)
|
# 1min.ai (si LLM_PROVIDER=onemin)
|
||||||
ONEMIN_API_KEY=
|
ONEMIN_API_KEY=
|
||||||
ONEMIN_MODEL=gpt-4o-mini
|
ONEMIN_MODEL=gpt-4o-mini
|
||||||
|
|
||||||
|
# --- Mises a jour automatiques (Watchtower) ------------------------------
|
||||||
|
# Watchtower verifie les nouvelles versions de core/brain/web et permet
|
||||||
|
# le declenchement manuel via l'UI (bouton "Mettre a jour"). Postgres et
|
||||||
|
# MinIO sont exclus volontairement.
|
||||||
|
#
|
||||||
|
# Activer : COMPOSE_PROFILES=autoupdate + WATCHTOWER_TOKEN non vide.
|
||||||
|
# COMPOSE_PROFILES=autoupdate
|
||||||
|
# WATCHTOWER_TOKEN=change-me-use-openssl-rand-hex-32
|
||||||
|
# WATCHTOWER_MONITOR_ONLY=false # true = detecter sans appliquer
|
||||||
|
# WATCHTOWER_SCHEDULE=0 0 4 * * *
|
||||||
|
# TZ=Europe/Paris
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ from app.infrastructure.onemin_adapter import OneMinAiLLMProvider
|
|||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
title="LoreMind Brain",
|
title="LoreMind Brain",
|
||||||
description="Backend IA pour la génération de contenu narratif.",
|
description="Backend IA pour la génération de contenu narratif.",
|
||||||
version="0.6.5",
|
version="0.6.6",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -689,6 +689,76 @@ async def get_ollama_model_info(
|
|||||||
return OllamaModelInfoDTO(context_length=0)
|
return OllamaModelInfoDTO(context_length=0)
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/models/ollama/pull")
|
||||||
|
async def pull_ollama_model(
|
||||||
|
body: dict[str, str],
|
||||||
|
settings: Annotated[Settings, Depends(get_settings)],
|
||||||
|
) -> StreamingResponse:
|
||||||
|
"""Telecharge un modele depuis Ollama et streame la progression.
|
||||||
|
|
||||||
|
Proxifie l'endpoint `/api/pull` d'Ollama qui renvoie du JSON ligne par
|
||||||
|
ligne (NDJSON) avec le statut de chaque etape : manifest, layers,
|
||||||
|
digest, success. On reemet ce flux tel quel au client (le front
|
||||||
|
parsera les lignes et affichera une barre de progression).
|
||||||
|
|
||||||
|
Le timeout est intentionnellement tres long (60 min) car certains
|
||||||
|
modeles font 30+ Go.
|
||||||
|
"""
|
||||||
|
name = (body.get("name") or "").strip()
|
||||||
|
if not name:
|
||||||
|
raise HTTPException(status_code=400, detail="name requis")
|
||||||
|
url = f"{settings.ollama_base_url}/api/pull"
|
||||||
|
|
||||||
|
async def stream() -> AsyncIterator[bytes]:
|
||||||
|
# On utilise un timeout long pour la lecture (60 min) mais court pour
|
||||||
|
# la connexion (10s) — si Ollama n'est pas joignable, on echoue vite.
|
||||||
|
timeout = httpx.Timeout(connect=10, read=3600, write=10, pool=10)
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=timeout) as client:
|
||||||
|
async with client.stream("POST", url, json={"model": name, "stream": True}) as r:
|
||||||
|
if r.status_code != 200:
|
||||||
|
# Ollama renvoie un message JSON d'erreur. On le passe
|
||||||
|
# tel quel au client en preservant le code HTTP.
|
||||||
|
body_text = await r.aread()
|
||||||
|
yield body_text
|
||||||
|
return
|
||||||
|
async for chunk in r.aiter_bytes():
|
||||||
|
yield chunk
|
||||||
|
except httpx.HTTPError as e:
|
||||||
|
# Erreur reseau : on emet une ligne JSON d'erreur compatible
|
||||||
|
# avec le format NDJSON d'Ollama.
|
||||||
|
err = json.dumps({"error": f"Connexion a Ollama impossible : {e}"}) + "\n"
|
||||||
|
yield err.encode("utf-8")
|
||||||
|
|
||||||
|
# application/x-ndjson : un objet JSON par ligne, pas de wrapping SSE.
|
||||||
|
# C'est le format natif d'Ollama, le front le parsera ligne par ligne.
|
||||||
|
return StreamingResponse(stream(), media_type="application/x-ndjson")
|
||||||
|
|
||||||
|
|
||||||
|
@app.delete("/models/ollama/{name:path}")
|
||||||
|
async def delete_ollama_model(
|
||||||
|
name: str,
|
||||||
|
settings: Annotated[Settings, Depends(get_settings)],
|
||||||
|
) -> dict[str, str]:
|
||||||
|
"""Supprime un modele du serveur Ollama.
|
||||||
|
|
||||||
|
Le `:path` dans le pattern autorise les `:` du nom (ex: `gemma4:e4b`)
|
||||||
|
sans avoir besoin de URL-encoder cote client.
|
||||||
|
"""
|
||||||
|
if not name.strip():
|
||||||
|
raise HTTPException(status_code=400, detail="name requis")
|
||||||
|
url = f"{settings.ollama_base_url}/api/delete"
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10) as client:
|
||||||
|
response = await client.request("DELETE", url, json={"model": name})
|
||||||
|
if response.status_code == 404:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Modele '{name}' introuvable")
|
||||||
|
response.raise_for_status()
|
||||||
|
except httpx.HTTPError as e:
|
||||||
|
raise HTTPException(status_code=502, detail=f"Ollama injoignable : {e}")
|
||||||
|
return {"status": "deleted", "name": name}
|
||||||
|
|
||||||
|
|
||||||
@app.get("/models/onemin")
|
@app.get("/models/onemin")
|
||||||
def list_onemin_models() -> dict[str, list[dict[str, object]]]:
|
def list_onemin_models() -> dict[str, list[dict[str, object]]]:
|
||||||
"""Catalogue statique des modeles 1min.ai, groupes par fournisseur.
|
"""Catalogue statique des modeles 1min.ai, groupes par fournisseur.
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
<groupId>com.loremind</groupId>
|
<groupId>com.loremind</groupId>
|
||||||
<artifactId>loremind-core</artifactId>
|
<artifactId>loremind-core</artifactId>
|
||||||
<version>0.6.5</version>
|
<version>0.6.9</version>
|
||||||
<name>LoreMind Core</name>
|
<name>LoreMind Core</name>
|
||||||
<description>Backend Core - Architecture Hexagonale</description>
|
<description>Backend Core - Architecture Hexagonale</description>
|
||||||
|
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ public class SceneService {
|
|||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
for (SceneBranch b : branches) {
|
for (SceneBranch b : branches) {
|
||||||
String target = b.getTargetSceneId();
|
String target = b.targetSceneId();
|
||||||
if (target == null || target.isBlank()) {
|
if (target == null || target.isBlank()) {
|
||||||
throw new IllegalArgumentException("Une branche doit avoir une scène de destination");
|
throw new IllegalArgumentException("Une branche doit avoir une scène de destination");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,11 +45,7 @@ public class GameSystemContextBuilder {
|
|||||||
private GameSystemContext build(GameSystem gs, GenerationIntent intent) {
|
private GameSystemContext build(GameSystem gs, GenerationIntent intent) {
|
||||||
Map<String, String> allSections = parseH2Sections(gs.getRulesMarkdown());
|
Map<String, String> allSections = parseH2Sections(gs.getRulesMarkdown());
|
||||||
Map<String, String> filtered = filterByIntent(allSections, intent);
|
Map<String, String> filtered = filterByIntent(allSections, intent);
|
||||||
return GameSystemContext.builder()
|
return new GameSystemContext(gs.getName(), gs.getDescription(), filtered);
|
||||||
.systemName(gs.getName())
|
|
||||||
.systemDescription(gs.getDescription())
|
|
||||||
.sections(filtered)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -79,12 +79,11 @@ public class CampaignStructuralContextBuilder {
|
|||||||
.map(this::toCharacterSummary)
|
.map(this::toCharacterSummary)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return CampaignStructuralContext.builder()
|
return new CampaignStructuralContext(
|
||||||
.campaignName(campaign.getName())
|
campaign.getName(),
|
||||||
.campaignDescription(campaign.getDescription())
|
campaign.getDescription(),
|
||||||
.arcs(arcs)
|
arcs,
|
||||||
.characters(characters)
|
characters);
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -93,10 +92,7 @@ public class CampaignStructuralContextBuilder {
|
|||||||
* sans injecter toute sa fiche.
|
* sans injecter toute sa fiche.
|
||||||
*/
|
*/
|
||||||
private CharacterSummary toCharacterSummary(Character c) {
|
private CharacterSummary toCharacterSummary(Character c) {
|
||||||
return CharacterSummary.builder()
|
return new CharacterSummary(c.getName(), extractSnippet(c.getMarkdownContent()));
|
||||||
.name(c.getName())
|
|
||||||
.snippet(extractSnippet(c.getMarkdownContent()))
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String extractSnippet(String markdown) {
|
private static String extractSnippet(String markdown) {
|
||||||
@@ -115,12 +111,11 @@ public class CampaignStructuralContextBuilder {
|
|||||||
.sorted(Comparator.comparingInt(Chapter::getOrder))
|
.sorted(Comparator.comparingInt(Chapter::getOrder))
|
||||||
.map(this::toChapterSummary)
|
.map(this::toChapterSummary)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
return ArcSummary.builder()
|
return new ArcSummary(
|
||||||
.name(arc.getName())
|
arc.getName(),
|
||||||
.description(arc.getDescription())
|
arc.getDescription(),
|
||||||
.illustrationCount(countImages(arc.getIllustrationImageIds()))
|
countImages(arc.getIllustrationImageIds()),
|
||||||
.chapters(chapters)
|
chapters);
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private ChapterSummary toChapterSummary(Chapter chapter) {
|
private ChapterSummary toChapterSummary(Chapter chapter) {
|
||||||
@@ -137,32 +132,28 @@ public class CampaignStructuralContextBuilder {
|
|||||||
.map(s -> toSceneSummary(s, nameById))
|
.map(s -> toSceneSummary(s, nameById))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return ChapterSummary.builder()
|
return new ChapterSummary(
|
||||||
.name(chapter.getName())
|
chapter.getName(),
|
||||||
.description(chapter.getDescription())
|
chapter.getDescription(),
|
||||||
.illustrationCount(countImages(chapter.getIllustrationImageIds()))
|
countImages(chapter.getIllustrationImageIds()),
|
||||||
.scenes(summaries)
|
summaries);
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private SceneSummary toSceneSummary(Scene scene, Map<String, String> nameById) {
|
private SceneSummary toSceneSummary(Scene scene, Map<String, String> nameById) {
|
||||||
List<BranchHint> hints = scene.getBranches() == null
|
List<BranchHint> hints = scene.getBranches() == null
|
||||||
? List.of()
|
? List.of()
|
||||||
: scene.getBranches().stream()
|
: scene.getBranches().stream()
|
||||||
.map(b -> BranchHint.builder()
|
.map(b -> new BranchHint(
|
||||||
.label(b.getLabel())
|
b.label(),
|
||||||
.targetSceneName(nameById.getOrDefault(
|
nameById.getOrDefault(b.targetSceneId(), "(scène inconnue)"),
|
||||||
b.getTargetSceneId(), "(scène inconnue)"))
|
b.condition()))
|
||||||
.condition(b.getCondition())
|
|
||||||
.build())
|
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
return SceneSummary.builder()
|
return new SceneSummary(
|
||||||
.name(scene.getName())
|
scene.getName(),
|
||||||
.description(scene.getDescription())
|
scene.getDescription(),
|
||||||
.illustrationCount(countImages(scene.getIllustrationImageIds()))
|
countImages(scene.getIllustrationImageIds()),
|
||||||
.branches(hints)
|
hints);
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Helper defensif : compte les illustrations attachees (null-safe). */
|
/** Helper defensif : compte les illustrations attachees (null-safe). */
|
||||||
|
|||||||
@@ -67,16 +67,15 @@ public class GeneratePageValuesUseCase {
|
|||||||
|
|
||||||
requireNonEmptyFields(template);
|
requireNonEmptyFields(template);
|
||||||
|
|
||||||
GenerationContext context = GenerationContext.builder()
|
// Seuls les champs TEXT sont envoyes a l'IA : les champs IMAGE
|
||||||
.loreName(lore.getName())
|
// necessitent un workflow different (pas de generation LLM texte).
|
||||||
.loreDescription(lore.getDescription())
|
GenerationContext context = new GenerationContext(
|
||||||
.folderName(folder.getName())
|
lore.getName(),
|
||||||
.templateName(template.getName())
|
lore.getDescription(),
|
||||||
// Seuls les champs TEXT sont envoyes a l'IA : les champs IMAGE
|
folder.getName(),
|
||||||
// necessitent un workflow different (pas de generation LLM texte).
|
template.getName(),
|
||||||
.templateFields(template.textFieldNames())
|
template.textFieldNames(),
|
||||||
.pageTitle(page.getTitle())
|
page.getTitle());
|
||||||
.build();
|
|
||||||
|
|
||||||
GenerationResult result = aiProvider.generatePage(context);
|
GenerationResult result = aiProvider.generatePage(context);
|
||||||
return result.values();
|
return result.values();
|
||||||
|
|||||||
@@ -82,12 +82,11 @@ public class LoreStructuralContextBuilder {
|
|||||||
Map<String, String> pageTitleById = pages.stream()
|
Map<String, String> pageTitleById = pages.stream()
|
||||||
.collect(Collectors.toMap(Page::getId, Page::getTitle, (a, b) -> a));
|
.collect(Collectors.toMap(Page::getId, Page::getTitle, (a, b) -> a));
|
||||||
|
|
||||||
return LoreStructuralContext.builder()
|
return new LoreStructuralContext(
|
||||||
.loreName(lore.getName())
|
lore.getName(),
|
||||||
.loreDescription(lore.getDescription())
|
lore.getDescription(),
|
||||||
.folders(buildFoldersMap(nodes, pages, templateNameById, pageTitleById))
|
buildFoldersMap(nodes, pages, templateNameById, pageTitleById),
|
||||||
.tags(extractUniqueTags(pages))
|
extractUniqueTags(pages));
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, List<PageSummary>> buildFoldersMap(
|
private Map<String, List<PageSummary>> buildFoldersMap(
|
||||||
@@ -118,13 +117,12 @@ public class LoreStructuralContextBuilder {
|
|||||||
Page page,
|
Page page,
|
||||||
Map<String, String> templateNameById,
|
Map<String, String> templateNameById,
|
||||||
Map<String, String> pageTitleById) {
|
Map<String, String> pageTitleById) {
|
||||||
return PageSummary.builder()
|
return new PageSummary(
|
||||||
.title(page.getTitle())
|
page.getTitle(),
|
||||||
.templateName(templateNameById.getOrDefault(page.getTemplateId(), "?"))
|
templateNameById.getOrDefault(page.getTemplateId(), "?"),
|
||||||
.values(truncatedValues(page.getValues()))
|
truncatedValues(page.getValues()),
|
||||||
.tags(page.getTags() != null ? List.copyOf(page.getTags()) : Collections.emptyList())
|
page.getTags() != null ? List.copyOf(page.getTags()) : Collections.emptyList(),
|
||||||
.relatedPageTitles(resolveRelatedTitles(page.getRelatedPageIds(), pageTitleById))
|
resolveRelatedTitles(page.getRelatedPageIds(), pageTitleById));
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -91,11 +91,7 @@ public class NarrativeEntityContextBuilder {
|
|||||||
putField(fields, "rewards", a.getRewards());
|
putField(fields, "rewards", a.getRewards());
|
||||||
putField(fields, "resolution", a.getResolution());
|
putField(fields, "resolution", a.getResolution());
|
||||||
putField(fields, "gmNotes", a.getGmNotes());
|
putField(fields, "gmNotes", a.getGmNotes());
|
||||||
return NarrativeEntityContext.builder()
|
return new NarrativeEntityContext("arc", a.getName(), fields);
|
||||||
.entityType("arc")
|
|
||||||
.title(a.getName())
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private NarrativeEntityContext fromChapter(Chapter c) {
|
private NarrativeEntityContext fromChapter(Chapter c) {
|
||||||
@@ -104,11 +100,7 @@ public class NarrativeEntityContextBuilder {
|
|||||||
putField(fields, "playerObjectives", c.getPlayerObjectives());
|
putField(fields, "playerObjectives", c.getPlayerObjectives());
|
||||||
putField(fields, "narrativeStakes", c.getNarrativeStakes());
|
putField(fields, "narrativeStakes", c.getNarrativeStakes());
|
||||||
putField(fields, "gmNotes", c.getGmNotes());
|
putField(fields, "gmNotes", c.getGmNotes());
|
||||||
return NarrativeEntityContext.builder()
|
return new NarrativeEntityContext("chapter", c.getName(), fields);
|
||||||
.entityType("chapter")
|
|
||||||
.title(c.getName())
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private NarrativeEntityContext fromScene(Scene s) {
|
private NarrativeEntityContext fromScene(Scene s) {
|
||||||
@@ -122,21 +114,13 @@ public class NarrativeEntityContextBuilder {
|
|||||||
putField(fields, "combatDifficulty", s.getCombatDifficulty());
|
putField(fields, "combatDifficulty", s.getCombatDifficulty());
|
||||||
putField(fields, "enemies", s.getEnemies());
|
putField(fields, "enemies", s.getEnemies());
|
||||||
putField(fields, "gmSecretNotes", s.getGmSecretNotes());
|
putField(fields, "gmSecretNotes", s.getGmSecretNotes());
|
||||||
return NarrativeEntityContext.builder()
|
return new NarrativeEntityContext("scene", s.getName(), fields);
|
||||||
.entityType("scene")
|
|
||||||
.title(s.getName())
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private NarrativeEntityContext fromCharacter(Character c) {
|
private NarrativeEntityContext fromCharacter(Character c) {
|
||||||
Map<String, String> fields = new LinkedHashMap<>();
|
Map<String, String> fields = new LinkedHashMap<>();
|
||||||
putField(fields, "fiche complète (markdown)", c.getMarkdownContent());
|
putField(fields, "fiche complète (markdown)", c.getMarkdownContent());
|
||||||
return NarrativeEntityContext.builder()
|
return new NarrativeEntityContext("character", c.getName(), fields);
|
||||||
.entityType("character")
|
|
||||||
.title(c.getName())
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Null/blank devient chaîne vide — uniforme côté prompt, pas de NPE côté LLM. */
|
/** Null/blank devient chaîne vide — uniforme côté prompt, pas de NPE côté LLM. */
|
||||||
|
|||||||
@@ -107,11 +107,6 @@ public class StreamChatForLoreUseCase {
|
|||||||
? page.getValues()
|
? page.getValues()
|
||||||
: Collections.emptyMap();
|
: Collections.emptyMap();
|
||||||
|
|
||||||
return PageContext.builder()
|
return new PageContext(page.getTitle(), templateName, templateFields, values);
|
||||||
.title(page.getTitle())
|
|
||||||
.templateName(templateName)
|
|
||||||
.templateFields(templateFields)
|
|
||||||
.values(values)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,25 @@
|
|||||||
package com.loremind.domain.campaigncontext;
|
package com.loremind.domain.campaigncontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
import lombok.extern.jackson.Jacksonized;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Value Object représentant une "sortie" narrative depuis une Scene.
|
* Value Object représentant une "sortie" narrative depuis une Scene.
|
||||||
* Décrit un choix offert aux joueurs et la scène de destination associée.
|
* Décrit un choix offert aux joueurs et la scène de destination associée.
|
||||||
* <p>
|
* <p>
|
||||||
* Immuable (@Value) : pour "modifier" une branche on la remplace.
|
* Record Java : immuable par construction, sans aucune dépendance technique
|
||||||
* @Jacksonized : permet à Jackson (sérialisation JSON via le converter JPA)
|
* (pas de Lombok, pas de Jackson). Jackson 2.12+ sait sérialiser/désérialiser
|
||||||
* de reconstruire l'objet en passant par le builder malgré l'absence de setters.
|
* les records nativement via le constructeur canonique — c'est ce dont
|
||||||
|
* dépend le SceneBranchListJsonConverter pour le stockage JSONB.
|
||||||
* <p>
|
* <p>
|
||||||
* Règle métier : targetSceneId DOIT pointer vers une Scene du MÊME Chapter
|
* Règle métier : targetSceneId DOIT pointer vers une Scene du MÊME Chapter
|
||||||
* (validation portée par SceneService).
|
* (validation portée par SceneService).
|
||||||
|
*
|
||||||
|
* @param label Libellé du choix (ex: "Si les joueurs attaquent le garde").
|
||||||
|
* @param targetSceneId Id de la Scene de destination, intra-chapitre uniquement.
|
||||||
|
* @param condition Notes MJ privées sur la condition de déclenchement (optionnel).
|
||||||
*/
|
*/
|
||||||
@Value
|
public record SceneBranch(String label, String targetSceneId, String condition) {
|
||||||
@Builder
|
|
||||||
@Jacksonized
|
|
||||||
public class SceneBranch {
|
|
||||||
|
|
||||||
/** Libellé du choix (ex: "Si les joueurs attaquent le garde"). */
|
/** Raccourci pour construire une branche sans condition (cas le plus courant). */
|
||||||
String label;
|
public static SceneBranch of(String label, String targetSceneId) {
|
||||||
|
return new SceneBranch(label, targetSceneId, null);
|
||||||
/** Id de la Scene de destination, intra-chapitre uniquement. */
|
}
|
||||||
String targetSceneId;
|
|
||||||
|
|
||||||
/** Notes MJ privées sur la condition de déclenchement (optionnel). */
|
|
||||||
String condition;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Singular;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -22,16 +18,16 @@ import java.util.List;
|
|||||||
* <p>
|
* <p>
|
||||||
* La liste `arcs` préserve l'ordre narratif (tri sur `order` ascendant
|
* La liste `arcs` préserve l'ordre narratif (tri sur `order` ascendant
|
||||||
* fait par le use case côté application layer).
|
* fait par le use case côté application layer).
|
||||||
|
* <p>
|
||||||
|
* Record Java : pur domaine, aucune dépendance technique.
|
||||||
|
*
|
||||||
|
* @param characters Personnages joueurs (PJ) de la campagne. Vide si aucun.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record CampaignStructuralContext(
|
||||||
@Builder
|
String campaignName,
|
||||||
public class CampaignStructuralContext {
|
String campaignDescription,
|
||||||
|
List<ArcSummary> arcs,
|
||||||
String campaignName;
|
List<CharacterSummary> characters) {
|
||||||
String campaignDescription;
|
|
||||||
@Singular List<ArcSummary> arcs;
|
|
||||||
/** Personnages joueurs (PJ) de la campagne. Vide si aucun. */
|
|
||||||
@Singular List<CharacterSummary> characters;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Résumé d'un PJ : nom + snippet court du markdown.
|
* Résumé d'un PJ : nom + snippet court du markdown.
|
||||||
@@ -40,53 +36,44 @@ public class CampaignStructuralContext {
|
|||||||
* La fiche complète n'est injectée que si le PJ est l'entité focus
|
* La fiche complète n'est injectée que si le PJ est l'entité focus
|
||||||
* (via NarrativeEntityContext, entity_type="character").
|
* (via NarrativeEntityContext, entity_type="character").
|
||||||
*/
|
*/
|
||||||
@Value
|
public record CharacterSummary(String name, String snippet) {
|
||||||
@Builder
|
|
||||||
public static class CharacterSummary {
|
|
||||||
String name;
|
|
||||||
String snippet;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Résumé d'un arc : nom + description courte + ses chapitres. */
|
/**
|
||||||
@Value
|
* Résumé d'un arc : nom + description courte + ses chapitres.
|
||||||
@Builder
|
*
|
||||||
public static class ArcSummary {
|
* @param illustrationCount Nombre d'illustrations attachees a cet arc (pour hint dans le prompt IA).
|
||||||
String name;
|
*/
|
||||||
String description;
|
public record ArcSummary(
|
||||||
/** Nombre d'illustrations attachees a cet arc (pour hint dans le prompt IA). */
|
String name,
|
||||||
int illustrationCount;
|
String description,
|
||||||
@Singular List<ChapterSummary> chapters;
|
int illustrationCount,
|
||||||
|
List<ChapterSummary> chapters) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Résumé d'un chapitre : nom + description courte + ses scènes. */
|
/** Résumé d'un chapitre : nom + description courte + ses scènes. */
|
||||||
@Value
|
public record ChapterSummary(
|
||||||
@Builder
|
String name,
|
||||||
public static class ChapterSummary {
|
String description,
|
||||||
String name;
|
int illustrationCount,
|
||||||
String description;
|
List<SceneSummary> scenes) {
|
||||||
int illustrationCount;
|
|
||||||
@Singular List<SceneSummary> scenes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Résumé d'une scène : nom + description courte + branches narratives. */
|
/** Résumé d'une scène : nom + description courte + branches narratives. */
|
||||||
@Value
|
public record SceneSummary(
|
||||||
@Builder
|
String name,
|
||||||
public static class SceneSummary {
|
String description,
|
||||||
String name;
|
int illustrationCount,
|
||||||
String description;
|
List<BranchHint> branches) {
|
||||||
int illustrationCount;
|
|
||||||
@Singular List<BranchHint> branches;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Indice d'une branche narrative vers une autre scène du même chapitre. */
|
/**
|
||||||
@Value
|
* Indice d'une branche narrative vers une autre scène du même chapitre.
|
||||||
@Builder
|
*
|
||||||
public static class BranchHint {
|
* @param label Libellé du choix joueur (ex: "Si les joueurs attaquent le garde").
|
||||||
/** Libellé du choix joueur (ex: "Si les joueurs attaquent le garde"). */
|
* @param targetSceneName Nom de la scène cible (résolu depuis targetSceneId côté builder).
|
||||||
String label;
|
* @param condition Condition MJ privée (optionnel).
|
||||||
/** Nom de la scène cible (résolu depuis targetSceneId côté builder). */
|
*/
|
||||||
String targetSceneName;
|
public record BranchHint(String label, String targetSceneName, String condition) {
|
||||||
/** Condition MJ privée (optionnel). */
|
|
||||||
String condition;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -21,28 +18,74 @@ import java.util.List;
|
|||||||
* Un chat Lore ne reçoit JAMAIS de campaignContext : un Lore ne voit pas
|
* Un chat Lore ne reçoit JAMAIS de campaignContext : un Lore ne voit pas
|
||||||
* ses campagnes (asymétrie métier : la campagne est l'emprunteur du Lore,
|
* ses campagnes (asymétrie métier : la campagne est l'emprunteur du Lore,
|
||||||
* pas l'inverse).
|
* pas l'inverse).
|
||||||
|
* <p>
|
||||||
|
* Record Java : pur domaine. Builder manuel fourni en raison des 6 champs
|
||||||
|
* dont 5 sont nullables — l'API fluide reste plus lisible aux call sites
|
||||||
|
* qu'un constructeur à 6 paramètres souvent à null.
|
||||||
|
*
|
||||||
|
* @param loreContext Optionnel : carte structurelle du Lore. Null si campagne non liée à un Lore.
|
||||||
|
* @param pageContext Optionnel : contexte d'une page précise en cours d'édition (chat Lore uniquement).
|
||||||
|
* @param campaignContext Optionnel : carte narrative d'une Campagne (chat Campagne uniquement).
|
||||||
|
* @param narrativeEntity Optionnel : entité narrative en cours d'édition (arc/chapter/scene).
|
||||||
|
* @param gameSystemContext Optionnel : règles du système de JDR de la campagne (filtrées par intent).
|
||||||
|
* Null si la campagne n'a pas de GameSystem associé. Campagne uniquement au MVP.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record ChatRequest(
|
||||||
@Builder
|
List<ChatMessage> messages,
|
||||||
public class ChatRequest {
|
LoreStructuralContext loreContext,
|
||||||
|
PageContext pageContext,
|
||||||
|
CampaignStructuralContext campaignContext,
|
||||||
|
NarrativeEntityContext narrativeEntity,
|
||||||
|
GameSystemContext gameSystemContext) {
|
||||||
|
|
||||||
List<ChatMessage> messages;
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
/** Optionnel : carte structurelle du Lore. Null si campagne non liée à un Lore. */
|
/** Builder fluide : permet d'omettre les contextes non pertinents. */
|
||||||
LoreStructuralContext loreContext;
|
public static final class Builder {
|
||||||
|
private List<ChatMessage> messages;
|
||||||
|
private LoreStructuralContext loreContext;
|
||||||
|
private PageContext pageContext;
|
||||||
|
private CampaignStructuralContext campaignContext;
|
||||||
|
private NarrativeEntityContext narrativeEntity;
|
||||||
|
private GameSystemContext gameSystemContext;
|
||||||
|
|
||||||
/** Optionnel : contexte d'une page précise en cours d'édition (chat Lore uniquement). */
|
private Builder() {}
|
||||||
PageContext pageContext;
|
|
||||||
|
|
||||||
/** Optionnel : carte narrative d'une Campagne (chat Campagne uniquement). */
|
public Builder messages(List<ChatMessage> messages) {
|
||||||
CampaignStructuralContext campaignContext;
|
this.messages = messages;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/** Optionnel : entité narrative en cours d'édition (arc/chapter/scene). */
|
public Builder loreContext(LoreStructuralContext loreContext) {
|
||||||
NarrativeEntityContext narrativeEntity;
|
this.loreContext = loreContext;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public Builder pageContext(PageContext pageContext) {
|
||||||
* Optionnel : règles du système de JDR de la campagne (filtrées par intent).
|
this.pageContext = pageContext;
|
||||||
* Null si la campagne n'a pas de GameSystem associé. Campagne uniquement au MVP.
|
return this;
|
||||||
*/
|
}
|
||||||
GameSystemContext gameSystemContext;
|
|
||||||
|
public Builder campaignContext(CampaignStructuralContext campaignContext) {
|
||||||
|
this.campaignContext = campaignContext;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder narrativeEntity(NarrativeEntityContext narrativeEntity) {
|
||||||
|
this.narrativeEntity = narrativeEntity;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder gameSystemContext(GameSystemContext gameSystemContext) {
|
||||||
|
this.gameSystemContext = gameSystemContext;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ChatRequest build() {
|
||||||
|
return new ChatRequest(messages, loreContext, pageContext,
|
||||||
|
campaignContext, narrativeEntity, gameSystemContext);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -11,20 +8,14 @@ import java.util.Map;
|
|||||||
* Contient uniquement les sections pertinentes pour l'intent de génération
|
* Contient uniquement les sections pertinentes pour l'intent de génération
|
||||||
* en cours (sélection effectuée par GameSystemContextBuilder). Les sections
|
* en cours (sélection effectuée par GameSystemContextBuilder). Les sections
|
||||||
* sont indexées par leur titre H2 original (ex : "Combat", "Classes").
|
* sont indexées par leur titre H2 original (ex : "Combat", "Classes").
|
||||||
|
*
|
||||||
|
* @param systemName Nom du système de JDR (ex : "Nimble", "D&D 5.1 SRD").
|
||||||
|
* @param systemDescription Description courte du système (nullable).
|
||||||
|
* @param sections Sections de règles pertinentes, indexées par titre H2.
|
||||||
|
* Vide si le GameSystem n'a aucune règle ou si aucune section ne matche l'intent.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record GameSystemContext(
|
||||||
@Builder
|
String systemName,
|
||||||
public class GameSystemContext {
|
String systemDescription,
|
||||||
|
Map<String, String> sections) {
|
||||||
/** Nom du système de JDR (ex : "Nimble", "D&D 5.1 SRD"). */
|
|
||||||
String systemName;
|
|
||||||
|
|
||||||
/** Description courte du système (nullable). */
|
|
||||||
String systemDescription;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sections de règles pertinentes, indexées par titre H2.
|
|
||||||
* Vide si le GameSystem n'a aucune règle ou si aucune section ne matche l'intent.
|
|
||||||
*/
|
|
||||||
Map<String, String> sections;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -10,19 +7,16 @@ import java.util.List;
|
|||||||
* pour remplir une Page à partir d'un Template.
|
* pour remplir une Page à partir d'un Template.
|
||||||
* <p>
|
* <p>
|
||||||
* Équivalent Java du PageGenerationContext Python (brain/app/domain/models.py).
|
* Équivalent Java du PageGenerationContext Python (brain/app/domain/models.py).
|
||||||
* Entité pure du domaine : aucune dépendance technique.
|
* Record Java : pur domaine, aucune dépendance technique.
|
||||||
* <p>
|
*
|
||||||
* Immuable via @Value (Lombok) : pas de setters, tous les champs final.
|
* @param templateFields Champs à générer (clés attendues dans la réponse).
|
||||||
* C'est un DTO de domaine entrant dans le port AiProvider.
|
* @param folderName Nom du LoreNode parent (ex: "PNJ", "Lieux").
|
||||||
*/
|
*/
|
||||||
@Value
|
public record GenerationContext(
|
||||||
@Builder
|
String loreName,
|
||||||
public class GenerationContext {
|
String loreDescription,
|
||||||
|
String folderName,
|
||||||
String loreName;
|
String templateName,
|
||||||
String loreDescription;
|
List<String> templateFields,
|
||||||
String folderName; // Nom du LoreNode parent (ex: "PNJ", "Lieux")
|
String pageTitle) {
|
||||||
String templateName;
|
|
||||||
List<String> templateFields; // Champs à générer (clés attendues dans la réponse)
|
|
||||||
String pageTitle;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Singular;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -16,15 +12,14 @@ import java.util.Map;
|
|||||||
* <p>
|
* <p>
|
||||||
* La map `folders` est indexée par nom de dossier et mappe vers la liste
|
* La map `folders` est indexée par nom de dossier et mappe vers la liste
|
||||||
* des pages qu'il contient (liste vide autorisée pour les dossiers vides).
|
* des pages qu'il contient (liste vide autorisée pour les dossiers vides).
|
||||||
|
* <p>
|
||||||
|
* Record Java : pur domaine, aucune dépendance technique.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record LoreStructuralContext(
|
||||||
@Builder
|
String loreName,
|
||||||
public class LoreStructuralContext {
|
String loreDescription,
|
||||||
|
Map<String, List<PageSummary>> folders,
|
||||||
String loreName;
|
List<String> tags) {
|
||||||
String loreDescription;
|
|
||||||
Map<String, List<PageSummary>> folders;
|
|
||||||
@Singular List<String> tags;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Résumé projeté d'une page pour l'IA.
|
* Résumé projeté d'une page pour l'IA.
|
||||||
@@ -40,13 +35,11 @@ public class LoreStructuralContext {
|
|||||||
* uniquement ce qui est partageable en narration — les secrets MJ
|
* uniquement ce qui est partageable en narration — les secrets MJ
|
||||||
* restent confinés à leur page d'édition).
|
* restent confinés à leur page d'édition).
|
||||||
*/
|
*/
|
||||||
@Value
|
public record PageSummary(
|
||||||
@Builder
|
String title,
|
||||||
public static class PageSummary {
|
String templateName,
|
||||||
String title;
|
Map<String, String> values,
|
||||||
String templateName;
|
List<String> tags,
|
||||||
Map<String, String> values;
|
List<String> relatedPageTitles) {
|
||||||
List<String> tags;
|
|
||||||
List<String> relatedPageTitles;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -17,13 +14,11 @@ import java.util.Map;
|
|||||||
* `fields` associe le nom d'un champ (ex: "themes", "playerNarration")
|
* `fields` associe le nom d'un champ (ex: "themes", "playerNarration")
|
||||||
* à sa valeur actuelle (chaîne vide si non renseigné). Utiliser une
|
* à sa valeur actuelle (chaîne vide si non renseigné). Utiliser une
|
||||||
* LinkedHashMap à la construction pour un prompt lisible (ordre préservé).
|
* LinkedHashMap à la construction pour un prompt lisible (ordre préservé).
|
||||||
|
*
|
||||||
|
* @param entityType "arc", "chapter" ou "scene" — utilisé pour libeller le bloc du prompt.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record NarrativeEntityContext(
|
||||||
@Builder
|
String entityType,
|
||||||
public class NarrativeEntityContext {
|
String title,
|
||||||
|
Map<String, String> fields) {
|
||||||
/** "arc", "chapter" ou "scene" — utilisé pour libeller le bloc du prompt. */
|
|
||||||
String entityType;
|
|
||||||
String title;
|
|
||||||
Map<String, String> fields;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
package com.loremind.domain.generationcontext;
|
package com.loremind.domain.generationcontext;
|
||||||
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Value;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -14,14 +11,11 @@ import java.util.Map;
|
|||||||
* à l'IA de focaliser ses suggestions sur les bons champs sans déborder
|
* à l'IA de focaliser ses suggestions sur les bons champs sans déborder
|
||||||
* sur d'autres pages/templates.
|
* sur d'autres pages/templates.
|
||||||
* <p>
|
* <p>
|
||||||
* Object de valeur immuable, pur domaine — aucune dépendance technique.
|
* Record Java : immuable, pur domaine, aucune dépendance technique.
|
||||||
*/
|
*/
|
||||||
@Value
|
public record PageContext(
|
||||||
@Builder
|
String title,
|
||||||
public class PageContext {
|
String templateName,
|
||||||
|
List<String> templateFields,
|
||||||
String title;
|
Map<String, String> values) {
|
||||||
String templateName;
|
|
||||||
List<String> templateFields;
|
|
||||||
Map<String, String> values;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,12 +53,12 @@ public class BrainAiClient implements AiProvider {
|
|||||||
|
|
||||||
private BrainGeneratePageRequest toBrainRequest(GenerationContext context) {
|
private BrainGeneratePageRequest toBrainRequest(GenerationContext context) {
|
||||||
return new BrainGeneratePageRequest(
|
return new BrainGeneratePageRequest(
|
||||||
context.getLoreName(),
|
context.loreName(),
|
||||||
context.getLoreDescription(),
|
context.loreDescription(),
|
||||||
context.getFolderName(),
|
context.folderName(),
|
||||||
context.getTemplateName(),
|
context.templateName(),
|
||||||
context.getTemplateFields(),
|
context.templateFields(),
|
||||||
context.getPageTitle()
|
context.pageTitle()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,35 +38,35 @@ public class BrainChatPayloadBuilder {
|
|||||||
|
|
||||||
public Map<String, Object> build(ChatRequest request) {
|
public Map<String, Object> build(ChatRequest request) {
|
||||||
Map<String, Object> root = new LinkedHashMap<>();
|
Map<String, Object> root = new LinkedHashMap<>();
|
||||||
root.put("messages", request.getMessages().stream()
|
root.put("messages", request.messages().stream()
|
||||||
.map(this::messageToMap)
|
.map(this::messageToMap)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
if (request.getLoreContext() != null) {
|
if (request.loreContext() != null) {
|
||||||
root.put("lore_context", loreContextToMap(request.getLoreContext()));
|
root.put("lore_context", loreContextToMap(request.loreContext()));
|
||||||
}
|
}
|
||||||
if (request.getPageContext() != null) {
|
if (request.pageContext() != null) {
|
||||||
root.put("page_context", pageContextToMap(request.getPageContext()));
|
root.put("page_context", pageContextToMap(request.pageContext()));
|
||||||
}
|
}
|
||||||
if (request.getCampaignContext() != null) {
|
if (request.campaignContext() != null) {
|
||||||
root.put("campaign_context", campaignContextToMap(request.getCampaignContext()));
|
root.put("campaign_context", campaignContextToMap(request.campaignContext()));
|
||||||
}
|
}
|
||||||
if (request.getNarrativeEntity() != null) {
|
if (request.narrativeEntity() != null) {
|
||||||
root.put("narrative_entity", narrativeEntityToMap(request.getNarrativeEntity()));
|
root.put("narrative_entity", narrativeEntityToMap(request.narrativeEntity()));
|
||||||
}
|
}
|
||||||
if (request.getGameSystemContext() != null) {
|
if (request.gameSystemContext() != null) {
|
||||||
root.put("game_system_context", gameSystemContextToMap(request.getGameSystemContext()));
|
root.put("game_system_context", gameSystemContextToMap(request.gameSystemContext()));
|
||||||
}
|
}
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> gameSystemContextToMap(GameSystemContext gs) {
|
private Map<String, Object> gameSystemContextToMap(GameSystemContext gs) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("system_name", gs.getSystemName());
|
map.put("system_name", gs.systemName());
|
||||||
if (gs.getSystemDescription() != null && !gs.getSystemDescription().isBlank()) {
|
if (gs.systemDescription() != null && !gs.systemDescription().isBlank()) {
|
||||||
map.put("system_description", gs.getSystemDescription());
|
map.put("system_description", gs.systemDescription());
|
||||||
}
|
}
|
||||||
map.put("sections", gs.getSections() != null ? gs.getSections() : Map.of());
|
map.put("sections", gs.sections() != null ? gs.sections() : Map.of());
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,56 +79,56 @@ public class BrainChatPayloadBuilder {
|
|||||||
|
|
||||||
private Map<String, Object> loreContextToMap(LoreStructuralContext ctx) {
|
private Map<String, Object> loreContextToMap(LoreStructuralContext ctx) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("lore_name", ctx.getLoreName());
|
map.put("lore_name", ctx.loreName());
|
||||||
map.put("lore_description", ctx.getLoreDescription());
|
map.put("lore_description", ctx.loreDescription());
|
||||||
|
|
||||||
Map<String, Object> foldersMap = new LinkedHashMap<>();
|
Map<String, Object> foldersMap = new LinkedHashMap<>();
|
||||||
for (Map.Entry<String, List<PageSummary>> e : ctx.getFolders().entrySet()) {
|
for (Map.Entry<String, List<PageSummary>> e : ctx.folders().entrySet()) {
|
||||||
foldersMap.put(e.getKey(), e.getValue().stream()
|
foldersMap.put(e.getKey(), e.getValue().stream()
|
||||||
.map(this::pageSummaryToMap)
|
.map(this::pageSummaryToMap)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
map.put("folders", foldersMap);
|
map.put("folders", foldersMap);
|
||||||
map.put("tags", ctx.getTags());
|
map.put("tags", ctx.tags());
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> pageSummaryToMap(PageSummary ps) {
|
private Map<String, Object> pageSummaryToMap(PageSummary ps) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("title", ps.getTitle());
|
map.put("title", ps.title());
|
||||||
map.put("template_name", ps.getTemplateName());
|
map.put("template_name", ps.templateName());
|
||||||
// values/tags/related_page_titles : omis si vides pour alléger le payload.
|
// values/tags/related_page_titles : omis si vides pour alléger le payload.
|
||||||
if (ps.getValues() != null && !ps.getValues().isEmpty()) {
|
if (ps.values() != null && !ps.values().isEmpty()) {
|
||||||
map.put("values", ps.getValues());
|
map.put("values", ps.values());
|
||||||
}
|
}
|
||||||
if (ps.getTags() != null && !ps.getTags().isEmpty()) {
|
if (ps.tags() != null && !ps.tags().isEmpty()) {
|
||||||
map.put("tags", ps.getTags());
|
map.put("tags", ps.tags());
|
||||||
}
|
}
|
||||||
if (ps.getRelatedPageTitles() != null && !ps.getRelatedPageTitles().isEmpty()) {
|
if (ps.relatedPageTitles() != null && !ps.relatedPageTitles().isEmpty()) {
|
||||||
map.put("related_page_titles", ps.getRelatedPageTitles());
|
map.put("related_page_titles", ps.relatedPageTitles());
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> pageContextToMap(PageContext pc) {
|
private Map<String, Object> pageContextToMap(PageContext pc) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("title", pc.getTitle());
|
map.put("title", pc.title());
|
||||||
map.put("template_name", pc.getTemplateName());
|
map.put("template_name", pc.templateName());
|
||||||
map.put("template_fields", pc.getTemplateFields());
|
map.put("template_fields", pc.templateFields());
|
||||||
map.put("values", pc.getValues());
|
map.put("values", pc.values());
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> campaignContextToMap(CampaignStructuralContext ctx) {
|
private Map<String, Object> campaignContextToMap(CampaignStructuralContext ctx) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("campaign_name", ctx.getCampaignName());
|
map.put("campaign_name", ctx.campaignName());
|
||||||
map.put("campaign_description", ctx.getCampaignDescription());
|
map.put("campaign_description", ctx.campaignDescription());
|
||||||
map.put("arcs", ctx.getArcs().stream()
|
map.put("arcs", ctx.arcs().stream()
|
||||||
.map(this::arcSummaryToMap)
|
.map(this::arcSummaryToMap)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
// Liste des PJ : omise si aucun pour alléger le prompt des campagnes sans fiches.
|
// Liste des PJ : omise si aucun pour alléger le prompt des campagnes sans fiches.
|
||||||
if (ctx.getCharacters() != null && !ctx.getCharacters().isEmpty()) {
|
if (ctx.characters() != null && !ctx.characters().isEmpty()) {
|
||||||
map.put("characters", ctx.getCharacters().stream()
|
map.put("characters", ctx.characters().stream()
|
||||||
.map(this::characterSummaryToMap)
|
.map(this::characterSummaryToMap)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
@@ -137,9 +137,9 @@ public class BrainChatPayloadBuilder {
|
|||||||
|
|
||||||
private Map<String, Object> characterSummaryToMap(CharacterSummary c) {
|
private Map<String, Object> characterSummaryToMap(CharacterSummary c) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("name", c.getName());
|
map.put("name", c.name());
|
||||||
if (c.getSnippet() != null && !c.getSnippet().isBlank()) {
|
if (c.snippet() != null && !c.snippet().isBlank()) {
|
||||||
map.put("snippet", c.getSnippet());
|
map.put("snippet", c.snippet());
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
@@ -167,10 +167,10 @@ public class BrainChatPayloadBuilder {
|
|||||||
private Map<String, Object> arcSummaryToMap(ArcSummary a) {
|
private Map<String, Object> arcSummaryToMap(ArcSummary a) {
|
||||||
return structuralSummaryToMap(
|
return structuralSummaryToMap(
|
||||||
a,
|
a,
|
||||||
ArcSummary::getName,
|
ArcSummary::name,
|
||||||
ArcSummary::getDescription,
|
ArcSummary::description,
|
||||||
ArcSummary::getIllustrationCount,
|
ArcSummary::illustrationCount,
|
||||||
(map, arc) -> map.put("chapters", arc.getChapters().stream()
|
(map, arc) -> map.put("chapters", arc.chapters().stream()
|
||||||
.map(this::chapterSummaryToMap)
|
.map(this::chapterSummaryToMap)
|
||||||
.collect(Collectors.toList())));
|
.collect(Collectors.toList())));
|
||||||
}
|
}
|
||||||
@@ -178,10 +178,10 @@ public class BrainChatPayloadBuilder {
|
|||||||
private Map<String, Object> chapterSummaryToMap(ChapterSummary c) {
|
private Map<String, Object> chapterSummaryToMap(ChapterSummary c) {
|
||||||
return structuralSummaryToMap(
|
return structuralSummaryToMap(
|
||||||
c,
|
c,
|
||||||
ChapterSummary::getName,
|
ChapterSummary::name,
|
||||||
ChapterSummary::getDescription,
|
ChapterSummary::description,
|
||||||
ChapterSummary::getIllustrationCount,
|
ChapterSummary::illustrationCount,
|
||||||
(map, chapter) -> map.put("scenes", chapter.getScenes().stream()
|
(map, chapter) -> map.put("scenes", chapter.scenes().stream()
|
||||||
.map(this::sceneSummaryToMap)
|
.map(this::sceneSummaryToMap)
|
||||||
.collect(Collectors.toList())));
|
.collect(Collectors.toList())));
|
||||||
}
|
}
|
||||||
@@ -189,13 +189,13 @@ public class BrainChatPayloadBuilder {
|
|||||||
private Map<String, Object> sceneSummaryToMap(SceneSummary s) {
|
private Map<String, Object> sceneSummaryToMap(SceneSummary s) {
|
||||||
return structuralSummaryToMap(
|
return structuralSummaryToMap(
|
||||||
s,
|
s,
|
||||||
SceneSummary::getName,
|
SceneSummary::name,
|
||||||
SceneSummary::getDescription,
|
SceneSummary::description,
|
||||||
SceneSummary::getIllustrationCount,
|
SceneSummary::illustrationCount,
|
||||||
(map, scene) -> {
|
(map, scene) -> {
|
||||||
// Branches narratives : omises si absentes (scènes linéaires classiques).
|
// Branches narratives : omises si absentes (scènes linéaires classiques).
|
||||||
if (s.getBranches() != null && !s.getBranches().isEmpty()) {
|
if (s.branches() != null && !s.branches().isEmpty()) {
|
||||||
map.put("branches", s.getBranches().stream()
|
map.put("branches", s.branches().stream()
|
||||||
.map(this::branchHintToMap)
|
.map(this::branchHintToMap)
|
||||||
.collect(Collectors.toList()));
|
.collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
@@ -204,19 +204,19 @@ public class BrainChatPayloadBuilder {
|
|||||||
|
|
||||||
private Map<String, Object> branchHintToMap(BranchHint b) {
|
private Map<String, Object> branchHintToMap(BranchHint b) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("label", b.getLabel());
|
map.put("label", b.label());
|
||||||
map.put("target_scene_name", b.getTargetSceneName());
|
map.put("target_scene_name", b.targetSceneName());
|
||||||
if (b.getCondition() != null && !b.getCondition().isBlank()) {
|
if (b.condition() != null && !b.condition().isBlank()) {
|
||||||
map.put("condition", b.getCondition());
|
map.put("condition", b.condition());
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Object> narrativeEntityToMap(NarrativeEntityContext ne) {
|
private Map<String, Object> narrativeEntityToMap(NarrativeEntityContext ne) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("entity_type", ne.getEntityType());
|
map.put("entity_type", ne.entityType());
|
||||||
map.put("title", ne.getTitle());
|
map.put("title", ne.title());
|
||||||
map.put("fields", ne.getFields());
|
map.put("fields", ne.fields());
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,283 @@
|
|||||||
|
package com.loremind.infrastructure.updates;
|
||||||
|
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.boot.web.client.RestTemplateBuilder;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpMethod;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Detection des mises a jour disponibles + declenchement via Watchtower.
|
||||||
|
*
|
||||||
|
* Strategie :
|
||||||
|
* - Au demarrage, on interroge le registry pour le digest courant de chaque
|
||||||
|
* image suivie ({@code update-check.images}). On stocke ces digests comme
|
||||||
|
* "baseline" (= ce que le conteneur en cours d'execution est cense faire
|
||||||
|
* tourner, puisque le `docker compose pull` precede toujours `up -d`).
|
||||||
|
* - {@link #check()} re-interroge le registry et compare. Si un digest a
|
||||||
|
* change, une mise a jour est disponible.
|
||||||
|
* - {@link #apply()} POST sur /v1/update de Watchtower (qui doit etre lance
|
||||||
|
* avec WATCHTOWER_HTTP_API_UPDATE=true et le meme token).
|
||||||
|
*
|
||||||
|
* Apres un apply reussi, Watchtower redemarre core => ce service est
|
||||||
|
* re-instancie => baseline re-aligne sur le registry => check renvoie
|
||||||
|
* "pas de MAJ" (etat coherent).
|
||||||
|
*
|
||||||
|
* La feature est <b>desactivee silencieusement</b> si {@code WATCHTOWER_TOKEN}
|
||||||
|
* n'est pas defini : check/apply renvoient des reponses neutres et l'UI
|
||||||
|
* masque le badge / bouton.
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class UpdateCheckService {
|
||||||
|
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(UpdateCheckService.class);
|
||||||
|
|
||||||
|
private static final List<MediaType> MANIFEST_ACCEPT = List.of(
|
||||||
|
MediaType.parseMediaType("application/vnd.docker.distribution.manifest.v2+json"),
|
||||||
|
MediaType.parseMediaType("application/vnd.docker.distribution.manifest.list.v2+json"),
|
||||||
|
MediaType.parseMediaType("application/vnd.oci.image.manifest.v1+json"),
|
||||||
|
MediaType.parseMediaType("application/vnd.oci.image.index.v1+json")
|
||||||
|
);
|
||||||
|
|
||||||
|
private final RestTemplate http;
|
||||||
|
private final String registry;
|
||||||
|
private final List<String> images;
|
||||||
|
private final String tag;
|
||||||
|
private final String watchtowerUrl;
|
||||||
|
private final String watchtowerToken;
|
||||||
|
|
||||||
|
private final Map<String, String> baselineDigests = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
public UpdateCheckService(
|
||||||
|
RestTemplateBuilder builder,
|
||||||
|
@Value("${update-check.registry:}") String registry,
|
||||||
|
@Value("${update-check.images:}") String imagesCsv,
|
||||||
|
@Value("${update-check.tag:latest}") String tag,
|
||||||
|
@Value("${update-check.watchtower-url:http://watchtower:8080}") String watchtowerUrl,
|
||||||
|
@Value("${update-check.watchtower-token:}") String watchtowerToken) {
|
||||||
|
this.http = builder
|
||||||
|
.setConnectTimeout(Duration.ofSeconds(5))
|
||||||
|
.setReadTimeout(Duration.ofSeconds(15))
|
||||||
|
.build();
|
||||||
|
this.registry = normalizeRegistry(registry);
|
||||||
|
this.images = parseImages(imagesCsv);
|
||||||
|
this.tag = tag;
|
||||||
|
this.watchtowerUrl = watchtowerUrl;
|
||||||
|
this.watchtowerToken = watchtowerToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
void initBaseline() {
|
||||||
|
if (!isEnabled()) {
|
||||||
|
log.info("Update check disabled (WATCHTOWER_TOKEN not set)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
log.info("Update check enabled - registry={} images={} tag={}", registry, images, tag);
|
||||||
|
for (String image : images) {
|
||||||
|
try {
|
||||||
|
String digest = fetchRemoteDigest(image);
|
||||||
|
if (digest != null) {
|
||||||
|
baselineDigests.put(image, digest);
|
||||||
|
log.debug("Baseline digest for {} = {}", image, digest);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.warn("Cannot baseline digest for {}: {}", image, e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEnabled() {
|
||||||
|
return watchtowerToken != null && !watchtowerToken.isBlank() && !images.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
public UpdateStatus check() {
|
||||||
|
if (!isEnabled()) {
|
||||||
|
return new UpdateStatus(false, false, List.of(), Instant.now());
|
||||||
|
}
|
||||||
|
List<ImageStatus> statuses = new ArrayList<>();
|
||||||
|
boolean anyUpdate = false;
|
||||||
|
for (String image : images) {
|
||||||
|
String baseline = baselineDigests.get(image);
|
||||||
|
String remote = null;
|
||||||
|
try {
|
||||||
|
remote = fetchRemoteDigest(image);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.warn("Check failed for {}: {}", image, e.getMessage());
|
||||||
|
}
|
||||||
|
// Si on n'a pas de baseline (echec au boot), on l'aligne maintenant
|
||||||
|
// pour eviter un faux positif "MAJ dispo".
|
||||||
|
if (baseline == null && remote != null) {
|
||||||
|
baselineDigests.put(image, remote);
|
||||||
|
baseline = remote;
|
||||||
|
}
|
||||||
|
boolean updateAvailable = baseline != null && remote != null && !baseline.equals(remote);
|
||||||
|
if (updateAvailable) anyUpdate = true;
|
||||||
|
statuses.add(new ImageStatus(image, baseline, remote, updateAvailable));
|
||||||
|
}
|
||||||
|
return new UpdateStatus(true, anyUpdate, statuses, Instant.now());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void apply() {
|
||||||
|
if (!isEnabled()) {
|
||||||
|
throw new IllegalStateException("Update apply not configured (WATCHTOWER_TOKEN missing)");
|
||||||
|
}
|
||||||
|
HttpHeaders headers = new HttpHeaders();
|
||||||
|
headers.setBearerAuth(watchtowerToken);
|
||||||
|
// Watchtower /v1/update declenche un scan+update immediat de tous les
|
||||||
|
// conteneurs labellises. La reponse est synchrone et peut prendre
|
||||||
|
// plusieurs secondes; en cas de redemarrage de core, le client
|
||||||
|
// recevra une connexion coupee — c'est attendu, l'UI le gere.
|
||||||
|
http.exchange(
|
||||||
|
watchtowerUrl + "/v1/update",
|
||||||
|
HttpMethod.POST,
|
||||||
|
new HttpEntity<>(headers),
|
||||||
|
Void.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------
|
||||||
|
// Registry HTTP API v2
|
||||||
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
|
private String fetchRemoteDigest(String image) {
|
||||||
|
String url = registry + "/v2/" + image + "/manifests/" + tag;
|
||||||
|
HttpHeaders headers = new HttpHeaders();
|
||||||
|
headers.setAccept(MANIFEST_ACCEPT);
|
||||||
|
try {
|
||||||
|
return digestCall(url, headers);
|
||||||
|
} catch (HttpClientErrorException.Unauthorized e) {
|
||||||
|
String www = e.getResponseHeaders() == null ? null
|
||||||
|
: e.getResponseHeaders().getFirst(HttpHeaders.WWW_AUTHENTICATE);
|
||||||
|
String token = obtainBearerToken(www);
|
||||||
|
if (token == null) {
|
||||||
|
log.warn("Cannot obtain bearer token for {} (registry response: {})", image, www);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
headers.setBearerAuth(token);
|
||||||
|
return digestCall(url, headers);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String digestCall(String url, HttpHeaders headers) {
|
||||||
|
ResponseEntity<Void> resp = http.exchange(
|
||||||
|
url, HttpMethod.HEAD, new HttpEntity<>(headers), Void.class);
|
||||||
|
return resp.getHeaders().getFirst("Docker-Content-Digest");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Suit le challenge {@code WWW-Authenticate: Bearer realm="...",service="...",scope="..."}
|
||||||
|
* pour obtenir un jeton (anonyme — suffisant pour les images publiques).
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("rawtypes")
|
||||||
|
private String obtainBearerToken(String wwwAuth) {
|
||||||
|
if (wwwAuth == null) return null;
|
||||||
|
String prefix = "Bearer ";
|
||||||
|
if (!wwwAuth.regionMatches(true, 0, prefix, 0, prefix.length())) return null;
|
||||||
|
Map<String, String> params = parseAuthParams(wwwAuth.substring(prefix.length()));
|
||||||
|
String realm = params.get("realm");
|
||||||
|
if (realm == null) return null;
|
||||||
|
StringBuilder url = new StringBuilder(realm);
|
||||||
|
boolean hasQuery = realm.contains("?");
|
||||||
|
for (String key : new String[]{"service", "scope"}) {
|
||||||
|
String v = params.get(key);
|
||||||
|
if (v != null) {
|
||||||
|
url.append(hasQuery ? '&' : '?')
|
||||||
|
.append(key).append('=')
|
||||||
|
.append(URLEncoder.encode(v, StandardCharsets.UTF_8));
|
||||||
|
hasQuery = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
ResponseEntity<Map> resp = http.getForEntity(url.toString(), Map.class);
|
||||||
|
Map<?, ?> body = resp.getBody();
|
||||||
|
if (body == null) return null;
|
||||||
|
Object t = body.get("token");
|
||||||
|
if (t == null) t = body.get("access_token");
|
||||||
|
return t == null ? null : t.toString();
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.warn("Bearer token request failed: {}", e.getMessage());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parser minimaliste pour {@code key="value", key2="value2"}. */
|
||||||
|
private static Map<String, String> parseAuthParams(String s) {
|
||||||
|
Map<String, String> out = new HashMap<>();
|
||||||
|
int i = 0;
|
||||||
|
int n = s.length();
|
||||||
|
while (i < n) {
|
||||||
|
while (i < n && (s.charAt(i) == ',' || s.charAt(i) == ' ')) i++;
|
||||||
|
int eq = s.indexOf('=', i);
|
||||||
|
if (eq < 0) break;
|
||||||
|
String key = s.substring(i, eq).trim();
|
||||||
|
int valStart = eq + 1;
|
||||||
|
String val;
|
||||||
|
if (valStart < n && s.charAt(valStart) == '"') {
|
||||||
|
int valEnd = s.indexOf('"', valStart + 1);
|
||||||
|
if (valEnd < 0) break;
|
||||||
|
val = s.substring(valStart + 1, valEnd);
|
||||||
|
i = valEnd + 1;
|
||||||
|
} else {
|
||||||
|
int valEnd = s.indexOf(',', valStart);
|
||||||
|
if (valEnd < 0) valEnd = n;
|
||||||
|
val = s.substring(valStart, valEnd).trim();
|
||||||
|
i = valEnd;
|
||||||
|
}
|
||||||
|
out.put(key, val);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String normalizeRegistry(String value) {
|
||||||
|
if (value == null || value.isBlank()) return "";
|
||||||
|
String v = value.trim();
|
||||||
|
if (!v.startsWith("http://") && !v.startsWith("https://")) {
|
||||||
|
v = "https://" + v;
|
||||||
|
}
|
||||||
|
if (v.endsWith("/")) v = v.substring(0, v.length() - 1);
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<String> parseImages(String csv) {
|
||||||
|
if (csv == null || csv.isBlank()) return List.of();
|
||||||
|
List<String> out = new ArrayList<>();
|
||||||
|
for (String part : csv.split(",")) {
|
||||||
|
String p = part.trim();
|
||||||
|
if (!p.isEmpty()) out.add(p);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------
|
||||||
|
// Records de retour (sortis sous forme JSON par Jackson)
|
||||||
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
|
public record UpdateStatus(
|
||||||
|
boolean enabled,
|
||||||
|
boolean updateAvailable,
|
||||||
|
List<ImageStatus> images,
|
||||||
|
Instant checkedAt) {}
|
||||||
|
|
||||||
|
public record ImageStatus(
|
||||||
|
String image,
|
||||||
|
String localDigest,
|
||||||
|
String remoteDigest,
|
||||||
|
boolean updateAvailable) {}
|
||||||
|
}
|
||||||
@@ -66,6 +66,7 @@ public class SecurityConfig {
|
|||||||
// Preflight CORS toujours libre (le browser n'envoie pas Authorization sur OPTIONS)
|
// Preflight CORS toujours libre (le browser n'envoie pas Authorization sur OPTIONS)
|
||||||
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
||||||
.requestMatchers("/api/settings/**").hasRole("ADMIN")
|
.requestMatchers("/api/settings/**").hasRole("ADMIN")
|
||||||
|
.requestMatchers("/api/admin/**").hasRole("ADMIN")
|
||||||
.anyRequest().permitAll()
|
.anyRequest().permitAll()
|
||||||
)
|
)
|
||||||
.httpBasic(basic -> {});
|
.httpBasic(basic -> {});
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.loremind.infrastructure.web.controller;
|
package com.loremind.infrastructure.web.controller;
|
||||||
|
|
||||||
|
import com.loremind.infrastructure.updates.UpdateCheckService;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
@@ -18,13 +19,18 @@ import java.util.Map;
|
|||||||
public class ConfigController {
|
public class ConfigController {
|
||||||
|
|
||||||
private final boolean demoMode;
|
private final boolean demoMode;
|
||||||
|
private final UpdateCheckService updates;
|
||||||
|
|
||||||
public ConfigController(@Value("${app.demo-mode:false}") boolean demoMode) {
|
public ConfigController(@Value("${app.demo-mode:false}") boolean demoMode,
|
||||||
|
UpdateCheckService updates) {
|
||||||
this.demoMode = demoMode;
|
this.demoMode = demoMode;
|
||||||
|
this.updates = updates;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public Map<String, Object> getPublicConfig() {
|
public Map<String, Object> getPublicConfig() {
|
||||||
return Map.of("demoMode", demoMode);
|
return Map.of(
|
||||||
|
"demoMode", demoMode,
|
||||||
|
"updateCheckEnabled", updates.isEnabled());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ import org.springframework.http.HttpMethod;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
import org.springframework.web.bind.annotation.PutMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -15,7 +17,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
|
import java.net.http.HttpRequest;
|
||||||
|
import java.net.http.HttpResponse;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.time.Duration;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,11 +78,81 @@ public class SettingsController {
|
|||||||
return forward(HttpMethod.POST, "/models/ollama/info", body);
|
return forward(HttpMethod.POST, "/models/ollama/info", body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Telecharge un modele Ollama et streame la progression au client.
|
||||||
|
* <p>
|
||||||
|
* On bypass RestTemplate (qui bufferise toute la reponse) au profit du
|
||||||
|
* client HTTP standard de Java en mode streaming. Le Brain renvoie du
|
||||||
|
* NDJSON ligne par ligne ; on relaie chaque chunk tel quel pour que le
|
||||||
|
* frontend voie la progression en temps reel.
|
||||||
|
*/
|
||||||
|
@PostMapping(value = "/models/ollama/pull", produces = "application/x-ndjson")
|
||||||
|
public ResponseEntity<StreamingResponseBody> pullOllamaModel(@RequestBody Map<String, Object> body) {
|
||||||
|
guardDemoMode();
|
||||||
|
StreamingResponseBody stream = output -> {
|
||||||
|
HttpClient http = HttpClient.newBuilder()
|
||||||
|
.connectTimeout(Duration.ofSeconds(10))
|
||||||
|
.build();
|
||||||
|
HttpRequest req = HttpRequest.newBuilder()
|
||||||
|
.uri(URI.create(brainBaseUrl + "/models/ollama/pull"))
|
||||||
|
.timeout(Duration.ofMinutes(60))
|
||||||
|
.header("Content-Type", "application/json")
|
||||||
|
.POST(HttpRequest.BodyPublishers.ofString(toJson(body)))
|
||||||
|
.build();
|
||||||
|
try {
|
||||||
|
HttpResponse<InputStream> resp = http.send(req, HttpResponse.BodyHandlers.ofInputStream());
|
||||||
|
try (InputStream in = resp.body()) {
|
||||||
|
byte[] buf = new byte[4096];
|
||||||
|
int n;
|
||||||
|
while ((n = in.read(buf)) != -1) {
|
||||||
|
output.write(buf, 0, n);
|
||||||
|
output.flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (InterruptedException ie) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
throw new IOException("Pull interrompu", ie);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
return ResponseEntity.ok().contentType(MediaType.parseMediaType("application/x-ndjson")).body(stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/models/ollama/{name}")
|
||||||
|
public ResponseEntity<Map<String, Object>> deleteOllamaModel(@PathVariable("name") String name) {
|
||||||
|
guardDemoMode();
|
||||||
|
return forward(HttpMethod.DELETE, "/models/ollama/" + name, null);
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/models/onemin")
|
@GetMapping("/models/onemin")
|
||||||
public ResponseEntity<Map<String, Object>> listOneMinModels() {
|
public ResponseEntity<Map<String, Object>> listOneMinModels() {
|
||||||
return forward(HttpMethod.GET, "/models/onemin", null);
|
return forward(HttpMethod.GET, "/models/onemin", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serialiseur JSON minimal pour eviter d'instancier ObjectMapper a chaque
|
||||||
|
* appel. Suffisant pour notre cas d'usage : Map<String,Object> avec des
|
||||||
|
* String/Number/Boolean en valeur.
|
||||||
|
*/
|
||||||
|
private static String toJson(Map<String, Object> m) {
|
||||||
|
StringBuilder sb = new StringBuilder("{");
|
||||||
|
boolean first = true;
|
||||||
|
for (Map.Entry<String, Object> e : m.entrySet()) {
|
||||||
|
if (!first) sb.append(",");
|
||||||
|
sb.append("\"").append(escape(e.getKey())).append("\":");
|
||||||
|
Object v = e.getValue();
|
||||||
|
if (v == null) sb.append("null");
|
||||||
|
else if (v instanceof Number || v instanceof Boolean) sb.append(v);
|
||||||
|
else sb.append("\"").append(escape(v.toString())).append("\"");
|
||||||
|
first = false;
|
||||||
|
}
|
||||||
|
return sb.append("}").toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String escape(String s) {
|
||||||
|
return s.replace("\\", "\\\\").replace("\"", "\\\"")
|
||||||
|
.replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t");
|
||||||
|
}
|
||||||
|
|
||||||
private void guardDemoMode() {
|
private void guardDemoMode() {
|
||||||
if (demoMode) {
|
if (demoMode) {
|
||||||
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Settings disabled in demo mode");
|
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Settings disabled in demo mode");
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package com.loremind.infrastructure.web.controller;
|
||||||
|
|
||||||
|
import com.loremind.infrastructure.updates.UpdateCheckService;
|
||||||
|
import com.loremind.infrastructure.updates.UpdateCheckService.UpdateStatus;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
import org.springframework.web.server.ResponseStatusException;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Endpoints admin pour la verification et le declenchement des mises a jour
|
||||||
|
* des conteneurs LoreMind (core/brain/web).
|
||||||
|
*
|
||||||
|
* Protege par HTTP Basic via SecurityConfig (path /api/admin/**).
|
||||||
|
* Si la feature n'est pas configuree (WATCHTOWER_TOKEN vide), check renvoie
|
||||||
|
* {enabled:false} et apply repond 503.
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/admin/updates")
|
||||||
|
public class UpdatesController {
|
||||||
|
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(UpdatesController.class);
|
||||||
|
|
||||||
|
private final UpdateCheckService updates;
|
||||||
|
private final boolean demoMode;
|
||||||
|
|
||||||
|
public UpdatesController(UpdateCheckService updates,
|
||||||
|
@Value("${app.demo-mode:false}") boolean demoMode) {
|
||||||
|
this.updates = updates;
|
||||||
|
this.demoMode = demoMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/check")
|
||||||
|
public UpdateStatus check() {
|
||||||
|
guardDemoMode();
|
||||||
|
return updates.check();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/apply")
|
||||||
|
public ResponseEntity<Map<String, Object>> apply() {
|
||||||
|
guardDemoMode();
|
||||||
|
if (!updates.isEnabled()) {
|
||||||
|
return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
|
||||||
|
.body(Map.of("error", "Update apply not configured"));
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
updates.apply();
|
||||||
|
return ResponseEntity.accepted()
|
||||||
|
.body(Map.of("status", "triggered",
|
||||||
|
"message", "Watchtower va telecharger et redemarrer les conteneurs."));
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Apply update failed", e);
|
||||||
|
return ResponseEntity.status(HttpStatus.BAD_GATEWAY)
|
||||||
|
.body(Map.of("error", "Watchtower unreachable: " + e.getMessage()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* En mode demo, les instances ne doivent pas se mettre a jour ni meme
|
||||||
|
* exposer leur statut (pas de surface d'attaque, et pas de redemarrage
|
||||||
|
* intempestif d'une demo en cours). Cohérent avec SettingsController.
|
||||||
|
*/
|
||||||
|
private void guardDemoMode() {
|
||||||
|
if (demoMode) {
|
||||||
|
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Updates disabled in demo mode");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -87,18 +87,14 @@ public class SceneMapper {
|
|||||||
private List<SceneBranchDTO> toBranchDTOs(List<SceneBranch> branches) {
|
private List<SceneBranchDTO> toBranchDTOs(List<SceneBranch> branches) {
|
||||||
if (branches == null) return new ArrayList<>();
|
if (branches == null) return new ArrayList<>();
|
||||||
return branches.stream()
|
return branches.stream()
|
||||||
.map(b -> new SceneBranchDTO(b.getLabel(), b.getTargetSceneId(), b.getCondition()))
|
.map(b -> new SceneBranchDTO(b.label(), b.targetSceneId(), b.condition()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<SceneBranch> toBranchDomain(List<SceneBranchDTO> dtos) {
|
private List<SceneBranch> toBranchDomain(List<SceneBranchDTO> dtos) {
|
||||||
if (dtos == null) return new ArrayList<>();
|
if (dtos == null) return new ArrayList<>();
|
||||||
return dtos.stream()
|
return dtos.stream()
|
||||||
.map(d -> SceneBranch.builder()
|
.map(d -> new SceneBranch(d.getLabel(), d.getTargetSceneId(), d.getCondition()))
|
||||||
.label(d.getLabel())
|
|
||||||
.targetSceneId(d.getTargetSceneId())
|
|
||||||
.condition(d.getCondition())
|
|
||||||
.build())
|
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,3 +54,11 @@ spring.servlet.multipart.max-request-size=10MB
|
|||||||
# Mode demo : masque Settings/Export cote front et bloque les PUT /api/settings
|
# Mode demo : masque Settings/Export cote front et bloque les PUT /api/settings
|
||||||
# cote serveur. Activer via DEMO_MODE=true sur les deploiements publics.
|
# cote serveur. Activer via DEMO_MODE=true sur les deploiements publics.
|
||||||
app.demo-mode=${DEMO_MODE:false}
|
app.demo-mode=${DEMO_MODE:false}
|
||||||
|
|
||||||
|
# Detection des mises a jour des conteneurs Docker (registry HTTP API + Watchtower).
|
||||||
|
# Feature desactivee si UPDATE_CHECK_WATCHTOWER_TOKEN est vide.
|
||||||
|
update-check.registry=${UPDATE_CHECK_REGISTRY:}
|
||||||
|
update-check.images=${UPDATE_CHECK_IMAGES:}
|
||||||
|
update-check.tag=${UPDATE_CHECK_TAG:latest}
|
||||||
|
update-check.watchtower-url=${WATCHTOWER_URL:http://watchtower:8080}
|
||||||
|
update-check.watchtower-token=${WATCHTOWER_TOKEN:}
|
||||||
|
|||||||
@@ -178,10 +178,7 @@ public class SceneServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testUpdateScene_WithValidBranches() {
|
void testUpdateScene_WithValidBranches() {
|
||||||
// Arrange
|
// Arrange
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("Go to scene 2", "scene-2");
|
||||||
.targetSceneId("scene-2")
|
|
||||||
.label("Go to scene 2")
|
|
||||||
.build();
|
|
||||||
Scene updatedScene = Scene.builder()
|
Scene updatedScene = Scene.builder()
|
||||||
.name("Updated Scene")
|
.name("Updated Scene")
|
||||||
.branches(List.of(branch))
|
.branches(List.of(branch))
|
||||||
@@ -203,10 +200,7 @@ public class SceneServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testUpdateScene_WithBranchToSelf() {
|
void testUpdateScene_WithBranchToSelf() {
|
||||||
// Arrange
|
// Arrange
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("Self-reference", "scene-1");
|
||||||
.targetSceneId("scene-1")
|
|
||||||
.label("Self-reference")
|
|
||||||
.build();
|
|
||||||
Scene updatedScene = Scene.builder()
|
Scene updatedScene = Scene.builder()
|
||||||
.name("Updated Scene")
|
.name("Updated Scene")
|
||||||
.branches(List.of(branch))
|
.branches(List.of(branch))
|
||||||
@@ -228,10 +222,7 @@ public class SceneServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testUpdateScene_WithBranchToDifferentChapter() {
|
void testUpdateScene_WithBranchToDifferentChapter() {
|
||||||
// Arrange
|
// Arrange
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("Go to other chapter", "scene-other-chapter");
|
||||||
.targetSceneId("scene-other-chapter")
|
|
||||||
.label("Go to other chapter")
|
|
||||||
.build();
|
|
||||||
Scene updatedScene = Scene.builder()
|
Scene updatedScene = Scene.builder()
|
||||||
.name("Updated Scene")
|
.name("Updated Scene")
|
||||||
.branches(List.of(branch))
|
.branches(List.of(branch))
|
||||||
@@ -253,10 +244,7 @@ public class SceneServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testUpdateScene_WithBranchNullTarget() {
|
void testUpdateScene_WithBranchNullTarget() {
|
||||||
// Arrange
|
// Arrange
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("Null target", null);
|
||||||
.targetSceneId(null)
|
|
||||||
.label("Null target")
|
|
||||||
.build();
|
|
||||||
Scene updatedScene = Scene.builder()
|
Scene updatedScene = Scene.builder()
|
||||||
.name("Updated Scene")
|
.name("Updated Scene")
|
||||||
.branches(List.of(branch))
|
.branches(List.of(branch))
|
||||||
@@ -277,10 +265,7 @@ public class SceneServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testUpdateScene_WithBranchBlankTarget() {
|
void testUpdateScene_WithBranchBlankTarget() {
|
||||||
// Arrange
|
// Arrange
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("Blank target", " ");
|
||||||
.targetSceneId(" ")
|
|
||||||
.label("Blank target")
|
|
||||||
.build();
|
|
||||||
Scene updatedScene = Scene.builder()
|
Scene updatedScene = Scene.builder()
|
||||||
.name("Updated Scene")
|
.name("Updated Scene")
|
||||||
.branches(List.of(branch))
|
.branches(List.of(branch))
|
||||||
|
|||||||
@@ -74,9 +74,9 @@ public class CampaignStructuralContextBuilderTest {
|
|||||||
|
|
||||||
CampaignStructuralContext ctx = builder.build("camp-1");
|
CampaignStructuralContext ctx = builder.build("camp-1");
|
||||||
|
|
||||||
assertEquals("Les Terres Brisées", ctx.getCampaignName());
|
assertEquals("Les Terres Brisées", ctx.campaignName());
|
||||||
assertEquals("Campagne dark fantasy", ctx.getCampaignDescription());
|
assertEquals("Campagne dark fantasy", ctx.campaignDescription());
|
||||||
assertTrue(ctx.getArcs().isEmpty());
|
assertTrue(ctx.arcs().isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -100,19 +100,19 @@ public class CampaignStructuralContextBuilderTest {
|
|||||||
|
|
||||||
CampaignStructuralContext ctx = builder.build("camp-1");
|
CampaignStructuralContext ctx = builder.build("camp-1");
|
||||||
|
|
||||||
assertEquals(2, ctx.getArcs().size());
|
assertEquals(2, ctx.arcs().size());
|
||||||
assertEquals("Arc A", ctx.getArcs().get(0).getName());
|
assertEquals("Arc A", ctx.arcs().get(0).name());
|
||||||
assertEquals("Arc B", ctx.getArcs().get(1).getName());
|
assertEquals("Arc B", ctx.arcs().get(1).name());
|
||||||
|
|
||||||
// Chapitres tries : ch2 (order 1) avant ch1 (order 2)
|
// Chapitres tries : ch2 (order 1) avant ch1 (order 2)
|
||||||
assertEquals(2, ctx.getArcs().get(0).getChapters().size());
|
assertEquals(2, ctx.arcs().get(0).chapters().size());
|
||||||
assertEquals("Ch B", ctx.getArcs().get(0).getChapters().get(0).getName());
|
assertEquals("Ch B", ctx.arcs().get(0).chapters().get(0).name());
|
||||||
assertEquals("Ch A", ctx.getArcs().get(0).getChapters().get(1).getName());
|
assertEquals("Ch A", ctx.arcs().get(0).chapters().get(1).name());
|
||||||
|
|
||||||
// Scenes dans ch-1 : s2 (order 1) avant s1 (order 2)
|
// Scenes dans ch-1 : s2 (order 1) avant s1 (order 2)
|
||||||
var chADto = ctx.getArcs().get(0).getChapters().get(1);
|
var chADto = ctx.arcs().get(0).chapters().get(1);
|
||||||
assertEquals("Scene B", chADto.getScenes().get(0).getName());
|
assertEquals("Scene B", chADto.scenes().get(0).name());
|
||||||
assertEquals("Scene A", chADto.getScenes().get(1).getName());
|
assertEquals("Scene A", chADto.scenes().get(1).name());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -120,15 +120,8 @@ public class CampaignStructuralContextBuilderTest {
|
|||||||
Arc arc = Arc.builder().id("arc-1").name("Arc").description("").order(1).build();
|
Arc arc = Arc.builder().id("arc-1").name("Arc").description("").order(1).build();
|
||||||
Chapter ch = Chapter.builder().id("ch-1").arcId("arc-1").name("Ch").description("").order(1).build();
|
Chapter ch = Chapter.builder().id("ch-1").arcId("arc-1").name("Ch").description("").order(1).build();
|
||||||
|
|
||||||
SceneBranch validBranch = SceneBranch.builder()
|
SceneBranch validBranch = new SceneBranch("Si les joueurs fuient", "s-2", "en cas de combat perdu");
|
||||||
.label("Si les joueurs fuient")
|
SceneBranch danglingBranch = SceneBranch.of("Vers l'inconnu", "s-inconnu");
|
||||||
.targetSceneId("s-2")
|
|
||||||
.condition("en cas de combat perdu")
|
|
||||||
.build();
|
|
||||||
SceneBranch danglingBranch = SceneBranch.builder()
|
|
||||||
.label("Vers l'inconnu")
|
|
||||||
.targetSceneId("s-inconnu")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
Scene s1 = Scene.builder().id("s-1").chapterId("ch-1").name("Entrée").description("")
|
Scene s1 = Scene.builder().id("s-1").chapterId("ch-1").name("Entrée").description("")
|
||||||
.order(1)
|
.order(1)
|
||||||
@@ -143,12 +136,12 @@ public class CampaignStructuralContextBuilderTest {
|
|||||||
|
|
||||||
CampaignStructuralContext ctx = builder.build("camp-1");
|
CampaignStructuralContext ctx = builder.build("camp-1");
|
||||||
|
|
||||||
var scene1Summary = ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0);
|
var scene1Summary = ctx.arcs().get(0).chapters().get(0).scenes().get(0);
|
||||||
assertEquals(2, scene1Summary.getBranches().size());
|
assertEquals(2, scene1Summary.branches().size());
|
||||||
assertEquals("Fuite", scene1Summary.getBranches().get(0).getTargetSceneName());
|
assertEquals("Fuite", scene1Summary.branches().get(0).targetSceneName());
|
||||||
assertEquals("en cas de combat perdu", scene1Summary.getBranches().get(0).getCondition());
|
assertEquals("en cas de combat perdu", scene1Summary.branches().get(0).condition());
|
||||||
// ID inconnu → libellé de fallback
|
// ID inconnu → libellé de fallback
|
||||||
assertEquals("(scène inconnue)", scene1Summary.getBranches().get(1).getTargetSceneName());
|
assertEquals("(scène inconnue)", scene1Summary.branches().get(1).targetSceneName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -170,9 +163,9 @@ public class CampaignStructuralContextBuilderTest {
|
|||||||
|
|
||||||
CampaignStructuralContext ctx = builder.build("camp-1");
|
CampaignStructuralContext ctx = builder.build("camp-1");
|
||||||
|
|
||||||
assertEquals(2, ctx.getArcs().get(0).getIllustrationCount());
|
assertEquals(2, ctx.arcs().get(0).illustrationCount());
|
||||||
assertEquals(0, ctx.getArcs().get(0).getChapters().get(0).getIllustrationCount());
|
assertEquals(0, ctx.arcs().get(0).chapters().get(0).illustrationCount());
|
||||||
assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getIllustrationCount());
|
assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().get(0).illustrationCount());
|
||||||
assertTrue(ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getBranches().isEmpty());
|
assertTrue(ctx.arcs().get(0).chapters().get(0).scenes().get(0).branches().isEmpty());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,13 +89,13 @@ public class GeneratePageValuesUseCaseTest {
|
|||||||
verify(aiProvider).generatePage(captor.capture());
|
verify(aiProvider).generatePage(captor.capture());
|
||||||
GenerationContext ctx = captor.getValue();
|
GenerationContext ctx = captor.getValue();
|
||||||
|
|
||||||
assertEquals("Aetheria", ctx.getLoreName());
|
assertEquals("Aetheria", ctx.loreName());
|
||||||
assertEquals("monde aérien", ctx.getLoreDescription());
|
assertEquals("monde aérien", ctx.loreDescription());
|
||||||
assertEquals("PNJ", ctx.getFolderName());
|
assertEquals("PNJ", ctx.folderName());
|
||||||
assertEquals("Personnage", ctx.getTemplateName());
|
assertEquals("Personnage", ctx.templateName());
|
||||||
assertEquals("Alice", ctx.getPageTitle());
|
assertEquals("Alice", ctx.pageTitle());
|
||||||
// Seuls les champs TEXT doivent etre envoyes (pas "Portrait" IMAGE).
|
// Seuls les champs TEXT doivent etre envoyes (pas "Portrait" IMAGE).
|
||||||
assertEquals(List.of("Histoire", "Apparence"), ctx.getTemplateFields());
|
assertEquals(List.of("Histoire", "Apparence"), ctx.templateFields());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -71,10 +71,10 @@ public class LoreStructuralContextBuilderTest {
|
|||||||
|
|
||||||
LoreStructuralContext ctx = builder.build("lore-1");
|
LoreStructuralContext ctx = builder.build("lore-1");
|
||||||
|
|
||||||
assertEquals("Aetheria", ctx.getLoreName());
|
assertEquals("Aetheria", ctx.loreName());
|
||||||
assertEquals("Monde aérien", ctx.getLoreDescription());
|
assertEquals("Monde aérien", ctx.loreDescription());
|
||||||
assertTrue(ctx.getFolders().isEmpty());
|
assertTrue(ctx.folders().isEmpty());
|
||||||
assertTrue(ctx.getTags().isEmpty());
|
assertTrue(ctx.tags().isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -110,32 +110,32 @@ public class LoreStructuralContextBuilderTest {
|
|||||||
|
|
||||||
LoreStructuralContext ctx = builder.build("lore-1");
|
LoreStructuralContext ctx = builder.build("lore-1");
|
||||||
|
|
||||||
assertEquals(2, ctx.getFolders().size());
|
assertEquals(2, ctx.folders().size());
|
||||||
assertTrue(ctx.getFolders().containsKey("PNJ"));
|
assertTrue(ctx.folders().containsKey("PNJ"));
|
||||||
assertTrue(ctx.getFolders().containsKey("Lieux"));
|
assertTrue(ctx.folders().containsKey("Lieux"));
|
||||||
|
|
||||||
var pnjPages = ctx.getFolders().get("PNJ");
|
var pnjPages = ctx.folders().get("PNJ");
|
||||||
assertEquals(1, pnjPages.size());
|
assertEquals(1, pnjPages.size());
|
||||||
var aliceSummary = pnjPages.get(0);
|
var aliceSummary = pnjPages.get(0);
|
||||||
assertEquals("Alice", aliceSummary.getTitle());
|
assertEquals("Alice", aliceSummary.title());
|
||||||
assertEquals("Personnage", aliceSummary.getTemplateName());
|
assertEquals("Personnage", aliceSummary.templateName());
|
||||||
// Blank/null filtrés
|
// Blank/null filtrés
|
||||||
assertEquals(1, aliceSummary.getValues().size());
|
assertEquals(1, aliceSummary.values().size());
|
||||||
assertEquals("Il était une fois...", aliceSummary.getValues().get("Histoire"));
|
assertEquals("Il était une fois...", aliceSummary.values().get("Histoire"));
|
||||||
assertEquals(List.of("hero", "magic"), aliceSummary.getTags());
|
assertEquals(List.of("hero", "magic"), aliceSummary.tags());
|
||||||
// p-2 resolved into title, p-ghost dropped silently
|
// p-2 resolved into title, p-ghost dropped silently
|
||||||
assertEquals(List.of("La Forêt"), aliceSummary.getRelatedPageTitles());
|
assertEquals(List.of("La Forêt"), aliceSummary.relatedPageTitles());
|
||||||
|
|
||||||
var forestSummary = ctx.getFolders().get("Lieux").get(0);
|
var forestSummary = ctx.folders().get("Lieux").get(0);
|
||||||
// Template introuvable → "?"
|
// Template introuvable → "?"
|
||||||
assertEquals("?", forestSummary.getTemplateName());
|
assertEquals("?", forestSummary.templateName());
|
||||||
assertTrue(forestSummary.getValues().isEmpty());
|
assertTrue(forestSummary.values().isEmpty());
|
||||||
assertTrue(forestSummary.getRelatedPageTitles().isEmpty());
|
assertTrue(forestSummary.relatedPageTitles().isEmpty());
|
||||||
|
|
||||||
// Tags uniques entre les 2 pages
|
// Tags uniques entre les 2 pages
|
||||||
assertEquals(2, ctx.getTags().size());
|
assertEquals(2, ctx.tags().size());
|
||||||
assertTrue(ctx.getTags().contains("hero"));
|
assertTrue(ctx.tags().contains("hero"));
|
||||||
assertTrue(ctx.getTags().contains("magic"));
|
assertTrue(ctx.tags().contains("magic"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -160,7 +160,7 @@ public class LoreStructuralContextBuilderTest {
|
|||||||
|
|
||||||
LoreStructuralContext ctx = builder.build("lore-1");
|
LoreStructuralContext ctx = builder.build("lore-1");
|
||||||
|
|
||||||
String truncated = ctx.getFolders().get("PNJ").get(0).getValues().get("Histoire");
|
String truncated = ctx.folders().get("PNJ").get(0).values().get("Histoire");
|
||||||
assertNotNull(truncated);
|
assertNotNull(truncated);
|
||||||
assertEquals(500 + 1, truncated.length()); // 500 + ellipse
|
assertEquals(500 + 1, truncated.length()); // 500 + ellipse
|
||||||
assertTrue(truncated.endsWith("…"));
|
assertTrue(truncated.endsWith("…"));
|
||||||
@@ -185,9 +185,9 @@ public class LoreStructuralContextBuilderTest {
|
|||||||
|
|
||||||
LoreStructuralContext ctx = builder.build("lore-1");
|
LoreStructuralContext ctx = builder.build("lore-1");
|
||||||
|
|
||||||
var summary = ctx.getFolders().get("PNJ").get(0);
|
var summary = ctx.folders().get("PNJ").get(0);
|
||||||
assertTrue(summary.getValues().isEmpty());
|
assertTrue(summary.values().isEmpty());
|
||||||
assertTrue(summary.getTags().isEmpty());
|
assertTrue(summary.tags().isEmpty());
|
||||||
assertTrue(summary.getRelatedPageTitles().isEmpty());
|
assertTrue(summary.relatedPageTitles().isEmpty());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,14 +44,14 @@ public class NarrativeEntityContextBuilderTest {
|
|||||||
|
|
||||||
NarrativeEntityContext ctx = builder.build("arc", "arc-1");
|
NarrativeEntityContext ctx = builder.build("arc", "arc-1");
|
||||||
|
|
||||||
assertEquals("arc", ctx.getEntityType());
|
assertEquals("arc", ctx.entityType());
|
||||||
assertEquals("L'arc sombre", ctx.getTitle());
|
assertEquals("L'arc sombre", ctx.title());
|
||||||
assertEquals("synopsis", ctx.getFields().get("description (synopsis)"));
|
assertEquals("synopsis", ctx.fields().get("description (synopsis)"));
|
||||||
assertEquals("trahison", ctx.getFields().get("themes"));
|
assertEquals("trahison", ctx.fields().get("themes"));
|
||||||
assertEquals("vie ou mort", ctx.getFields().get("stakes"));
|
assertEquals("vie ou mort", ctx.fields().get("stakes"));
|
||||||
assertEquals("pouvoir", ctx.getFields().get("rewards"));
|
assertEquals("pouvoir", ctx.fields().get("rewards"));
|
||||||
assertEquals("le roi meurt", ctx.getFields().get("resolution"));
|
assertEquals("le roi meurt", ctx.fields().get("resolution"));
|
||||||
assertEquals("secret", ctx.getFields().get("gmNotes"));
|
assertEquals("secret", ctx.fields().get("gmNotes"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -64,12 +64,12 @@ public class NarrativeEntityContextBuilderTest {
|
|||||||
|
|
||||||
NarrativeEntityContext ctx = builder.build("chapter", "ch-1");
|
NarrativeEntityContext ctx = builder.build("chapter", "ch-1");
|
||||||
|
|
||||||
assertEquals("chapter", ctx.getEntityType());
|
assertEquals("chapter", ctx.entityType());
|
||||||
assertEquals("Chapitre 1", ctx.getTitle());
|
assertEquals("Chapitre 1", ctx.title());
|
||||||
assertEquals("", ctx.getFields().get("description (synopsis)"));
|
assertEquals("", ctx.fields().get("description (synopsis)"));
|
||||||
assertEquals("", ctx.getFields().get("playerObjectives"));
|
assertEquals("", ctx.fields().get("playerObjectives"));
|
||||||
assertEquals("haut", ctx.getFields().get("narrativeStakes"));
|
assertEquals("haut", ctx.fields().get("narrativeStakes"));
|
||||||
assertEquals("", ctx.getFields().get("gmNotes"));
|
assertEquals("", ctx.fields().get("gmNotes"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -85,17 +85,17 @@ public class NarrativeEntityContextBuilderTest {
|
|||||||
|
|
||||||
NarrativeEntityContext ctx = builder.build("scene", "s-1");
|
NarrativeEntityContext ctx = builder.build("scene", "s-1");
|
||||||
|
|
||||||
assertEquals("scene", ctx.getEntityType());
|
assertEquals("scene", ctx.entityType());
|
||||||
assertEquals("L'auberge", ctx.getTitle());
|
assertEquals("L'auberge", ctx.title());
|
||||||
assertEquals("lieu calme", ctx.getFields().get("description"));
|
assertEquals("lieu calme", ctx.fields().get("description"));
|
||||||
assertEquals("Taverne", ctx.getFields().get("location"));
|
assertEquals("Taverne", ctx.fields().get("location"));
|
||||||
assertEquals("Soir", ctx.getFields().get("timing"));
|
assertEquals("Soir", ctx.fields().get("timing"));
|
||||||
assertEquals("tendue", ctx.getFields().get("atmosphere"));
|
assertEquals("tendue", ctx.fields().get("atmosphere"));
|
||||||
assertEquals("Vous entrez...", ctx.getFields().get("playerNarration"));
|
assertEquals("Vous entrez...", ctx.fields().get("playerNarration"));
|
||||||
assertEquals("option A...", ctx.getFields().get("choicesConsequences"));
|
assertEquals("option A...", ctx.fields().get("choicesConsequences"));
|
||||||
assertEquals("moyen", ctx.getFields().get("combatDifficulty"));
|
assertEquals("moyen", ctx.fields().get("combatDifficulty"));
|
||||||
assertEquals("3 bandits", ctx.getFields().get("enemies"));
|
assertEquals("3 bandits", ctx.fields().get("enemies"));
|
||||||
assertEquals("trésor caché", ctx.getFields().get("gmSecretNotes"));
|
assertEquals("trésor caché", ctx.fields().get("gmSecretNotes"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -104,7 +104,7 @@ public class NarrativeEntityContextBuilderTest {
|
|||||||
when(arcRepository.findById("arc-1")).thenReturn(Optional.of(arc));
|
when(arcRepository.findById("arc-1")).thenReturn(Optional.of(arc));
|
||||||
|
|
||||||
NarrativeEntityContext ctx = builder.build(" ARC ", "arc-1");
|
NarrativeEntityContext ctx = builder.build(" ARC ", "arc-1");
|
||||||
assertEquals("arc", ctx.getEntityType());
|
assertEquals("arc", ctx.entityType());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -55,9 +55,7 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
void setUp() {
|
void setUp() {
|
||||||
campaignCtx = CampaignStructuralContext.builder()
|
campaignCtx = new CampaignStructuralContext("X", "d", List.of(), List.of());
|
||||||
.campaignName("X").campaignDescription("d")
|
|
||||||
.build();
|
|
||||||
messages = List.of();
|
messages = List.of();
|
||||||
onUsage = mock(Consumer.class);
|
onUsage = mock(Consumer.class);
|
||||||
onToken = mock(Consumer.class);
|
onToken = mock(Consumer.class);
|
||||||
@@ -85,10 +83,10 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
|
verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
|
||||||
ChatRequest req = captor.getValue();
|
ChatRequest req = captor.getValue();
|
||||||
assertSame(campaignCtx, req.getCampaignContext());
|
assertSame(campaignCtx, req.campaignContext());
|
||||||
assertNull(req.getLoreContext());
|
assertNull(req.loreContext());
|
||||||
assertNull(req.getNarrativeEntity());
|
assertNull(req.narrativeEntity());
|
||||||
assertNull(req.getPageContext());
|
assertNull(req.pageContext());
|
||||||
verifyNoInteractions(loreContextBuilder);
|
verifyNoInteractions(loreContextBuilder);
|
||||||
verifyNoInteractions(narrativeEntityContextBuilder);
|
verifyNoInteractions(narrativeEntityContextBuilder);
|
||||||
}
|
}
|
||||||
@@ -96,8 +94,8 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
@Test
|
@Test
|
||||||
void testExecute_LinkedCampaign_LoadsLoreContext() {
|
void testExecute_LinkedCampaign_LoadsLoreContext() {
|
||||||
Campaign linked = Campaign.builder().id("c-1").name("C").loreId("lore-1").build();
|
Campaign linked = Campaign.builder().id("c-1").name("C").loreId("lore-1").build();
|
||||||
LoreStructuralContext loreCtx = LoreStructuralContext.builder()
|
LoreStructuralContext loreCtx = new LoreStructuralContext(
|
||||||
.loreName("L").loreDescription("d").folders(Collections.emptyMap()).build();
|
"L", "d", Collections.emptyMap(), List.of());
|
||||||
|
|
||||||
when(campaignRepository.findById("c-1")).thenReturn(Optional.of(linked));
|
when(campaignRepository.findById("c-1")).thenReturn(Optional.of(linked));
|
||||||
when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
|
when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
|
||||||
@@ -107,7 +105,7 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
assertSame(loreCtx, captor.getValue().getLoreContext());
|
assertSame(loreCtx, captor.getValue().loreContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -122,15 +120,14 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
assertNull(captor.getValue().getLoreContext());
|
assertNull(captor.getValue().loreContext());
|
||||||
// La requete doit tout de meme partir (pas d'exception).
|
// La requete doit tout de meme partir (pas d'exception).
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testExecute_WithEntityFocus_BuildsNarrativeEntity() {
|
void testExecute_WithEntityFocus_BuildsNarrativeEntity() {
|
||||||
Campaign standalone = Campaign.builder().id("c-1").name("C").loreId(null).build();
|
Campaign standalone = Campaign.builder().id("c-1").name("C").loreId(null).build();
|
||||||
NarrativeEntityContext entity = NarrativeEntityContext.builder()
|
NarrativeEntityContext entity = new NarrativeEntityContext("scene", "L'auberge", Map.of());
|
||||||
.entityType("scene").title("L'auberge").fields(Map.of()).build();
|
|
||||||
|
|
||||||
when(campaignRepository.findById("c-1")).thenReturn(Optional.of(standalone));
|
when(campaignRepository.findById("c-1")).thenReturn(Optional.of(standalone));
|
||||||
when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
|
when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
|
||||||
@@ -140,7 +137,7 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
assertSame(entity, captor.getValue().getNarrativeEntity());
|
assertSame(entity, captor.getValue().narrativeEntity());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -153,7 +150,7 @@ public class StreamChatForCampaignUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
assertNull(captor.getValue().getNarrativeEntity());
|
assertNull(captor.getValue().narrativeEntity());
|
||||||
verifyNoInteractions(narrativeEntityContextBuilder);
|
verifyNoInteractions(narrativeEntityContextBuilder);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,10 +55,7 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
void setUp() {
|
void setUp() {
|
||||||
loreCtx = LoreStructuralContext.builder()
|
loreCtx = new LoreStructuralContext("Aetheria", "d", Collections.emptyMap(), List.of());
|
||||||
.loreName("Aetheria").loreDescription("d")
|
|
||||||
.folders(Collections.emptyMap())
|
|
||||||
.build();
|
|
||||||
messages = List.of();
|
messages = List.of();
|
||||||
onUsage = mock(Consumer.class);
|
onUsage = mock(Consumer.class);
|
||||||
onToken = mock(Consumer.class);
|
onToken = mock(Consumer.class);
|
||||||
@@ -75,9 +72,9 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
|
verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
|
||||||
ChatRequest req = captor.getValue();
|
ChatRequest req = captor.getValue();
|
||||||
assertSame(loreCtx, req.getLoreContext());
|
assertSame(loreCtx, req.loreContext());
|
||||||
assertNull(req.getPageContext());
|
assertNull(req.pageContext());
|
||||||
assertNull(req.getCampaignContext());
|
assertNull(req.campaignContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -88,7 +85,7 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
assertNull(captor.getValue().getPageContext());
|
assertNull(captor.getValue().pageContext());
|
||||||
verifyNoInteractions(pageRepository);
|
verifyNoInteractions(pageRepository);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,12 +113,12 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
ChatRequest req = captor.getValue();
|
ChatRequest req = captor.getValue();
|
||||||
assertNotNull(req.getPageContext());
|
assertNotNull(req.pageContext());
|
||||||
assertEquals("Alice", req.getPageContext().getTitle());
|
assertEquals("Alice", req.pageContext().title());
|
||||||
assertEquals("Personnage", req.getPageContext().getTemplateName());
|
assertEquals("Personnage", req.pageContext().templateName());
|
||||||
// Seuls les champs TEXT exposes
|
// Seuls les champs TEXT exposes
|
||||||
assertEquals(List.of("Histoire"), req.getPageContext().getTemplateFields());
|
assertEquals(List.of("Histoire"), req.pageContext().templateFields());
|
||||||
assertEquals(values, req.getPageContext().getValues());
|
assertEquals(values, req.pageContext().values());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -137,12 +134,12 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
var pageCtx = captor.getValue().getPageContext();
|
var pageCtx = captor.getValue().pageContext();
|
||||||
assertNotNull(pageCtx);
|
assertNotNull(pageCtx);
|
||||||
assertEquals("Orphan", pageCtx.getTitle());
|
assertEquals("Orphan", pageCtx.title());
|
||||||
assertEquals("?", pageCtx.getTemplateName());
|
assertEquals("?", pageCtx.templateName());
|
||||||
assertTrue(pageCtx.getTemplateFields().isEmpty());
|
assertTrue(pageCtx.templateFields().isEmpty());
|
||||||
assertTrue(pageCtx.getValues().isEmpty());
|
assertTrue(pageCtx.values().isEmpty());
|
||||||
verifyNoInteractions(templateRepository);
|
verifyNoInteractions(templateRepository);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,9 +157,9 @@ public class StreamChatForLoreUseCaseTest {
|
|||||||
|
|
||||||
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
|
||||||
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
|
||||||
var pageCtx = captor.getValue().getPageContext();
|
var pageCtx = captor.getValue().pageContext();
|
||||||
assertEquals("?", pageCtx.getTemplateName());
|
assertEquals("?", pageCtx.templateName());
|
||||||
assertTrue(pageCtx.getTemplateFields().isEmpty());
|
assertTrue(pageCtx.templateFields().isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -9,48 +9,36 @@ import static org.junit.jupiter.api.Assertions.assertNull;
|
|||||||
/**
|
/**
|
||||||
* Tests unitaires pour SceneBranch (Value Object).
|
* Tests unitaires pour SceneBranch (Value Object).
|
||||||
* Verifie :
|
* Verifie :
|
||||||
* - l'immuabilite (pas de setters : seul le builder permet la construction),
|
* - l'immuabilite (record : aucun setter, constructeur canonique uniquement),
|
||||||
* - l'egalite structurelle generee par @Value (equals/hashCode sur tous les
|
* - l'egalite structurelle generee par record (equals/hashCode sur tous les
|
||||||
* champs) — deux branches aux memes champs sont strictement egales,
|
* champs) — deux branches aux memes champs sont strictement egales,
|
||||||
* - le support du champ optionnel {@code condition}.
|
* - le support du champ optionnel {@code condition}.
|
||||||
*/
|
*/
|
||||||
class SceneBranchTest {
|
class SceneBranchTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_exposesAllFields() {
|
void constructor_exposesAllFields() {
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = new SceneBranch(
|
||||||
.label("Si les joueurs attaquent le garde")
|
"Si les joueurs attaquent le garde",
|
||||||
.targetSceneId("sc-combat")
|
"sc-combat",
|
||||||
.condition("initiative > 15")
|
"initiative > 15");
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("Si les joueurs attaquent le garde", branch.getLabel());
|
assertEquals("Si les joueurs attaquent le garde", branch.label());
|
||||||
assertEquals("sc-combat", branch.getTargetSceneId());
|
assertEquals("sc-combat", branch.targetSceneId());
|
||||||
assertEquals("initiative > 15", branch.getCondition());
|
assertEquals("initiative > 15", branch.condition());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void condition_isOptional() {
|
void condition_isOptional() {
|
||||||
SceneBranch branch = SceneBranch.builder()
|
SceneBranch branch = SceneBranch.of("sortie par la porte", "sc-corridor");
|
||||||
.label("sortie par la porte")
|
|
||||||
.targetSceneId("sc-corridor")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertNull(branch.getCondition());
|
assertNull(branch.condition());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoBranches_withSameFields_areEqual() {
|
void twoBranches_withSameFields_areEqual() {
|
||||||
SceneBranch a = SceneBranch.builder()
|
SceneBranch a = new SceneBranch("fuite", "sc-2", null);
|
||||||
.label("fuite")
|
SceneBranch b = new SceneBranch("fuite", "sc-2", null);
|
||||||
.targetSceneId("sc-2")
|
|
||||||
.condition(null)
|
|
||||||
.build();
|
|
||||||
SceneBranch b = SceneBranch.builder()
|
|
||||||
.label("fuite")
|
|
||||||
.targetSceneId("sc-2")
|
|
||||||
.condition(null)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals(a, b);
|
assertEquals(a, b);
|
||||||
assertEquals(a.hashCode(), b.hashCode());
|
assertEquals(a.hashCode(), b.hashCode());
|
||||||
@@ -58,16 +46,16 @@ class SceneBranchTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoBranches_differingOnTargetSceneId_areNotEqual() {
|
void twoBranches_differingOnTargetSceneId_areNotEqual() {
|
||||||
SceneBranch a = SceneBranch.builder().label("X").targetSceneId("sc-1").build();
|
SceneBranch a = SceneBranch.of("X", "sc-1");
|
||||||
SceneBranch b = SceneBranch.builder().label("X").targetSceneId("sc-2").build();
|
SceneBranch b = SceneBranch.of("X", "sc-2");
|
||||||
|
|
||||||
assertNotEquals(a, b);
|
assertNotEquals(a, b);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoBranches_differingOnCondition_areNotEqual() {
|
void twoBranches_differingOnCondition_areNotEqual() {
|
||||||
SceneBranch a = SceneBranch.builder().label("X").targetSceneId("sc-1").condition("A").build();
|
SceneBranch a = new SceneBranch("X", "sc-1", "A");
|
||||||
SceneBranch b = SceneBranch.builder().label("X").targetSceneId("sc-1").condition("B").build();
|
SceneBranch b = new SceneBranch("X", "sc-1", "B");
|
||||||
|
|
||||||
assertNotEquals(a, b);
|
assertNotEquals(a, b);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,15 +60,15 @@ class SceneTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_preservesBranches_whenProvided() {
|
void builder_preservesBranches_whenProvided() {
|
||||||
SceneBranch b1 = SceneBranch.builder().label("fuite").targetSceneId("sc-2").build();
|
SceneBranch b1 = SceneBranch.of("fuite", "sc-2");
|
||||||
SceneBranch b2 = SceneBranch.builder().label("combat").targetSceneId("sc-3").build();
|
SceneBranch b2 = SceneBranch.of("combat", "sc-3");
|
||||||
|
|
||||||
Scene scene = Scene.builder()
|
Scene scene = Scene.builder()
|
||||||
.branches(List.of(b1, b2))
|
.branches(List.of(b1, b2))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
assertEquals(2, scene.getBranches().size());
|
assertEquals(2, scene.getBranches().size());
|
||||||
assertEquals("fuite", scene.getBranches().get(0).getLabel());
|
assertEquals("fuite", scene.getBranches().get(0).label());
|
||||||
assertEquals("sc-3", scene.getBranches().get(1).getTargetSceneId());
|
assertEquals("sc-3", scene.getBranches().get(1).targetSceneId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,108 +6,97 @@ import com.loremind.domain.generationcontext.CampaignStructuralContext.ChapterSu
|
|||||||
import com.loremind.domain.generationcontext.CampaignStructuralContext.SceneSummary;
|
import com.loremind.domain.generationcontext.CampaignStructuralContext.SceneSummary;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests unitaires pour CampaignStructuralContext et ses types imbriques.
|
* Tests unitaires pour CampaignStructuralContext et ses types imbriques.
|
||||||
* Focus sur les annotations @Singular (chapters/scenes/branches/arcs) qui
|
* Records purs : aucune dependance technique.
|
||||||
* permettent une construction incrementale du graphe narratif.
|
|
||||||
*/
|
*/
|
||||||
class CampaignStructuralContextTest {
|
class CampaignStructuralContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_constructsFullNarrativeTree() {
|
void constructor_buildsFullNarrativeTree() {
|
||||||
BranchHint branch = BranchHint.builder()
|
BranchHint branch = new BranchHint("si les PJ fuient", "La poursuite", "PJ < moitie des HP");
|
||||||
.label("si les PJ fuient")
|
|
||||||
.targetSceneName("La poursuite")
|
|
||||||
.condition("PJ < moitie des HP")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
SceneSummary scene = SceneSummary.builder()
|
SceneSummary scene = new SceneSummary(
|
||||||
.name("L'auberge")
|
"L'auberge",
|
||||||
.description("Rencontre tendue avec le tavernier")
|
"Rencontre tendue avec le tavernier",
|
||||||
.illustrationCount(2)
|
2,
|
||||||
.branch(branch)
|
List.of(branch));
|
||||||
.build();
|
|
||||||
|
|
||||||
ChapterSummary chapter = ChapterSummary.builder()
|
ChapterSummary chapter = new ChapterSummary(
|
||||||
.name("L'arrivee")
|
"L'arrivee",
|
||||||
.description("Les PJ decouvrent la ville")
|
"Les PJ decouvrent la ville",
|
||||||
.scene(scene)
|
0,
|
||||||
.build();
|
List.of(scene));
|
||||||
|
|
||||||
ArcSummary arc = ArcSummary.builder()
|
ArcSummary arc = new ArcSummary(
|
||||||
.name("Acte I")
|
"Acte I",
|
||||||
.description("Mise en place")
|
"Mise en place",
|
||||||
.illustrationCount(1)
|
1,
|
||||||
.chapter(chapter)
|
List.of(chapter));
|
||||||
.build();
|
|
||||||
|
|
||||||
CampaignStructuralContext ctx = CampaignStructuralContext.builder()
|
CampaignStructuralContext ctx = new CampaignStructuralContext(
|
||||||
.campaignName("Les Ombres")
|
"Les Ombres",
|
||||||
.campaignDescription("Une campagne dark fantasy")
|
"Une campagne dark fantasy",
|
||||||
.arc(arc)
|
List.of(arc),
|
||||||
.build();
|
List.of());
|
||||||
|
|
||||||
assertEquals("Les Ombres", ctx.getCampaignName());
|
assertEquals("Les Ombres", ctx.campaignName());
|
||||||
assertEquals(1, ctx.getArcs().size());
|
assertEquals(1, ctx.arcs().size());
|
||||||
assertEquals(1, ctx.getArcs().get(0).getChapters().size());
|
assertEquals(1, ctx.arcs().get(0).chapters().size());
|
||||||
assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().size());
|
assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().size());
|
||||||
assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getBranches().size());
|
assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().get(0).branches().size());
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- BranchHint ---------------------------------------------------------
|
// --- BranchHint ---------------------------------------------------------
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void branchHint_preservesAllFields() {
|
void branchHint_preservesAllFields() {
|
||||||
BranchHint b = BranchHint.builder()
|
BranchHint b = new BranchHint("combat", "La confrontation", "initiative > 15");
|
||||||
.label("combat")
|
|
||||||
.targetSceneName("La confrontation")
|
|
||||||
.condition("initiative > 15")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("combat", b.getLabel());
|
assertEquals("combat", b.label());
|
||||||
assertEquals("La confrontation", b.getTargetSceneName());
|
assertEquals("La confrontation", b.targetSceneName());
|
||||||
assertEquals("initiative > 15", b.getCondition());
|
assertEquals("initiative > 15", b.condition());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void branchHint_conditionIsOptional() {
|
void branchHint_conditionIsOptional() {
|
||||||
BranchHint b = BranchHint.builder()
|
BranchHint b = new BranchHint("suite normale", "Scene 2", null);
|
||||||
.label("suite normale")
|
|
||||||
.targetSceneName("Scene 2")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertNull(b.getCondition());
|
assertNull(b.condition());
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- illustrationCount --------------------------------------------------
|
// --- illustrationCount --------------------------------------------------
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void illustrationCount_defaultsToZero_onAllSummaryTypes() {
|
void illustrationCount_defaultsToZero_onAllSummaryTypes() {
|
||||||
ArcSummary arc = ArcSummary.builder().name("X").build();
|
ArcSummary arc = new ArcSummary("X", null, 0, List.of());
|
||||||
ChapterSummary chapter = ChapterSummary.builder().name("X").build();
|
ChapterSummary chapter = new ChapterSummary("X", null, 0, List.of());
|
||||||
SceneSummary scene = SceneSummary.builder().name("X").build();
|
SceneSummary scene = new SceneSummary("X", null, 0, List.of());
|
||||||
|
|
||||||
assertEquals(0, arc.getIllustrationCount());
|
assertEquals(0, arc.illustrationCount());
|
||||||
assertEquals(0, chapter.getIllustrationCount());
|
assertEquals(0, chapter.illustrationCount());
|
||||||
assertEquals(0, scene.getIllustrationCount());
|
assertEquals(0, scene.illustrationCount());
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- @Singular : accumulation incrementale -----------------------------
|
// --- Construction incrementale (chapitres multiples) -------------------
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void singular_accumulatesMultipleCalls() {
|
void multipleChapters_arePreserved() {
|
||||||
ArcSummary arc = ArcSummary.builder()
|
ArcSummary arc = new ArcSummary(
|
||||||
.name("Acte I")
|
"Acte I",
|
||||||
.chapter(ChapterSummary.builder().name("Ch1").build())
|
null,
|
||||||
.chapter(ChapterSummary.builder().name("Ch2").build())
|
0,
|
||||||
.chapter(ChapterSummary.builder().name("Ch3").build())
|
List.of(
|
||||||
.build();
|
new ChapterSummary("Ch1", null, 0, List.of()),
|
||||||
|
new ChapterSummary("Ch2", null, 0, List.of()),
|
||||||
|
new ChapterSummary("Ch3", null, 0, List.of())));
|
||||||
|
|
||||||
assertEquals(3, arc.getChapters().size());
|
assertEquals(3, arc.chapters().size());
|
||||||
assertTrue(arc.getChapters().stream().anyMatch(c -> "Ch2".equals(c.getName())));
|
assertEquals("Ch2", arc.chapters().get(1).name());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.loremind.domain.generationcontext;
|
|||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
@@ -26,57 +27,45 @@ class ChatRequestTest {
|
|||||||
void buildLoreOnly_leavesCampaignAndEntityNull() {
|
void buildLoreOnly_leavesCampaignAndEntityNull() {
|
||||||
ChatRequest request = ChatRequest.builder()
|
ChatRequest request = ChatRequest.builder()
|
||||||
.messages(sampleMessages)
|
.messages(sampleMessages)
|
||||||
.loreContext(LoreStructuralContext.builder()
|
.loreContext(new LoreStructuralContext("Ithoril", "Royaume sombre", Map.of(), List.of()))
|
||||||
.loreName("Ithoril")
|
|
||||||
.loreDescription("Royaume sombre")
|
|
||||||
.folders(java.util.Map.of())
|
|
||||||
.build())
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
assertEquals(1, request.getMessages().size());
|
assertEquals(1, request.messages().size());
|
||||||
assertNotNull(request.getLoreContext());
|
assertNotNull(request.loreContext());
|
||||||
assertEquals("Ithoril", request.getLoreContext().getLoreName());
|
assertEquals("Ithoril", request.loreContext().loreName());
|
||||||
assertNull(request.getPageContext());
|
assertNull(request.pageContext());
|
||||||
assertNull(request.getCampaignContext());
|
assertNull(request.campaignContext());
|
||||||
assertNull(request.getNarrativeEntity());
|
assertNull(request.narrativeEntity());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void buildLoreWithPageFocus_hasBothContexts() {
|
void buildLoreWithPageFocus_hasBothContexts() {
|
||||||
ChatRequest request = ChatRequest.builder()
|
ChatRequest request = ChatRequest.builder()
|
||||||
.messages(sampleMessages)
|
.messages(sampleMessages)
|
||||||
.loreContext(LoreStructuralContext.builder().folders(java.util.Map.of()).build())
|
.loreContext(new LoreStructuralContext(null, null, Map.of(), List.of()))
|
||||||
.pageContext(PageContext.builder()
|
.pageContext(new PageContext("Thorin", "PNJ", null, null))
|
||||||
.title("Thorin")
|
|
||||||
.templateName("PNJ")
|
|
||||||
.build())
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
assertNotNull(request.getLoreContext());
|
assertNotNull(request.loreContext());
|
||||||
assertNotNull(request.getPageContext());
|
assertNotNull(request.pageContext());
|
||||||
assertEquals("Thorin", request.getPageContext().getTitle());
|
assertEquals("Thorin", request.pageContext().title());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void buildCampaignWithNarrativeEntity_hasBothContexts() {
|
void buildCampaignWithNarrativeEntity_hasBothContexts() {
|
||||||
ChatRequest request = ChatRequest.builder()
|
ChatRequest request = ChatRequest.builder()
|
||||||
.messages(sampleMessages)
|
.messages(sampleMessages)
|
||||||
.campaignContext(CampaignStructuralContext.builder()
|
.campaignContext(new CampaignStructuralContext(
|
||||||
.campaignName("Les Ombres")
|
"Les Ombres", "...", List.of(), List.of()))
|
||||||
.campaignDescription("...")
|
.narrativeEntity(new NarrativeEntityContext(
|
||||||
.build())
|
"scene", "L'auberge", Map.of("location", "Taverne")))
|
||||||
.narrativeEntity(NarrativeEntityContext.builder()
|
|
||||||
.entityType("scene")
|
|
||||||
.title("L'auberge")
|
|
||||||
.fields(java.util.Map.of("location", "Taverne"))
|
|
||||||
.build())
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
assertNotNull(request.getCampaignContext());
|
assertNotNull(request.campaignContext());
|
||||||
assertNotNull(request.getNarrativeEntity());
|
assertNotNull(request.narrativeEntity());
|
||||||
assertEquals("scene", request.getNarrativeEntity().getEntityType());
|
assertEquals("scene", request.narrativeEntity().entityType());
|
||||||
assertNull(request.getLoreContext());
|
assertNull(request.loreContext());
|
||||||
assertNull(request.getPageContext());
|
assertNull(request.pageContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -86,10 +75,10 @@ class ChatRequestTest {
|
|||||||
.messages(sampleMessages)
|
.messages(sampleMessages)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
assertEquals(1, request.getMessages().size());
|
assertEquals(1, request.messages().size());
|
||||||
assertNull(request.getLoreContext());
|
assertNull(request.loreContext());
|
||||||
assertNull(request.getPageContext());
|
assertNull(request.pageContext());
|
||||||
assertNull(request.getCampaignContext());
|
assertNull(request.campaignContext());
|
||||||
assertNull(request.getNarrativeEntity());
|
assertNull(request.narrativeEntity());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,41 +9,38 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests unitaires pour GenerationContext (Value Object pour la generation one-shot).
|
* Tests unitaires pour GenerationContext (Value Object pour la generation one-shot).
|
||||||
* Verifie la construction via builder et l'egalite structurelle.
|
* Verifie la construction et l'egalite structurelle (record).
|
||||||
*/
|
*/
|
||||||
class GenerationContextTest {
|
class GenerationContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_preservesAllFields() {
|
void constructor_preservesAllFields() {
|
||||||
GenerationContext ctx = GenerationContext.builder()
|
GenerationContext ctx = new GenerationContext(
|
||||||
.loreName("Ithoril")
|
"Ithoril",
|
||||||
.loreDescription("Royaume sombre")
|
"Royaume sombre",
|
||||||
.folderName("PNJ")
|
"PNJ",
|
||||||
.templateName("Fiche PNJ")
|
"Fiche PNJ",
|
||||||
.templateFields(List.of("histoire", "motto", "apparence"))
|
List.of("histoire", "motto", "apparence"),
|
||||||
.pageTitle("Thorin")
|
"Thorin");
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("Ithoril", ctx.getLoreName());
|
assertEquals("Ithoril", ctx.loreName());
|
||||||
assertEquals("PNJ", ctx.getFolderName());
|
assertEquals("PNJ", ctx.folderName());
|
||||||
assertEquals("Fiche PNJ", ctx.getTemplateName());
|
assertEquals("Fiche PNJ", ctx.templateName());
|
||||||
assertEquals(3, ctx.getTemplateFields().size());
|
assertEquals(3, ctx.templateFields().size());
|
||||||
assertEquals("Thorin", ctx.getPageTitle());
|
assertEquals("Thorin", ctx.pageTitle());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoContexts_withSameFields_areEqual() {
|
void twoContexts_withSameFields_areEqual() {
|
||||||
GenerationContext a = GenerationContext.builder()
|
GenerationContext a = new GenerationContext("X", null, null, null, List.of("f1"), "A");
|
||||||
.loreName("X").pageTitle("A").templateFields(List.of("f1")).build();
|
GenerationContext b = new GenerationContext("X", null, null, null, List.of("f1"), "A");
|
||||||
GenerationContext b = GenerationContext.builder()
|
|
||||||
.loreName("X").pageTitle("A").templateFields(List.of("f1")).build();
|
|
||||||
assertEquals(a, b);
|
assertEquals(a, b);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoContexts_differingOnPageTitle_areNotEqual() {
|
void twoContexts_differingOnPageTitle_areNotEqual() {
|
||||||
GenerationContext a = GenerationContext.builder().pageTitle("A").build();
|
GenerationContext a = new GenerationContext(null, null, null, null, null, "A");
|
||||||
GenerationContext b = GenerationContext.builder().pageTitle("B").build();
|
GenerationContext b = new GenerationContext(null, null, null, null, null, "B");
|
||||||
assertNotEquals(a, b);
|
assertNotEquals(a, b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,66 +12,61 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Tests unitaires pour LoreStructuralContext et son type imbrique PageSummary.
|
* Tests unitaires pour LoreStructuralContext et son type imbrique PageSummary.
|
||||||
* Valide le @Singular de Lombok sur {@code tags} (alimentation incrementale via
|
* Records purs : aucune dependance technique.
|
||||||
* {@code tag(...)} vs initialisation groupee via {@code tags(...)}).
|
|
||||||
*/
|
*/
|
||||||
class LoreStructuralContextTest {
|
class LoreStructuralContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_preservesFoldersAndTags() {
|
void constructor_preservesFoldersAndTags() {
|
||||||
PageSummary pnj = PageSummary.builder()
|
PageSummary pnj = new PageSummary(
|
||||||
.title("Thorin")
|
"Thorin",
|
||||||
.templateName("PNJ")
|
"PNJ",
|
||||||
.values(Map.of("histoire", "Nee sous une etoile rouge"))
|
Map.of("histoire", "Nee sous une etoile rouge"),
|
||||||
.tags(List.of("pnj", "allie"))
|
List.of("pnj", "allie"),
|
||||||
.relatedPageTitles(List.of("Taverne du Dragon d'Or"))
|
List.of("Taverne du Dragon d'Or"));
|
||||||
.build();
|
|
||||||
|
|
||||||
LoreStructuralContext ctx = LoreStructuralContext.builder()
|
LoreStructuralContext ctx = new LoreStructuralContext(
|
||||||
.loreName("Ithoril")
|
"Ithoril",
|
||||||
.loreDescription("Royaume sombre")
|
"Royaume sombre",
|
||||||
.folders(Map.of("PNJ", List.of(pnj)))
|
Map.of("PNJ", List.of(pnj)),
|
||||||
.tag("royaume")
|
List.of("royaume", "dark-fantasy"));
|
||||||
.tag("dark-fantasy")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("Ithoril", ctx.getLoreName());
|
assertEquals("Ithoril", ctx.loreName());
|
||||||
assertEquals(1, ctx.getFolders().size());
|
assertEquals(1, ctx.folders().size());
|
||||||
assertEquals(1, ctx.getFolders().get("PNJ").size());
|
assertEquals(1, ctx.folders().get("PNJ").size());
|
||||||
assertEquals(2, ctx.getTags().size(), "@Singular doit accumuler les appels tag()");
|
assertEquals(2, ctx.tags().size());
|
||||||
assertTrue(ctx.getTags().contains("royaume"));
|
assertTrue(ctx.tags().contains("royaume"));
|
||||||
assertTrue(ctx.getTags().contains("dark-fantasy"));
|
assertTrue(ctx.tags().contains("dark-fantasy"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void emptyFolders_areAllowed() {
|
void emptyFolders_areAllowed() {
|
||||||
// Dossier vide : legitime (ex: dossier "Lieux" cree mais pas encore peuple).
|
// Dossier vide : legitime (ex: dossier "Lieux" cree mais pas encore peuple).
|
||||||
LoreStructuralContext ctx = LoreStructuralContext.builder()
|
LoreStructuralContext ctx = new LoreStructuralContext(
|
||||||
.loreName("Vide")
|
"Vide",
|
||||||
.loreDescription("")
|
"",
|
||||||
.folders(Map.of("Lieux", List.of()))
|
Map.of("Lieux", List.of()),
|
||||||
.build();
|
List.of());
|
||||||
|
|
||||||
assertNotNull(ctx.getFolders().get("Lieux"));
|
assertNotNull(ctx.folders().get("Lieux"));
|
||||||
assertTrue(ctx.getFolders().get("Lieux").isEmpty());
|
assertTrue(ctx.folders().get("Lieux").isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- PageSummary --------------------------------------------------------
|
// --- PageSummary --------------------------------------------------------
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void pageSummary_preservesAllFields() {
|
void pageSummary_preservesAllFields() {
|
||||||
PageSummary ps = PageSummary.builder()
|
PageSummary ps = new PageSummary(
|
||||||
.title("Le Donjon du Chaos")
|
"Le Donjon du Chaos",
|
||||||
.templateName("Lieu")
|
"Lieu",
|
||||||
.values(Map.of("histoire", "Bati il y a 1000 ans..."))
|
Map.of("histoire", "Bati il y a 1000 ans..."),
|
||||||
.tags(List.of("donjon", "ancien"))
|
List.of("donjon", "ancien"),
|
||||||
.relatedPageTitles(List.of("Thorin", "Garde royale"))
|
List.of("Thorin", "Garde royale"));
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("Le Donjon du Chaos", ps.getTitle());
|
assertEquals("Le Donjon du Chaos", ps.title());
|
||||||
assertEquals("Lieu", ps.getTemplateName());
|
assertEquals("Lieu", ps.templateName());
|
||||||
assertEquals(1, ps.getValues().size());
|
assertEquals(1, ps.values().size());
|
||||||
assertEquals(2, ps.getTags().size());
|
assertEquals(2, ps.tags().size());
|
||||||
assertEquals(2, ps.getRelatedPageTitles().size());
|
assertEquals(2, ps.relatedPageTitles().size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,21 +16,17 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
|||||||
class NarrativeEntityContextTest {
|
class NarrativeEntityContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_preservesAllFields() {
|
void constructor_preservesAllFields() {
|
||||||
Map<String, String> fields = new LinkedHashMap<>();
|
Map<String, String> fields = new LinkedHashMap<>();
|
||||||
fields.put("themes", "trahison");
|
fields.put("themes", "trahison");
|
||||||
fields.put("stakes", "la survie du royaume");
|
fields.put("stakes", "la survie du royaume");
|
||||||
|
|
||||||
NarrativeEntityContext ctx = NarrativeEntityContext.builder()
|
NarrativeEntityContext ctx = new NarrativeEntityContext("arc", "Acte I", fields);
|
||||||
.entityType("arc")
|
|
||||||
.title("Acte I")
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("arc", ctx.getEntityType());
|
assertEquals("arc", ctx.entityType());
|
||||||
assertEquals("Acte I", ctx.getTitle());
|
assertEquals("Acte I", ctx.title());
|
||||||
assertEquals(2, ctx.getFields().size());
|
assertEquals(2, ctx.fields().size());
|
||||||
assertEquals("trahison", ctx.getFields().get("themes"));
|
assertEquals("trahison", ctx.fields().get("themes"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -41,19 +37,15 @@ class NarrativeEntityContextTest {
|
|||||||
fields.put("timing", "Soir");
|
fields.put("timing", "Soir");
|
||||||
fields.put("atmosphere", "fumee");
|
fields.put("atmosphere", "fumee");
|
||||||
|
|
||||||
NarrativeEntityContext ctx = NarrativeEntityContext.builder()
|
NarrativeEntityContext ctx = new NarrativeEntityContext("scene", "L'auberge", fields);
|
||||||
.entityType("scene")
|
|
||||||
.title("L'auberge")
|
|
||||||
.fields(fields)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("[location, timing, atmosphere]", ctx.getFields().keySet().toString());
|
assertEquals("[location, timing, atmosphere]", ctx.fields().keySet().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void twoContexts_differingOnEntityType_areNotEqual() {
|
void twoContexts_differingOnEntityType_areNotEqual() {
|
||||||
NarrativeEntityContext a = NarrativeEntityContext.builder().entityType("arc").title("X").build();
|
NarrativeEntityContext a = new NarrativeEntityContext("arc", "X", Map.of());
|
||||||
NarrativeEntityContext b = NarrativeEntityContext.builder().entityType("scene").title("X").build();
|
NarrativeEntityContext b = new NarrativeEntityContext("scene", "X", Map.of());
|
||||||
assertNotEquals(a, b);
|
assertNotEquals(a, b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,31 +14,29 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
|||||||
class PageContextTest {
|
class PageContextTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void builder_preservesAllFields() {
|
void constructor_preservesAllFields() {
|
||||||
PageContext ctx = PageContext.builder()
|
PageContext ctx = new PageContext(
|
||||||
.title("Thorin")
|
"Thorin",
|
||||||
.templateName("PNJ")
|
"PNJ",
|
||||||
.templateFields(List.of("histoire", "apparence", "motto"))
|
List.of("histoire", "apparence", "motto"),
|
||||||
.values(Map.of("histoire", "Nee sous une etoile rouge"))
|
Map.of("histoire", "Nee sous une etoile rouge"));
|
||||||
.build();
|
|
||||||
|
|
||||||
assertEquals("Thorin", ctx.getTitle());
|
assertEquals("Thorin", ctx.title());
|
||||||
assertEquals("PNJ", ctx.getTemplateName());
|
assertEquals("PNJ", ctx.templateName());
|
||||||
assertEquals(3, ctx.getTemplateFields().size());
|
assertEquals(3, ctx.templateFields().size());
|
||||||
assertEquals(1, ctx.getValues().size());
|
assertEquals(1, ctx.values().size());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void emptyValues_areAllowed() {
|
void emptyValues_areAllowed() {
|
||||||
// Page vierge : template defini mais aucun champ rempli (cas generation ex-nihilo).
|
// Page vierge : template defini mais aucun champ rempli (cas generation ex-nihilo).
|
||||||
PageContext ctx = PageContext.builder()
|
PageContext ctx = new PageContext(
|
||||||
.title("Nouveau PNJ")
|
"Nouveau PNJ",
|
||||||
.templateName("PNJ")
|
"PNJ",
|
||||||
.templateFields(List.of("histoire", "apparence"))
|
List.of("histoire", "apparence"),
|
||||||
.values(Map.of())
|
Map.of());
|
||||||
.build();
|
|
||||||
|
|
||||||
assertTrue(ctx.getValues().isEmpty());
|
assertTrue(ctx.values().isEmpty());
|
||||||
assertEquals(2, ctx.getTemplateFields().size());
|
assertEquals(2, ctx.templateFields().size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,12 +83,8 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_loreContext_includesBasicFields() {
|
void build_loreContext_includesBasicFields() {
|
||||||
LoreStructuralContext lore = LoreStructuralContext.builder()
|
LoreStructuralContext lore = new LoreStructuralContext(
|
||||||
.loreName("Ithoril")
|
"Ithoril", "Royaume sombre", Map.of(), List.of("dark-fantasy"));
|
||||||
.loreDescription("Royaume sombre")
|
|
||||||
.folders(Map.of())
|
|
||||||
.tag("dark-fantasy")
|
|
||||||
.build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -103,17 +99,10 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_pageSummary_omitsEmptyValuesTagsAndRelated() {
|
void build_pageSummary_omitsEmptyValuesTagsAndRelated() {
|
||||||
PageSummary minimal = PageSummary.builder()
|
PageSummary minimal = new PageSummary("Thorin", "PNJ",
|
||||||
.title("Thorin")
|
Map.of(), List.of(), List.of());
|
||||||
.templateName("PNJ")
|
LoreStructuralContext lore = new LoreStructuralContext(
|
||||||
.values(Map.of())
|
"X", "", Map.of("PNJ", List.of(minimal)), List.of());
|
||||||
.tags(List.of())
|
|
||||||
.relatedPageTitles(List.of())
|
|
||||||
.build();
|
|
||||||
LoreStructuralContext lore = LoreStructuralContext.builder()
|
|
||||||
.loreName("X").loreDescription("")
|
|
||||||
.folders(Map.of("PNJ", List.of(minimal)))
|
|
||||||
.build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -132,17 +121,12 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_pageSummary_includesNonEmptyValuesTagsAndRelated() {
|
void build_pageSummary_includesNonEmptyValuesTagsAndRelated() {
|
||||||
PageSummary full = PageSummary.builder()
|
PageSummary full = new PageSummary("Thorin", "PNJ",
|
||||||
.title("Thorin")
|
Map.of("histoire", "Nee sous une etoile rouge"),
|
||||||
.templateName("PNJ")
|
List.of("pnj", "allie"),
|
||||||
.values(Map.of("histoire", "Nee sous une etoile rouge"))
|
List.of("Taverne du Dragon d'Or"));
|
||||||
.tags(List.of("pnj", "allie"))
|
LoreStructuralContext lore = new LoreStructuralContext(
|
||||||
.relatedPageTitles(List.of("Taverne du Dragon d'Or"))
|
"X", "", Map.of("PNJ", List.of(full)), List.of());
|
||||||
.build();
|
|
||||||
LoreStructuralContext lore = LoreStructuralContext.builder()
|
|
||||||
.loreName("X").loreDescription("")
|
|
||||||
.folders(Map.of("PNJ", List.of(full)))
|
|
||||||
.build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -161,12 +145,8 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_pageContext_includesAllFields() {
|
void build_pageContext_includesAllFields() {
|
||||||
PageContext pc = PageContext.builder()
|
PageContext pc = new PageContext("Thorin", "PNJ",
|
||||||
.title("Thorin")
|
List.of("histoire", "motto"), Map.of("histoire", "..."));
|
||||||
.templateName("PNJ")
|
|
||||||
.templateFields(List.of("histoire", "motto"))
|
|
||||||
.values(Map.of("histoire", "..."))
|
|
||||||
.build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).pageContext(pc).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).pageContext(pc).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -182,17 +162,12 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_campaignContext_serializesFullNarrativeTree() {
|
void build_campaignContext_serializesFullNarrativeTree() {
|
||||||
BranchHint branch = BranchHint.builder()
|
BranchHint branch = new BranchHint("fuite", "La poursuite", "HP < 50%");
|
||||||
.label("fuite").targetSceneName("La poursuite").condition("HP < 50%").build();
|
SceneSummary scene = new SceneSummary("L'auberge", "Rencontre tendue", 3, List.of(branch));
|
||||||
SceneSummary scene = SceneSummary.builder()
|
ChapterSummary chapter = new ChapterSummary("L'arrivee", "...", 0, List.of(scene));
|
||||||
.name("L'auberge").description("Rencontre tendue")
|
ArcSummary arc = new ArcSummary("Acte I", "Mise en place", 1, List.of(chapter));
|
||||||
.illustrationCount(3).branch(branch).build();
|
CampaignStructuralContext camp = new CampaignStructuralContext(
|
||||||
ChapterSummary chapter = ChapterSummary.builder()
|
"Les Ombres", "dark fantasy", List.of(arc), List.of());
|
||||||
.name("L'arrivee").description("...").scene(scene).build();
|
|
||||||
ArcSummary arc = ArcSummary.builder()
|
|
||||||
.name("Acte I").description("Mise en place").illustrationCount(1).chapter(chapter).build();
|
|
||||||
CampaignStructuralContext camp = CampaignStructuralContext.builder()
|
|
||||||
.campaignName("Les Ombres").campaignDescription("dark fantasy").arc(arc).build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -223,9 +198,9 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_arcSummary_omitsIllustrationCount_whenZero() {
|
void build_arcSummary_omitsIllustrationCount_whenZero() {
|
||||||
ArcSummary arc = ArcSummary.builder().name("A").description("").illustrationCount(0).build();
|
ArcSummary arc = new ArcSummary("A", "", 0, List.of());
|
||||||
CampaignStructuralContext camp = CampaignStructuralContext.builder()
|
CampaignStructuralContext camp = new CampaignStructuralContext(
|
||||||
.campaignName("X").campaignDescription("").arc(arc).build();
|
"X", "", List.of(arc), List.of());
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -238,11 +213,11 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_sceneSummary_omitsBranches_whenEmpty() {
|
void build_sceneSummary_omitsBranches_whenEmpty() {
|
||||||
SceneSummary scene = SceneSummary.builder().name("S").description("").build();
|
SceneSummary scene = new SceneSummary("S", "", 0, List.of());
|
||||||
ChapterSummary chapter = ChapterSummary.builder().name("Ch").description("").scene(scene).build();
|
ChapterSummary chapter = new ChapterSummary("Ch", "", 0, List.of(scene));
|
||||||
ArcSummary arc = ArcSummary.builder().name("A").description("").chapter(chapter).build();
|
ArcSummary arc = new ArcSummary("A", "", 0, List.of(chapter));
|
||||||
CampaignStructuralContext camp = CampaignStructuralContext.builder()
|
CampaignStructuralContext camp = new CampaignStructuralContext(
|
||||||
.campaignName("X").campaignDescription("").arc(arc).build();
|
"X", "", List.of(arc), List.of());
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -256,12 +231,12 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_branchHint_omitsCondition_whenBlank() {
|
void build_branchHint_omitsCondition_whenBlank() {
|
||||||
BranchHint branch = BranchHint.builder().label("X").targetSceneName("Y").condition(" ").build();
|
BranchHint branch = new BranchHint("X", "Y", " ");
|
||||||
SceneSummary scene = SceneSummary.builder().name("S").description("").branch(branch).build();
|
SceneSummary scene = new SceneSummary("S", "", 0, List.of(branch));
|
||||||
ChapterSummary chapter = ChapterSummary.builder().name("Ch").description("").scene(scene).build();
|
ChapterSummary chapter = new ChapterSummary("Ch", "", 0, List.of(scene));
|
||||||
ArcSummary arc = ArcSummary.builder().name("A").description("").chapter(chapter).build();
|
ArcSummary arc = new ArcSummary("A", "", 0, List.of(chapter));
|
||||||
CampaignStructuralContext camp = CampaignStructuralContext.builder()
|
CampaignStructuralContext camp = new CampaignStructuralContext(
|
||||||
.campaignName("X").campaignDescription("").arc(arc).build();
|
"X", "", List.of(arc), List.of());
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -278,10 +253,8 @@ class BrainChatPayloadBuilderTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void build_narrativeEntity_includesAllFields() {
|
void build_narrativeEntity_includesAllFields() {
|
||||||
NarrativeEntityContext entity = NarrativeEntityContext.builder()
|
NarrativeEntityContext entity = new NarrativeEntityContext("scene", "L'auberge",
|
||||||
.entityType("scene").title("L'auberge")
|
Map.of("location", "Taverne", "timing", "Soir"));
|
||||||
.fields(Map.of("location", "Taverne", "timing", "Soir"))
|
|
||||||
.build();
|
|
||||||
ChatRequest req = ChatRequest.builder().messages(sampleMessages).narrativeEntity(entity).build();
|
ChatRequest req = ChatRequest.builder().messages(sampleMessages).narrativeEntity(entity).build();
|
||||||
|
|
||||||
Map<String, Object> payload = builder.build(req);
|
Map<String, Object> payload = builder.build(req);
|
||||||
@@ -295,10 +268,9 @@ class BrainChatPayloadBuilderTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void build_campaignScenario_includesBothContextsAndEntity() {
|
void build_campaignScenario_includesBothContextsAndEntity() {
|
||||||
CampaignStructuralContext camp = CampaignStructuralContext.builder()
|
CampaignStructuralContext camp = new CampaignStructuralContext(
|
||||||
.campaignName("X").campaignDescription("").build();
|
"X", "", List.of(), List.of());
|
||||||
NarrativeEntityContext entity = NarrativeEntityContext.builder()
|
NarrativeEntityContext entity = new NarrativeEntityContext("arc", "T", Map.of());
|
||||||
.entityType("arc").title("T").fields(Map.of()).build();
|
|
||||||
ChatRequest req = ChatRequest.builder()
|
ChatRequest req = ChatRequest.builder()
|
||||||
.messages(sampleMessages)
|
.messages(sampleMessages)
|
||||||
.campaignContext(camp)
|
.campaignContext(camp)
|
||||||
|
|||||||
@@ -48,27 +48,21 @@ class SceneBranchListJsonConverterTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void roundTrip_preservesAllBranchFields() {
|
void roundTrip_preservesAllBranchFields() {
|
||||||
// Test critique : depend de @Jacksonized sur SceneBranch.
|
// Test critique : Jackson doit reconstruire SceneBranch (record) via
|
||||||
|
// son constructeur canonique sans aucune annotation.
|
||||||
List<SceneBranch> source = List.of(
|
List<SceneBranch> source = List.of(
|
||||||
SceneBranch.builder()
|
new SceneBranch("si les joueurs attaquent", "sc-combat", "initiative > 15"),
|
||||||
.label("si les joueurs attaquent")
|
SceneBranch.of("si les joueurs fuient", "sc-poursuite")
|
||||||
.targetSceneId("sc-combat")
|
|
||||||
.condition("initiative > 15")
|
|
||||||
.build(),
|
|
||||||
SceneBranch.builder()
|
|
||||||
.label("si les joueurs fuient")
|
|
||||||
.targetSceneId("sc-poursuite")
|
|
||||||
.build()
|
|
||||||
);
|
);
|
||||||
|
|
||||||
String json = converter.convertToDatabaseColumn(source);
|
String json = converter.convertToDatabaseColumn(source);
|
||||||
List<SceneBranch> back = converter.convertToEntityAttribute(json);
|
List<SceneBranch> back = converter.convertToEntityAttribute(json);
|
||||||
|
|
||||||
assertEquals(2, back.size());
|
assertEquals(2, back.size());
|
||||||
assertEquals("si les joueurs attaquent", back.get(0).getLabel());
|
assertEquals("si les joueurs attaquent", back.get(0).label());
|
||||||
assertEquals("sc-combat", back.get(0).getTargetSceneId());
|
assertEquals("sc-combat", back.get(0).targetSceneId());
|
||||||
assertEquals("initiative > 15", back.get(0).getCondition());
|
assertEquals("initiative > 15", back.get(0).condition());
|
||||||
assertEquals("sc-poursuite", back.get(1).getTargetSceneId());
|
assertEquals("sc-poursuite", back.get(1).targetSceneId());
|
||||||
assertNull(back.get(1).getCondition(), "condition absente doit rester null apres round-trip");
|
assertNull(back.get(1).condition(), "condition absente doit rester null apres round-trip");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,13 +70,13 @@ class PostgresSceneRepositoryTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void save_scenePreservesBranches_viaJsonbRoundTrip() {
|
void save_scenePreservesBranches_viaJsonbRoundTrip() {
|
||||||
// Le critique : le @Jacksonized de SceneBranch doit permettre la
|
// Le critique : SceneBranch (record) doit etre reconstructible par
|
||||||
// reconstruction via builder apres serialisation Jackson.
|
// Jackson via le constructeur canonique apres serialisation JSON.
|
||||||
Scene scene = Scene.builder()
|
Scene scene = Scene.builder()
|
||||||
.chapterId(chapterId).name("Decision").order(0)
|
.chapterId(chapterId).name("Decision").order(0)
|
||||||
.branches(List.of(
|
.branches(List.of(
|
||||||
SceneBranch.builder().label("fuite").targetSceneId("sc-2").condition("HP bas").build(),
|
new SceneBranch("fuite", "sc-2", "HP bas"),
|
||||||
SceneBranch.builder().label("combat").targetSceneId("sc-3").build()
|
SceneBranch.of("combat", "sc-3")
|
||||||
))
|
))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
@@ -84,10 +84,10 @@ class PostgresSceneRepositoryTest {
|
|||||||
Scene r = repository.findById(saved.getId()).orElseThrow();
|
Scene r = repository.findById(saved.getId()).orElseThrow();
|
||||||
|
|
||||||
assertEquals(2, r.getBranches().size());
|
assertEquals(2, r.getBranches().size());
|
||||||
assertEquals("fuite", r.getBranches().get(0).getLabel());
|
assertEquals("fuite", r.getBranches().get(0).label());
|
||||||
assertEquals("sc-2", r.getBranches().get(0).getTargetSceneId());
|
assertEquals("sc-2", r.getBranches().get(0).targetSceneId());
|
||||||
assertEquals("HP bas", r.getBranches().get(0).getCondition());
|
assertEquals("HP bas", r.getBranches().get(0).condition());
|
||||||
assertEquals("combat", r.getBranches().get(1).getLabel());
|
assertEquals("combat", r.getBranches().get(1).label());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ services:
|
|||||||
core:
|
core:
|
||||||
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/core:${TAG:-latest}
|
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/core:${TAG:-latest}
|
||||||
container_name: loremind-core
|
container_name: loremind-core
|
||||||
|
labels:
|
||||||
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -79,14 +81,50 @@ services:
|
|||||||
MINIO_ENDPOINT: http://minio:9000
|
MINIO_ENDPOINT: http://minio:9000
|
||||||
MINIO_ACCESS_KEY: ${MINIO_USER:-minioadmin}
|
MINIO_ACCESS_KEY: ${MINIO_USER:-minioadmin}
|
||||||
MINIO_SECRET_KEY: ${MINIO_PASSWORD:-minioadmin}
|
MINIO_SECRET_KEY: ${MINIO_PASSWORD:-minioadmin}
|
||||||
|
# Detection des mises a jour : interroge le registry et delegue le pull/restart
|
||||||
|
# a Watchtower. Si WATCHTOWER_TOKEN est vide, la feature est desactivee
|
||||||
|
# (l'UI masque le badge et le bouton).
|
||||||
|
UPDATE_CHECK_REGISTRY: ${REGISTRY:-git.igmlcreation.fr}
|
||||||
|
UPDATE_CHECK_IMAGES: ietm64/core,ietm64/brain,ietm64/web
|
||||||
|
UPDATE_CHECK_TAG: ${TAG:-latest}
|
||||||
|
WATCHTOWER_URL: http://watchtower:8080
|
||||||
|
WATCHTOWER_TOKEN: ${WATCHTOWER_TOKEN:-}
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# Ollama embarque (option par defaut pour les utilisateurs sans Ollama installe).
|
||||||
|
# Active via COMPOSE_PROFILES=local-ollama (gere par l'installeur).
|
||||||
|
# Si l'utilisateur a deja Ollama sur l'hote, ce service reste inactif et
|
||||||
|
# OLLAMA_BASE_URL pointe vers http://host.docker.internal:11434.
|
||||||
|
ollama:
|
||||||
|
image: ollama/ollama:latest
|
||||||
|
container_name: loremind-ollama
|
||||||
|
profiles: ["local-ollama"]
|
||||||
|
volumes:
|
||||||
|
- ollama-data:/root/.ollama
|
||||||
|
# Port expose sur loopback uniquement pour debug / pull manuel de modeles.
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:11434:11434"
|
||||||
|
# GPU NVIDIA si disponible (silencieusement ignore sinon).
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
reservations:
|
||||||
|
devices:
|
||||||
|
- driver: nvidia
|
||||||
|
count: all
|
||||||
|
capabilities: [gpu]
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
brain:
|
brain:
|
||||||
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/brain:${TAG:-latest}
|
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/brain:${TAG:-latest}
|
||||||
container_name: loremind-brain
|
container_name: loremind-brain
|
||||||
|
labels:
|
||||||
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
environment:
|
environment:
|
||||||
LLM_PROVIDER: ${LLM_PROVIDER:-ollama}
|
LLM_PROVIDER: ${LLM_PROVIDER:-ollama}
|
||||||
OLLAMA_BASE_URL: ${OLLAMA_BASE_URL:-http://host.docker.internal:11434}
|
# Defaut = Ollama embarque (service ollama du compose).
|
||||||
|
# L'installeur reecrit cette valeur en http://host.docker.internal:11434
|
||||||
|
# si l'utilisateur choisit le mode "Ollama deja installe sur l'hote".
|
||||||
|
OLLAMA_BASE_URL: ${OLLAMA_BASE_URL:-http://ollama:11434}
|
||||||
LLM_MODEL: ${LLM_MODEL:-gemma4:26b}
|
LLM_MODEL: ${LLM_MODEL:-gemma4:26b}
|
||||||
ONEMIN_API_KEY: ${ONEMIN_API_KEY:-}
|
ONEMIN_API_KEY: ${ONEMIN_API_KEY:-}
|
||||||
ONEMIN_MODEL: ${ONEMIN_MODEL:-gpt-4o-mini}
|
ONEMIN_MODEL: ${ONEMIN_MODEL:-gpt-4o-mini}
|
||||||
@@ -102,6 +140,8 @@ services:
|
|||||||
web:
|
web:
|
||||||
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/web:${TAG:-latest}
|
image: ${REGISTRY:-git.igmlcreation.fr}/ietm64/web:${TAG:-latest}
|
||||||
container_name: loremind-web
|
container_name: loremind-web
|
||||||
|
labels:
|
||||||
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
depends_on:
|
depends_on:
|
||||||
- core
|
- core
|
||||||
- brain
|
- brain
|
||||||
@@ -109,7 +149,40 @@ services:
|
|||||||
- "${WEB_PORT:-8081}:80"
|
- "${WEB_PORT:-8081}:80"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
# Mises a jour automatiques des images core/brain/web.
|
||||||
|
# Active uniquement si COMPOSE_PROFILES=autoupdate (gere par l'installeur).
|
||||||
|
# Postgres et MinIO sont volontairement exclus (donnees persistantes,
|
||||||
|
# compatibilite de version a verifier manuellement).
|
||||||
|
watchtower:
|
||||||
|
# Fork maintenu de containrrr/watchtower (l'original est abandonne depuis
|
||||||
|
# ~2023 et son client Docker API est trop vieux pour les versions recentes
|
||||||
|
# de Docker Desktop -- erreur "client version 1.25 is too old").
|
||||||
|
# nickfedor/watchtower est un drop-in : memes variables d'environnement,
|
||||||
|
# meme API HTTP, juste l'image change.
|
||||||
|
image: nickfedor/watchtower:latest
|
||||||
|
container_name: loremind-watchtower
|
||||||
|
profiles: ["autoupdate"]
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
environment:
|
||||||
|
WATCHTOWER_LABEL_ENABLE: "true"
|
||||||
|
WATCHTOWER_CLEANUP: "true"
|
||||||
|
WATCHTOWER_INCLUDE_RESTARTING: "true"
|
||||||
|
# MONITOR_ONLY=true => detecte sans appliquer (l'UI declenche manuellement).
|
||||||
|
# MONITOR_ONLY=false => applique automatiquement selon WATCHTOWER_SCHEDULE.
|
||||||
|
WATCHTOWER_MONITOR_ONLY: "${WATCHTOWER_MONITOR_ONLY:-false}"
|
||||||
|
WATCHTOWER_SCHEDULE: "${WATCHTOWER_SCHEDULE:-0 0 4 * * *}"
|
||||||
|
# API HTTP pour declenchement manuel via le bouton UI (Core -> Watchtower).
|
||||||
|
WATCHTOWER_HTTP_API_UPDATE: "true"
|
||||||
|
WATCHTOWER_HTTP_API_PERIODIC_POLLS: "true"
|
||||||
|
WATCHTOWER_HTTP_API_TOKEN: "${WATCHTOWER_TOKEN:?set WATCHTOWER_TOKEN in .env (re-run installer)}"
|
||||||
|
WATCHTOWER_TIMEOUT: 60s
|
||||||
|
WATCHTOWER_NOTIFICATIONS_LEVEL: info
|
||||||
|
TZ: ${TZ:-Europe/Paris}
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres-data:
|
postgres-data:
|
||||||
minio-data:
|
minio-data:
|
||||||
brain-data:
|
brain-data:
|
||||||
|
ollama-data:
|
||||||
|
|||||||
207
installers/README.md
Normal file
207
installers/README.md
Normal file
@@ -0,0 +1,207 @@
|
|||||||
|
# LoreMindMJ — Installation rapide
|
||||||
|
|
||||||
|
Ces scripts installent Docker (si nécessaire), génèrent un `.env` sécurisé
|
||||||
|
et lancent la stack. Aucune configuration manuelle requise.
|
||||||
|
|
||||||
|
## Windows 10 / 11
|
||||||
|
|
||||||
|
**Procédure recommandée :**
|
||||||
|
|
||||||
|
1. Téléchargez les trois fichiers suivants dans un même dossier
|
||||||
|
(par ex. `Téléchargements\LoreMind\`) :
|
||||||
|
- [`install.bat`](install.bat) — lanceur
|
||||||
|
- [`install.ps1`](install.ps1) — script principal
|
||||||
|
- [`secure-host-ollama.ps1`](secure-host-ollama.ps1) — *uniquement si vous avez déjà Ollama sur votre PC*
|
||||||
|
2. **Clic-droit** sur `install.bat` → **Exécuter en tant qu'administrateur**.
|
||||||
|
3. Acceptez le prompt UAC.
|
||||||
|
|
||||||
|
Le script :
|
||||||
|
1. Vérifie / installe **WSL2** (un reboot peut être nécessaire — relancer le script après).
|
||||||
|
2. Vérifie / installe **Docker Desktop** via `winget`.
|
||||||
|
3. Vous demande quelques choix (admin, fournisseur LLM, mode Ollama, mises à jour auto).
|
||||||
|
4. Génère `%LOCALAPPDATA%\LoreMind\.env` avec mots de passe aléatoires.
|
||||||
|
5. Lance la stack et ouvre `http://localhost:8081`.
|
||||||
|
|
||||||
|
Le `install.bat` sert juste à lancer `install.ps1` proprement (avec UAC + ExecutionPolicy
|
||||||
|
adaptée à la session, sans modifier les paramètres système). Il est purement
|
||||||
|
déclaratif et auditable en quelques lignes.
|
||||||
|
|
||||||
|
## Linux (Debian / Ubuntu / Fedora / Arch)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -fsSL https://git.igmlcreation.fr/ietm64/loremind/raw/branch/main/installers/install.sh | bash
|
||||||
|
```
|
||||||
|
|
||||||
|
Le script :
|
||||||
|
1. Installe **Docker** via le script officiel `get.docker.com` si absent.
|
||||||
|
2. Ajoute l'utilisateur courant au groupe `docker` (relogin nécessaire la 1ʳᵉ fois).
|
||||||
|
3. Installe dans `~/.local/share/loremind`.
|
||||||
|
4. Lance la stack et ouvre `http://localhost:8081`.
|
||||||
|
|
||||||
|
## Mode Ollama (moteur LLM local)
|
||||||
|
|
||||||
|
Pendant l'installation, l'installeur pose deux questions successives pour
|
||||||
|
déterminer comment LoreMind utilisera Ollama :
|
||||||
|
|
||||||
|
### 1. *« Avez-vous déjà Ollama installé sur cette machine ? »*
|
||||||
|
|
||||||
|
#### Réponse : **Oui** → mode **hôte sécurisé**
|
||||||
|
|
||||||
|
L'installeur appelle automatiquement le helper `secure-host-ollama.{sh,ps1}`
|
||||||
|
qui configure votre Ollama existant pour qu'il soit joignable par le conteneur
|
||||||
|
Docker LoreMind **sans être exposé sur le réseau local ni Internet**.
|
||||||
|
|
||||||
|
- **Linux** : Ollama écoute sur l'IP de la passerelle Docker (`172.17.0.1`
|
||||||
|
par défaut). Cette IP n'est jamais routée hors de la machine. Override
|
||||||
|
systemd écrit dans `/etc/systemd/system/ollama.service.d/loremind-host.conf`.
|
||||||
|
- **Windows** : Ollama écoute sur `0.0.0.0` (techniquement nécessaire avec
|
||||||
|
Docker Desktop) mais le pare-feu Windows est configuré pour ne **laisser
|
||||||
|
passer que** le loopback et les sous-réseaux Docker Desktop. Règles
|
||||||
|
ajoutées préfixées `LoreMind-Ollama-*`.
|
||||||
|
|
||||||
|
L'URL configurée dans `.env` est `OLLAMA_BASE_URL=http://host.docker.internal:11434`.
|
||||||
|
|
||||||
|
#### Réponse : **Non** → l'installeur pose la question 2.
|
||||||
|
|
||||||
|
### 2. *« Voulez-vous installer Ollama via Docker maintenant ? »*
|
||||||
|
|
||||||
|
#### Réponse : **Oui (défaut)** → mode **embarqué**
|
||||||
|
|
||||||
|
Un service `ollama` est ajouté à la stack via le profile Docker `local-ollama`.
|
||||||
|
Ollama tourne dans un conteneur dédié, sur le réseau interne Docker, **jamais
|
||||||
|
exposé au LAN ni à Internet**. Les modèles sont stockés dans le volume
|
||||||
|
Docker `ollama-data` (persistants entre redémarrages et mises à jour).
|
||||||
|
|
||||||
|
- URL : `OLLAMA_BASE_URL=http://ollama:11434` (DNS interne Docker).
|
||||||
|
- Aucune configuration réseau ou pare-feu requise.
|
||||||
|
- Support GPU NVIDIA automatique si disponible.
|
||||||
|
|
||||||
|
Pour télécharger un modèle :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker exec -it loremind-ollama ollama pull gemma3:27b
|
||||||
|
docker exec -it loremind-ollama ollama list
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Réponse : **Non** → mode **différé**
|
||||||
|
|
||||||
|
Aucune configuration Ollama n'est appliquée. L'installeur termine sans
|
||||||
|
Ollama. Vous configurez Ollama plus tard via la page **Paramètres** de LoreMind
|
||||||
|
en y indiquant l'URL de votre serveur Ollama.
|
||||||
|
|
||||||
|
### Lancer le helper de sécurisation manuellement
|
||||||
|
|
||||||
|
Si vous avez choisi le mode différé puis installé Ollama plus tard sur votre
|
||||||
|
poste, ou si vous voulez basculer du mode embarqué vers le mode hôte :
|
||||||
|
|
||||||
|
**Linux :**
|
||||||
|
```bash
|
||||||
|
bash secure-host-ollama.sh
|
||||||
|
# Puis dans .env du dossier d'installation :
|
||||||
|
# OLLAMA_BASE_URL=http://host.docker.internal:11434
|
||||||
|
# Et : docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
**Windows (PowerShell admin) :**
|
||||||
|
```powershell
|
||||||
|
.\secure-host-ollama.ps1
|
||||||
|
# Puis editez .env (dans %LOCALAPPDATA%\LoreMind\) :
|
||||||
|
# OLLAMA_BASE_URL=http://host.docker.internal:11434
|
||||||
|
# Et : docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
Les helpers sont **réexécutables sans risque** : ils suppriment leurs
|
||||||
|
anciennes règles avant de les recréer. Utile par exemple si vous avez
|
||||||
|
réinitialisé Docker Desktop et que les sous-réseaux ont changé.
|
||||||
|
|
||||||
|
### Annuler la configuration de sécurisation
|
||||||
|
|
||||||
|
**Linux :**
|
||||||
|
```bash
|
||||||
|
sudo rm /etc/systemd/system/ollama.service.d/loremind-host.conf
|
||||||
|
sudo systemctl daemon-reload && sudo systemctl restart ollama
|
||||||
|
```
|
||||||
|
|
||||||
|
**Windows (PowerShell admin) :**
|
||||||
|
```powershell
|
||||||
|
Get-NetFirewallRule -DisplayName "LoreMind-Ollama-*" | Remove-NetFirewallRule
|
||||||
|
[Environment]::SetEnvironmentVariable("OLLAMA_HOST", $null, "User")
|
||||||
|
```
|
||||||
|
|
||||||
|
## Variables disponibles
|
||||||
|
|
||||||
|
| Variable | Défaut | Effet |
|
||||||
|
|-------------------|---------------------------------|----------------------------------------|
|
||||||
|
| `WEB_PORT` | `8081` | Port HTTP de l'UI |
|
||||||
|
| `INSTALL_DIR` | `~/.local/share/loremind` (Lin) | Dossier d'installation |
|
||||||
|
| `NON_INTERACTIVE` | `0` | `1` = aucune question, valeurs par défaut |
|
||||||
|
|
||||||
|
Exemple Linux non-interactif sur port 9000 :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
WEB_PORT=9000 NON_INTERACTIVE=1 bash install.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Mises à jour automatiques (Watchtower)
|
||||||
|
|
||||||
|
Si vous avez répondu **oui** à la question "Activer les mises à jour auto",
|
||||||
|
un container [Watchtower](https://containrrr.dev/watchtower/) est lancé en
|
||||||
|
parallèle. Il vérifie chaque nuit à 4h les nouvelles versions de
|
||||||
|
`core`, `brain` et `web` sur le registry, télécharge et redémarre les
|
||||||
|
conteneurs concernés. **Postgres et MinIO sont volontairement exclus**
|
||||||
|
(données persistantes — montée de version à valider manuellement).
|
||||||
|
|
||||||
|
### Activer / désactiver après coup
|
||||||
|
|
||||||
|
Éditer `.env` dans le dossier d'installation :
|
||||||
|
|
||||||
|
```env
|
||||||
|
COMPOSE_PROFILES=autoupdate # active
|
||||||
|
COMPOSE_PROFILES= # desactive
|
||||||
|
```
|
||||||
|
|
||||||
|
Puis :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d # applique le changement
|
||||||
|
docker compose stop watchtower # si on vient de le desactiver
|
||||||
|
```
|
||||||
|
|
||||||
|
### Changer l'horaire
|
||||||
|
|
||||||
|
`WATCHTOWER_SCHEDULE` dans `.env` accepte la syntaxe
|
||||||
|
[cron 6 champs](https://pkg.go.dev/github.com/robfig/cron) (sec min h jour mois j-sem).
|
||||||
|
Exemples : `0 0 4 * * *` (4h du matin, défaut), `0 30 3 * * 0` (dimanche 3h30).
|
||||||
|
|
||||||
|
### Mode "notification seulement" (sans auto-apply)
|
||||||
|
|
||||||
|
Si vous préférez être notifié *sans* que les conteneurs redémarrent
|
||||||
|
automatiquement la nuit, éditez `.env` :
|
||||||
|
|
||||||
|
```env
|
||||||
|
WATCHTOWER_MONITOR_ONLY=true
|
||||||
|
```
|
||||||
|
|
||||||
|
Puis `docker compose up -d watchtower`. Watchtower continuera à vérifier
|
||||||
|
le registry chaque nuit, le badge **MAJ** apparaîtra dans la sidebar de
|
||||||
|
l'UI, et un bouton **Mettre à jour maintenant** sera disponible dans
|
||||||
|
*Paramètres → Mises à jour*.
|
||||||
|
|
||||||
|
### Mise à jour manuelle (à tout moment)
|
||||||
|
|
||||||
|
Depuis l'interface : *Paramètres → Mises à jour → Mettre à jour maintenant*.
|
||||||
|
|
||||||
|
Ou en CLI :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose pull && docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
## Désinstallation
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd <dossier d'install>
|
||||||
|
docker compose down -v # -v supprime aussi les volumes (données effacées !)
|
||||||
|
```
|
||||||
|
|
||||||
|
Puis supprimer le dossier d'installation.
|
||||||
59
installers/install.bat
Normal file
59
installers/install.bat
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
@echo off
|
||||||
|
REM ============================================================================
|
||||||
|
REM LoreMindMJ - Lanceur Windows pour install.ps1
|
||||||
|
REM ----------------------------------------------------------------------------
|
||||||
|
REM Procedure :
|
||||||
|
REM 1. Clic-DROIT sur ce fichier (install.bat)
|
||||||
|
REM 2. Choisir "Executer en tant qu'administrateur"
|
||||||
|
REM 3. Accepter le prompt UAC
|
||||||
|
REM ============================================================================
|
||||||
|
|
||||||
|
setlocal
|
||||||
|
title LoreMindMJ - Installeur
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ============================================================
|
||||||
|
echo LoreMindMJ - Installeur Windows
|
||||||
|
echo ============================================================
|
||||||
|
echo.
|
||||||
|
|
||||||
|
REM --- Verification des droits administrateur --------------------------------
|
||||||
|
net session >nul 2>&1
|
||||||
|
if %errorlevel% NEQ 0 (
|
||||||
|
echo [ERREUR] Ce script doit etre execute en tant qu'administrateur.
|
||||||
|
echo.
|
||||||
|
echo Procedure :
|
||||||
|
echo 1. Fermez cette fenetre.
|
||||||
|
echo 2. Clic-DROIT sur install.bat ^> "Executer en tant qu'administrateur".
|
||||||
|
echo 3. Acceptez le prompt UAC.
|
||||||
|
echo.
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
|
REM --- Verification de la presence d'install.ps1 -----------------------------
|
||||||
|
if not exist "%~dp0install.ps1" (
|
||||||
|
echo [ERREUR] install.ps1 introuvable dans le meme dossier que ce .bat.
|
||||||
|
echo Dossier attendu : %~dp0
|
||||||
|
echo.
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
|
REM --- Lancement du script PowerShell ----------------------------------------
|
||||||
|
REM -ExecutionPolicy Bypass : uniquement pour cette session, ne modifie pas
|
||||||
|
REM les parametres systeme.
|
||||||
|
cd /d "%~dp0"
|
||||||
|
|
||||||
|
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "%~dp0install.ps1" %*
|
||||||
|
set "PS_EXIT=%errorlevel%"
|
||||||
|
|
||||||
|
echo.
|
||||||
|
if %PS_EXIT% EQU 0 (
|
||||||
|
echo Installation terminee avec succes.
|
||||||
|
) else (
|
||||||
|
echo [ATTENTION] Le script PowerShell s'est termine avec le code %PS_EXIT%.
|
||||||
|
)
|
||||||
|
echo.
|
||||||
|
pause
|
||||||
|
endlocal
|
||||||
441
installers/install.ps1
Normal file
441
installers/install.ps1
Normal file
@@ -0,0 +1,441 @@
|
|||||||
|
#Requires -Version 5.1
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Installeur officiel de LoreMindMJ pour Windows 10/11.
|
||||||
|
|
||||||
|
.DESCRIPTION
|
||||||
|
Script d'installation pas-a-pas qui :
|
||||||
|
- Verifie la presence de WSL2 et Docker Desktop ; les installe via winget si absents
|
||||||
|
- Telecharge le fichier docker-compose.yml officiel depuis le depot du projet
|
||||||
|
- Genere un fichier .env contenant des secrets aleatoires (RNG cryptographique)
|
||||||
|
- Configure le mode Ollama (embarque dans Docker ou Ollama deja installe sur l'hote)
|
||||||
|
- Demarre la stack Docker et ouvre l'application dans le navigateur
|
||||||
|
|
||||||
|
Aucune connexion sortante n'est etablie en dehors :
|
||||||
|
- du depot officiel du projet (fichier docker-compose.yml)
|
||||||
|
- du Docker Hub / registry Docker pour les images
|
||||||
|
|
||||||
|
Le code source de ce script est public et auditable a l'adresse indiquee dans .LINK.
|
||||||
|
|
||||||
|
.PARAMETER InstallDir
|
||||||
|
Dossier d'installation. Defaut : %LOCALAPPDATA%\LoreMind
|
||||||
|
|
||||||
|
.PARAMETER ComposeUrl
|
||||||
|
URL du fichier docker-compose.yml a recuperer. Defaut : version officielle du depot.
|
||||||
|
|
||||||
|
.PARAMETER WebPort
|
||||||
|
Port HTTP local sur lequel l'application sera exposee. Defaut : 8081.
|
||||||
|
|
||||||
|
.PARAMETER NonInteractive
|
||||||
|
Mode automatique pour CI / re-installation. Utilise les valeurs par defaut.
|
||||||
|
|
||||||
|
.EXAMPLE
|
||||||
|
Procedure recommandee :
|
||||||
|
1. Telechargez install.ps1 dans un dossier (clic droit -> Enregistrer la cible sous).
|
||||||
|
2. Ouvrez PowerShell en tant qu'administrateur (clic droit sur PowerShell).
|
||||||
|
3. Naviguez vers le dossier : cd C:\Chemin\Vers\Le\Dossier
|
||||||
|
4. Lancez : .\install.ps1
|
||||||
|
|
||||||
|
.NOTES
|
||||||
|
Auteur : ietm64
|
||||||
|
Licence : AGPL-3.0
|
||||||
|
Projet : LoreMindMJ - assistant pour Maitres de Jeu de JDR
|
||||||
|
Version : 0.6.9
|
||||||
|
|
||||||
|
.LINK
|
||||||
|
https://git.igmlcreation.fr/ietm64/loremind
|
||||||
|
#>
|
||||||
|
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[string]$InstallDir = "$env:LOCALAPPDATA\LoreMind",
|
||||||
|
[string]$ComposeUrl = "https://git.igmlcreation.fr/ietm64/loremind/raw/branch/main/docker-compose.yml",
|
||||||
|
[int]$WebPort = 8081,
|
||||||
|
[switch]$NonInteractive
|
||||||
|
)
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
function Write-Step($msg) { Write-Host "==> $msg" -ForegroundColor Cyan }
|
||||||
|
function Write-Ok($msg) { Write-Host " OK $msg" -ForegroundColor Green }
|
||||||
|
function Write-Warn2($msg) { Write-Host " !! $msg" -ForegroundColor Yellow }
|
||||||
|
function Write-Err($msg) { Write-Host " XX $msg" -ForegroundColor Red }
|
||||||
|
|
||||||
|
function Test-Admin {
|
||||||
|
# Verifie si la session courante a les droits administrateur Windows.
|
||||||
|
$current = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||||
|
return ([Security.Principal.WindowsPrincipal]$current).IsInRole(
|
||||||
|
[Security.Principal.WindowsBuiltInRole]::Administrator)
|
||||||
|
}
|
||||||
|
|
||||||
|
function New-RandomSecret([int]$Length = 32) {
|
||||||
|
# Genere un secret aleatoire imprimable (hex) via le RNG cryptographique
|
||||||
|
# de .NET. Utilise pour les mots de passe Postgres / MinIO / tokens internes
|
||||||
|
# afin que chaque installation ait des credentials uniques.
|
||||||
|
$bytes = New-Object byte[] $Length
|
||||||
|
[System.Security.Cryptography.RandomNumberGenerator]::Create().GetBytes($bytes)
|
||||||
|
return ([BitConverter]::ToString($bytes) -replace '-','').ToLower().Substring(0, $Length)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Test-Wsl2 {
|
||||||
|
try {
|
||||||
|
$out = wsl.exe --status 2>$null
|
||||||
|
return ($LASTEXITCODE -eq 0)
|
||||||
|
} catch { return $false }
|
||||||
|
}
|
||||||
|
|
||||||
|
function Test-Docker {
|
||||||
|
$cmd = Get-Command docker -ErrorAction SilentlyContinue
|
||||||
|
if (-not $cmd) { return $false }
|
||||||
|
docker info *>$null
|
||||||
|
return ($LASTEXITCODE -eq 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Wait-Docker([int]$TimeoutSec = 600) {
|
||||||
|
# Attend que Docker reponde. Tolere les erreurs "command not found" pendant
|
||||||
|
# les premieres iterations le temps que le PATH soit rafraichi.
|
||||||
|
Write-Step "Attente du demarrage de Docker Desktop (max ${TimeoutSec}s)..."
|
||||||
|
Write-Host " Si Docker Desktop affiche un contrat de licence, acceptez-le."
|
||||||
|
$deadline = (Get-Date).AddSeconds($TimeoutSec)
|
||||||
|
$reportedFound = $false
|
||||||
|
while ((Get-Date) -lt $deadline) {
|
||||||
|
if (Get-Command docker -ErrorAction SilentlyContinue) {
|
||||||
|
if (-not $reportedFound) {
|
||||||
|
Write-Ok "Commande 'docker' detectee, attente du daemon..."
|
||||||
|
$reportedFound = $true
|
||||||
|
}
|
||||||
|
docker info *>$null
|
||||||
|
if ($LASTEXITCODE -eq 0) { Write-Ok "Docker repond"; return $true }
|
||||||
|
}
|
||||||
|
Start-Sleep -Seconds 5
|
||||||
|
}
|
||||||
|
return $false
|
||||||
|
}
|
||||||
|
|
||||||
|
function Update-PathFromRegistry {
|
||||||
|
# winget install ne propage pas les modifs de PATH a la session courante.
|
||||||
|
# On relit la valeur PATH depuis le registre (Machine + User) et on
|
||||||
|
# l'applique a $env:PATH pour rendre 'docker.exe' immediatement utilisable.
|
||||||
|
$machinePath = [Environment]::GetEnvironmentVariable('Path','Machine')
|
||||||
|
$userPath = [Environment]::GetEnvironmentVariable('Path','User')
|
||||||
|
$env:PATH = ($machinePath, $userPath -join ';').TrimEnd(';')
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 0. Verification des droits administrateur
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# On NE force PAS l'elevation automatique : on demande a l'utilisateur de
|
||||||
|
# relancer le script lui-meme avec les droits admin. C'est plus transparent
|
||||||
|
# et evite les avertissements antivirus liees a l'elevation silencieuse.
|
||||||
|
if (-not (Test-Admin)) {
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "Ce script doit etre execute en tant qu'administrateur." -ForegroundColor Yellow
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "Procedure :"
|
||||||
|
Write-Host " 1. Fermez cette fenetre PowerShell."
|
||||||
|
Write-Host " 2. Cliquez-droit sur l'icone PowerShell > 'Executer en tant qu'administrateur'."
|
||||||
|
Write-Host " 3. Naviguez a nouveau vers ce dossier et relancez : .\install.ps1"
|
||||||
|
Write-Host ""
|
||||||
|
Read-Host "Appuyez sur Entree pour quitter"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "============================================================"
|
||||||
|
Write-Host " LoreMindMJ - Installeur Windows" -ForegroundColor Magenta
|
||||||
|
Write-Host "============================================================"
|
||||||
|
Write-Host ""
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 1. WSL2
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
Write-Step "Verification de WSL2..."
|
||||||
|
if (Test-Wsl2) {
|
||||||
|
Write-Ok "WSL2 deja installe"
|
||||||
|
} else {
|
||||||
|
Write-Warn2 "WSL2 absent - installation en cours"
|
||||||
|
wsl.exe --install --no-launch
|
||||||
|
Write-Warn2 "REDEMARRAGE REQUIS. Relancez ce script apres reboot."
|
||||||
|
Read-Host "Appuyez sur Entree pour quitter"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 2. Docker Desktop
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
Write-Step "Verification de Docker Desktop..."
|
||||||
|
if (Test-Docker) {
|
||||||
|
Write-Ok "Docker fonctionnel"
|
||||||
|
} else {
|
||||||
|
if (-not (Get-Command winget -ErrorAction SilentlyContinue)) {
|
||||||
|
Write-Err "winget introuvable. Installez Docker Desktop manuellement : https://www.docker.com/products/docker-desktop/"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
Write-Warn2 "Installation de Docker Desktop via winget (gestionnaire de paquets officiel Microsoft)..."
|
||||||
|
# On invoque winget en mode interactif (l'utilisateur voit la progression).
|
||||||
|
# Les flags --accept-* sont necessaires pour ne pas bloquer sur les CGU
|
||||||
|
# (Docker Desktop a des conditions d'utilisation a accepter).
|
||||||
|
winget install --id Docker.DockerDesktop -e --accept-package-agreements --accept-source-agreements
|
||||||
|
if ($LASTEXITCODE -ne 0) { Write-Err "Echec de l'installation Docker Desktop via winget"; exit 1 }
|
||||||
|
|
||||||
|
# winget a modifie le PATH systeme mais pas celui de la session courante.
|
||||||
|
# On le rafraichit pour que la commande 'docker' soit immediatement trouvable.
|
||||||
|
Update-PathFromRegistry
|
||||||
|
|
||||||
|
Write-Step "Lancement de Docker Desktop..."
|
||||||
|
$dd = "$env:ProgramFiles\Docker\Docker\Docker Desktop.exe"
|
||||||
|
if (Test-Path $dd) { Start-Process $dd }
|
||||||
|
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " Docker Desktop demarre pour la premiere fois." -ForegroundColor Yellow
|
||||||
|
Write-Host " Au premier lancement, il affiche un contrat de licence (Subscription Service Agreement)."
|
||||||
|
Write-Host " Cliquez 'Accept' pour continuer."
|
||||||
|
Write-Host ""
|
||||||
|
Read-Host " Appuyez sur Entree une fois que Docker Desktop affiche 'Engine running' (icone baleine verte)"
|
||||||
|
|
||||||
|
if (-not (Wait-Docker 600)) {
|
||||||
|
Write-Err "Docker ne repond toujours pas apres 10 minutes."
|
||||||
|
Write-Err "Verifiez que Docker Desktop est lance et que vous avez accepte le contrat,"
|
||||||
|
Write-Err "puis relancez install.bat."
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 3. Dossier d'installation + docker-compose.yml
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
Write-Step "Preparation du dossier $InstallDir"
|
||||||
|
New-Item -ItemType Directory -Force -Path $InstallDir | Out-Null
|
||||||
|
Set-Location $InstallDir
|
||||||
|
|
||||||
|
$composePath = Join-Path $InstallDir 'docker-compose.yml'
|
||||||
|
Write-Step "Telechargement de docker-compose.yml depuis le depot officiel"
|
||||||
|
Write-Host " Source : $ComposeUrl"
|
||||||
|
# Seul telechargement reseau effectue par ce script. Aucune execution de code
|
||||||
|
# distant : le fichier est uniquement enregistre sur le disque puis passe a
|
||||||
|
# 'docker compose' pour interpretation locale.
|
||||||
|
Invoke-WebRequest -Uri $ComposeUrl -OutFile $composePath -UseBasicParsing
|
||||||
|
Write-Ok "docker-compose.yml recupere ($composePath)"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 4. Generation du .env
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
$envPath = Join-Path $InstallDir '.env'
|
||||||
|
if (Test-Path $envPath) {
|
||||||
|
Write-Warn2 ".env deja present - sauvegarde en .env.bak"
|
||||||
|
Copy-Item $envPath "$envPath.bak" -Force
|
||||||
|
}
|
||||||
|
|
||||||
|
Write-Step "Configuration"
|
||||||
|
|
||||||
|
$adminUser = if ($NonInteractive) { 'admin' } else {
|
||||||
|
$r = Read-Host " Nom d'utilisateur admin [admin]"; if ([string]::IsNullOrWhiteSpace($r)) { 'admin' } else { $r }
|
||||||
|
}
|
||||||
|
$adminPass = if ($NonInteractive) { New-RandomSecret 16 } else {
|
||||||
|
$r = Read-Host " Mot de passe admin (vide = genere automatiquement)"
|
||||||
|
if ([string]::IsNullOrWhiteSpace($r)) { New-RandomSecret 16 } else { $r }
|
||||||
|
}
|
||||||
|
|
||||||
|
$llmProvider = if ($NonInteractive) { 'ollama' } else {
|
||||||
|
$r = Read-Host " Provider LLM : [ollama] / onemin"
|
||||||
|
if ($r -eq 'onemin') { 'onemin' } else { 'ollama' }
|
||||||
|
}
|
||||||
|
$onemKey = ''
|
||||||
|
if ($llmProvider -eq 'onemin' -and -not $NonInteractive) {
|
||||||
|
$onemKey = Read-Host " Cle API 1min.ai"
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- Mode Ollama : 3 options possibles -------------------------------------
|
||||||
|
# 1. Hote : Ollama est deja installe sur cette machine -> on configure le
|
||||||
|
# pare-feu pour que Docker puisse l'atteindre sans exposer le port.
|
||||||
|
# 2. Embarque : Ollama tourne dans un conteneur Docker dedie (profile local-ollama).
|
||||||
|
# 3. Aucun : on n'installe rien tout de suite. L'utilisateur configurera
|
||||||
|
# Ollama plus tard via la page Parametres de LoreMind.
|
||||||
|
$ollamaMode = 'embedded' # valeurs : 'host' | 'embedded' | 'none'
|
||||||
|
$ollamaBaseUrl = 'http://ollama:11434'
|
||||||
|
if ($llmProvider -eq 'ollama') {
|
||||||
|
$hasHostOllama = if ($NonInteractive) { $false } else {
|
||||||
|
$r = Read-Host " Avez-vous deja Ollama installe sur cette machine ? [o/N]"
|
||||||
|
($r -match '^(o|O|y|Y|oui|yes)$')
|
||||||
|
}
|
||||||
|
if ($hasHostOllama) {
|
||||||
|
$ollamaMode = 'host'
|
||||||
|
} else {
|
||||||
|
# Pas d'Ollama present : proposer l'installation Docker, sinon laisser
|
||||||
|
# l'utilisateur le configurer plus tard via la page Parametres.
|
||||||
|
$installViaDocker = if ($NonInteractive) { $true } else {
|
||||||
|
$r = Read-Host " Voulez-vous installer Ollama via Docker maintenant ? [O/n]"
|
||||||
|
-not ($r -match '^(n|N|no|non)$')
|
||||||
|
}
|
||||||
|
$ollamaMode = if ($installViaDocker) { 'embedded' } else { 'none' }
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($ollamaMode -eq 'host') {
|
||||||
|
$ollamaBaseUrl = 'http://host.docker.internal:11434'
|
||||||
|
# Delegue au helper dedie : configure OLLAMA_HOST=0.0.0.0 ET ajoute des
|
||||||
|
# regles Windows Firewall qui n'autorisent l'acces qu'aux conteneurs
|
||||||
|
# Docker (loopback + sous-reseaux Docker Desktop). Resultat : Ollama
|
||||||
|
# n'est pas expose au LAN ni a Internet.
|
||||||
|
$secureHelper = Join-Path $PSScriptRoot 'secure-host-ollama.ps1'
|
||||||
|
if (Test-Path $secureHelper) {
|
||||||
|
Write-Step "Configuration securisee d'Ollama hote (helper dedie)..."
|
||||||
|
try {
|
||||||
|
& $secureHelper
|
||||||
|
} catch {
|
||||||
|
Write-Warn2 "Le helper secure-host-ollama.ps1 a echoue : $($_.Exception.Message)"
|
||||||
|
Write-Warn2 "Configurez Ollama manuellement avant de continuer."
|
||||||
|
}
|
||||||
|
Write-Host ""
|
||||||
|
Read-Host "Appuyez sur Entree une fois Ollama redemarre pour continuer l'installation"
|
||||||
|
} else {
|
||||||
|
Write-Warn2 "secure-host-ollama.ps1 introuvable a cote de install.ps1."
|
||||||
|
Write-Warn2 "Telechargez-le depuis le depot et relancez-le manuellement."
|
||||||
|
}
|
||||||
|
} elseif ($ollamaMode -eq 'embedded') {
|
||||||
|
Write-Ok "Ollama sera lance dans Docker (modeles dans un volume Docker dedie)"
|
||||||
|
} else {
|
||||||
|
# Mode 'none' : on cible host.docker.internal en supposant qu'Ollama
|
||||||
|
# sera installe plus tard sur l'hote. L'utilisateur peut aussi changer
|
||||||
|
# l'URL via la page Parametres pour pointer vers un Ollama distant.
|
||||||
|
$ollamaBaseUrl = 'http://host.docker.internal:11434'
|
||||||
|
Write-Warn2 "Aucun Ollama ne sera installe pour le moment. Configurez-le plus tard via la page Parametres de LoreMind."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$llmModel = 'gemma4:e4b'
|
||||||
|
|
||||||
|
$autoUpdate = if ($NonInteractive) { $true } else {
|
||||||
|
$r = Read-Host " Activer les mises a jour auto (chaque nuit a 4h) ? [O/n]"
|
||||||
|
-not ($r -match '^(n|N|no|non)$')
|
||||||
|
}
|
||||||
|
# Combinaison de profiles : autoupdate et/ou local-ollama (separes par virgule).
|
||||||
|
$profilesList = @()
|
||||||
|
if ($autoUpdate) { $profilesList += 'autoupdate' }
|
||||||
|
if ($ollamaMode -eq 'embedded' -and $llmProvider -eq 'ollama'){ $profilesList += 'local-ollama' }
|
||||||
|
$composeProfiles = $profilesList -join ','
|
||||||
|
|
||||||
|
$envContent = @"
|
||||||
|
# Genere par install.ps1 le $(Get-Date -Format 'yyyy-MM-dd HH:mm')
|
||||||
|
REGISTRY=git.igmlcreation.fr
|
||||||
|
TAG=latest
|
||||||
|
|
||||||
|
WEB_PORT=$WebPort
|
||||||
|
|
||||||
|
POSTGRES_DB=loremind
|
||||||
|
POSTGRES_USER=loremind
|
||||||
|
POSTGRES_PASSWORD=$(New-RandomSecret 24)
|
||||||
|
|
||||||
|
ADMIN_USERNAME=$adminUser
|
||||||
|
ADMIN_PASSWORD=$adminPass
|
||||||
|
|
||||||
|
BRAIN_INTERNAL_SECRET=$(New-RandomSecret 32)
|
||||||
|
|
||||||
|
MINIO_USER=minioadmin
|
||||||
|
MINIO_PASSWORD=$(New-RandomSecret 24)
|
||||||
|
|
||||||
|
LLM_PROVIDER=$llmProvider
|
||||||
|
OLLAMA_BASE_URL=$ollamaBaseUrl
|
||||||
|
LLM_MODEL=$llmModel
|
||||||
|
ONEMIN_API_KEY=$onemKey
|
||||||
|
ONEMIN_MODEL=gpt-4o-mini
|
||||||
|
|
||||||
|
COMPOSE_PROFILES=$composeProfiles
|
||||||
|
WATCHTOWER_TOKEN=$(New-RandomSecret 32)
|
||||||
|
WATCHTOWER_MONITOR_ONLY=false
|
||||||
|
WATCHTOWER_SCHEDULE=0 0 4 * * *
|
||||||
|
TZ=Europe/Paris
|
||||||
|
"@
|
||||||
|
|
||||||
|
Set-Content -Path $envPath -Value $envContent -Encoding UTF8
|
||||||
|
Write-Ok ".env genere ($envPath)"
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 5. Pull + up
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
Write-Step "Telechargement des images Docker (peut prendre quelques minutes)"
|
||||||
|
docker compose pull
|
||||||
|
if ($LASTEXITCODE -ne 0) { Write-Err "Echec docker compose pull"; exit 1 }
|
||||||
|
|
||||||
|
Write-Step "Demarrage de la stack"
|
||||||
|
docker compose up -d
|
||||||
|
if ($LASTEXITCODE -ne 0) { Write-Err "Echec docker compose up"; exit 1 }
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 5b. Telechargement du modele Ollama (mode embarque uniquement)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# En mode embarque, le conteneur Ollama est prêt mais ne contient aucun modele
|
||||||
|
# par defaut. On propose de pull le modele configure tout de suite pour que
|
||||||
|
# l'utilisateur ait quelque chose a utiliser des le premier lancement.
|
||||||
|
if ($ollamaMode -eq 'embedded' -and $llmProvider -eq 'ollama') {
|
||||||
|
$pullNow = if ($NonInteractive) { $true } else {
|
||||||
|
$r = Read-Host " Telecharger le modele '$llmModel' maintenant ? (peut prendre quelques minutes) [O/n]"
|
||||||
|
-not ($r -match '^(n|N|no|non)$')
|
||||||
|
}
|
||||||
|
if ($pullNow) {
|
||||||
|
# Petite attente pour laisser le conteneur ollama finir son init.
|
||||||
|
Write-Step "Attente de la disponibilite du conteneur Ollama..."
|
||||||
|
$ollamaReady = $false
|
||||||
|
for ($i = 0; $i -lt 30; $i++) {
|
||||||
|
docker exec loremind-ollama ollama list *>$null
|
||||||
|
if ($LASTEXITCODE -eq 0) { $ollamaReady = $true; break }
|
||||||
|
Start-Sleep -Seconds 2
|
||||||
|
}
|
||||||
|
if (-not $ollamaReady) {
|
||||||
|
Write-Warn2 "Le conteneur Ollama ne repond pas encore. Vous pourrez pull le modele plus tard avec :"
|
||||||
|
Write-Warn2 " docker exec -it loremind-ollama ollama pull $llmModel"
|
||||||
|
} else {
|
||||||
|
Write-Step "Telechargement du modele $llmModel (peut prendre plusieurs minutes selon votre connexion)..."
|
||||||
|
docker exec loremind-ollama ollama pull $llmModel
|
||||||
|
if ($LASTEXITCODE -eq 0) {
|
||||||
|
Write-Ok "Modele $llmModel pret a l'emploi"
|
||||||
|
} else {
|
||||||
|
Write-Warn2 "Echec du pull. Reessayez manuellement : docker exec -it loremind-ollama ollama pull $llmModel"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Write-Host " Pour le telecharger plus tard : docker exec -it loremind-ollama ollama pull $llmModel"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# 6. Recap
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
$url = "http://localhost:$WebPort"
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "============================================================" -ForegroundColor Green
|
||||||
|
Write-Host " LoreMindMJ est lance !" -ForegroundColor Green
|
||||||
|
Write-Host "============================================================" -ForegroundColor Green
|
||||||
|
Write-Host " URL : $url"
|
||||||
|
Write-Host " Identifiant : $adminUser"
|
||||||
|
Write-Host " Mot de passe : $adminPass"
|
||||||
|
Write-Host " Dossier : $InstallDir"
|
||||||
|
if ($autoUpdate) {
|
||||||
|
Write-Host " Auto-update : active (chaque nuit a 4h via Watchtower)" -ForegroundColor Green
|
||||||
|
} else {
|
||||||
|
Write-Host " Auto-update : desactive (mise a jour manuelle uniquement)"
|
||||||
|
}
|
||||||
|
if ($llmProvider -eq 'ollama') {
|
||||||
|
switch ($ollamaMode) {
|
||||||
|
'embedded' {
|
||||||
|
Write-Host " Ollama : embarque (service Docker 'ollama')" -ForegroundColor Green
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " IMPORTANT : telechargez un modele avant utilisation :"
|
||||||
|
Write-Host " docker exec -it loremind-ollama ollama pull $llmModel"
|
||||||
|
}
|
||||||
|
'host' {
|
||||||
|
Write-Host " Ollama : hote (configure via secure-host-ollama.ps1)"
|
||||||
|
}
|
||||||
|
'none' {
|
||||||
|
Write-Host " Ollama : non configure - a faire via Parametres dans l'app" -ForegroundColor Yellow
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " Commandes utiles (depuis $InstallDir) :"
|
||||||
|
Write-Host " docker compose ps # etat"
|
||||||
|
Write-Host " docker compose logs -f # logs"
|
||||||
|
Write-Host " docker compose down # arret"
|
||||||
|
Write-Host " docker compose pull && docker compose up -d # mise a jour"
|
||||||
|
Write-Host ""
|
||||||
|
|
||||||
|
Start-Process $url
|
||||||
305
installers/install.sh
Normal file
305
installers/install.sh
Normal file
@@ -0,0 +1,305 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ==========================================================================
|
||||||
|
# Installeur LoreMindMJ pour Linux (Debian/Ubuntu/Fedora/Arch)
|
||||||
|
# Usage :
|
||||||
|
# curl -fsSL https://git.igmlcreation.fr/ietm64/loremind/raw/branch/main/installers/install.sh | bash
|
||||||
|
# ==========================================================================
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
INSTALL_DIR="${INSTALL_DIR:-$HOME/.local/share/loremind}"
|
||||||
|
COMPOSE_URL="${COMPOSE_URL:-https://git.igmlcreation.fr/ietm64/loremind/raw/branch/main/docker-compose.yml}"
|
||||||
|
WEB_PORT="${WEB_PORT:-8081}"
|
||||||
|
NON_INTERACTIVE="${NON_INTERACTIVE:-0}"
|
||||||
|
|
||||||
|
c_cyan='\033[1;36m'; c_green='\033[1;32m'; c_yellow='\033[1;33m'; c_red='\033[1;31m'; c_off='\033[0m'
|
||||||
|
step() { echo -e "${c_cyan}==> $*${c_off}"; }
|
||||||
|
ok() { echo -e " ${c_green}OK${c_off} $*"; }
|
||||||
|
warn() { echo -e " ${c_yellow}!!${c_off} $*"; }
|
||||||
|
err() { echo -e " ${c_red}XX${c_off} $*" >&2; }
|
||||||
|
|
||||||
|
rand_hex() {
|
||||||
|
# $1 = nb de caracteres hex
|
||||||
|
local n="${1:-32}"
|
||||||
|
if command -v openssl >/dev/null 2>&1; then
|
||||||
|
openssl rand -hex $((n / 2))
|
||||||
|
else
|
||||||
|
head -c $((n * 2)) /dev/urandom | od -An -tx1 | tr -d ' \n' | head -c "$n"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ask() {
|
||||||
|
# ask "prompt" "default"
|
||||||
|
local prompt="$1" def="${2:-}" reply
|
||||||
|
if [ "$NON_INTERACTIVE" = "1" ]; then
|
||||||
|
echo "$def"; return
|
||||||
|
fi
|
||||||
|
if [ -n "$def" ]; then
|
||||||
|
read -r -p " $prompt [$def] " reply </dev/tty || true
|
||||||
|
else
|
||||||
|
read -r -p " $prompt " reply </dev/tty || true
|
||||||
|
fi
|
||||||
|
echo "${reply:-$def}"
|
||||||
|
}
|
||||||
|
|
||||||
|
detect_pkg() {
|
||||||
|
if command -v apt-get >/dev/null 2>&1; then echo apt
|
||||||
|
elif command -v dnf >/dev/null 2>&1; then echo dnf
|
||||||
|
elif command -v pacman >/dev/null 2>&1; then echo pacman
|
||||||
|
else echo unknown
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
install_docker() {
|
||||||
|
step "Installation de Docker..."
|
||||||
|
local pm; pm="$(detect_pkg)"
|
||||||
|
case "$pm" in
|
||||||
|
apt|dnf|pacman)
|
||||||
|
# Script officiel Docker (gere apt/dnf/pacman)
|
||||||
|
curl -fsSL https://get.docker.com | sh
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
err "Gestionnaire de paquets non reconnu. Installez Docker manuellement : https://docs.docker.com/engine/install/"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if ! getent group docker >/dev/null; then sudo groupadd docker || true; fi
|
||||||
|
sudo usermod -aG docker "$USER" || true
|
||||||
|
sudo systemctl enable --now docker || true
|
||||||
|
warn "Vous avez ete ajoute au groupe 'docker'. Si docker echoue ensuite, deconnectez-vous puis reconnectez-vous (ou 'newgrp docker')."
|
||||||
|
}
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
echo
|
||||||
|
echo "============================================================"
|
||||||
|
echo -e " ${c_cyan}LoreMindMJ - Installeur Linux${c_off}"
|
||||||
|
echo "============================================================"
|
||||||
|
echo
|
||||||
|
|
||||||
|
# 1. Docker
|
||||||
|
step "Verification de Docker..."
|
||||||
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
install_docker
|
||||||
|
elif ! docker info >/dev/null 2>&1; then
|
||||||
|
warn "Docker installe mais inaccessible (daemon arrete ou groupe docker manquant)"
|
||||||
|
sudo systemctl start docker || true
|
||||||
|
if ! docker info >/dev/null 2>&1; then
|
||||||
|
sudo usermod -aG docker "$USER" || true
|
||||||
|
err "Re-essayez apres 'newgrp docker' ou une nouvelle session."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
ok "Docker fonctionnel"
|
||||||
|
|
||||||
|
# 2. docker compose v2
|
||||||
|
step "Verification de docker compose..."
|
||||||
|
if ! docker compose version >/dev/null 2>&1; then
|
||||||
|
err "Plugin 'docker compose' manquant. Sur Debian/Ubuntu : sudo apt install docker-compose-plugin"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
ok "docker compose disponible"
|
||||||
|
|
||||||
|
# 3. Dossier + compose
|
||||||
|
step "Preparation du dossier $INSTALL_DIR"
|
||||||
|
mkdir -p "$INSTALL_DIR"
|
||||||
|
cd "$INSTALL_DIR"
|
||||||
|
step "Telechargement de docker-compose.yml"
|
||||||
|
curl -fsSL "$COMPOSE_URL" -o docker-compose.yml
|
||||||
|
ok "docker-compose.yml recupere"
|
||||||
|
|
||||||
|
# 4. .env
|
||||||
|
if [ -f .env ]; then
|
||||||
|
warn ".env existant -> sauvegarde en .env.bak"
|
||||||
|
cp .env .env.bak
|
||||||
|
fi
|
||||||
|
|
||||||
|
step "Configuration"
|
||||||
|
ADMIN_USERNAME="$(ask "Nom d'utilisateur admin" "admin")"
|
||||||
|
ADMIN_PASSWORD="$(ask "Mot de passe admin (vide = genere)" "")"
|
||||||
|
[ -z "$ADMIN_PASSWORD" ] && ADMIN_PASSWORD="$(rand_hex 16)"
|
||||||
|
|
||||||
|
LLM_PROVIDER="$(ask "Provider LLM (ollama / onemin)" "ollama")"
|
||||||
|
ONEMIN_API_KEY=""
|
||||||
|
if [ "$LLM_PROVIDER" = "onemin" ] && [ "$NON_INTERACTIVE" != "1" ]; then
|
||||||
|
ONEMIN_API_KEY="$(ask "Cle API 1min.ai" "")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- Mode Ollama : 3 options possibles -------------------------------------
|
||||||
|
# 1. host : Ollama deja installe sur la machine -> helper de securisation
|
||||||
|
# 2. embedded : service 'ollama' du compose (profile local-ollama)
|
||||||
|
# 3. none : aucune installation, configuration ulterieure via l'app
|
||||||
|
OLLAMA_MODE="embedded"
|
||||||
|
OLLAMA_BASE_URL_VAL="http://ollama:11434"
|
||||||
|
LLM_MODEL_VAL="gemma4:e4b"
|
||||||
|
if [ "$LLM_PROVIDER" = "ollama" ]; then
|
||||||
|
HOST_OLLAMA_REPLY="$(ask "Avez-vous deja Ollama installe sur cette machine ? [o/N]" "N")"
|
||||||
|
case "$HOST_OLLAMA_REPLY" in
|
||||||
|
o|O|y|Y|oui|yes|Oui|Yes)
|
||||||
|
OLLAMA_MODE="host"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# Pas d'Ollama present : proposer l'installation Docker.
|
||||||
|
INSTALL_DOCKER_REPLY="$(ask "Voulez-vous installer Ollama via Docker maintenant ? [O/n]" "O")"
|
||||||
|
case "$INSTALL_DOCKER_REPLY" in
|
||||||
|
n|N|no|non|No|Non) OLLAMA_MODE="none" ;;
|
||||||
|
*) OLLAMA_MODE="embedded" ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
case "$OLLAMA_MODE" in
|
||||||
|
host)
|
||||||
|
OLLAMA_BASE_URL_VAL="http://host.docker.internal:11434"
|
||||||
|
# Delegue la configuration securisee au helper dedie : il fait
|
||||||
|
# ecouter Ollama uniquement sur l'IP du bridge Docker (jamais
|
||||||
|
# exposee au LAN ni a Internet) plutot que sur 0.0.0.0.
|
||||||
|
SECURE_HELPER="$(dirname -- "$0")/secure-host-ollama.sh"
|
||||||
|
if [ -f "$SECURE_HELPER" ]; then
|
||||||
|
step "Configuration securisee d'Ollama hote..."
|
||||||
|
bash "$SECURE_HELPER" || warn "Le helper secure-host-ollama.sh a echoue. Configurez Ollama manuellement."
|
||||||
|
else
|
||||||
|
warn "secure-host-ollama.sh introuvable a cote de install.sh."
|
||||||
|
warn "Telechargez-le depuis le depot et relancez : bash secure-host-ollama.sh"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
embedded)
|
||||||
|
ok "Ollama sera lance dans Docker (modeles dans un volume Docker)"
|
||||||
|
;;
|
||||||
|
none)
|
||||||
|
# On cible host.docker.internal par defaut en supposant qu'Ollama
|
||||||
|
# sera installe plus tard sur l'hote. L'utilisateur peut aussi
|
||||||
|
# changer l'URL via la page Parametres pour un Ollama distant.
|
||||||
|
OLLAMA_BASE_URL_VAL="http://host.docker.internal:11434"
|
||||||
|
warn "Aucun Ollama ne sera installe pour le moment. Configurez-le plus tard via la page Parametres de LoreMind."
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
AUTO_UPDATE_REPLY="$(ask "Activer les mises a jour auto (chaque nuit a 4h) ? [O/n]" "O")"
|
||||||
|
case "$AUTO_UPDATE_REPLY" in
|
||||||
|
n|N|no|non|No|Non) AUTO_UPDATE=0 ;;
|
||||||
|
*) AUTO_UPDATE=1 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Combinaison de profiles : autoupdate et/ou local-ollama (separes par virgule).
|
||||||
|
PROFILES_ARR=()
|
||||||
|
[ "$AUTO_UPDATE" = "1" ] && PROFILES_ARR+=("autoupdate")
|
||||||
|
if [ "$LLM_PROVIDER" = "ollama" ] && [ "$OLLAMA_MODE" = "embedded" ]; then
|
||||||
|
PROFILES_ARR+=("local-ollama")
|
||||||
|
fi
|
||||||
|
COMPOSE_PROFILES="$(IFS=,; echo "${PROFILES_ARR[*]}")"
|
||||||
|
|
||||||
|
cat > .env <<EOF
|
||||||
|
# Genere par install.sh le $(date '+%Y-%m-%d %H:%M')
|
||||||
|
REGISTRY=git.igmlcreation.fr
|
||||||
|
TAG=latest
|
||||||
|
|
||||||
|
WEB_PORT=${WEB_PORT}
|
||||||
|
|
||||||
|
POSTGRES_DB=loremind
|
||||||
|
POSTGRES_USER=loremind
|
||||||
|
POSTGRES_PASSWORD=$(rand_hex 24)
|
||||||
|
|
||||||
|
ADMIN_USERNAME=${ADMIN_USERNAME}
|
||||||
|
ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||||
|
|
||||||
|
BRAIN_INTERNAL_SECRET=$(rand_hex 32)
|
||||||
|
|
||||||
|
MINIO_USER=minioadmin
|
||||||
|
MINIO_PASSWORD=$(rand_hex 24)
|
||||||
|
|
||||||
|
LLM_PROVIDER=${LLM_PROVIDER}
|
||||||
|
OLLAMA_BASE_URL=${OLLAMA_BASE_URL_VAL}
|
||||||
|
LLM_MODEL=${LLM_MODEL_VAL}
|
||||||
|
ONEMIN_API_KEY=${ONEMIN_API_KEY}
|
||||||
|
ONEMIN_MODEL=gpt-4o-mini
|
||||||
|
|
||||||
|
COMPOSE_PROFILES=${COMPOSE_PROFILES}
|
||||||
|
WATCHTOWER_TOKEN=$(rand_hex 32)
|
||||||
|
WATCHTOWER_MONITOR_ONLY=false
|
||||||
|
WATCHTOWER_SCHEDULE=0 0 4 * * *
|
||||||
|
TZ=$(timedatectl show -p Timezone --value 2>/dev/null || echo Europe/Paris)
|
||||||
|
EOF
|
||||||
|
chmod 600 .env
|
||||||
|
ok ".env genere ($INSTALL_DIR/.env)"
|
||||||
|
|
||||||
|
# 5. Pull + up
|
||||||
|
step "Telechargement des images (peut prendre quelques minutes)"
|
||||||
|
docker compose pull
|
||||||
|
step "Demarrage de la stack"
|
||||||
|
docker compose up -d
|
||||||
|
|
||||||
|
# 5b. Telechargement du modele Ollama (mode embarque uniquement)
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# Le conteneur Ollama est pret mais sans modele. On propose le pull tout de
|
||||||
|
# suite pour que l'utilisateur ait quelque chose a utiliser au premier lancement.
|
||||||
|
if [ "$LLM_PROVIDER" = "ollama" ] && [ "$OLLAMA_MODE" = "embedded" ]; then
|
||||||
|
PULL_REPLY="$(ask "Telecharger le modele '${LLM_MODEL_VAL}' maintenant ? (peut prendre plusieurs minutes) [O/n]" "O")"
|
||||||
|
case "$PULL_REPLY" in
|
||||||
|
n|N|no|non|No|Non)
|
||||||
|
echo " Pour le telecharger plus tard : docker exec -it loremind-ollama ollama pull ${LLM_MODEL_VAL}"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
step "Attente de la disponibilite du conteneur Ollama..."
|
||||||
|
OLLAMA_READY=0
|
||||||
|
for i in $(seq 1 30); do
|
||||||
|
if docker exec loremind-ollama ollama list >/dev/null 2>&1; then
|
||||||
|
OLLAMA_READY=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
if [ "$OLLAMA_READY" = "0" ]; then
|
||||||
|
warn "Le conteneur Ollama ne repond pas encore. Vous pourrez pull plus tard :"
|
||||||
|
warn " docker exec -it loremind-ollama ollama pull ${LLM_MODEL_VAL}"
|
||||||
|
else
|
||||||
|
step "Telechargement du modele ${LLM_MODEL_VAL} (peut prendre plusieurs minutes selon votre connexion)..."
|
||||||
|
if docker exec loremind-ollama ollama pull "${LLM_MODEL_VAL}"; then
|
||||||
|
ok "Modele ${LLM_MODEL_VAL} pret a l'emploi"
|
||||||
|
else
|
||||||
|
warn "Echec du pull. Reessayez : docker exec -it loremind-ollama ollama pull ${LLM_MODEL_VAL}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 6. Recap
|
||||||
|
URL="http://localhost:${WEB_PORT}"
|
||||||
|
echo
|
||||||
|
echo -e "${c_green}============================================================${c_off}"
|
||||||
|
echo -e "${c_green} LoreMindMJ est lance !${c_off}"
|
||||||
|
echo -e "${c_green}============================================================${c_off}"
|
||||||
|
echo " URL : $URL"
|
||||||
|
echo " Identifiant : $ADMIN_USERNAME"
|
||||||
|
echo " Mot de passe : $ADMIN_PASSWORD"
|
||||||
|
echo " Dossier : $INSTALL_DIR"
|
||||||
|
if [ "$AUTO_UPDATE" = "1" ]; then
|
||||||
|
echo -e " Auto-update : ${c_green}active${c_off} (chaque nuit a 4h via Watchtower)"
|
||||||
|
else
|
||||||
|
echo " Auto-update : desactive (mise a jour manuelle uniquement)"
|
||||||
|
fi
|
||||||
|
if [ "$LLM_PROVIDER" = "ollama" ]; then
|
||||||
|
case "$OLLAMA_MODE" in
|
||||||
|
embedded)
|
||||||
|
echo -e " Ollama : ${c_green}embarque${c_off} (service Docker 'ollama')"
|
||||||
|
echo
|
||||||
|
echo " IMPORTANT : telechargez un modele avant utilisation :"
|
||||||
|
echo " docker exec -it loremind-ollama ollama pull ${LLM_MODEL_VAL}"
|
||||||
|
;;
|
||||||
|
host)
|
||||||
|
echo " Ollama : hote (configure via secure-host-ollama.sh)"
|
||||||
|
;;
|
||||||
|
none)
|
||||||
|
echo -e " Ollama : ${c_yellow}non configure${c_off} - a faire via Parametres dans l'app"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
echo
|
||||||
|
echo " Commandes utiles (depuis $INSTALL_DIR) :"
|
||||||
|
echo " docker compose ps # etat"
|
||||||
|
echo " docker compose logs -f # logs"
|
||||||
|
echo " docker compose down # arret"
|
||||||
|
echo " docker compose pull && docker compose up -d # mise a jour"
|
||||||
|
echo
|
||||||
|
|
||||||
|
if command -v xdg-open >/dev/null 2>&1; then xdg-open "$URL" >/dev/null 2>&1 || true; fi
|
||||||
183
installers/secure-host-ollama.ps1
Normal file
183
installers/secure-host-ollama.ps1
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
#Requires -Version 5.1
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Configuration securisee d'Ollama hote pour LoreMindMJ (Windows).
|
||||||
|
|
||||||
|
.DESCRIPTION
|
||||||
|
But : permettre au conteneur Docker LoreMind d'atteindre l'Ollama installe
|
||||||
|
sur l'hote, SANS exposer Ollama sur le LAN ni Internet.
|
||||||
|
|
||||||
|
Strategie (specifique a Docker Desktop / WSL2 sur Windows) :
|
||||||
|
1. Ollama doit ecouter sur 0.0.0.0 (techniquement necessaire car Docker
|
||||||
|
Desktop sur Windows utilise un reseau Hyper-V / WSL2 separe).
|
||||||
|
2. On compense en ajoutant des regles Windows Firewall qui :
|
||||||
|
- BLOQUENT le port 11434 entrant par defaut sur tout profil
|
||||||
|
- AUTORISENT 11434 uniquement depuis les sous-reseaux Docker Desktop
|
||||||
|
(detectes dynamiquement) et depuis le loopback.
|
||||||
|
|
||||||
|
Resultat : Ollama est joignable par les conteneurs Docker mais
|
||||||
|
inaccessible depuis le reseau local ou Internet.
|
||||||
|
|
||||||
|
.NOTES
|
||||||
|
Ce script doit etre execute en tant qu'administrateur.
|
||||||
|
Les regles ajoutees sont prefixees par "LoreMind-Ollama-" pour
|
||||||
|
faciliter leur identification et suppression ulterieure.
|
||||||
|
|
||||||
|
.LINK
|
||||||
|
https://git.igmlcreation.fr/ietm64/loremind
|
||||||
|
#>
|
||||||
|
|
||||||
|
[CmdletBinding()]
|
||||||
|
param()
|
||||||
|
|
||||||
|
$ErrorActionPreference = 'Stop'
|
||||||
|
|
||||||
|
function Write-Step($msg) { Write-Host "==> $msg" -ForegroundColor Cyan }
|
||||||
|
function Write-Ok($msg) { Write-Host " OK $msg" -ForegroundColor Green }
|
||||||
|
function Write-Warn2($msg) { Write-Host " !! $msg" -ForegroundColor Yellow }
|
||||||
|
function Write-Err($msg) { Write-Host " XX $msg" -ForegroundColor Red }
|
||||||
|
|
||||||
|
# --- 1. Verification admin -------------------------------------------------
|
||||||
|
$current = [Security.Principal.WindowsIdentity]::GetCurrent()
|
||||||
|
$isAdmin = ([Security.Principal.WindowsPrincipal]$current).IsInRole(
|
||||||
|
[Security.Principal.WindowsBuiltInRole]::Administrator)
|
||||||
|
if (-not $isAdmin) {
|
||||||
|
Write-Err "Ce script doit etre execute en tant qu'administrateur."
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "Procedure : clic-droit sur PowerShell > 'Executer en tant qu'administrateur',"
|
||||||
|
Write-Host "puis relancez ce script."
|
||||||
|
Read-Host "Appuyez sur Entree pour quitter"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- 2. Detection des sous-reseaux Docker Desktop --------------------------
|
||||||
|
Write-Step "Detection des sous-reseaux utilises par Docker Desktop..."
|
||||||
|
|
||||||
|
$dockerSubnets = @()
|
||||||
|
|
||||||
|
# Methode 1 : interroger Docker pour les bridges actifs.
|
||||||
|
try {
|
||||||
|
$networks = docker network ls --filter driver=bridge --format "{{.Name}}" 2>$null
|
||||||
|
foreach ($net in $networks) {
|
||||||
|
if ([string]::IsNullOrWhiteSpace($net)) { continue }
|
||||||
|
$subnet = docker network inspect $net -f "{{range .IPAM.Config}}{{.Subnet}}{{end}}" 2>$null
|
||||||
|
if (-not [string]::IsNullOrWhiteSpace($subnet)) {
|
||||||
|
$dockerSubnets += $subnet.Trim()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
Write-Warn2 "Impossible d'interroger Docker pour les sous-reseaux. Utilisation des plages par defaut."
|
||||||
|
}
|
||||||
|
|
||||||
|
# Methode 2 : interfaces vEthernet (WSL/DockerNAT) detectees par Windows.
|
||||||
|
try {
|
||||||
|
$wslInterfaces = Get-NetIPConfiguration -ErrorAction SilentlyContinue |
|
||||||
|
Where-Object { $_.InterfaceAlias -match 'vEthernet \(WSL|vEthernet \(Default Switch|vEthernet \(Docker' }
|
||||||
|
foreach ($iface in $wslInterfaces) {
|
||||||
|
$ipv4 = $iface.IPv4Address
|
||||||
|
if ($ipv4 -and $ipv4.IPAddress) {
|
||||||
|
# On deduit un /24 a partir de l'adresse de l'interface (approximation safe).
|
||||||
|
$octets = $ipv4.IPAddress.Split('.')
|
||||||
|
$subnet = "{0}.{1}.{2}.0/24" -f $octets[0], $octets[1], $octets[2]
|
||||||
|
$dockerSubnets += $subnet
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch { }
|
||||||
|
|
||||||
|
# Methode 3 : fallback sur les plages connues de Docker Desktop si rien detecte.
|
||||||
|
if ($dockerSubnets.Count -eq 0) {
|
||||||
|
Write-Warn2 "Aucun sous-reseau Docker detecte. Utilisation des plages par defaut Docker Desktop."
|
||||||
|
$dockerSubnets = @(
|
||||||
|
"172.16.0.0/12", # Plage standard des reseaux bridge Docker
|
||||||
|
"192.168.65.0/24" # Plage WSL2 / Docker Desktop frequente
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# Deduplication et nettoyage.
|
||||||
|
$dockerSubnets = $dockerSubnets | Where-Object { $_ -match '^\d+\.\d+\.\d+\.\d+/\d+$' } | Select-Object -Unique
|
||||||
|
Write-Ok "Sous-reseaux autorises : $($dockerSubnets -join ', ')"
|
||||||
|
|
||||||
|
# --- 3. Variable d'environnement OLLAMA_HOST -------------------------------
|
||||||
|
Write-Step "Configuration de la variable OLLAMA_HOST..."
|
||||||
|
[Environment]::SetEnvironmentVariable('OLLAMA_HOST','0.0.0.0:11434','User')
|
||||||
|
Write-Ok "OLLAMA_HOST=0.0.0.0:11434 definie au niveau utilisateur"
|
||||||
|
|
||||||
|
# --- 4. Suppression des anciennes regles LoreMind --------------------------
|
||||||
|
Write-Step "Nettoyage des anciennes regles Windows Firewall LoreMind..."
|
||||||
|
$oldRules = Get-NetFirewallRule -DisplayName "LoreMind-Ollama-*" -ErrorAction SilentlyContinue
|
||||||
|
if ($oldRules) {
|
||||||
|
$oldRules | Remove-NetFirewallRule
|
||||||
|
Write-Ok "$($oldRules.Count) ancienne(s) regle(s) supprimee(s)"
|
||||||
|
} else {
|
||||||
|
Write-Ok "Aucune ancienne regle a supprimer"
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- 5. Creation des regles --------------------------------------------------
|
||||||
|
Write-Step "Creation des regles Windows Firewall..."
|
||||||
|
|
||||||
|
# 5a. Regle de blocage par defaut (priorite la plus basse en cas de conflit :
|
||||||
|
# les regles Allow ont priorite sur les Block dans Windows Firewall, donc
|
||||||
|
# ce Block sert de filet final pour tout ce qui n'est pas explicitement
|
||||||
|
# autorise par les regles ci-dessous).
|
||||||
|
New-NetFirewallRule `
|
||||||
|
-DisplayName "LoreMind-Ollama-Block-All" `
|
||||||
|
-Description "LoreMind: bloque toute connexion entrante Ollama par defaut" `
|
||||||
|
-Direction Inbound `
|
||||||
|
-Action Block `
|
||||||
|
-Protocol TCP `
|
||||||
|
-LocalPort 11434 `
|
||||||
|
-Profile Any `
|
||||||
|
-RemoteAddress Any | Out-Null
|
||||||
|
Write-Ok "Regle Block-All (port 11434) creee"
|
||||||
|
|
||||||
|
# 5b. Regle d'autorisation : loopback uniquement.
|
||||||
|
New-NetFirewallRule `
|
||||||
|
-DisplayName "LoreMind-Ollama-Allow-Loopback" `
|
||||||
|
-Description "LoreMind: autorise Ollama depuis 127.0.0.1" `
|
||||||
|
-Direction Inbound `
|
||||||
|
-Action Allow `
|
||||||
|
-Protocol TCP `
|
||||||
|
-LocalPort 11434 `
|
||||||
|
-Profile Any `
|
||||||
|
-RemoteAddress "127.0.0.1" | Out-Null
|
||||||
|
Write-Ok "Regle Allow-Loopback creee"
|
||||||
|
|
||||||
|
# 5c. Regles d'autorisation : sous-reseaux Docker Desktop.
|
||||||
|
foreach ($subnet in $dockerSubnets) {
|
||||||
|
$safeName = "LoreMind-Ollama-Allow-Docker-$($subnet -replace '[\./]','_')"
|
||||||
|
New-NetFirewallRule `
|
||||||
|
-DisplayName $safeName `
|
||||||
|
-Description "LoreMind: autorise Ollama depuis le sous-reseau Docker $subnet" `
|
||||||
|
-Direction Inbound `
|
||||||
|
-Action Allow `
|
||||||
|
-Protocol TCP `
|
||||||
|
-LocalPort 11434 `
|
||||||
|
-Profile Any `
|
||||||
|
-RemoteAddress $subnet | Out-Null
|
||||||
|
Write-Ok "Regle Allow-Docker creee pour $subnet"
|
||||||
|
}
|
||||||
|
|
||||||
|
# --- 6. Redemarrage Ollama -------------------------------------------------
|
||||||
|
Write-Step "Redemarrage d'Ollama pour appliquer OLLAMA_HOST..."
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " Pour que la variable d'environnement prenne effet, vous devez :" -ForegroundColor Yellow
|
||||||
|
Write-Host " 1. Quitter completement Ollama (icone systray > Quit Ollama)"
|
||||||
|
Write-Host " 2. Le relancer depuis le menu Demarrer"
|
||||||
|
Write-Host ""
|
||||||
|
|
||||||
|
# --- 7. Recap --------------------------------------------------------------
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host "============================================================" -ForegroundColor Green
|
||||||
|
Write-Host " Ollama hote configure de maniere securisee" -ForegroundColor Green
|
||||||
|
Write-Host "============================================================" -ForegroundColor Green
|
||||||
|
Write-Host " Adresse d'ecoute : 0.0.0.0:11434 (toutes interfaces)"
|
||||||
|
Write-Host " Pare-feu Windows : bloque par defaut, autorise loopback + Docker"
|
||||||
|
Write-Host " Inaccessible depuis : LAN, WiFi public, Internet"
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " Pour LoreMind, definissez dans le fichier .env :"
|
||||||
|
Write-Host " OLLAMA_BASE_URL=http://host.docker.internal:11434"
|
||||||
|
Write-Host ""
|
||||||
|
Write-Host " Pour annuler cette configuration :"
|
||||||
|
Write-Host ' Get-NetFirewallRule -DisplayName "LoreMind-Ollama-*" | Remove-NetFirewallRule'
|
||||||
|
Write-Host ' [Environment]::SetEnvironmentVariable("OLLAMA_HOST",$null,"User")'
|
||||||
|
Write-Host ""
|
||||||
128
installers/secure-host-ollama.sh
Normal file
128
installers/secure-host-ollama.sh
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# ============================================================================
|
||||||
|
# LoreMindMJ - Configuration securisee d'Ollama hote (Linux)
|
||||||
|
# ----------------------------------------------------------------------------
|
||||||
|
# But : permettre au conteneur Docker de LoreMind d'atteindre l'Ollama
|
||||||
|
# installe sur l'hote, SANS l'exposer sur le LAN ni Internet.
|
||||||
|
#
|
||||||
|
# Strategie : faire ecouter Ollama uniquement sur l'IP de la passerelle du
|
||||||
|
# bridge Docker (typiquement 172.17.0.1). Cette IP n'est jamais
|
||||||
|
# routee en dehors de la machine — seuls les conteneurs Docker
|
||||||
|
# peuvent l'atteindre.
|
||||||
|
#
|
||||||
|
# Ce script peut etre lance independamment de install.sh, par ex. si vous
|
||||||
|
# avez initialement choisi le mode "Ollama embarque" et changez d'avis.
|
||||||
|
#
|
||||||
|
# Usage : bash secure-host-ollama.sh
|
||||||
|
# ============================================================================
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
c_cyan='\033[1;36m'; c_green='\033[1;32m'; c_yellow='\033[1;33m'; c_red='\033[1;31m'; c_off='\033[0m'
|
||||||
|
step() { echo -e "${c_cyan}==> $*${c_off}"; }
|
||||||
|
ok() { echo -e " ${c_green}OK${c_off} $*"; }
|
||||||
|
warn() { echo -e " ${c_yellow}!!${c_off} $*"; }
|
||||||
|
err() { echo -e " ${c_red}XX${c_off} $*" >&2; }
|
||||||
|
|
||||||
|
# --- 1. Verifications prealables -------------------------------------------
|
||||||
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
err "Docker introuvable. Installez Docker avant de lancer ce script."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v systemctl >/dev/null 2>&1; then
|
||||||
|
err "systemctl introuvable. Ce script suppose un systeme avec systemd."
|
||||||
|
err "Configurez OLLAMA_HOST manuellement selon votre init system."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! systemctl list-unit-files 2>/dev/null | grep -q '^ollama\.service'; then
|
||||||
|
err "Service systemd 'ollama' introuvable."
|
||||||
|
err "Installez Ollama via le script officiel : curl -fsSL https://ollama.com/install.sh | sh"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 2. Detection de l'IP de la passerelle Docker --------------------------
|
||||||
|
step "Detection de l'IP du bridge Docker..."
|
||||||
|
BRIDGE_IP=""
|
||||||
|
|
||||||
|
# Methode 1 : docker network inspect (la plus fiable)
|
||||||
|
if BRIDGE_IP="$(docker network inspect bridge -f '{{range .IPAM.Config}}{{.Gateway}}{{end}}' 2>/dev/null)"; then
|
||||||
|
if [ -n "$BRIDGE_IP" ]; then
|
||||||
|
ok "IP du bridge Docker detectee via docker network inspect : $BRIDGE_IP"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Methode 2 : interface docker0 (si docker network inspect echoue)
|
||||||
|
if [ -z "$BRIDGE_IP" ] && command -v ip >/dev/null 2>&1; then
|
||||||
|
BRIDGE_IP="$(ip -4 addr show docker0 2>/dev/null | awk '/inet / {print $2}' | cut -d/ -f1 | head -1)"
|
||||||
|
if [ -n "$BRIDGE_IP" ]; then
|
||||||
|
ok "IP du bridge Docker detectee via interface docker0 : $BRIDGE_IP"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Methode 3 : valeur par defaut (compatible avec 99% des installations)
|
||||||
|
if [ -z "$BRIDGE_IP" ]; then
|
||||||
|
BRIDGE_IP="172.17.0.1"
|
||||||
|
warn "Detection automatique echouee, utilisation de la valeur par defaut : $BRIDGE_IP"
|
||||||
|
warn "Si Docker n'a jamais ete demarre sur cette machine, lancez 'docker info' une fois pour creer le bridge."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 3. Ecriture de l'override systemd -------------------------------------
|
||||||
|
step "Configuration du service systemd Ollama..."
|
||||||
|
OVERRIDE_DIR="/etc/systemd/system/ollama.service.d"
|
||||||
|
OVERRIDE_FILE="$OVERRIDE_DIR/loremind-host.conf"
|
||||||
|
|
||||||
|
sudo mkdir -p "$OVERRIDE_DIR"
|
||||||
|
sudo tee "$OVERRIDE_FILE" >/dev/null <<EOF
|
||||||
|
# Genere par LoreMind secure-host-ollama.sh
|
||||||
|
# Lie Ollama exclusivement a l'IP de la passerelle Docker.
|
||||||
|
# Consequence : Ollama est joignable depuis les conteneurs Docker
|
||||||
|
# (via host.docker.internal) mais PAS depuis le LAN ni Internet.
|
||||||
|
# Pour revenir a la configuration par defaut : sudo rm $OVERRIDE_FILE && sudo systemctl daemon-reload && sudo systemctl restart ollama
|
||||||
|
[Service]
|
||||||
|
Environment="OLLAMA_HOST=$BRIDGE_IP:11434"
|
||||||
|
EOF
|
||||||
|
ok "Override ecrit : $OVERRIDE_FILE"
|
||||||
|
|
||||||
|
# --- 4. Rechargement et redemarrage ----------------------------------------
|
||||||
|
step "Rechargement de la configuration systemd..."
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
ok "daemon-reload effectue"
|
||||||
|
|
||||||
|
step "Redemarrage du service Ollama..."
|
||||||
|
sudo systemctl restart ollama
|
||||||
|
sleep 2
|
||||||
|
if sudo systemctl is-active --quiet ollama; then
|
||||||
|
ok "Ollama redemarre et actif"
|
||||||
|
else
|
||||||
|
err "Ollama n'a pas redemarre correctement. Verifiez : sudo journalctl -u ollama -n 50"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 5. Verification du binding --------------------------------------------
|
||||||
|
step "Verification : Ollama doit ecouter sur $BRIDGE_IP:11434..."
|
||||||
|
sleep 1
|
||||||
|
if command -v ss >/dev/null 2>&1; then
|
||||||
|
if ss -tln 2>/dev/null | grep -q "$BRIDGE_IP:11434"; then
|
||||||
|
ok "Ollama ecoute bien sur $BRIDGE_IP:11434"
|
||||||
|
else
|
||||||
|
warn "Verification impossible (ss n'a pas trouve le binding). Cela peut etre normal si le service vient juste de demarrer."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# --- 6. Recap --------------------------------------------------------------
|
||||||
|
echo
|
||||||
|
echo -e "${c_green}============================================================${c_off}"
|
||||||
|
echo -e "${c_green} Ollama hote configure de maniere securisee${c_off}"
|
||||||
|
echo -e "${c_green}============================================================${c_off}"
|
||||||
|
echo " Adresse d'ecoute : $BRIDGE_IP:11434"
|
||||||
|
echo " Accessible depuis : conteneurs Docker uniquement (via host.docker.internal)"
|
||||||
|
echo " Inaccessible depuis : LAN, WiFi public, Internet"
|
||||||
|
echo
|
||||||
|
echo " Pour LoreMind, definissez dans le fichier .env :"
|
||||||
|
echo " OLLAMA_BASE_URL=http://host.docker.internal:11434"
|
||||||
|
echo
|
||||||
|
echo " Pour annuler cette configuration :"
|
||||||
|
echo " sudo rm $OVERRIDE_FILE"
|
||||||
|
echo " sudo systemctl daemon-reload && sudo systemctl restart ollama"
|
||||||
|
echo
|
||||||
@@ -20,6 +20,24 @@ server {
|
|||||||
proxy_send_timeout 300s;
|
proxy_send_timeout 300s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# index.html : toujours revalide. Empeche un navigateur qui a precedemment
|
||||||
|
# visite une autre instance LoreMind (demo en ligne, dev local, etc.) de
|
||||||
|
# servir une vieille version cachee a la place de l'app reelle.
|
||||||
|
location = /index.html {
|
||||||
|
add_header Cache-Control "no-cache, no-store, must-revalidate" always;
|
||||||
|
add_header Pragma "no-cache" always;
|
||||||
|
expires 0;
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Assets Angular avec hash dans le nom (main.<hash>.js, etc.) :
|
||||||
|
# immuables, peuvent etre caches longtemps.
|
||||||
|
location ~* \.(?:js|css|woff2?|ttf|svg|png|jpg|jpeg|webp|ico)$ {
|
||||||
|
expires 1y;
|
||||||
|
add_header Cache-Control "public, immutable" always;
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.html;
|
try_files $uri $uri/ /index.html;
|
||||||
}
|
}
|
||||||
|
|||||||
4
web/package-lock.json
generated
4
web/package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "loremind-web",
|
"name": "loremind-web",
|
||||||
"version": "0.6.5",
|
"version": "0.6.9",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "loremind-web",
|
"name": "loremind-web",
|
||||||
"version": "0.6.5",
|
"version": "0.6.9",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^17.0.0",
|
"@angular/animations": "^17.0.0",
|
||||||
"@angular/common": "^17.0.0",
|
"@angular/common": "^17.0.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "loremind-web",
|
"name": "loremind-web",
|
||||||
"version": "0.6.5",
|
"version": "0.6.9",
|
||||||
"description": "LoreMind Frontend - Angular",
|
"description": "LoreMind Frontend - Angular",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import { HttpInterceptorFn, HttpErrorResponse } from '@angular/common/http';
|
import { HttpInterceptorFn, HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { inject } from '@angular/core';
|
||||||
import { catchError, throwError } from 'rxjs';
|
import { catchError, throwError } from 'rxjs';
|
||||||
|
import { ConfigService } from '../services/config.service';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Detecte la perte de session demo (orchestrateur) via les codes 401/502 sur
|
* Detecte la perte de session demo (orchestrateur) via les codes 401/502 sur
|
||||||
@@ -7,9 +9,10 @@ import { catchError, throwError } from 'rxjs';
|
|||||||
* Le reload renvoie l'utilisateur sur la page "Preparation" pour creer une
|
* Le reload renvoie l'utilisateur sur la page "Preparation" pour creer une
|
||||||
* nouvelle session sans qu'il ait a faire Ctrl+Shift+R.
|
* nouvelle session sans qu'il ait a faire Ctrl+Shift+R.
|
||||||
*
|
*
|
||||||
* Cet interceptor est inerte en mode normal (non-demo) : si le backend natif
|
* Strictement inerte hors mode demo : sans cette garde, un 401 du backend
|
||||||
* renvoie un 401 legitime, ca declenche aussi le reload, ce qui est sans
|
* natif (par ex. HTTP Basic sur /api/settings avant authentification) ou un
|
||||||
* consequence puisqu'aucun flux d'auth utilisateur n'existe encore cote app.
|
* 502 transitoire au boot (Brain pas encore pret) declencherait a tort
|
||||||
|
* l'overlay "session demo expiree" sur les installs self-hosted.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Module-level flag : evite de declencher overlay + reload plusieurs fois si
|
// Module-level flag : evite de declencher overlay + reload plusieurs fois si
|
||||||
@@ -17,8 +20,16 @@ import { catchError, throwError } from 'rxjs';
|
|||||||
let alreadyTriggered = false;
|
let alreadyTriggered = false;
|
||||||
|
|
||||||
export const sessionExpiredInterceptor: HttpInterceptorFn = (req, next) => {
|
export const sessionExpiredInterceptor: HttpInterceptorFn = (req, next) => {
|
||||||
|
const config = inject(ConfigService);
|
||||||
|
|
||||||
return next(req).pipe(
|
return next(req).pipe(
|
||||||
catchError((err) => {
|
catchError((err) => {
|
||||||
|
// Garde stricte : l'overlay et le reload n'ont de sens qu'en mode demo,
|
||||||
|
// ou l'orchestrateur drop les sessions sans prevenir le client.
|
||||||
|
if (!config.demoMode) {
|
||||||
|
return throwError(() => err);
|
||||||
|
}
|
||||||
|
|
||||||
const isApiCall = req.url.includes('/api/');
|
const isApiCall = req.url.includes('/api/');
|
||||||
const isSessionLoss =
|
const isSessionLoss =
|
||||||
err instanceof HttpErrorResponse && (err.status === 401 || err.status === 502);
|
err instanceof HttpErrorResponse && (err.status === 401 || err.status === 502);
|
||||||
|
|||||||
@@ -8,11 +8,12 @@ import { firstValueFrom } from 'rxjs';
|
|||||||
*/
|
*/
|
||||||
export interface PublicConfig {
|
export interface PublicConfig {
|
||||||
demoMode: boolean;
|
demoMode: boolean;
|
||||||
|
updateCheckEnabled: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Injectable({ providedIn: 'root' })
|
@Injectable({ providedIn: 'root' })
|
||||||
export class ConfigService {
|
export class ConfigService {
|
||||||
private config: PublicConfig = { demoMode: false };
|
private config: PublicConfig = { demoMode: false, updateCheckEnabled: false };
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
@@ -28,4 +29,8 @@ export class ConfigService {
|
|||||||
get demoMode(): boolean {
|
get demoMode(): boolean {
|
||||||
return this.config.demoMode;
|
return this.config.demoMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get updateCheckEnabled(): boolean {
|
||||||
|
return this.config.updateCheckEnabled;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,6 +65,86 @@ export class SettingsService {
|
|||||||
listOneMinModels(): Observable<{ groups: OneMinModelGroup[] }> {
|
listOneMinModels(): Observable<{ groups: OneMinModelGroup[] }> {
|
||||||
return this.http.get<{ groups: OneMinModelGroup[] }>(`${this.apiUrl}/models/onemin`, this.authOptions);
|
return this.http.get<{ groups: OneMinModelGroup[] }>(`${this.apiUrl}/models/onemin`, this.authOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Telecharge un modele Ollama et streame la progression au client.
|
||||||
|
*
|
||||||
|
* Le backend renvoie du NDJSON (un objet JSON par ligne) avec le format
|
||||||
|
* Ollama natif : `{status, digest?, total?, completed?}`. On parse chaque
|
||||||
|
* ligne au fur et a mesure et on emet via un Observable que le composant
|
||||||
|
* peut consommer pour mettre a jour une barre de progression.
|
||||||
|
*
|
||||||
|
* On utilise `fetch` directement plutot que `HttpClient` car Angular
|
||||||
|
* bufferise les reponses XHR, ce qui empeche le streaming en temps reel.
|
||||||
|
*/
|
||||||
|
pullOllamaModel(name: string): Observable<OllamaPullEvent> {
|
||||||
|
return new Observable<OllamaPullEvent>((subscriber) => {
|
||||||
|
const controller = new AbortController();
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${this.apiUrl}/models/ollama/pull`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'include',
|
||||||
|
body: JSON.stringify({ name }),
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
if (!response.ok || !response.body) {
|
||||||
|
subscriber.error(new Error(`HTTP ${response.status}`));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const reader = response.body.getReader();
|
||||||
|
const decoder = new TextDecoder();
|
||||||
|
let buffer = '';
|
||||||
|
while (true) {
|
||||||
|
const { value, done } = await reader.read();
|
||||||
|
if (done) break;
|
||||||
|
buffer += decoder.decode(value, { stream: true });
|
||||||
|
// Decoupage NDJSON : chaque ligne est un objet JSON complet.
|
||||||
|
let nl: number;
|
||||||
|
while ((nl = buffer.indexOf('\n')) >= 0) {
|
||||||
|
const line = buffer.slice(0, nl).trim();
|
||||||
|
buffer = buffer.slice(nl + 1);
|
||||||
|
if (!line) continue;
|
||||||
|
try {
|
||||||
|
subscriber.next(JSON.parse(line) as OllamaPullEvent);
|
||||||
|
} catch {
|
||||||
|
// Ligne non JSON (rare) : on l'ignore.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
subscriber.complete();
|
||||||
|
} catch (err) {
|
||||||
|
if ((err as Error).name !== 'AbortError') subscriber.error(err);
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
return () => controller.abort();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteOllamaModel(name: string): Observable<{ status: string; name: string }> {
|
||||||
|
return this.http.delete<{ status: string; name: string }>(
|
||||||
|
`${this.apiUrl}/models/ollama/${encodeURIComponent(name)}`, this.authOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format des evenements emis par Ollama pendant un pull. Les champs sont
|
||||||
|
* optionnels car le serveur emet differents types de messages selon l'etape :
|
||||||
|
* - `{status: "pulling manifest"}`
|
||||||
|
* - `{status: "downloading", digest, total, completed}`
|
||||||
|
* - `{status: "verifying sha256 digest"}`
|
||||||
|
* - `{status: "writing manifest"}`
|
||||||
|
* - `{status: "removing any unused layers"}`
|
||||||
|
* - `{status: "success"}`
|
||||||
|
* - `{error: "..."}` en cas d'erreur (modele inexistant, reseau, etc.)
|
||||||
|
*/
|
||||||
|
export interface OllamaPullEvent {
|
||||||
|
status?: string;
|
||||||
|
digest?: string;
|
||||||
|
total?: number;
|
||||||
|
completed?: number;
|
||||||
|
error?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Un groupe de modeles 1min.ai regroupes par fournisseur (Anthropic, OpenAI, ...). */
|
/** Un groupe de modeles 1min.ai regroupes par fournisseur (Anthropic, OpenAI, ...). */
|
||||||
|
|||||||
62
web/src/app/services/updates.service.ts
Normal file
62
web/src/app/services/updates.service.ts
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
import { BehaviorSubject, Observable, catchError, of, tap } from 'rxjs';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reflet de UpdateCheckService.UpdateStatus cote backend.
|
||||||
|
*/
|
||||||
|
export interface ImageStatus {
|
||||||
|
image: string;
|
||||||
|
localDigest: string | null;
|
||||||
|
remoteDigest: string | null;
|
||||||
|
updateAvailable: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdateStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
updateAvailable: boolean;
|
||||||
|
images: ImageStatus[];
|
||||||
|
checkedAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Service de detection / declenchement des mises a jour des conteneurs
|
||||||
|
* LoreMind. Endpoints proteges par HTTP Basic (admin) — withCredentials
|
||||||
|
* comme pour SettingsService.
|
||||||
|
*
|
||||||
|
* `updateAvailable$` est un signal global consomme par la sidebar pour
|
||||||
|
* afficher un badge. Il est rafraichi via {@link checkNow}.
|
||||||
|
*/
|
||||||
|
@Injectable({ providedIn: 'root' })
|
||||||
|
export class UpdatesService {
|
||||||
|
private readonly apiUrl = '/api/admin/updates';
|
||||||
|
private readonly authOptions = { withCredentials: true };
|
||||||
|
|
||||||
|
private readonly _updateAvailable$ = new BehaviorSubject<boolean>(false);
|
||||||
|
readonly updateAvailable$ = this._updateAvailable$.asObservable();
|
||||||
|
|
||||||
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interroge le backend. Met a jour `updateAvailable$` au passage.
|
||||||
|
* Renvoie `null` en cas d'erreur (pas authentifie, feature off, etc.)
|
||||||
|
* pour ne pas faire crasher l'UI au boot.
|
||||||
|
*/
|
||||||
|
checkNow(): Observable<UpdateStatus | null> {
|
||||||
|
return this.http.get<UpdateStatus>(`${this.apiUrl}/check`, this.authOptions).pipe(
|
||||||
|
tap(s => this._updateAvailable$.next(!!s?.updateAvailable)),
|
||||||
|
catchError(() => {
|
||||||
|
this._updateAvailable$.next(false);
|
||||||
|
return of(null);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
apply(): Observable<{ status: string; message: string } | null> {
|
||||||
|
return this.http.post<{ status: string; message: string }>(
|
||||||
|
`${this.apiUrl}/apply`, null, this.authOptions
|
||||||
|
).pipe(
|
||||||
|
catchError(() => of(null))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -56,11 +56,91 @@
|
|||||||
<lucide-icon [img]="RefreshCw" [size]="14"></lucide-icon>
|
<lucide-icon [img]="RefreshCw" [size]="14"></lucide-icon>
|
||||||
<span>{{ loadingModels ? 'Chargement...' : 'Actualiser' }}</span>
|
<span>{{ loadingModels ? 'Chargement...' : 'Actualiser' }}</span>
|
||||||
</button>
|
</button>
|
||||||
|
<button type="button" class="btn-secondary" (click)="openPullDialog()">
|
||||||
|
<lucide-icon [img]="Plus" [size]="14"></lucide-icon>
|
||||||
|
<span>Telecharger</span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<p class="hint" *ngIf="ollamaModels.length === 0">Aucun modele detecte. Verifie que Ollama tourne et que l'URL est correcte.</p>
|
<p class="hint" *ngIf="ollamaModels.length === 0">Aucun modele detecte. Verifie que Ollama tourne et que l'URL est correcte.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Liste des modeles installes avec bouton supprimer -->
|
||||||
|
<div class="form-row" *ngIf="ollamaModels.length > 0">
|
||||||
|
<label>Modeles installes</label>
|
||||||
|
<ul class="installed-models">
|
||||||
|
<li *ngFor="let m of ollamaModels">
|
||||||
|
<span class="model-name">{{ m }}</span>
|
||||||
|
<button type="button" class="btn-icon btn-danger"
|
||||||
|
(click)="deleteModel(m)"
|
||||||
|
[disabled]="deletingModel === m"
|
||||||
|
[title]="'Supprimer ' + m">
|
||||||
|
<lucide-icon [img]="Trash2" [size]="14"></lucide-icon>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<!-- Dialog de telechargement de modele -->
|
||||||
|
<div class="modal-overlay" *ngIf="pullDialogOpen" (click)="closePullDialog()">
|
||||||
|
<div class="modal-content" (click)="$event.stopPropagation()">
|
||||||
|
<header class="modal-header">
|
||||||
|
<h3>Telecharger un modele Ollama</h3>
|
||||||
|
<button type="button" class="btn-icon" (click)="closePullDialog()" [disabled]="pullInProgress" title="Fermer">
|
||||||
|
<lucide-icon [img]="X" [size]="18"></lucide-icon>
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="modal-body">
|
||||||
|
<div *ngIf="!pullInProgress">
|
||||||
|
<label for="pull-name">Nom du modele</label>
|
||||||
|
<input id="pull-name" type="text" [(ngModel)]="pullModelName"
|
||||||
|
placeholder="ex: gemma4:e4b" autocomplete="off"
|
||||||
|
(keydown.enter)="startPull()">
|
||||||
|
|
||||||
|
<p class="hint">Suggestions :</p>
|
||||||
|
<div class="suggestions">
|
||||||
|
<button type="button" *ngFor="let s of pullSuggestions"
|
||||||
|
class="suggestion-chip" (click)="selectSuggestion(s)">{{ s }}</button>
|
||||||
|
</div>
|
||||||
|
<p class="hint" style="margin-top: 0.75rem;">
|
||||||
|
La liste complete est sur <a href="https://ollama.com/library" target="_blank" rel="noopener">ollama.com/library</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngIf="pullInProgress" class="pull-progress">
|
||||||
|
<div class="pull-status">{{ pullStatus }}</div>
|
||||||
|
<div class="progress-bar" *ngIf="pullTotal > 0">
|
||||||
|
<div class="progress-fill" [style.width.%]="pullPercent"></div>
|
||||||
|
</div>
|
||||||
|
<div class="progress-text" *ngIf="pullTotal > 0">
|
||||||
|
{{ formatBytes(pullCompleted) }} / {{ formatBytes(pullTotal) }} ({{ pullPercent }}%)
|
||||||
|
</div>
|
||||||
|
<div class="progress-text" *ngIf="pullTotal === 0">
|
||||||
|
Preparation...
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<footer class="modal-footer">
|
||||||
|
<button type="button" class="btn-secondary"
|
||||||
|
(click)="cancelPull()" *ngIf="pullInProgress">
|
||||||
|
Annuler
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn-secondary"
|
||||||
|
(click)="closePullDialog()" *ngIf="!pullInProgress">
|
||||||
|
Fermer
|
||||||
|
</button>
|
||||||
|
<button type="button" class="btn-primary"
|
||||||
|
(click)="startPull()"
|
||||||
|
[disabled]="pullInProgress || !pullModelName.trim()" *ngIf="!pullInProgress">
|
||||||
|
<lucide-icon [img]="Download" [size]="14"></lucide-icon>
|
||||||
|
<span>Telecharger</span>
|
||||||
|
</button>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Bloc 1min.ai -->
|
<!-- Bloc 1min.ai -->
|
||||||
<section class="card" *ngIf="settings && settings.llm_provider === 'onemin'">
|
<section class="card" *ngIf="settings && settings.llm_provider === 'onemin'">
|
||||||
<h2>Configuration 1min.ai</h2>
|
<h2>Configuration 1min.ai</h2>
|
||||||
@@ -141,6 +221,56 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<!-- Bloc Mises a jour -->
|
||||||
|
<section class="card" *ngIf="config.updateCheckEnabled">
|
||||||
|
<h2>Mises a jour</h2>
|
||||||
|
<p class="hint">Verifie aupres du registry Docker si une nouvelle version
|
||||||
|
des conteneurs (core, brain, web) est disponible. Postgres et MinIO sont
|
||||||
|
exclus — ils sont mis a jour manuellement.</p>
|
||||||
|
|
||||||
|
<div class="form-row">
|
||||||
|
<button type="button" class="btn-secondary" (click)="checkUpdates()" [disabled]="updateChecking">
|
||||||
|
<lucide-icon [img]="RefreshCw" [size]="14"></lucide-icon>
|
||||||
|
<span>{{ updateChecking ? 'Verification...' : 'Verifier maintenant' }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngIf="updateStatus && !updateStatus.enabled" class="hint">
|
||||||
|
Feature non configuree (WATCHTOWER_TOKEN absent).
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngIf="updateStatus?.enabled">
|
||||||
|
<div *ngIf="updateStatus?.updateAvailable" class="alert alert-success">
|
||||||
|
<lucide-icon [img]="Download" [size]="16"></lucide-icon>
|
||||||
|
<span>Une mise a jour est disponible.</span>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="!updateStatus?.updateAvailable" class="hint">
|
||||||
|
Tout est a jour (verifie le {{ updateStatus?.checkedAt | date:'short' }}).
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul class="update-images" *ngIf="updateStatus?.images?.length">
|
||||||
|
<li *ngFor="let img of updateStatus?.images">
|
||||||
|
<strong>{{ img.image }}</strong>
|
||||||
|
<span *ngIf="img.updateAvailable" class="badge-update">MAJ dispo</span>
|
||||||
|
<span *ngIf="!img.updateAvailable && img.remoteDigest" class="badge-ok">a jour</span>
|
||||||
|
<span *ngIf="!img.remoteDigest" class="badge-warn">indisponible</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="form-row" *ngIf="updateStatus?.updateAvailable">
|
||||||
|
<button type="button" class="btn-primary" (click)="applyUpdate()" [disabled]="updateApplying">
|
||||||
|
<lucide-icon [img]="Download" [size]="16"></lucide-icon>
|
||||||
|
<span>{{ updateApplying ? 'Mise a jour en cours...' : 'Mettre a jour maintenant' }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div *ngIf="updateMessage" class="alert alert-success">
|
||||||
|
<lucide-icon [img]="Check" [size]="16"></lucide-icon>
|
||||||
|
<span>{{ updateMessage }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
<div class="actions" *ngIf="settings">
|
<div class="actions" *ngIf="settings">
|
||||||
<button class="btn-primary" (click)="save()" [disabled]="saving">
|
<button class="btn-primary" (click)="save()" [disabled]="saving">
|
||||||
<lucide-icon [img]="Save" [size]="16"></lucide-icon>
|
<lucide-icon [img]="Save" [size]="16"></lucide-icon>
|
||||||
|
|||||||
@@ -5,6 +5,173 @@
|
|||||||
color: var(--color-text, #e8e8e8);
|
color: var(--color-text, #e8e8e8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Liste des modeles installes -----------------------------------------
|
||||||
|
.installed-models {
|
||||||
|
list-style: none;
|
||||||
|
margin: 6px 0 0;
|
||||||
|
padding: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
|
||||||
|
li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 6px 12px;
|
||||||
|
background: rgba(255, 255, 255, 0.03);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.model-name {
|
||||||
|
font-family: ui-monospace, SFMono-Regular, monospace;
|
||||||
|
color: #c4b8e0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-icon {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 28px;
|
||||||
|
height: 28px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
|
border-radius: 5px;
|
||||||
|
color: inherit;
|
||||||
|
cursor: pointer;
|
||||||
|
&:hover { background: rgba(255, 255, 255, 0.06); }
|
||||||
|
&:disabled { opacity: 0.5; cursor: not-allowed; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-icon.btn-danger:hover {
|
||||||
|
background: rgba(239, 68, 68, 0.12);
|
||||||
|
border-color: rgba(239, 68, 68, 0.4);
|
||||||
|
color: #fca5a5;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Modal de pull -------------------------------------------------------
|
||||||
|
.modal-overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
background: rgba(0, 0, 0, 0.6);
|
||||||
|
backdrop-filter: blur(4px);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-content {
|
||||||
|
background: #1f1a2e;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||||
|
border-radius: 10px;
|
||||||
|
width: min(520px, 92vw);
|
||||||
|
max-height: 90vh;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 16px 20px;
|
||||||
|
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 1.05rem;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-body {
|
||||||
|
padding: 20px;
|
||||||
|
overflow-y: auto;
|
||||||
|
|
||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
font-weight: 500;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"] {
|
||||||
|
width: 100%;
|
||||||
|
padding: 8px 12px;
|
||||||
|
background: rgba(255, 255, 255, 0.04);
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.12);
|
||||||
|
border-radius: 6px;
|
||||||
|
color: inherit;
|
||||||
|
font-family: ui-monospace, SFMono-Regular, monospace;
|
||||||
|
box-sizing: border-box;
|
||||||
|
&:focus { outline: 2px solid #b794f4; outline-offset: 0; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.suggestions {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6px;
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.suggestion-chip {
|
||||||
|
padding: 4px 10px;
|
||||||
|
background: rgba(183, 148, 244, 0.1);
|
||||||
|
border: 1px solid rgba(183, 148, 244, 0.25);
|
||||||
|
border-radius: 14px;
|
||||||
|
color: #d6c5f0;
|
||||||
|
font-family: ui-monospace, SFMono-Regular, monospace;
|
||||||
|
font-size: 0.82rem;
|
||||||
|
cursor: pointer;
|
||||||
|
&:hover { background: rgba(183, 148, 244, 0.2); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.modal-footer {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 14px 20px;
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
}
|
||||||
|
|
||||||
|
.pull-progress {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 12px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pull-status {
|
||||||
|
font-size: 0.92rem;
|
||||||
|
color: #d6c5f0;
|
||||||
|
font-family: ui-monospace, SFMono-Regular, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-bar {
|
||||||
|
width: 100%;
|
||||||
|
height: 8px;
|
||||||
|
background: rgba(255, 255, 255, 0.06);
|
||||||
|
border-radius: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-fill {
|
||||||
|
height: 100%;
|
||||||
|
background: linear-gradient(90deg, #8b5cf6, #b794f4);
|
||||||
|
transition: width 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-text {
|
||||||
|
font-size: 0.82rem;
|
||||||
|
color: #aaa0c5;
|
||||||
|
font-family: ui-monospace, SFMono-Regular, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
.page-header {
|
.page-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -153,3 +320,46 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
accent-color: #6c63ff;
|
accent-color: #6c63ff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.update-images {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0.75rem 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.4rem;
|
||||||
|
}
|
||||||
|
.update-images li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.6rem;
|
||||||
|
padding: 0.4rem 0.6rem;
|
||||||
|
background: rgba(255, 255, 255, 0.03);
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
.badge-update {
|
||||||
|
margin-left: auto;
|
||||||
|
background: #6c63ff;
|
||||||
|
color: white;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 0.15rem 0.5rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.badge-ok {
|
||||||
|
margin-left: auto;
|
||||||
|
background: rgba(76, 175, 80, 0.2);
|
||||||
|
color: #81c784;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
padding: 0.15rem 0.5rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.badge-warn {
|
||||||
|
margin-left: auto;
|
||||||
|
background: rgba(255, 152, 0, 0.2);
|
||||||
|
color: #ffb74d;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
padding: 0.15rem 0.5rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { LucideAngularModule, ArrowLeft, RefreshCw, Save, Check, AlertCircle } from 'lucide-angular';
|
import { LucideAngularModule, ArrowLeft, RefreshCw, Save, Check, AlertCircle, Download, Trash2, Plus, X } from 'lucide-angular';
|
||||||
import { SettingsService, AppSettings, AppSettingsUpdate, OneMinModelGroup } from '../services/settings.service';
|
import { SettingsService, AppSettings, AppSettingsUpdate, OneMinModelGroup, OllamaPullEvent } from '../services/settings.service';
|
||||||
|
import { Subscription } from 'rxjs';
|
||||||
|
import { UpdatesService, UpdateStatus } from '../services/updates.service';
|
||||||
|
import { ConfigService } from '../services/config.service';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ecran de parametrage du LLM utilise par le Brain.
|
* Ecran de parametrage du LLM utilise par le Brain.
|
||||||
@@ -30,6 +33,41 @@ export class SettingsComponent implements OnInit {
|
|||||||
readonly Save = Save;
|
readonly Save = Save;
|
||||||
readonly Check = Check;
|
readonly Check = Check;
|
||||||
readonly AlertCircle = AlertCircle;
|
readonly AlertCircle = AlertCircle;
|
||||||
|
readonly Download = Download;
|
||||||
|
readonly Trash2 = Trash2;
|
||||||
|
readonly Plus = Plus;
|
||||||
|
readonly X = X;
|
||||||
|
|
||||||
|
// --- Pull / delete de modeles Ollama ---
|
||||||
|
/** Dialog d'ajout de modele ouvert/ferme. */
|
||||||
|
pullDialogOpen = false;
|
||||||
|
/** Nom saisi par l'utilisateur dans le dialog. */
|
||||||
|
pullModelName = '';
|
||||||
|
/** Suggestions courantes affichees dans le dialog. */
|
||||||
|
readonly pullSuggestions = [
|
||||||
|
'gemma4:e4b', 'gemma3:4b', 'gemma3:12b',
|
||||||
|
'llama3.2:3b', 'llama3.1:8b',
|
||||||
|
'mistral:7b', 'qwen2.5:3b', 'qwen2.5:7b'
|
||||||
|
];
|
||||||
|
/** Pull en cours ; null si aucun. */
|
||||||
|
pullInProgress = false;
|
||||||
|
/** Etape courante affichee a l'utilisateur (ex: "downloading", "verifying"). */
|
||||||
|
pullStatus = '';
|
||||||
|
/** Bytes telecharges sur le digest courant. */
|
||||||
|
pullCompleted = 0;
|
||||||
|
/** Bytes totaux du digest courant. */
|
||||||
|
pullTotal = 0;
|
||||||
|
/** Souscription au flux de pull pour pouvoir l'annuler. */
|
||||||
|
private pullSubscription: Subscription | null = null;
|
||||||
|
|
||||||
|
/** Modele en cours de suppression (nom) pour disabler son bouton. */
|
||||||
|
deletingModel: string | null = null;
|
||||||
|
|
||||||
|
// Mises a jour conteneurs
|
||||||
|
updateStatus: UpdateStatus | null = null;
|
||||||
|
updateChecking = false;
|
||||||
|
updateApplying = false;
|
||||||
|
updateMessage = '';
|
||||||
|
|
||||||
settings: AppSettings | null = null;
|
settings: AppSettings | null = null;
|
||||||
ollamaModels: string[] = [];
|
ollamaModels: string[] = [];
|
||||||
@@ -61,11 +99,51 @@ export class SettingsComponent implements OnInit {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private settingsService: SettingsService,
|
private settingsService: SettingsService,
|
||||||
private router: Router
|
private router: Router,
|
||||||
|
private updatesService: UpdatesService,
|
||||||
|
public config: ConfigService
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.loadSettings();
|
this.loadSettings();
|
||||||
|
if (this.config.updateCheckEnabled) {
|
||||||
|
this.checkUpdates();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
checkUpdates(): void {
|
||||||
|
this.updateChecking = true;
|
||||||
|
this.updateMessage = '';
|
||||||
|
this.updatesService.checkNow().subscribe({
|
||||||
|
next: (s) => {
|
||||||
|
this.updateStatus = s;
|
||||||
|
this.updateChecking = false;
|
||||||
|
},
|
||||||
|
error: () => {
|
||||||
|
this.updateChecking = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
applyUpdate(): void {
|
||||||
|
if (!confirm('Telecharger et redemarrer les conteneurs maintenant ? L\'app sera indisponible quelques secondes.')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.updateApplying = true;
|
||||||
|
this.updateMessage = '';
|
||||||
|
this.updatesService.apply().subscribe({
|
||||||
|
next: (r) => {
|
||||||
|
this.updateApplying = false;
|
||||||
|
// Le redemarrage de core peut couper la connexion avant la reponse —
|
||||||
|
// dans ce cas r vaut null (gere par catchError dans le service).
|
||||||
|
this.updateMessage = r?.message
|
||||||
|
?? 'Mise a jour declenchee. Rechargez la page dans 30s.';
|
||||||
|
},
|
||||||
|
error: () => {
|
||||||
|
this.updateApplying = false;
|
||||||
|
this.updateMessage = 'Mise a jour declenchee. Rechargez la page dans 30s.';
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
loadSettings(): void {
|
loadSettings(): void {
|
||||||
@@ -180,6 +258,119 @@ export class SettingsComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Gestion des modeles Ollama (pull / delete) -------------------------
|
||||||
|
|
||||||
|
openPullDialog(): void {
|
||||||
|
this.pullDialogOpen = true;
|
||||||
|
this.pullModelName = '';
|
||||||
|
this.resetPullState();
|
||||||
|
}
|
||||||
|
|
||||||
|
closePullDialog(): void {
|
||||||
|
if (this.pullInProgress) return; // empêche fermeture pendant un pull
|
||||||
|
this.pullDialogOpen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
selectSuggestion(name: string): void {
|
||||||
|
this.pullModelName = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
startPull(): void {
|
||||||
|
const name = this.pullModelName.trim();
|
||||||
|
if (!name || this.pullInProgress) return;
|
||||||
|
this.resetPullState();
|
||||||
|
this.pullInProgress = true;
|
||||||
|
this.pullStatus = 'connexion...';
|
||||||
|
this.errorMessage = '';
|
||||||
|
|
||||||
|
this.pullSubscription = this.settingsService.pullOllamaModel(name).subscribe({
|
||||||
|
next: (event: OllamaPullEvent) => {
|
||||||
|
if (event.error) {
|
||||||
|
this.errorMessage = `Echec : ${event.error}`;
|
||||||
|
this.pullInProgress = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (event.status) this.pullStatus = event.status;
|
||||||
|
if (event.completed != null) this.pullCompleted = event.completed;
|
||||||
|
if (event.total != null) this.pullTotal = event.total;
|
||||||
|
},
|
||||||
|
error: (err) => {
|
||||||
|
this.errorMessage = this.extractError(err, `Echec du telechargement de ${name}.`);
|
||||||
|
this.pullInProgress = false;
|
||||||
|
},
|
||||||
|
complete: () => {
|
||||||
|
this.pullInProgress = false;
|
||||||
|
this.successMessage = `Modele ${name} telecharge.`;
|
||||||
|
this.refreshModels();
|
||||||
|
// Si l'utilisateur n'avait aucun modele, on selectionne celui-ci.
|
||||||
|
if (this.settings && !this.settings.llm_model) {
|
||||||
|
this.settings.llm_model = name;
|
||||||
|
this.fetchOllamaModelInfo();
|
||||||
|
}
|
||||||
|
// Petite tempo avant de fermer pour que le user voie "success".
|
||||||
|
setTimeout(() => this.closePullDialog(), 1200);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelPull(): void {
|
||||||
|
if (this.pullSubscription) {
|
||||||
|
this.pullSubscription.unsubscribe();
|
||||||
|
this.pullSubscription = null;
|
||||||
|
}
|
||||||
|
this.pullInProgress = false;
|
||||||
|
this.pullStatus = 'annule';
|
||||||
|
}
|
||||||
|
|
||||||
|
private resetPullState(): void {
|
||||||
|
this.pullStatus = '';
|
||||||
|
this.pullCompleted = 0;
|
||||||
|
this.pullTotal = 0;
|
||||||
|
if (this.pullSubscription) {
|
||||||
|
this.pullSubscription.unsubscribe();
|
||||||
|
this.pullSubscription = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Pourcentage du digest courant pour la barre de progression. */
|
||||||
|
get pullPercent(): number {
|
||||||
|
if (this.pullTotal <= 0) return 0;
|
||||||
|
return Math.min(100, Math.round((this.pullCompleted / this.pullTotal) * 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Affichage humain des octets ('1.2 GB' / '450 MB'). */
|
||||||
|
formatBytes(b: number): string {
|
||||||
|
if (!b) return '0';
|
||||||
|
const u = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||||
|
let i = 0;
|
||||||
|
let v = b;
|
||||||
|
while (v >= 1024 && i < u.length - 1) { v /= 1024; i++; }
|
||||||
|
return `${v.toFixed(v < 10 && i > 0 ? 1 : 0)} ${u[i]}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteModel(name: string): void {
|
||||||
|
if (!confirm(`Supprimer le modele '${name}' ? L'espace disque sera libere.`)) return;
|
||||||
|
this.deletingModel = name;
|
||||||
|
this.errorMessage = '';
|
||||||
|
this.settingsService.deleteOllamaModel(name).subscribe({
|
||||||
|
next: () => {
|
||||||
|
this.deletingModel = null;
|
||||||
|
this.successMessage = `Modele ${name} supprime.`;
|
||||||
|
// Si l'utilisateur supprime le modele actuellement selectionne,
|
||||||
|
// on bascule sur le premier disponible (ou vide).
|
||||||
|
this.refreshModels();
|
||||||
|
if (this.settings && this.settings.llm_model === name) {
|
||||||
|
this.settings.llm_model = '';
|
||||||
|
this.ollamaModelMaxContext = 0;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: (err) => {
|
||||||
|
this.deletingModel = null;
|
||||||
|
this.errorMessage = this.extractError(err, `Echec de la suppression de ${name}.`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
goBack(): void {
|
goBack(): void {
|
||||||
this.router.navigate(['/lore']);
|
this.router.navigate(['/lore']);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,7 @@
|
|||||||
<button class="tool-btn" *ngIf="!config.demoMode" [class.active]="currentRoute.startsWith('/settings')" (click)="navigateTo('/settings')">
|
<button class="tool-btn" *ngIf="!config.demoMode" [class.active]="currentRoute.startsWith('/settings')" (click)="navigateTo('/settings')">
|
||||||
<lucide-icon [img]="Settings" [size]="16"></lucide-icon>
|
<lucide-icon [img]="Settings" [size]="16"></lucide-icon>
|
||||||
<span>Paramètres</span>
|
<span>Paramètres</span>
|
||||||
|
<span class="update-badge" *ngIf="updateAvailable$ | async" title="Mise a jour disponible">MAJ</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -178,6 +178,23 @@
|
|||||||
border: 1px solid #3a3f55;
|
border: 1px solid #3a3f55;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.update-badge {
|
||||||
|
margin-left: auto;
|
||||||
|
font-size: 0.65rem;
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
background: #6c63ff;
|
||||||
|
color: white;
|
||||||
|
padding: 0.15rem 0.4rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
animation: update-pulse 2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes update-pulse {
|
||||||
|
0%, 100% { box-shadow: 0 0 0 0 rgba(108, 99, 255, 0.5); }
|
||||||
|
50% { box-shadow: 0 0 0 4px rgba(108, 99, 255, 0); }
|
||||||
|
}
|
||||||
|
|
||||||
.sidebar-footer {
|
.sidebar-footer {
|
||||||
padding-top: 1rem;
|
padding-top: 1rem;
|
||||||
border-top: 1px solid #1e1e3a;
|
border-top: 1px solid #1e1e3a;
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { AsyncPipe, NgIf, NgFor } from '@angular/common';
|
import { AsyncPipe, NgIf, NgFor } from '@angular/common';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { LucideAngularModule, Search, Download, Settings, ArrowLeft, Dices } from 'lucide-angular';
|
import { LucideAngularModule, Search, Download, Settings, ArrowLeft, Dices } from 'lucide-angular';
|
||||||
import { LayoutService } from '../services/layout.service';
|
import { LayoutService } from '../services/layout.service';
|
||||||
import { GlobalSearchService } from '../services/global-search.service';
|
import { GlobalSearchService } from '../services/global-search.service';
|
||||||
import { ConfigService } from '../services/config.service';
|
import { ConfigService } from '../services/config.service';
|
||||||
|
import { UpdatesService } from '../services/updates.service';
|
||||||
// Single source of truth pour la version affichée dans le footer :
|
// Single source of truth pour la version affichée dans le footer :
|
||||||
// on lit directement package.json à la compilation (resolveJsonModule).
|
// on lit directement package.json à la compilation (resolveJsonModule).
|
||||||
import packageJson from '../../../package.json';
|
import packageJson from '../../../package.json';
|
||||||
@@ -16,7 +17,7 @@ import packageJson from '../../../package.json';
|
|||||||
templateUrl: './sidebar.component.html',
|
templateUrl: './sidebar.component.html',
|
||||||
styleUrls: ['./sidebar.component.scss']
|
styleUrls: ['./sidebar.component.scss']
|
||||||
})
|
})
|
||||||
export class SidebarComponent {
|
export class SidebarComponent implements OnInit {
|
||||||
currentRoute = '';
|
currentRoute = '';
|
||||||
|
|
||||||
readonly Search = Search;
|
readonly Search = Search;
|
||||||
@@ -27,18 +28,30 @@ export class SidebarComponent {
|
|||||||
|
|
||||||
readonly layoutConfig$ = this.layoutService.secondarySidebar$;
|
readonly layoutConfig$ = this.layoutService.secondarySidebar$;
|
||||||
readonly appVersion = packageJson.version;
|
readonly appVersion = packageJson.version;
|
||||||
|
readonly updateAvailable$ = this.updates.updateAvailable$;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private router: Router,
|
private router: Router,
|
||||||
private layoutService: LayoutService,
|
private layoutService: LayoutService,
|
||||||
private globalSearch: GlobalSearchService,
|
private globalSearch: GlobalSearchService,
|
||||||
public config: ConfigService
|
public config: ConfigService,
|
||||||
|
private updates: UpdatesService
|
||||||
) {
|
) {
|
||||||
this.router.events.subscribe(() => {
|
this.router.events.subscribe(() => {
|
||||||
this.currentRoute = this.router.url;
|
this.currentRoute = this.router.url;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
// Premier check au boot uniquement si la feature est activee + mode non-demo.
|
||||||
|
// L'erreur 401 (admin non auth) est silencieusement ignoree par le service —
|
||||||
|
// le badge ne s'affichera que si l'utilisateur est passe par /settings et a
|
||||||
|
// saisi ses credentials HTTP Basic. Comportement attendu mono-utilisateur.
|
||||||
|
if (this.config.updateCheckEnabled && !this.config.demoMode) {
|
||||||
|
this.updates.checkNow().subscribe();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
navigateTo(route: string): void {
|
navigateTo(route: string): void {
|
||||||
this.router.navigate([route]);
|
this.router.navigate([route]);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user