Upload 26 files

mouh/learning/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "v4.5.1",
+  "version": "v4.5.3",
   "files": {
     "app.py": "36ff9411bd29395d",
     "requirements.txt": "613d00e516f8f4b8",
@@ -25,7 +25,7 @@
     "engine/__init__.py": "9ed43b8c6346ad0e",
     "engine/trainer.py": "778e08d76a7731e3",
     "mouh/webui.py": "de56bcb7b5a926c5",
-    "mouh/world.py": "eb7541962969ba76",
+    "mouh/world.py": "11dfe4d90d48b2d7",
     "mouh/lab/__init__.py": "374f8a6b3c61de0a",
     "mouh/lab/common.py": "3e81863585cd64a8",
     "mouh/lab/algorithms.py": "603da6df0953b6d0",
@@ -37,7 +37,7 @@
     "mouh/lab/api.py": "e3b2d3894f81a5de",
     "mouh/lab/examples.py": "e1218f95b6f3c220",
     "unique_ext/README.md": "0f0be41551e6bacb",
-    "unique_ext/__init__.py": "a8f8476d8d99df3d",
+    "unique_ext/__init__.py": "7aae5378f906d108",
     "unique_ext/backends/__init__.py": "e3b0c44298fc1c14",
     "unique_ext/backends/hf.py": "506d29e81c127e1e",
     "unique_ext/contracts.py": "4ce5632e921dfcdc",
@@ -63,8 +63,8 @@
     "web/symbioza/index.html": "af4f860577542cea",
     "web/symbioza/static/css/hub.css": "18b95106f5f2022a",
     "web/symbioza/static/css/hud.css": "87ba7a20761a9d6a",
-    "web/symbioza/static/js/app.js": "b198351f459479cb",
-    "web/symbioza/static/js/flat.js": "5741ea89873ccf16",
+    "web/symbioza/static/js/app.js": "c977fdb2efe9c392",
+    "web/symbioza/static/js/flat.js": "62503f1c83fc2151",
     "web/symbioza/static/js/hub.js": "dc1ca2ac931a0c2e",
     "web/symbioza/static/js/shaders.js": "0e070676691c054c",
     "web/symbioza/static/vendor/three/LICENSE.txt": "8b378ebe60e2fe50",

mouh/world.py

@@ -305,11 +305,38 @@ def _compact(path: Path) -> None:
 
 
 def objects(world_dir: Path, limit: int = 60) -> list[dict]:
-    """Index du monde, le plus récent d'abord : un objet par emplacement, **sans** son rendu (léger)."""
+    """Index du monde, un objet par emplacement, **sans** son rendu (léger), le plus récent d'abord.
+
+    Quand le monde dépasse ``limit``, chaque secteur garde sa part (v4.5.2) et les artefacts simulés passent avant les
+    structures de code : une reconstruction de 60 sessions de code ne doit pas chasser de l'arène le drone ou le pont
+    que l'essaim vient de valider.
+    """
     with _LOCK:
         latest = list(_latest_by_slot(Path(world_dir) / OBJECTS).values())
     latest.sort(key=lambda r: r.get("at", ""), reverse=True)
-    return [{k: v for k, v in r.items() if k != "render"} for r in latest[:max(1, limit)]]
+    limit = max(1, limit)
+    if len(latest) > limit:
+        quota = max(1, limit // len(SECTORS))
+        chosen: list[dict] = []
+        taken: set[int] = set()
+        per: dict[str, int] = {}
+        for artefacts_first in (True, False):           # 1) artefacts par secteur, 2) structures par secteur
+            for i, r in enumerate(latest):
+                d = r.get("domain", "algorithmique")
+                if i in taken or (r.get("matter") == "artefact") != artefacts_first or per.get(d, 0) >= quota:
+                    continue
+                chosen.append(r)
+                taken.add(i)
+                per[d] = per.get(d, 0) + 1
+        for i, r in enumerate(latest):                  # 3) le reste de la place, au plus récent
+            if len(chosen) >= limit:
+                break
+            if i not in taken:
+                chosen.append(r)
+                taken.add(i)
+        order = {id(r): i for i, r in enumerate(latest)}
+        latest = sorted(chosen[:limit], key=lambda r: order[id(r)])
+    return [{k: v for k, v in r.items() if k != "render"} for r in latest]
 
 
 def object_render(world_dir: Path, object_id: str) -> dict | None:

tests/test_frontend.py

@@ -209,3 +209,10 @@ def test_cache_policy_revalidates_the_page_and_spares_the_api():
     assert cache_policy("/symbioza/static/css/hud.css") == "no-cache"
     assert cache_policy("/static/vendor/three/build/three.module.js").startswith("public, max-age=")
     assert cache_policy("/api/ui/meta") is None and cache_policy("/gradio/") is None
+
+
+def test_the_flat_view_is_frugal_on_old_machines():
+    """v4.5.3 : tracés groupés, budget de segments par image, aucune image tracée quand rien ne bouge."""
+    flat = FLAT.read_text(encoding="utf-8")
+    assert "new Path2D()" in flat and "EDGE_BUDGET" in flat and "FRAME_MS" in flat
+    assert "(!dirty && !animated())" in flat

tests/test_world.py

@@ -207,3 +207,16 @@ def test_rebuild_is_admin_only_and_rebenches_old_sessions(unified):
         r = c.post("/api/ui/jobs/world", json={"limit": 10}, headers={"x-admin-key": "secret"})
         j = wait(c, r.json()["job"])
         assert j["state"] == "done" and "dont 1 en rupture" in j["result"]["message"]
+
+
+def test_a_flood_of_code_structures_never_pushes_validated_artifacts_out_of_the_arena(tmp_path):
+    """Régression v4.5.1 : 59 sessions de code reconstruites après le drone le chassaient des 40 objets affichés."""
+    report = lab.evaluate({"solution.py": TRUSS["candidate"]}, lab_tests(TRUSS))
+    world.deposit(tmp_path, instruction="pont", files={}, task_hash="p" * 64, certified=True, report=report)
+    time.sleep(1.1)                                       # les structures arrivent après, comme une reconstruction
+    for i in range(59):
+        world.deposit(tmp_path, instruction=f"code {i}", files={"solution.py": f"def f{i}(x):\n    return x + {i}\n"},
+                      task_hash=f"s{i:03d}" + "x" * 60, certified=True, report=None)
+    shown = world.objects(tmp_path, limit=40)
+    assert len(shown) == 40 and any(o["domain"] == "mecanique" for o in shown)
+    assert [o["at"] for o in shown] == sorted((o["at"] for o in shown), reverse=True)

unique_ext/__init__.py

@@ -13,7 +13,7 @@ from __future__ import annotations
 import os
 
 API_VERSION = 1          # contrat entre le job d'entraînement et ce paquet : le job refuse une autre valeur
-__version__ = "4.5.1"
+__version__ = "4.5.3"
 
 
 def enabled(name: str) -> bool:

web/symbioza/static/js/app.js

@@ -1104,6 +1104,11 @@ async function poll() {
     const shown = flat.update(lastRecords, building);
     setText('m-shown', String(shown));
     body.dataset.items = String(shown);
+    // Jauges en vue en plan : le coût réel du dessin 2D sur cette machine (les calculs, eux, sont faits sur le Space).
+    const st = flat.stats();
+    setText('m-fps', st.animated ? st.fps.toFixed(0) : 'repos');
+    setText('m-frame', `${st.drawMs.toFixed(1)} ms`);
+    setText('m-tris', `${st.segments.toLocaleString('fr-FR')} seg.`);
     setSource(shown ? 'live' : 'demo');
   } else {
     setSource('off');
@@ -1159,6 +1164,7 @@ function toggleBloom() {
 function toggleRotate() {
   state.rotate = !state.rotate;
   setPressed('btn-rotate', state.rotate);
+  if (typeof flat !== 'undefined' && flat) flat.redraw();
 }
 
 function onKey(e) {
@@ -1274,6 +1280,7 @@ if (!ctx) {
   showGlMessage(glError);
   // Repli : le même monde en 2D isométrique. Un clic sur un objet ouvre l'inspecteur, comme dans la 3D.
   flat = createFlat($('scene'), {
+    rotating: () => state.rotate,
     area: () => {
       const w = window.innerWidth;
       const h = window.innerHeight;

web/symbioza/static/js/flat.js

@@ -9,7 +9,9 @@ const NAMES = {
   mecanique: 'MÉCANIQUE & ROBOTIQUE', electronique: 'ÉLECTRONIQUE & EMBARQUÉ',
   biologie: 'GÉNÉTIQUE & BIO SYNTHÉTIQUE', algorithmique: 'ALGORITHMIQUE & ARCHITECTURES',
 };
-const MAX_EDGES = 1600;
+const MAX_EDGES = 1600;          // segments gardés par objet
+const EDGE_BUDGET = 12000;       // segments tracés au plus par image, tous objets confondus
+const FRAME_MS = 42;             // 24 images/s au plus : assez pour une rejouée, sobre pour un vieux processeur
 const BOX = [[0, 1], [1, 2], [2, 3], [3, 0], [4, 5], [5, 6], [6, 7], [7, 4], [0, 4], [1, 5], [2, 6], [3, 7]];
 
 function edgesOf(vertices, faces) {
@@ -85,7 +87,7 @@ function prepare(e, i, n) {
   return item;
 }
 
-export function createFlat(host, { onPick, area } = {}) {
+export function createFlat(host, { onPick, area, rotating } = {}) {
   const canvas = document.createElement('canvas');
   canvas.className = 'flat';
   host.appendChild(canvas);
@@ -97,6 +99,8 @@ export function createFlat(host, { onPick, area } = {}) {
   let view = { cx: 0, cy: 0, s: 40 };
   const started = performance.now();
   let last = 0;
+  let dirty = true;
+  const stats = { drawMs: 0, fps: 0, segments: 0 };
 
   function resize() {
     const dpr = Math.min(window.devicePixelRatio || 1, 2);
@@ -124,31 +128,34 @@ export function createFlat(host, { onPick, area } = {}) {
     return [view.cx + view.s * u, view.cy + view.s * (0.5 * v - 0.9 * y), v];
   }
 
-  function line(a, b, color, width = 1) {
-    const p = P(...a);
-    const q = P(...b);
+  // Tracés groupés : un seul chemin par couleur, tracé une fois par image (des milliers de segments en un appel),
+  // et un budget de segments par image pour qu'une machine modeste ne sature jamais.
+  function seg(path, a, b) {
+    const p = P(a[0], a[1], a[2]);
+    const q = P(b[0], b[1], b[2]);
+    path.moveTo(p[0], p[1]);
+    path.lineTo(q[0], q[1]);
+  }
+
+  function stroke(path, color, width) {
     g.strokeStyle = color;
     g.lineWidth = width;
-    g.beginPath();
-    g.moveTo(p[0], p[1]);
-    g.lineTo(q[0], q[1]);
-    g.stroke();
+    g.stroke(path);
   }
 
-  function ellipse(x, z, r, color, width = 1.5) {
+  function ring(path, x, z, r) {
     const c = P(x, FLOOR_Y, z);
-    g.strokeStyle = color;
-    g.lineWidth = width;
-    g.beginPath();
-    g.ellipse(c[0], c[1], r * view.s, r * view.s * 0.5, 0, 0, Math.PI * 2);
-    g.stroke();
+    path.moveTo(c[0] + r * view.s, c[1]);
+    path.ellipse(c[0], c[1], r * view.s, r * view.s * 0.5, 0, 0, Math.PI * 2);
   }
 
   function drawSectors() {
+    const path = new Path2D();
     for (let k = 0; k < 4; k += 1) {
       const a = (k * Math.PI) / 2;
-      line([Math.cos(a) * 3.2, FLOOR_Y, Math.sin(a) * 3.2], [Math.cos(a) * 40, FLOOR_Y, Math.sin(a) * 40], 'rgba(162, 75, 255, 0.28)');
+      seg(path, [Math.cos(a) * 3.2, FLOOR_Y, Math.sin(a) * 3.2], [Math.cos(a) * 40, FLOOR_Y, Math.sin(a) * 40]);
     }
+    stroke(path, 'rgba(162, 75, 255, 0.28)', 1);
     g.font = `600 ${view.s > 14 ? 11 : 9}px ui-monospace, monospace`;
     g.textAlign = 'center';
     g.fillStyle = 'rgba(201, 155, 255, 0.85)';
@@ -159,7 +166,7 @@ export function createFlat(host, { onPick, area } = {}) {
     }
   }
 
-  function drawRig(it, t) {
+  function rigEdges(path, it, t) {
     const r = it.rig;
     const total = r.frames.length * r.dt;
     const tt = t % (total + 1.2);
@@ -177,45 +184,80 @@ export function createFlat(host, { onPick, area } = {}) {
         const w = rotate(bq, [local[0] + geo.pos[0], local[1] + geo.pos[1], local[2] + geo.pos[2]]);
         corners.push(toScene([w[0] + bp[0], w[1] + bp[1], w[2] + bp[2]]));
       }
-      for (const [a, b] of BOX) line(corners[a], corners[b], 'rgba(214, 170, 255, 0.95)', 1.4);
+      for (const [a, b] of BOX) seg(path, corners[a], corners[b]);
     }
   }
 
+  // Une image n'est tracée que si quelque chose bouge (rotation, robot rejoué, chantier) ou a changé : à l'arrêt,
+  // la vue ne coûte rien au processeur.
+  function animated() {
+    return (rotating ? rotating() : true) || sites.length > 0 || items.some((it) => it.rig);
+  }
+
   function draw(now) {
     requestAnimationFrame(draw);
-    if (document.hidden || now - last < 33) return;
+    if (document.hidden || (!dirty && !animated()) || now - last < FRAME_MS) return;
+    const interval = now - last;
     last = now;
+    dirty = false;
+    const t0 = performance.now();
     const t = (now - started) / 1000;
-    if (!drag) theta += 0.0016;
+    if (!drag && (rotating ? rotating() : true)) theta += 0.0016 * Math.min(interval, 200) / 33;
     g.clearRect(0, 0, window.innerWidth, window.innerHeight);
     drawSectors();
-    const order = [...items].sort((a, b) => P(a.place[0], 0, a.place[1])[2] - P(b.place[0], 0, b.place[1])[2]);
-    for (const it of order) {
+    const total = items.reduce((n, it) => n + it.edges.length, 0);
+    const stride = Math.max(1, Math.ceil(total / EDGE_BUDGET));
+    const edges = new Path2D();
+    const rigs = new Path2D();
+    const links = [new Path2D(), new Path2D(), new Path2D()];
+    const rings = { valide: new Path2D(), rupture: new Path2D(), libre: new Path2D() };
+    const marks = [[], [], []];
+    for (const it of items) {
       const [px, pz] = it.place;
       const e = it.entry;
-      ellipse(px, pz, 1.45, e.lab ? STATUS[e.status] || STATUS.valide : 'rgba(255, 230, 0, 0.6)', 1.6);
-      if (it.rig) drawRig(it, t);
-      for (const [a, b] of it.edges) line([px + a[0], a[1], pz + a[2]], [px + b[0], b[1], pz + b[2]], 'rgba(201, 155, 255, 0.5)');
-      for (const l of it.links) line([px + l.a[0], l.a[1], pz + l.a[2]], [px + l.b[0], l.b[1], pz + l.b[2]], LINK[l.s] || LINK[0], 1.6);
-      for (const m of it.marks) {
-        const p = P(px + m.p[0], m.p[1], pz + m.p[2]);
-        g.fillStyle = m.s === 2 ? `rgba(255, 42, 77, ${0.55 + 0.45 * Math.abs(Math.sin(t * 3))})` : LINK[m.s] || LINK[1];
-        g.beginPath();
-        g.arc(p[0], p[1], 3.5, 0, Math.PI * 2);
-        g.fill();
+      ring(rings[e.lab ? (e.status === 'rupture' ? 'rupture' : 'valide') : 'libre'], px, pz, 1.45);
+      if (it.rig) rigEdges(rigs, it, t);
+      for (let k = 0; k < it.edges.length; k += stride) {
+        const [a, b] = it.edges[k];
+        seg(edges, [px + a[0], a[1], pz + a[2]], [px + b[0], b[1], pz + b[2]]);
       }
+      for (const l of it.links) seg(links[l.s] || links[0], [px + l.a[0], l.a[1], pz + l.a[2]], [px + l.b[0], l.b[1], pz + l.b[2]]);
+      for (const m of it.marks) marks[m.s in marks ? m.s : 2].push(P(px + m.p[0], m.p[1], pz + m.p[2]));
     }
-    for (const b of sites) {                      // chantiers : losange en fil de fer qui tourne
-      const [x, z] = b.place;
-      ellipse(x, z, 1.45, 'rgba(162, 75, 255, 0.9)', 1.5);
-      const a = t * 1.5;
-      const pts = [0, 1, 2, 3].map((k) => [x + 0.9 * Math.cos(a + (k * Math.PI) / 2), 0, z + 0.9 * Math.sin(a + (k * Math.PI) / 2)]);
-      for (let k = 0; k < 4; k += 1) {
-        line(pts[k], pts[(k + 1) % 4], 'rgba(162, 75, 255, 0.9)');
-        line(pts[k], [x, 1, z], 'rgba(162, 75, 255, 0.6)');
-        line(pts[k], [x, -1, z], 'rgba(162, 75, 255, 0.6)');
+    stroke(rings.libre, 'rgba(255, 230, 0, 0.6)', 1.6);
+    stroke(rings.valide, STATUS.valide, 1.6);
+    stroke(rings.rupture, STATUS.rupture, 1.8);
+    stroke(edges, 'rgba(201, 155, 255, 0.5)', 1);
+    stroke(rigs, 'rgba(214, 170, 255, 0.95)', 1.4);
+    links.forEach((path, k) => stroke(path, LINK[k], 1.6));
+    marks.forEach((pts, k) => {
+      if (!pts.length) return;
+      const path = new Path2D();
+      for (const p of pts) { path.moveTo(p[0] + 3.5, p[1]); path.arc(p[0], p[1], 3.5, 0, Math.PI * 2); }
+      g.globalAlpha = k === 2 ? 0.55 + 0.45 * Math.abs(Math.sin(t * 3)) : 1;
+      g.fillStyle = LINK[k];
+      g.fill(path);
+      g.globalAlpha = 1;
+    });
+    if (sites.length) {                           // chantiers : losange en fil de fer qui tourne
+      const path = new Path2D();
+      for (const b of sites) {
+        const [x, z] = b.place;
+        ring(path, x, z, 1.45);
+        const a = t * 1.5;
+        const pts = [0, 1, 2, 3].map((k) => [x + 0.9 * Math.cos(a + (k * Math.PI) / 2), 0, z + 0.9 * Math.sin(a + (k * Math.PI) / 2)]);
+        for (let k = 0; k < 4; k += 1) {
+          seg(path, pts[k], pts[(k + 1) % 4]);
+          seg(path, pts[k], [x, 1, z]);
+          seg(path, pts[k], [x, -1, z]);
+        }
       }
+      stroke(path, 'rgba(162, 75, 255, 0.85)', 1.3);
     }
+    const spent = performance.now() - t0;
+    stats.drawMs = stats.drawMs ? stats.drawMs * 0.9 + spent * 0.1 : spent;
+    stats.fps = interval > 0 && interval < 1000 ? (stats.fps ? stats.fps * 0.9 + (1000 / interval) * 0.1 : 1000 / interval) : stats.fps;
+    stats.segments = Math.ceil(total / stride);
   }
 
   function pick(ev) {
@@ -233,6 +275,7 @@ export function createFlat(host, { onPick, area } = {}) {
   canvas.addEventListener('pointermove', (ev) => {
     if (!drag) return;
     theta += (ev.clientX - drag.x) * 0.006;
+    dirty = true;
     drag.moved += Math.abs(ev.clientX - drag.x);
     drag.x = ev.clientX;
   });
@@ -240,7 +283,7 @@ export function createFlat(host, { onPick, area } = {}) {
     if (drag && drag.moved < 6) pick(ev);
     drag = null;
   });
-  window.addEventListener('resize', () => { resize(); fit(); });
+  window.addEventListener('resize', () => { resize(); fit(); dirty = true; });
   resize();
   fit();
   requestAnimationFrame(draw);
@@ -250,7 +293,10 @@ export function createFlat(host, { onPick, area } = {}) {
       items = records.map((e, i) => prepare(e, i, records.length));
       sites = (building || []).filter((b) => Array.isArray(b.place));
       fit();
+      dirty = true;
       return items.length;
     },
+    redraw() { dirty = true; },
+    stats() { return { ...stats, animated: animated() }; },
   };
 }