FabNum/Code
4
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: FabNum:c0ab1f15912475c66037d609932fc7dc5af8737d
Branches Tags
FabNum:dev
FabNum:public
..
compare: FabNum:397e5b3307247ad8a47c33b8d8e6e7f9133ff1d0
Branches Tags
FabNum:public
FabNum:dev

3 Commits
c0ab1f1591 ... 397e5b3307

Author SHA1 Message Date
Stéphan
397e5b3307 style(css) : mise à jour de la bonne indentation 2025-06-15 11:59:04 +02:00
Stéphan
e926f9c73a fix(pgpt) : suite à montée de version de docker 
régénération du docker-compose.yaml pour pouvoir relancer le service
 2025-06-15 11:56:24 +02:00
Stéphan
29f36f6442 fix(session) : problème de cache de config.py 
mise en place de la génération dynamique de toutes les variables
dépendant de session_id
 2025-06-15 11:55:26 +02:00
5 changed files with 179 additions and 198 deletions
Show Stats Expand all files Collapse all files

310
assets/styles/base.css
View File

@ -4,33 +4,33 @@
1. Reset et base 1. Reset et base
========================================== */ ========================================== */
.stAppHeader { .stAppHeader {
visibility: hidden; visibility: hidden;
} }
body, body,
html { html {
font-family: font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial,
sans-serif; sans-serif;
} }
body, body,
.stApp, .stApp,
.block-container { .block-container {
background-color: var(--bg-color) !important; background-color: var(--bg-color) !important;
color: var(--text-color) !important; color: var(--text-color) !important;
} }
/* ========================================== /* ==========================================
2. Layout et containers 2. Layout et containers
========================================== */ ========================================== */
.block-container { .block-container {
max-width: 1024px !important; max-width: 1024px !important;
padding: 0 1rem 10rem; padding: 0 1rem 10rem;
} }
.stVerticalBlock { .stVerticalBlock {
gap: 0.5rem !important; gap: 0.5rem !important;
} }
/* ========================================== /* ==========================================
@ -42,97 +42,97 @@ body,
.stDownloadButton > button, .stDownloadButton > button,
.stFormSubmitButton > button, .stFormSubmitButton > button,
.stSlider > div > div { .stSlider > div > div {
background-color: darkgreen !important; background-color: darkgreen !important;
color: white !important; color: white !important;
border: 1px solid grey; border: 1px solid grey;
} }
.st-key-FormSubmitter-auth_form-Se-connecter { .st-key-FormSubmitter-auth_form-Se-connecter {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
button[data-testid="stBaseButton-primary"], button[data-testid="stBaseButton-primary"],
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
button[data-testid="stBaseButton-secondary"] { button[data-testid="stBaseButton-secondary"] {
color: white !important; color: white !important;
background: darkgreen !important; background: darkgreen !important;
} }
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
button[data-testid="stBaseButton-primary"] button[data-testid="stBaseButton-primary"]
p, p,
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
button[data-testid="stBaseButton-secondary"] button[data-testid="stBaseButton-secondary"]
p { p {
color: white !important; color: white !important;
} }
.bouton-fictif { .bouton-fictif {
display: inline-flex; display: inline-flex;
-moz-box-align: center; -moz-box-align: center;
align-items: center; align-items: center;
-moz-box-pack: center; -moz-box-pack: center;
justify-content: center; justify-content: center;
padding: 0.25rem 0.75rem; padding: 0.25rem 0.75rem;
border-radius: 0.5rem; border-radius: 0.5rem;
min-height: 2.5rem; min-height: 2.5rem;
margin-bottom: 20px; margin-bottom: 20px;
line-height: 1; line-height: 1;
text-transform: none; text-transform: none;
font-size: x-large; font-size: x-large;
font-family: inherit; font-family: inherit;
user-select: none; user-select: none;
border: 1px solid rgba(49, 51, 63, 0.2); border: 1px solid rgba(49, 51, 63, 0.2);
background-color: darkgrey !important; background-color: darkgrey !important;
color: darkgreen !important; color: darkgreen !important;
font-weight: bold !important; font-weight: bold !important;
width: 100%; width: 100%;
letter-spacing: 0.2em; letter-spacing: 0.2em;
} }
button[data-testid="stBaseButton-headerNoPadding"] svg { button[data-testid="stBaseButton-headerNoPadding"] svg {
fill: var(--text-color) !important; fill: var(--text-color) !important;
} }
/* --- 3.2 Onglets et radiogroup --- */ /* --- 3.2 Onglets et radiogroup --- */
div[role="radiogroup"] > label { div[role="radiogroup"] > label {
padding: 0.5em 1em; padding: 0.5em 1em;
border-radius: 0.4em; border-radius: 0.4em;
margin-right: 0.5em; margin-right: 0.5em;
cursor: pointer; cursor: pointer;
border: 1px solid #fff; border: 1px solid #fff;
} }
div[role="radiogroup"] > label[data-selected="true"] { div[role="radiogroup"] > label[data-selected="true"] {
font-weight: bold; font-weight: bold;
border: 2px solid #145a1a; border: 2px solid #145a1a;
} }
section:not([data-testid="stSidebar"]) div[role="radiogroup"] > label p { section:not([data-testid="stSidebar"]) div[role="radiogroup"] > label p {
background-color: var(--radio-bg) !important; background-color: var(--radio-bg) !important;
color: var(--radio-text) !important; color: var(--radio-text) !important;
} }
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
div[role="radiogroup"] div[role="radiogroup"]
> label[data-selected="true"] { > label[data-selected="true"] {
background-color: var(--radio-selected-bg) !important; background-color: var(--radio-selected-bg) !important;
color: var(--radio-selected-text) !important; color: var(--radio-selected-text) !important;
} }
/* --- 3.3 Champs de formulaire --- */ /* --- 3.3 Champs de formulaire --- */
div[data-baseweb="select"], div[data-baseweb="select"],
section:not([data-testid="stSidebar"]) div[data-baseweb="base-input"], section:not([data-testid="stSidebar"]) div[data-baseweb="base-input"],
section[data-testid="stFileUploaderDropzone"] { section[data-testid="stFileUploaderDropzone"] {
border: 1px solid var(--input-border) !important; border: 1px solid var(--input-border) !important;
border-radius: 5px; border-radius: 5px;
padding: 4px; padding: 4px;
} }
small { small {
display: none; display: none;
} }
section:not([data-testid="stSidebar"]) div[data-testid="stSelectbox"] p, section:not([data-testid="stSidebar"]) div[data-testid="stSelectbox"] p,
@ -142,7 +142,7 @@ section:not([data-testid="stSidebar"]) div[data-testid="stCheckbox"] p,
section:not([data-testid="stSidebar"]) div[data-testid="stTextInput"] p, section:not([data-testid="stSidebar"]) div[data-testid="stTextInput"] p,
section:not([data-testid="stSidebar"]) div[data-testid="stTextArea"] p, section:not([data-testid="stSidebar"]) div[data-testid="stTextArea"] p,
section:not([data-testid="stSidebar"]) div[data-testid="stAlertContentInfo"] p { section:not([data-testid="stSidebar"]) div[data-testid="stAlertContentInfo"] p {
color: var(--text-color) !important; color: var(--text-color) !important;
} }
/* ========================================== /* ==========================================
@ -151,98 +151,98 @@ section:not([data-testid="stSidebar"]) div[data-testid="stAlertContentInfo"] p {
/* --- 4.1 Header --- */ /* --- 4.1 Header --- */
.wide-header { .wide-header {
width: 100vw; width: 100vw;
margin-left: calc(-50vw + 50%); margin-left: calc(-50vw + 50%);
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
text-align: center; text-align: center;
padding-top: 1rem; padding-top: 1rem;
margin-top: -1.25em; margin-top: -1.25em;
background-color: var(--header-bg); background-color: var(--header-bg);
} }
.titre-header { .titre-header {
font-size: 2rem !important; font-size: 2rem !important;
font-weight: bolder !important; font-weight: bolder !important;
color: var(--header-title); color: var(--header-title);
} }
/* --- 4.2 Footer --- */ /* --- 4.2 Footer --- */
.wide-footer { .wide-footer {
width: 100vw; width: 100vw;
margin-left: calc(-50vw + 50%); margin-left: calc(-50vw + 50%);
margin-top: 3rem; margin-top: 3rem;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
text-align: center; text-align: center;
padding-top: 1rem; padding-top: 1rem;
background-color: var(--footer-bg); background-color: var(--footer-bg);
} }
.info-footer { .info-footer {
font-size: 1rem !important; font-size: 1rem !important;
font-weight: 800; font-weight: 800;
color: var(--footer-text); color: var(--footer-text);
} }
/* ========================================== /* ==========================================
5. Sidebar 5. Sidebar
========================================== */ ========================================== */
section[data-testid="stSidebar"] { section[data-testid="stSidebar"] {
background-color: #ccc !important; background-color: #ccc !important;
color: #111 !important; color: #111 !important;
} }
section[data-testid="stSidebar"] .stButton > button { section[data-testid="stSidebar"] .stButton > button {
background-color: darkgreen !important; background-color: darkgreen !important;
color: white !important; color: white !important;
font-weight: bold !important; font-weight: bold !important;
border: 1px solid #ccc !important; border: 1px solid #ccc !important;
width: 100%; width: 100%;
} }
section[data-testid="stSidebar"] .decorative-heading { section[data-testid="stSidebar"] .decorative-heading {
font-size: 1.25rem; font-size: 1.25rem;
font-weight: bold; font-weight: bold;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
text-align: center; text-align: center;
color: #145a1a; color: #145a1a;
} }
section[data-testid="stSidebar"] div[role="radiogroup"] { section[data-testid="stSidebar"] div[role="radiogroup"] {
justify-content: center !important; justify-content: center !important;
display: flex !important; display: flex !important;
gap: 1rem; gap: 1rem;
} }
/* ========================================== /* ==========================================
6. Tables 6. Tables
========================================== */ ========================================== */
table { table {
border: 1px solid var(--table-border) !important; border: 1px solid var(--table-border) !important;
border-collapse: collapse; border-collapse: collapse;
width: 100%; width: 100%;
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
th, th,
td { td {
border: 1px solid var(--table-border) !important; border: 1px solid var(--table-border) !important;
padding: 8px; padding: 8px;
text-align: left; text-align: left;
} }
caption { caption {
caption-side: top; caption-side: top;
font-weight: bold; font-weight: bold;
padding: 0.5em; padding: 0.5em;
text-align: left; text-align: left;
caption-side: bottom; caption-side: bottom;
text-align: center; text-align: center;
} }
table[role="table"] th[scope="col"] { table[role="table"] th[scope="col"] {
background-color: var(--background-color); background-color: var(--background-color);
} }
/* ========================================== /* ==========================================
@ -254,99 +254,99 @@ table[role="table"] th[scope="col"] {
/* --- 7.2 Graphiques --- */ /* --- 7.2 Graphiques --- */
.stPlotlyChart text { .stPlotlyChart text {
fill: var(--plot-text) !important; fill: var(--plot-text) !important;
} }
.stPlotlyChart text { .stPlotlyChart text {
fill: black !important; fill: black !important;
text-shadow: none !important; text-shadow: none !important;
font-weight: bold !important; font-weight: bold !important;
font-size: 14px !important; font-size: 14px !important;
font-family: Verdana, sans-serif !important; font-family: Verdana, sans-serif !important;
} }
/* Cache complètement la section d'actions Vega */ /* Cache complètement la section d'actions Vega */
.vega-actions { .vega-actions {
display: none !important; display: none !important;
} }
/* Et aussi le <details> parent, s'il faut tout masquer */ /* Et aussi le <details> parent, s'il faut tout masquer */
details[title="Click to view actions"] { details[title="Click to view actions"] {
display: none !important; display: none !important;
} }
/* --- 7.3 Détails et paragraphes --- */ /* --- 7.3 Détails et paragraphes --- */
details { details {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 6px; border-radius: 6px;
padding: 0.5em; padding: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
background-color: var(--background-color); background-color: var(--background-color);
border-color: var(--details-border) !important; border-color: var(--details-border) !important;
} }
section:not([data-testid="stSidebar"]) section:not([data-testid="stSidebar"])
div:not[data-testid="stElementContainer"] div:not[data-testid="stElementContainer"]
p:not(#Authentification):not(#Theme) { p:not(#Authentification):not(#Theme) {
color: var(--paragraph-color) !important; color: var(--paragraph-color) !important;
} }
section:not([data-testid="stSidebar"]) hr { section:not([data-testid="stSidebar"]) hr {
background-color: var(--hr-color) !important; background-color: var(--hr-color) !important;
} }
/* --- 7.4 Conteneurs de commentaires et tickets --- */ /* --- 7.4 Conteneurs de commentaires et tickets --- */
.conteneur_commentaire, .conteneur_commentaire,
.conteneur_ticket { .conteneur_ticket {
background: var(--background-color); background: var(--background-color);
padding: 1em; padding: 1em;
border-radius: 8px; border-radius: 8px;
margin-bottom: 1em; margin-bottom: 1em;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.commentaire_auteur, .commentaire_auteur,
.ticket_auteur { .ticket_auteur {
color: var(--text-color) !important; color: var(--text-color) !important;
margin: 0; margin: 0;
} }
.commentaire_contenu, .commentaire_contenu,
.ticket_contenu { .ticket_contenu {
color: var(--text-color) !important; color: var(--text-color) !important;
margin: 0.5rem 0 0; margin: 0.5rem 0 0;
} }
/* --- 7.5 Blocs mathématiques --- */ /* --- 7.5 Blocs mathématiques --- */
.math-block { .math-block {
display: block; display: block;
text-align: center; text-align: center;
margin: 1em 0; margin: 1em 0;
border: 1px solid var(--math-block-border); border: 1px solid var(--math-block-border);
border-radius: 10px; border-radius: 10px;
background: var(--math-block-bg); background: var(--math-block-bg);
font-size: x-large; font-size: x-large;
color: var(--text-color); color: var(--text-color);
} }
.math-block math { .math-block math {
display: inline-block; display: inline-block;
} }
/* ========================================== /* ==========================================
8. Éléments spécifiques 8. Éléments spécifiques
========================================== */ ========================================== */
div.stElementContainer.element-container.st-key-nom_utilisateur { div.stElementContainer.element-container.st-key-nom_utilisateur {
display: none !important; display: none !important;
} }
.st-key-telecharger_fiche_pdf { .st-key-telecharger_fiche_pdf {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
margin-top: 1rem; margin-top: 1rem;
} }
.details_introduction { .details_introduction {
margin-top: 0.5rem; margin-top: 0.5rem;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }

3
components/header.py
View File

@ -1,6 +1,7 @@
import streamlit as st import streamlit as st
from config import ENV from config import ENV
from utils.translations import _ from utils.translations import _
from utils.persistance import get_session_id
def afficher_entete(): def afficher_entete():
@ -11,7 +12,7 @@ def afficher_entete():
""" """
if ENV == "dev": if ENV == "dev":
header += f"<p>🔧 {_("app.dev_mode")}</p>" header += f"<p>🔧 {_("app.dev_mode")} Session : {get_session_id()}</p>"
else: else:
header += f"<p>{_("header.subtitle")}</p>" header += f"<p>{_("header.subtitle")}</p>"

11
fabnum.py
View File

@ -1,5 +1,8 @@
import utils.persistance
utils.persistance.update_session_paths()
import streamlit as st import streamlit as st
from utils.persistance import get_champ_statut from utils.persistance import get_champ_statut, get_session_id
st.set_page_config( st.set_page_config(
page_title="Fabnum – Analyse de chaîne", page_title="Fabnum – Analyse de chaîne",
@ -88,8 +91,6 @@ init_translations()
# Pour tester d'autres langues, décommenter cette ligne : # Pour tester d'autres langues, décommenter cette ligne :
set_language("fr") set_language("fr")
session_id = st.context.headers.get("x-session-id")
# #
# Important # Important
# Avec Selinux, il faut mettre les bons droits : # Avec Selinux, il faut mettre les bons droits :
@ -97,6 +98,7 @@ session_id = st.context.headers.get("x-session-id")
# sudo semanage fcontext -a -t var_log_t '/var/log/nginx/fabnum-public\.access\.log' # sudo semanage fcontext -a -t var_log_t '/var/log/nginx/fabnum-public\.access\.log'
# sudo restorecon -v /var/log/nginx/fabnum-public.access.log # sudo restorecon -v /var/log/nginx/fabnum-public.access.log
# #
session_id = get_session_id()
def get_total_bytes_for_session(session_id): def get_total_bytes_for_session(session_id):
total_bytes = 0 total_bytes = 0
try: try:
@ -158,7 +160,7 @@ def fermer_page():
st.markdown("""</section>""", unsafe_allow_html=True) st.markdown("""</section>""", unsafe_allow_html=True)
st.markdown("</main>", unsafe_allow_html=True) st.markdown("</main>", unsafe_allow_html=True)
total_bytes = get_total_bytes_for_session(session_id) total_bytes = get_total_bytes_for_session(get_session_id())
afficher_pied_de_page() afficher_pied_de_page()
afficher_impact(total_bytes) afficher_impact(total_bytes)
@ -176,7 +178,6 @@ ia_nalyse_tab = _("navigation.ia_nalyse")
plan_d_action_tab = _("navigation.plan_d_action") plan_d_action_tab = _("navigation.plan_d_action")
visualisations_tab = _("navigation.visualisations") visualisations_tab = _("navigation.visualisations")
from utils.persistance import get_champ_statut
navigation_onglet = get_champ_statut("navigation_onglet") navigation_onglet = get_champ_statut("navigation_onglet")
if navigation_onglet == instructions_tab: if navigation_onglet == instructions_tab:

30
pgpt/docker-compose.yaml
View File

@ -3,10 +3,8 @@ services:
#---- Private-GPT services --------- #---- Private-GPT services ---------
#----------------------------------- #-----------------------------------
# Private-GPT service for the Ollama CPU and GPU modes
# This service builds from an external Dockerfile and runs the Ollama mode.
private-gpt-ollama: private-gpt-ollama:
image: ${PGPT_IMAGE:-zylonai/private-gpt}:${PGPT_TAG:-0.6.2}-ollama # x-release-please-version image: ${PGPT_IMAGE:-zylonai/private-gpt}:${PGPT_TAG:-0.6.2}-ollama
user: root user: root
build: build:
context: . context: .
@ -29,12 +27,10 @@ services:
- ollama-api - ollama-api
depends_on: depends_on:
ollama: ollama:
condition: service_healthy condition: service_started
# Private-GPT service for the local mode
# This service builds from a local Dockerfile and runs the application in local mode.
private-gpt-llamacpp-cpu: private-gpt-llamacpp-cpu:
image: ${PGPT_IMAGE:-zylonai/private-gpt}:${PGPT_TAG:-0.6.2}-llamacpp-cpu # x-release-please-version image: ${PGPT_IMAGE:-zylonai/private-gpt}:${PGPT_TAG:-0.6.2}-llamacpp-cpu
user: root user: root
build: build:
context: . context: .
@ -56,22 +52,8 @@ services:
#---- Ollama services -------------- #---- Ollama services --------------
#----------------------------------- #-----------------------------------
# Traefik reverse proxy for the Ollama service
# This will route requests to the Ollama service based on the profile.
ollama: ollama:
image: traefik:v2.10 image: traefik:v2.10
healthcheck:
test:
[
"CMD",
"sh",
"-c",
"wget -q --spider http://ollama:11434 || exit 1",
]
interval: 10s
retries: 3
start_period: 5s
timeout: 5s
ports: ports:
- "127.0.0.1:8080:8080" - "127.0.0.1:8080:8080"
command: command:
@ -86,24 +68,26 @@ services:
- ./.docker/router.yml:/etc/router.yml:ro - ./.docker/router.yml:/etc/router.yml:ro
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
security_opt:
- label:disable
profiles: profiles:
- "" - ""
- ollama-cpu - ollama-cpu
- ollama-cuda - ollama-cuda
- ollama-api - ollama-api
# Ollama service for the CPU mode
ollama-cpu: ollama-cpu:
image: ollama/ollama:latest image: ollama/ollama:latest
ports: ports:
- "127.0.0.1:11434:11434" - "127.0.0.1:11434:11434"
volumes: volumes:
- ./models:/root/.ollama:Z - ./models:/root/.ollama:Z
healthcheck:
disable: true
profiles: profiles:
- "" - ""
- ollama-cpu - ollama-cpu
# Ollama service for the CUDA mode
ollama-cuda: ollama-cuda:
image: ollama/ollama:latest image: ollama/ollama:latest
ports: ports:

23
utils/persistance.py
View File

@ -8,22 +8,17 @@ from pathlib import Path
load_dotenv(".env") load_dotenv(".env")
def initialise(): def get_session_id() -> str:
SAVE_SESSIONS_PATH.mkdir(parents=True, exist_ok=True) session_id = st.context.headers.get("x-session-id", "anonymous")
def get_session_id():
if "session_id" not in st.session_state:
session_id = st.context.headers.get("x-session-id", "anonymous")
st.session_state["session_id"] = session_id
else:
session_id = st.session_state["session_id"]
return session_id return session_id
SAVE_STATUT = os.getenv("SAVE_STATUT", "statut_general.json") def update_session_paths():
session_id = get_session_id() global SAVE_STATUT, SAVE_SESSIONS_PATH, SAVE_STATUT_PATH
SAVE_SESSIONS_PATH = Path(f"tmp/sessions/{session_id}")
SAVE_STATUT_PATH = SAVE_SESSIONS_PATH / SAVE_STATUT SAVE_STATUT = os.getenv("SAVE_STATUT", "statut_general.json")
initialise() SAVE_SESSIONS_PATH = Path(f"tmp/sessions/{get_session_id()}")
SAVE_SESSIONS_PATH.mkdir(parents=True, exist_ok=True)
SAVE_STATUT_PATH = SAVE_SESSIONS_PATH / SAVE_STATUT
def _maj_champ(fichier, cle: str, contenu: str = "") -> bool: def _maj_champ(fichier, cle: str, contenu: str = "") -> bool: