diff --git a/ops/work/web/app.py b/ops/work/web/app.py index 1420b26..77dfcf6 100644 --- a/ops/work/web/app.py +++ b/ops/work/web/app.py @@ -946,6 +946,7 @@ def analog_search(query, domain="vcs"): return d.get(k) or "" cand = [] + tspec = specs(target) if target is not None else {} for d in devices: if target is not None and d is target: continue @@ -959,6 +960,15 @@ def analog_search(query, domain="vcs"): continue if domain == "telephony" and d.get("sales_scope") != "reference": continue + cs = specs(d) + # жёсткие характеристики: если у цели подтверждено, у кандидата не должно быть «нет» + if target is not None: + if tspec.get("4k") is True and cs.get("4k") is False: + continue + if tspec.get("sip") is True and cs.get("sip") is False: + continue + if tspec.get("pickup_m") and cs.get("pickup_m") and cs["pickup_m"] < tspec["pickup_m"] * 0.8: + continue s, why = 0, [] if parsed["class"]: s += 50 @@ -977,22 +987,31 @@ def analog_search(query, domain="vcs"): if d.get("sales_scope") == "alternative": s += 5 why.append("alternative vendor") + # близость числовых характеристик + for k, label in (("zoom_optical", "зум"), ("pickup_m", "захват"), ("fov_h", "FOV")): + tv, cv = tspec.get(k), cs.get(k) + if tv and cv: + diff = abs(float(tv) - float(cv)) / max(float(tv), 1) + s += max(0, 10 - int(diff * 10)) + why.append("%s ~ %s" % (label, cv)) gaps = [] if target is not None: - tp = {str(x).upper() for x in (target.get("protocols") or [])} - cp = prot - if tp - cp: - gaps.append("нет протоколов: " + ", ".join(sorted(tp - cp))) - tf = {str(x).lower() for x in _features(target)} - cf = feats - if tf - cf: - gaps.append("нет функций: " + ", ".join(sorted(tf - cf))[:120]) + if cs.get("4k") is None: + gaps.append("4K не подтверждён") + if cs.get("sip") is None and tspec.get("sip") is True: + gaps.append("SIP не подтверждён") + if tspec.get("pickup_m") and cs.get("pickup_m") and cs["pickup_m"] < tspec["pickup_m"]: + gaps.append("захват меньше: %s < %s м" % (cs["pickup_m"], tspec["pickup_m"])) + if tspec.get("zoom_optical") and cs.get("zoom_optical") and cs["zoom_optical"] < tspec["zoom_optical"]: + gaps.append("зум меньше") if target.get("form_factor") and d.get("form_factor") != target.get("form_factor"): gaps.append("другой форм-фактор") + if cs.get("room_size") is None: + gaps.append("вместимость комнаты не подтверждена") cand.append({"name": _dev_name(d), "vendor": d.get("vendor"), "domain": d.get("domain"), "solution_class": d.get("solution_class"), "sales_scope": d.get("sales_scope"), - "protocols": d.get("protocols") or [], + "protocols": d.get("protocols") or [], "specs": cs, "score": s, "why": why, "gaps": gaps}) cand.sort(key=lambda x: (-x["score"], x["vendor"] or "", x["name"])) # если фильтр по протоколу/фиче дал 0 — не врём, а сообщаем о нехватке данных @@ -1006,11 +1025,76 @@ def analog_search(query, domain="vcs"): "deployment": target.get("deployment"), "components": target.get("components") or []} if target else None), "parsed": parsed, - "alternatives": cand[:12], + "alternatives": cand[:6], "note": "Только same domain + solution_class; телефония не предлагается для VCS."} +def specs(d): + """Канонические характеристики для сравнения. None = нет подтверждённых данных.""" + name = _dev_name(d) + a = D.attrs.get(norm(name), {}) + fs = {str(x).lower() for x in _features(d)} + prot = {str(x).upper() for x in (d.get("protocols") or [])} + + def num(k): + v = a.get(k) + try: + return float(v) + except Exception: + return None + + maxres = str(a.get("camera.max_resolution") or "").lower() + fourk = ("4k" in fs or "3840" in maxres or "4k" in maxres) + return { + "4k": True if fourk else (False if fs or maxres else None), + "sip": True if "SIP" in prot else (False if prot else None), + "h323": True if any("H.323" in p or "H323" in p for p in prot) else (False if prot else None), + "zoom_optical": num("camera.zoom_optical"), + "fov_h": num("camera.fov_h"), + "pickup_m": num("audio.pickup_m"), + "mic_count": num("audio.mic_count"), + "room_size": d.get("room_size") or a.get("room.max_participants"), + "display_inch": d.get("display_inch"), + "form_factor": d.get("form_factor"), + "native_vcs": d.get("native_vcs"), + "deployment": d.get("deployment"), + "verified": bool((d.get("source") or {}).get("verified")), + "sources": (d.get("source") or {}).get("files") or [], + } + + +def compare_devices(keys): + ds = [] + for k in keys: + d = find_device(k) + if d and d not in ds: + ds.append(d) + if not ds: + return {"error": "not_found", "keys": keys} + fields = [ + ("vendor", "Вендор"), ("solution_class", "Класс"), ("form_factor", "Форм-фактор"), + ("4k", "4K"), ("sip", "SIP"), ("h323", "H.323"), ("zoom_optical", "Оптический зум"), + ("fov_h", "FOV"), ("pickup_m", "Захват, м"), ("mic_count", "Микрофоны"), + ("room_size", "Комната"), ("native_vcs", "Native VCS"), ("deployment", "Deployment"), + ] + cols, rows = [], [] + for d in ds: + s = specs(d) + cols.append({"key": _key(d), "name": _dev_name(d), "vendor": d.get("vendor")}) + for f, label in fields: + vals = [] + for d in ds: + v = specs(d).get(f) if f in specs(d) else d.get(f) + if v is None or v == "": + v = None + elif isinstance(v, bool): + v = "да" if v else "нет" + vals.append(v) + rows.append({"field": f, "label": label, "values": vals}) + return {"columns": cols, "rows": rows, "note": "— = нет подтверждённых данных; не выдумываем."} + + def _key(d): return d.get("id") or norm(_dev_name(d)) @@ -1104,7 +1188,8 @@ def search_catalog(params): "domain": d.get("domain"), "solution_class": d.get("solution_class"), "role": d.get("role"), "form_factor": d.get("form_factor"), "protocols": d.get("protocols") or [], "sales_scope": d.get("sales_scope"), - "deployment": d.get("deployment"), "features": _features(d)[:8]} + "deployment": d.get("deployment"), "features": _features(d)[:8], + "specs": specs(d)} for d in items[:100]] return {"query": q, "vendor": vendor, "domain": domain, "interpreted": interpreted, "total": len(items), "items": out, @@ -1135,6 +1220,7 @@ def product_info(key): "protocols": d.get("protocols") or [], "sales_scope": d.get("sales_scope"), "deployment": d.get("deployment"), "components": d.get("components") or [], "features": _features(d), + "specs": specs(d), "attributes": D.attrs.get(norm(_dev_name(d)), {})}, "analogs": analog_search(_dev_name(d), d.get("domain") or "vcs")} @@ -1293,6 +1379,9 @@ class H(BaseHTTPRequestHandler): return self._out(search_catalog(q)) if p == "/api/product": return self._out(product_info(q.get("key", [""])[0])) + if p == "/api/compare": + keys = [x for x in (q.get("keys", [""])[0] or "").split(",") if x] + return self._out(compare_devices(keys)) if p == "/api/room-roles": return self._out(room_roles()) if p == "/api/hosts": diff --git a/ops/work/web/studio.html b/ops/work/web/studio.html index 1460b0f..8b7efae 100644 --- a/ops/work/web/studio.html +++ b/ops/work/web/studio.html @@ -140,24 +140,35 @@ async function openProduct(key){ $('#detailbox').innerHTML='загрузка…'; const r = await api('/api/product?key='+encodeURIComponent(key)); if(r.error){$('#detailbox').innerHTML='не найдено';return;} - S.product=r.product; const p=r.product, alts=r.analogs?.alternatives||[]; + S.product=r.product; S.alts=r.analogs?.alternatives||[]; + const p=r.product, alts=S.alts; + const sp=p.specs||{}; + const fmt=v=>v===null||v===undefined||v===''?'—':(typeof v==='boolean'?(v?'да':'нет'):v); const kv = [['Вендор',p.vendor],['Домен',p.domain],['Класс',p.solution_class],['Роль',p.role],['Форм-фактор',p.form_factor],['Протоколы',(p.protocols||[]).join(', ')||'нет данных'],['Scope',p.sales_scope],['Deployment',p.deployment||'—']]; + const skv = [['4K',fmt(sp['4k'])],['SIP',fmt(sp['sip'])],['H.323',fmt(sp['h323'])],['Оптический зум',fmt(sp['zoom_optical'])],['FOV',fmt(sp['fov_h'])],['Захват, м',fmt(sp['pickup_m'])],['Микрофоны',fmt(sp['mic_count'])],['Комната',fmt(sp['room_size'])]]; $('#detailbox').innerHTML = `
| Характеристика | ${head}
|---|