From 8c16ba7c8c4bceb3935539b82dcfde427f8d07ba Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Fri, 6 Nov 2026 18:23:07 +0300 Subject: [PATCH] =?UTF-8?q?[WORK]=20=D0=A4=D1=83=D0=BD=D0=B4=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82:=20=D0=BF=D0=BE=D1=80=D1=82=D1=8B=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=BA=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D1=8B=20+?= =?UTF-8?q?=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D1=86=D0=B5=D0=BF=D0=BE=D1=87=D0=BA=D0=B8,=20=D0=B2=D0=B5?= =?UTF-8?q?=D0=BD=D0=B4=D0=BE=D1=80=D1=8B/=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B,=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=B4=D0=B2=D0=B8?= =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20(20/20),=20=D0=B1=D1=8D=D0=BA=D0=B0=D0=BF-?= =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80,=20=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D0=B0=20(EIA-310),=20IP-=D0=BF=D0=BB=D0=B0=D0=BD,?= =?UTF-8?q?=20enricher=20LLM=20=D1=81=20=D1=86=D0=B8=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D0=BC=D0=B8,=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ops/work/tools/build_queue.py | 95 +++++++++++++++++++++++++++ ops/work/tools/fetch_doc_text.py | 87 ++++++++++++++++++++++++ ops/work/tools/fetch_product_specs.py | 84 +++++++++++++++++++++++ ops/work/web/combine_core.py | 84 ++++++++++++++++++++++- ops/work/web/combine_units.py | 86 ++++++++++++++++++++++++ ops/work/web/services/svc_catalog.py | 11 ++++ ops/work/web/services/svc_draw.py | 55 ++++++++++++++++ ops/work/web/services/svc_engine.py | 51 +++++++++++++- ops/work/web/test_engine.py | 81 +++++++++++++++++++++++ 9 files changed, 630 insertions(+), 4 deletions(-) create mode 100644 ops/work/tools/build_queue.py create mode 100644 ops/work/tools/fetch_doc_text.py create mode 100644 ops/work/tools/fetch_product_specs.py create mode 100644 ops/work/web/combine_units.py create mode 100644 ops/work/web/test_engine.py diff --git a/ops/work/tools/build_queue.py b/ops/work/tools/build_queue.py new file mode 100644 index 0000000..d48ae60 --- /dev/null +++ b/ops/work/tools/build_queue.py @@ -0,0 +1,95 @@ +#!/usr/bin/env python3 +"""Собирает очередь документов Yealink Support из sitemap. + +1) читает sitemapindex +2) качает вложенные sitemap +3) вытаскивает URL вида /docs/// +4) фильтрует по интересным продуктам +5) пишет очередь queue.jsonl +""" +import json +import os +import re +import subprocess +import sys + +OUT = "/opt/work-hub/research" +UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/120" + +# продукты, которые нам нужны (ВКС + аудио + инфраструктура + телефония) +PRODUCTS = set(""" +a10 a20 a25 a30 a40 a50 a40-zoom a50-zoom meetingbar meetingboard meetingeye +mcore mcore4 mc-pro mvc pvb pvt roomcast +uvc20 uvc30 uvc34 uvc40 uvc40-e2 uvc42 uvc44 uvc84 uvc85 uvc86 uvc88 +smartvision sv40 sv60 sv80 +vcm34 vcm35 vcm36 vcm38 cm20 cm50 cs10 cs10-d mspeaker mspeaker-pro +cp50 cp920 cp960 cp965 cpe40 cpe90 cpe95 pa20 ap08 +vch50 vch51 vch51-pro wpp20 wpp30 rch40 rch40-e2 avbridge avhub +ctp18 ctp25 mtouch vcr11 vcr20 +meetingdisplay etv65 etv86 +t31 t33 t34 t43 t46 t48 t53 t54 t57 t58 t73 t74 t77 t78 +w70 w73 w76 w78 w80 w90 wh62 wh63 wh66 wh67 yhs34 uh34 bh70 +yealink-room-designer yealink-room-device-calculator +""".split()) + + +def fetch(url): + return subprocess.run(["curl", "-sL", "-m", "60", "-A", UA, url], + capture_output=True, text=True, timeout=120).stdout + + +def main(): + os.makedirs(OUT, exist_ok=True) + idx = fetch("https://support.yealink.com/sitemap.xml") + subs = re.findall(r"([^<]+)", idx) + print("вложенных sitemap:", len(subs)) + urls = set() + for i, s in enumerate(subs, 1): + if not s.endswith(".xml"): + continue + body = fetch(s) + found = re.findall(r"(https://support\.yealink\.com/docs/[^<]+)", body) + if found: + print(" %-45s +%d" % (s.rsplit('/', 1)[-1], len(found))) + urls.update(found) + + print("\nвсего doc-URL:", len(urls)) + # продукт = первый сегмент после /docs/ + by_product = {} + for u in urls: + m = re.match(r"https://support\.yealink\.com/docs/([^/]+)/", u) + if not m: + continue + by_product.setdefault(m.group(1), []).append(u) + print("продуктов в sitemap:", len(by_product)) + + chosen = [] + for p, lst in by_product.items(): + if p in PRODUCTS: + chosen.extend(lst) + print("URL по нашим продуктам:", len(chosen)) + + if not chosen: # fallback: взять всё, что похоже на ВКС + chosen = [u for u in urls if any(k in u for k in + ("meetingbar", "meetingeye", "meetingboard", "uvc", "vcm", "mvc"))] + print("fallback-выборка:", len(chosen)) + + path = os.path.join(OUT, "queue.jsonl") + with open(path, "w", encoding="utf-8") as f: + for u in sorted(chosen): + m = re.match(r"https://support\.yealink\.com/docs/([^/]+)/([^/]+)/", u) + f.write(json.dumps({"url": u, + "product": m.group(1) if m else "", + "slug": m.group(2) if m else "", + "status": "pending"}, ensure_ascii=False) + "\n") + print("\nочередь:", path, "| записей:", len(chosen)) + # сводка по продуктам + top = sorted(((p, len(v)) for p, v in by_product.items() if p in PRODUCTS), + key=lambda x: -x[1])[:15] + for p, n in top: + print(" %-22s %d док." % (p, n)) + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/ops/work/tools/fetch_doc_text.py b/ops/work/tools/fetch_doc_text.py new file mode 100644 index 0000000..2714d57 --- /dev/null +++ b/ops/work/tools/fetch_doc_text.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +"""Извлекает текст ProseMirror-документа со страницы support.yealink.com.""" +import json +import re +import subprocess +import sys + +UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/120" + + +def get_text(url): + html = subprocess.run(["curl", "-sL", "-m", "40", "-A", UA, url], + capture_output=True, text=True, timeout=90).stdout + m = re.search(r']*id="__NUXT_DATA__"[^>]*>(.*?)', html, re.S) + if not m: + return [], [] + data = json.loads(m.group(1).strip()) + docs = [] + + def walk(o): + if isinstance(o, str): + if o.strip().startswith('{"type":"doc"'): + try: + docs.append(json.loads(o)) + except Exception: + pass + elif isinstance(o, list): + for v in o: + walk(v) + elif isinstance(o, dict): + for v in o.values(): + walk(v) + walk(data) + + lines, images = [], [] + + def t(n, depth=0): + if not isinstance(n, dict): + return + typ = n.get("type") + if typ == "text": + lines.append(n.get("text", "")) + elif typ == "image": + src = (n.get("attrs") or {}).get("src") + if src: + images.append(src) + elif typ == "heading": + txt = "".join(x for x in _collect(n)) + lines.append("\n## " + txt) + return + elif typ in ("paragraph", "tableRow"): + txt = "".join(x for x in _collect(n)) + if txt.strip(): + lines.append(txt) + return + for c in n.get("content") or []: + t(c, depth + 1) + + def _collect(n): + out = [] + def w(x): + if isinstance(x, dict): + if x.get("type") == "text": + out.append(x.get("text", "")) + for c in x.get("content") or []: + w(c) + w(n) + return out + + for d in docs: + for c in d.get("content") or []: + t(c) + return lines, images + + +if __name__ == "__main__": + for url in sys.argv[1:]: + print("\n" + "=" * 70) + print("URL:", url) + print("=" * 70) + lines, images = get_text(url) + for ln in lines[:60]: + print(" ", ln[:160]) + if images: + print("\n изображения (%d):" % len(images)) + for i in images[:10]: + print(" ", i[:140]) diff --git a/ops/work/tools/fetch_product_specs.py b/ops/work/tools/fetch_product_specs.py new file mode 100644 index 0000000..def0c82 --- /dev/null +++ b/ops/work/tools/fetch_product_specs.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +"""Пробуем достать данные устройств с yealink.com и support.yealink.com.""" +import json +import re +import subprocess +import sys + +UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/120 Safari/537.36" + + +def fetch(url): + return subprocess.run(["curl", "-sL", "-m", "45", "-A", UA, url], + capture_output=True, text=True, timeout=90).stdout + + +def nuxt_text(html): + m = re.search(r']*id="__NUXT_DATA__"[^>]*>(.*?)', html, re.S) + if not m: + return "" + try: + data = json.loads(m.group(1).strip()) + except Exception: + return "" + texts = [] + + def walk(o): + if isinstance(o, str): + if o.strip().startswith('{"type":"doc"'): + try: + d = json.loads(o) + def t(n): + if isinstance(n, dict): + if n.get("type") == "text": + texts.append(n.get("text", "")) + for c in n.get("content") or []: + t(c) + t(d) + except Exception: + pass + elif isinstance(o, list): + for v in o: + walk(v) + elif isinstance(o, dict): + for v in o.values(): + walk(v) + walk(data) + return "\n".join(texts) + + +def raw_text(html): + html = re.sub(r"", " ", html, flags=re.S | re.I) + html = re.sub(r"", " ", html, flags=re.S | re.I) + txt = re.sub(r"<[^>]+>", "\n", html) + txt = re.sub(r" ?", " ", txt) + txt = re.sub(r"\n{2,}", "\n", txt) + return txt + + +KEYS = ("power", "poe", "vch", "pickup", "consumption", "watt", "Вт", + "interface", "port", "microphone", "cable") + + +def scan(text, name): + print("\n=== %s ===" % name) + lines = [ln.strip() for ln in text.splitlines() if ln.strip()] + hits = [ln for ln in lines if any(k.lower() in ln.lower() for k in KEYS)] + for ln in hits[:14]: + print(" ", ln[:150]) + if not hits: + print(" (нет совпадений)") + + +if __name__ == "__main__": + urls = sys.argv[1:] + for u in urls: + html = fetch(u) + name = u.split("/")[-2] if u.endswith("/") else u.rsplit("/", 1)[-1] + print("\n" + "#" * 70) + print("URL:", u, "| размер:", len(html)) + t = nuxt_text(html) + if t: + scan(t, "NUXT: " + name[:40]) + if len(t) < 200: + scan(raw_text(html), "HTML: " + name[:40]) diff --git a/ops/work/web/combine_core.py b/ops/work/web/combine_core.py index 2621074..3b3cdc1 100644 --- a/ops/work/web/combine_core.py +++ b/ops/work/web/combine_core.py @@ -151,6 +151,80 @@ class Core: for e in self.mounts.get("edges") or []: self.mounts_map.setdefault(norm(e["host"]), []).append(e["mount"]) + # ── сигналы и совместимость разъёмов ── + SIGNAL_OF = { + "HDMI": "video", "DP": "video", "USB": "data", "USB-C": "data", + "VCH": "audio", "3.5mm": "audio", "LAN": "network", + "RJ-9": "telephony", "PHOENIX": "control", "OPS": "data", + } + # какие соединения допустимы на уровне сигнала + SIGNAL_LINK = { + ("video", "video"), ("data", "data"), ("audio", "audio"), + ("network", "network"), ("telephony", "telephony"), ("control", "control"), + } + # разъём -> разъём (физическая совместимость) + PHYSICAL = { + ("HDMI", "HDMI"), ("DP", "DP"), ("USB", "USB"), ("USB-C", "USB-C"), + ("VCH", "VCH"), ("LAN", "LAN"), ("3.5mm", "3.5mm"), ("RJ-9", "RJ-9"), + ("PHOENIX", "PHOENIX"), + # допустимые переходники + ("USB", "USB-C"), ("USB-C", "USB"), ("USB-C", "DP"), ("DP", "USB-C"), + } + + def vendor_of(self, name): + """Вендор и направление устройства (пока yealink/vcs, структура готова).""" + return {"vendor": "yealink", "domain": "vcs"} + + def vendors(self): + out = {} + for k, v in self.devices.items(): + meta = self.vendor_of(v["name"]) + key = (meta["vendor"], meta["domain"]) + out.setdefault(key, []).append(v["name"]) + return [{"vendor": k[0], "domain": k[1], + "devices": len(v), "examples": sorted(v)[:5]} + for k, v in sorted(out.items())] + + def port_objects(self, name): + """Порты как объекты: разъём, сигнал, направление, версия.""" + ins, outs, src = self.ports(name) + objs = [] + for i, p in enumerate(x for x in ins if x and x != "—"): + objs.append({"connector": p, "signal": self.SIGNAL_OF.get(p, "unknown"), + "direction": "in", "index": i, "source": src}) + for i, p in enumerate(x for x in outs if x and x != "—"): + objs.append({"connector": p, "signal": self.SIGNAL_OF.get(p, "unknown"), + "direction": "out", "index": i, "source": src}) + return objs + + def signal_ok(self, a, b): + """Совместимы ли два порта по физике и сигналу.""" + if (a, b) not in self.PHYSICAL and (b, a) not in self.PHYSICAL: + return False, "разъёмы несовместимы: %s / %s" % (a, b) + sa, sb = self.SIGNAL_OF.get(a), self.SIGNAL_OF.get(b) + if (sa, sb) not in self.SIGNAL_LINK: + return False, "разные сигналы: %s / %s" % (sa, sb) + return True, "ok" + + def signal_chains(self, host_key, items): + """Проверка сигнальных цепочек для каждого устройства.""" + plan = self.port_plan(host_key, items) + rows = [] + for r in plan["rows"]: + if not r["ok"]: + rows.append({"device": r["device"], "ok": False, + "reason": "нет подходящего порта", "from_port": None, + "to_port": None}) + continue + hp = r["host_port"] or "" + hp = hp[4:] if hp.startswith("out:") else hp + ok, why = self.signal_ok(hp, r["needs_port"] or "") + rows.append({"device": r["device"], "ok": ok, "reason": why, + "from_port": hp, "to_port": r["needs_port"], + "signal": self.SIGNAL_OF.get(hp)}) + return {"host": plan["host"], "chains": rows, + "ok": sum(1 for r in rows if r["ok"]), "total": len(rows)} + # ── порты ── def ports(self, name): k = norm(name) @@ -362,14 +436,17 @@ class Core: if a.get("audio.pickup_m") or a.get("ports.vch"): vch_users += q - # инфраструктура добавляет порты и бюджет - extra_ports, extra_budget = 0, 0.0 + # инфраструктура: порты с учётом каскада (каждый доп. коммутатор + # занимает 1 порт предыдущего) + total_infra_ports, extra_budget, n_switches = 0, 0.0, 0 for inf in (infra_items or []): for x in (self.infra.get("devices") or []): if norm(x["device"]) == norm(inf): sp = x.get("specs") or {} - extra_ports += int(sp.get("poe_ports") or 0) + total_infra_ports += int(sp.get("poe_ports") or 0) extra_budget += float(sp.get("poe_budget_w") or 0) + n_switches += 1 + extra_ports = max(0, total_infra_ports - max(0, n_switches - 1)) chains_needed = None if vch_users and vch_ports is not None: @@ -380,6 +457,7 @@ class Core: % (vch_users, total_ports)) return {"host": host, "vch_ports": vch_ports, "vch_users": vch_users, "extra_ports": extra_ports, "extra_budget_w": extra_budget, + "n_switches": n_switches, "raw_infra_ports": total_infra_ports, "total_power_w": round(total_w, 1), "power_budget_w": extra_budget or None, "missing_power": sorted(set(missing_w)), diff --git a/ops/work/web/combine_units.py b/ops/work/web/combine_units.py new file mode 100644 index 0000000..16ffb55 --- /dev/null +++ b/ops/work/web/combine_units.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python3 +"""Единицы измерения: нормализация к метрической системе и словарь.""" +import re + +# (шаблон, коэффициент к базовой единице, базовая единица) +CONVERSIONS = [ + (r"(\d+(?:[.,]\d+)?)\s*(?:ft|feet|foot)\b", 0.3048, "m"), + (r"(\d+(?:[.,]\d+)?)\s*(?:in|inch|inches)\b", 25.4, "mm"), + (r"(\d+(?:[.,]\d+)?)\s*(?:lb|lbs|pound)\b", 0.453592, "kg"), + (r"(\d+(?:[.,]\d+)?)\s*(?:°\s*F|F)\b", None, "C"), # особая формула + (r"(\d+(?:[.,]\d+)?)\s*(?:kHz)\b", 1000.0, "Hz"), + (r"(\d+(?:[.,]\d+)?)\s*(?:W|Вт)\b", 1.0, "W"), + (r"(\d+(?:[.,]\d+)?)\s*(?:dB\s*SPL|дБ)\b", 1.0, "dBSPL"), +] + +KINDS = { + "length": {"m": 1.0, "cm": 0.01, "mm": 0.001, "ft": 0.3048, "in": 0.0254}, + "mass": {"kg": 1.0, "g": 0.001, "lb": 0.453592}, + "power": {"W": 1.0, "kW": 1000.0, "mW": 0.001}, + "frequency": {"Hz": 1.0, "kHz": 1000.0, "MHz": 1e6, "GHz": 1e9}, + "angle": {"deg": 1.0, "rad": 57.29578}, +} + +ALIASES = { + "м": "m", "метр": "m", "метров": "m", "mm": "mm", "мм": "mm", + "см": "cm", "cm": "cm", "кг": "kg", "g": "g", "г": "g", + "вт": "W", "W": "W", "квт": "kW", "кВт": "kW", + "гц": "Hz", "Hz": "Hz", "кгц": "kHz", "кГц": "kHz", + "дб": "dBSPL", "дБ": "dBSPL", "°": "deg", +} + + +def num(s): + return float(str(s).replace(",", ".")) + + +def to_base(value, unit): + unit = ALIASES.get(unit, unit) + for kind, table in KINDS.items(): + if unit in table: + return value * table[unit], kind, unit + return value, None, unit + + +def normalize(text): + """'10ft (3m)' -> [{'value': 3.0, 'unit': 'm', 'kind': 'length'}]; переводит ft/in/lb.""" + out = [] + if not text: + return out + t = str(text) + # 1) явная пара: 10ft (3m) — берём метрическую часть + m = re.search(r"(\d+(?:[.,]\d+)?)\s*(?:ft|feet|in|lb|lbs)\s*\(\s*(\d+(?:[.,]\d+)?)\s*(mm|cm|m|kg)\s*\)", + t, re.I) + if m: + v, kind, u = to_base(num(m.group(2)), m.group(3)) + out.append({"value": round(v, 3), "unit": u, "kind": kind, "from": m.group(0)}) + t = t.replace(m.group(0), " ") + # 2) одиночные единицы + for pat, k, unit in CONVERSIONS: + for mm in re.finditer(pat, t, re.I): + raw = num(mm.group(1)) + if unit == "C": + out.append({"value": round((raw - 32) * 5 / 9, 2), "unit": "C", + "kind": "temperature", "from": mm.group(0)}) + continue + v, kind, u = to_base(raw * k, unit) + out.append({"value": round(v, 4), "unit": u, "kind": kind, "from": mm.group(0)}) + return out + + +def fmt(value, unit): + """Человекочитаемый вывод в метрической системе.""" + v, kind, u = to_base(value, unit) + if kind == "length": + if u == "mm" or v < 0.01: + return "%.1f мм" % (v * 1000 if u == "m" else v * 1000) + if v < 1: + return "%.0f см" % (v * 100) + return "%.2f м" % v + if kind == "mass": + return "%.2f кг" % v + if kind == "power": + return "%.1f Вт" % v + if kind == "frequency": + return "%.0f Гц" % v if v < 1000 else "%.1f кГц" % (v / 1000) + return "%s %s" % (value, unit) diff --git a/ops/work/web/services/svc_catalog.py b/ops/work/web/services/svc_catalog.py index 852ed5a..be6bf07 100644 --- a/ops/work/web/services/svc_catalog.py +++ b/ops/work/web/services/svc_catalog.py @@ -74,10 +74,21 @@ def matrix(q, body): "hosts": [h["name"] for h in host_list]} +def vendors(q, body): + return {"vendors": C.vendors()} + + +def port_objects(q, body): + name = (q.get("name") or q.get("device") or [""])[0] + return {"device": name, "ports": C.port_objects(name)} + + serve({ "/devices": devices, "/device": device, "/ports": ports, "/hosts": hosts, "/matrix": matrix, + "/vendors": vendors, + "/port-objects": port_objects, }, int(sys.argv[1]) if len(sys.argv) > 1 else 8101, "catalog") diff --git a/ops/work/web/services/svc_draw.py b/ops/work/web/services/svc_draw.py index 84b5f89..ad85e49 100644 --- a/ops/work/web/services/svc_draw.py +++ b/ops/work/web/services/svc_draw.py @@ -91,7 +91,62 @@ def cables(q, body): return C.cable_schedule((q.get("host") or [""])[0], _items(q)) +def rack(q, body): + """Чертёж стойки (EIA-310: 1U = 44.45 мм).""" + items = _items(q) + U = 44.45 + u = 1 + rows = [] + for r in items: + h = 1 + name = r[0] + if any(x in name.lower() for x in ("mcore", "codec", "dsp", "ap08")): + h = 1 + rows.append({"device": name, "qty": r[1], "u": h, "start_u": u}) + u += h * r[1] + total_u = u + 1 + W, px = 420, 70 + H = int(total_u * px + 80) + parts = [f'', + f'', + f'' + f'Стойка: {total_u}U (EIA-310, 1U=44.45 мм)'] + for r in rows: + y = 60 + (r["start_u"] - 1) * px + for n in range(r["qty"]): + yy = y + n * r["u"] * px + parts.append(f'') + parts.append(f'' + f'{_esc(r["device"])[:38]}') + parts.append(f'U{r["start_u"]+n}') + parts.append("") + return {"svg": "".join(parts), "total_u": total_u, + "height_mm": round(total_u * U, 1)} + + +def ipplan(q, body): + """IP-план: выдаёт адреса по порядку для сетевых устройств.""" + base = (q.get("net") or ["10.10.20."])[0] + start = int((q.get("start") or ["10"])[0]) + items = _items(q) + rows, n = [], start + for r in items: + name, qty = r[0], r[1] + ins, outs, src = C.ports(name) + if "LAN" not in (ins + outs): + continue + for _ in range(qty): + rows.append({"device": name, "ip": "%s%d" % (base, n), + "purpose": "управление", "vlan": (q.get("vlan") or ["20"])[0]}) + n += 1 + return {"base": base, "rows": rows, "count": len(rows)} + + serve({ "/diagram": diagram, "/cables": cables, + "/rack": rack, + "/ipplan": ipplan, }, int(sys.argv[1]) if len(sys.argv) > 1 else 8104, "draw") diff --git a/ops/work/web/services/svc_engine.py b/ops/work/web/services/svc_engine.py index 3b7d09e..454c367 100644 --- a/ops/work/web/services/svc_engine.py +++ b/ops/work/web/services/svc_engine.py @@ -25,7 +25,7 @@ def groups(q, body): if g["id"] == "infra": for x in (C.infra.get("devices") or []): items.append({"model": x["device"], "role": "infrastructure", - "max_qty": 4, "condition": x.get("why") or "", + "max_qty": 8, "condition": (x.get("evidence") or "")[:110], "specs": x.get("specs") or {}}) out.append({"id": g["id"], "name": g["name"], "hint": "PoE-коммутаторы и хабы", "items": items}) @@ -284,6 +284,51 @@ def xlsx(q, body): "content_type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"} +def signals(q, body): + return C.signal_chains((q.get("host") or [""])[0], _items(q)) + + +def port_objects(q, body): + name = (q.get("device") or [""])[0] + return {"device": name, "ports": C.port_objects(name)} + + +def review(q, body): + """Ревью проекта: проблемы с серьёзностью, до закупки.""" + hk = cc.norm((q.get("host") or [""])[0]) + if hk not in C.devices: + return {"error": "хост не найден"} + items = _items(q) + issues = [] + cap = C.capacity(hk, items, q.get("infra") or []) + for i in cap["issues"]: + issues.append({"level": "blocker", "text": i}) + sig = C.signal_chains(hk, items) + for r in sig["chains"]: + if not r["ok"]: + issues.append({"level": "blocker", + "text": "%s: %s" % (r["device"], r["reason"])}) + comp = C.completeness(hk) + if comp["level"] != "full": + issues.append({"level": "warning", "text": "неполные данные: " + comp["note"]}) + if cap["missing_power"]: + issues.append({"level": "warning", + "text": "нет данных о питании: " + ", ".join(cap["missing_power"][:6])}) + # крепления в комплекте + for r in items: + if C.mount_included(r[0]): + issues.append({"level": "info", + "text": "%s: крепление уже в комплекте" % r[0]}) + blockers = sum(1 for i in issues if i["level"] == "blocker") + return {"host": C.devices[hk]["name"], "issues": issues, + "blockers": blockers, "warnings": sum(1 for i in issues if i["level"] == "warning"), + "ready": blockers == 0, "checks": len("checklist")} + + +def vendors(q, body): + return {"vendors": C.vendors()} + + serve({ "/groups": groups, "/check": check, @@ -294,5 +339,9 @@ serve({ "/autofill": autofill, "/accessory": accessory_hosts, "/checklist": checklist, + "/signals": signals, + "/ports-objects": port_objects, + "/review": review, + "/vendors": vendors, "/xlsx": xlsx, }, int(sys.argv[1]) if len(sys.argv) > 1 else 8102, "engine") diff --git a/ops/work/web/test_engine.py b/ops/work/web/test_engine.py new file mode 100644 index 0000000..e753f5c --- /dev/null +++ b/ops/work/web/test_engine.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python3 +"""Тесты правил движка. Запуск: python test_engine.py (код 1 при ошибке).""" +import sys + +sys.path.insert(0, "/root/buryan-infra/ops/work/web") +import combine_core as cc # noqa + +C = cc.Core() +FAILS = [] + + +def eq(name, got, want): + if got != want: + FAILS.append("%s: получили %r, ожидали %r" % (name, got, want)) + + +def ok(name, cond, extra=""): + if not cond: + FAILS.append("%s %s" % (name, extra)) + + +# 1. сигналы +ok("signal HDMI-HDMI", C.signal_ok("HDMI", "HDMI")[0]) +ok("signal USB-USB", C.signal_ok("USB", "USB")[0]) +ok("signal USB-USB-C (переходник)", C.signal_ok("USB", "USB-C")[0]) +ok("signal HDMI-USB запрещён", not C.signal_ok("HDMI", "USB")[0]) +ok("signal VCH-LAN запрещён", not C.signal_ok("VCH", "LAN")[0]) + +# 2. порты как объекты +po = C.port_objects("UVC86") +ok("UVC86 есть порты", len(po) > 0) +ok("UVC86 имеет сигнал video", + any(p["signal"] == "video" for p in po), str(po[:3])) + +# 3. ёмкость: каскад RCH40 (2 шт = 7 портов) +cap = C.capacity("MeetingEye 500", [["VCM38", 8]], ["RCH40 E2", "RCH40 E2"]) +eq("каскад 2×RCH40", cap["extra_ports"], 7) +eq("число коммутаторов", cap["n_switches"], 2) +ok("бюджет 180 Вт", abs(cap["extra_budget_w"] - 180) < 0.1) + +# 4. лимит матрицы ловится +cap2 = C.capacity("MeetingEye 500", [["VCM38", 99]]) +ok("превышение лимита VCM38", any("лимит" in i for i in cap2["issues"]), str(cap2["issues"])) + +# 5. совместимость пар +r = C.check_pair("MeetingEye 500", "VCM36-W") +eq("M500 + VCM36-W", r["supported"], False) +r2 = C.check_pair("MeetingEye 500", "VCM38") +eq("M500 + VCM38", r2["supported"], True) + +# 6. крепление в комплекте +ok("UVC85-BYOD крепление в комплекте", C.mount_included("UVC85-BYOD")) +ok("MTower не в комплекте", not C.mount_included("MTower")) + +# 7. приоритет портов: дисплей -> HDMI +plan = C.port_plan("MeetingBar A50", [["MeetingDisplay", 1]]) +disp = [x for x in plan["rows"] if x["device"] == "MeetingDisplay"] +ok("дисплей подключается", bool(disp)) +if disp: + ok("дисплей через HDMI или LAN", disp[0]["needs_port"] in ("HDMI", "DP", "LAN"), + str(disp[0])) + +# 8. кабельный журнал: нет нерешённых для простого набора +cab = C.cable_schedule("MeetingBar A50", [["UVC86", 1], ["CTP25", 1]]) +eq("кабели: нерешённых", len(cab["unresolved"]), 0) + +# 9. сигнальные цепочки без блокеров +sig = C.signal_chains("MeetingBar A50", [["UVC86", 1], ["CTP25", 1]]) +eq("сигнальные цепочки: все ок", sig["ok"], sig["total"]) + +# 10. вендоры +vend = C.vendors() +ok("вендоры есть", len(vend) >= 1) + +print("тестов пройдено:", 20 - len(FAILS)) +if FAILS: + print("ОШИБКИ (%d):" % len(FAILS)) + for f in FAILS: + print(" -", f) + sys.exit(1) +print("ВСЕ ТЕСТЫ ПРОЙДЕНЫ")