diff --git a/ops/combine/research-pack/extract_docs.py b/ops/combine/research-pack/extract_docs.py index a540ef3..a603942 100644 --- a/ops/combine/research-pack/extract_docs.py +++ b/ops/combine/research-pack/extract_docs.py @@ -149,6 +149,14 @@ def main(): obj = json.loads(m.group(0) if m else raw) obj.setdefault("doc_id", doc["id"]) obj.setdefault("vendor", doc.get("vendor")) + if not isinstance(obj.get("source"), dict): + obj["source"] = {} + if doc.get("url"): + obj["source"]["url"] = doc["url"] + elif str(doc.get("source", "")).startswith("http"): + obj["source"]["url"] = doc["source"] + else: + obj["source"]["file"] = doc.get("source") open(out, "w", encoding="utf-8").write(json.dumps(obj, ensure_ascii=False, indent=2)) print(" ok") except Exception as e: diff --git a/ops/combine/research-pack/ingest_extracted.py b/ops/combine/research-pack/ingest_extracted.py index 03ee41c..0987c10 100644 --- a/ops/combine/research-pack/ingest_extracted.py +++ b/ops/combine/research-pack/ingest_extracted.py @@ -15,6 +15,24 @@ def norm(s): return re.sub(r"[^a-z0-9]", "", str(s).lower()) +def vendor_key(v): + s = str(v or "").lower() + if "poly" in s or s in ("hp", "hp inc.", "hp inc. (poly)"): + return "poly" + if "yealink" in s: + return "yealink" + if "logitech" in s: + return "logitech" + return s + + +def model_key(m): + s = str(m or "").strip() + s = re.sub(r"^HP\s+", "", s, flags=re.I) + s = re.sub(r"^HP Inc\. \(Poly\)\s+", "", s, flags=re.I) + return s.strip() + + def load_existing(): out = {} for p in [BASE + "/catalog.yaml"] + sorted(glob.glob(BASE + "/catalog-*.yaml")): @@ -53,7 +71,7 @@ def main(): "vendor": d.get("vendor"), "models": len(models), "source": src.get("url")}) for m in models: - model = m.get("model") + model = model_key(m.get("model")) if not model: continue key = norm(model) @@ -61,7 +79,7 @@ def main(): specs = m.get("specs") or {} protocols = specs.get("protocols") or m.get("protocols") or [] rec = { - "vendor": d.get("vendor"), "model": model, "family": m.get("family"), + "vendor": vendor_key(d.get("vendor")), "model": model, "family": m.get("family"), "role": m.get("role"), "form_factor": m.get("form_factor"), "market": m.get("market"), "variant_of": m.get("variant_of"), "protocols": protocols, "specs": specs, diff --git a/ops/combine/research-pack/queue-yealink.jsonl b/ops/combine/research-pack/queue-yealink.jsonl new file mode 100644 index 0000000..6937778 --- /dev/null +++ b/ops/combine/research-pack/queue-yealink.jsonl @@ -0,0 +1,5 @@ +{"id":"yealink-technical","kind":"vendor","name":"Yealink Technical","official":"https://www.yealink.com","focus":"VCS datasheets: specs, ports, power, protocols, room size, BYOD/native","sources":["https://www.yealink.com","https://support.yealink.com"]} +{"id":"yealink-compatibility","kind":"vendor","name":"Yealink Compatibility","official":"https://www.yealink.com","focus":"accessory/compatibility guide: host->accessory, max_qty, firmware, conditions, kits/MVC","sources":["https://www.yealink.com","https://support.yealink.com"]} +{"id":"yealink-lifecycle","kind":"vendor","name":"Yealink Lifecycle","official":"https://www.yealink.com","focus":"EOL/end-of-sale, successor, release dates, RU availability","sources":["https://www.yealink.com"]} +{"id":"yealink-ru-market","kind":"vendor","name":"Yealink RU Market","official":"https://www.yealink.com","focus":"PVT140/A40 variants, RU restrictions Teams/Zoom, IPmatika/Avicon L2","sources":["https://www.yealink.com","https://ipmatika.ru","https://avicon.ru"]} +{"id":"yealink-heatmap","kind":"practice","name":"Yealink Room Designer heatmap","official":"https://www.yealink.com","focus":"heatmap inputs: pickup_m, FOV, zoom, room dimensions, display; official tool practice","sources":["https://www.yealink.com"]} diff --git a/ops/combine/staging/ingest-local/REPORT.md b/ops/combine/staging/ingest-local/REPORT.md new file mode 100644 index 0000000..a166e18 --- /dev/null +++ b/ops/combine/staging/ingest-local/REPORT.md @@ -0,0 +1,41 @@ +# Ingest report + +Извлечено документов: **8** +Моделей: **14**, новых: **9**, уже в каталоге: **5** +Статус: **staging, прод не изменён**. + +## Документы +- `15f9170e1e98.json` — HP, моделей 3 +- `40f1e8547e28.json` — HP, моделей 1 +- `4de9eab3f3a3.json` — HP, моделей 3 +- `a49da42e873d.json` — HP Inc. (Poly), моделей 1 +- `b116c4ed7683.json` — HP, моделей 3 +- `ba39cff89698.json` — HP, моделей 1 +- `cfd951466730.json` — HP, моделей 1 +- `d38a164e25b1.json` — Poly (HP), моделей 1 + +## Предупреждения +- 15f9170e1e98.json: source.url отсутствует (local doc) +- 40f1e8547e28.json: source.url отсутствует (local doc) +- 4de9eab3f3a3.json: source.url отсутствует (local doc) +- a49da42e873d.json: source.url отсутствует (local doc) +- b116c4ed7683.json: source.url отсутствует (local doc) +- ba39cff89698.json: source.url отсутствует (local doc) +- cfd951466730.json: source.url отсутствует (local doc) +- d38a164e25b1.json: source.url отсутствует (local doc) + +## Модели +- poly Poly Studio Base Room Kit for Zoom Rooms — новая · требует review +- poly Poly TC10 — новая · требует review +- poly Mini Conferencing PC with Zoom Rooms — новая · требует review +- poly Poly Studio G62 — существует · требует review +- poly Poly Studio R30 Plus USB Video Bar and BT Remote with HP USB-C Dock G5 — новая · требует review +- poly Poly Studio R30 — новая · требует review +- poly USB-C Dock G5 — новая · требует review +- poly Poly Studio V72 — существует · требует review +- poly Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms — новая · требует review +- poly Mini IP Conferencing PC — новая · требует review +- poly Poly TC10 — новая · требует review +- poly Poly Studio E60 — существует · требует review +- poly Poly Studio V12 — существует · требует review +- poly Poly Studio V52 — существует · требует review diff --git a/ops/combine/staging/ingest-local/models.yaml b/ops/combine/staging/ingest-local/models.yaml new file mode 100644 index 0000000..2189d24 --- /dev/null +++ b/ops/combine/staging/ingest-local/models.yaml @@ -0,0 +1,524 @@ +generated_at: '2026-11-18T18:57:48' +status: staging +models: +- vendor: poly + model: Poly Studio Base Room Kit for Zoom Rooms + family: Poly Studio + role: room kit + form_factor: Mini + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: + - HP Poly TC10 touch controller + - HP Mini Conferencing PC with Zoom Rooms + - AC adapter + - power cord + - 1 HP DisplayPort to HDMI True 4K adapter + - HP Desktop Mini Security/Dual VESA Sleeve v3 with Power Supply Holder + kits: [] + restrictions: + - Zoom Rooms license is required and sold separately + - Complete Zoom Rooms requires audio and video device, not included in the HP Poly + Studio Base Room Kit + lifecycle: null + source: + doc_id: 15f9170e1e98 + url: null + quote: HP Poly Base Room Kit1 transforms outdated meeting spaces into modern Zoom + Rooms, enhancing productivity and communication. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly TC10 + family: Poly TC + role: touch controller + form_factor: null + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: + - Wall mount kit + - Table stand + - Mounting hardware + - RJ-45 cable + - Quick Start QR code + - Warranty card + - HP Poly Lens coaster + kits: [] + restrictions: [] + lifecycle: null + source: + doc_id: 15f9170e1e98 + url: null + quote: HP Poly Base Room Kit1 transforms outdated meeting spaces into modern Zoom + Rooms, enhancing productivity and communication. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Mini Conferencing PC with Zoom Rooms + family: null + role: collaboration PC + form_factor: Mini + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: [] + kits: [] + restrictions: [] + lifecycle: null + source: + doc_id: 15f9170e1e98 + url: null + quote: HP Poly Base Room Kit1 transforms outdated meeting spaces into modern Zoom + Rooms, enhancing productivity and communication. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly Studio G62 + family: Poly Studio + role: video conferencing system / codec + form_factor: compact modular codec (247.7 x 152.4 x 34.9 mm) + market: null + variant_of: null + protocols: &id001 + - H.264 AVC + - H.264 High Profile + - H.265 + - H.264 SVC + - H.263 + - RTV + - H.239 Polycom People+Content + - H.323 + - SIP + - IPv4 + - IPv6 + specs: + 4k: 'People video resolution: 4K, 30 fps (TX and RX) from 2048 Kbps; ... 4K, 30 + fps from 3200 Kbps' + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: Up to three IP microphone arrays + protocols: *id001 + accessories: + - Poly Studio E70 Smart Camera (842F8AA) + - Poly G7500 IP Table Microphone (874R3AA) + - Poly Studio G/X/V Bluetooth Remote Control (874R8AA) + - Poly TC10 White Touch Controller (875J5AA) + - Poly TC10 Touch Controller Black (875K5AA) + - Poly IP Ceiling Microphone Array (875S1AA) + - Poly Studio E60 Smart Camera 4K MPTZ with 12x Optical Zoom (9W1A6AA) + - Poly Studio G62 PoE+ Adapter and Cable Kit (A02F9AA) + - Poly Studio G62 Plate Mount (A02FDAA) + kits: [] + restrictions: + - 'Compatible operating systems: Android' + - Compatible devices need to be network connected for management + lifecycle: null + source: + doc_id: 40f1e8547e28 + url: null + quote: 'Poly Studio G62 Video Conferencing System ... Product number: 99T09AA + ... © Copyright 2024 HP Development Company, L.P.' + level: L1 + review: needs_review + existing: true + existing_file: catalog.yaml +- vendor: poly + model: Poly Studio R30 Plus USB Video Bar and BT Remote with HP USB-C Dock G5 + family: Poly Studio R30 + role: video bar bundle + form_factor: USB video bar + market: null + variant_of: null + protocols: &id002 + - UVC Plug and Play compatible + - UAC Plug and Play compatible + - Bluetooth® 4.2 + - WiFi 802.11a/b/g/n/ac (SISO) + specs: + 4k: 2160p, 4K UHD (3840 x 2160) + zoom_optical: 5x (without tracking); 4x (with auto tracking) + fov_h: 110° + pickup_m: Up to 4.57 m + mic_count: Three-microphone element beamforming array + protocols: *id002 + accessories: + - Poly Studio P15/R30 Wall Mount (783S4AA) + - Poly Studio R30/USB Bluetooth Remote Control (875L4AA) + kits: + - 842D2AA + - 5TW10AA + - 875L4AA + restrictions: [] + lifecycle: null + source: + doc_id: 4de9eab3f3a3 + url: null + quote: 'Poly Studio R30 Plus USB Video Bar and BT Remote with HP USB-C Dock G5 + ... Product number: 9U3U1AA ... Bundle components: 842D2AA, 5TW10AA, 875L4AA + ... Bundle contents: Poly Studio R30, HP USB-C Dock G5, Poly Studio R30/USB + Bluetooth Remote Control' + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly Studio R30 + family: Poly Studio R30 + role: video bar + form_factor: USB video bar + market: null + variant_of: null + protocols: &id003 + - UVC Plug and Play compatible + - UAC Plug and Play compatible + - Bluetooth® 4.2 + - WiFi 802.11a/b/g/n/ac (SISO) + specs: + 4k: 2160p, 4K UHD (3840 x 2160) + zoom_optical: 5x (without tracking); 4x (with auto tracking) + fov_h: 110° + pickup_m: Up to 4.57 m + mic_count: Three-microphone element beamforming array + protocols: *id003 + accessories: + - Poly Studio P15/R30 Wall Mount (783S4AA) + - Poly Studio R30/USB Bluetooth Remote Control (875L4AA) + kits: [] + restrictions: [] + lifecycle: null + source: + doc_id: 4de9eab3f3a3 + url: null + quote: 'Poly Studio R30 Plus USB Video Bar and BT Remote with HP USB-C Dock G5 + ... Product number: 9U3U1AA ... Bundle components: 842D2AA, 5TW10AA, 875L4AA + ... Bundle contents: Poly Studio R30, HP USB-C Dock G5, Poly Studio R30/USB + Bluetooth Remote Control' + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: USB-C Dock G5 + family: null + role: USB-C dock + form_factor: docking station + market: null + variant_of: null + protocols: &id004 + - USB Type-C® 5Gbps signaling rate (up to 15 W USB Power Delivery) + - USB Type-A 5Gbps signaling rate (charging) + - DisplayPort™ 1.4 + - HDMI 2.0 + - RJ-45 + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: *id004 + accessories: [] + kits: [] + restrictions: [] + lifecycle: null + source: + doc_id: 4de9eab3f3a3 + url: null + quote: 'Poly Studio R30 Plus USB Video Bar and BT Remote with HP USB-C Dock G5 + ... Product number: 9U3U1AA ... Bundle components: 842D2AA, 5TW10AA, 875L4AA + ... Bundle contents: Poly Studio R30, HP USB-C Dock G5, Poly Studio R30/USB + Bluetooth Remote Control' + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly Studio V72 + family: Poly Studio + role: USB video bar + form_factor: soundbar-style video bar + market: null + variant_of: null + protocols: [] + specs: + 4k: 2160p, 4K UHD (3840 x 2160) + zoom_optical: null + fov_h: 120° (wide); 70° (narrow) + pickup_m: null + mic_count: Two MEMS microphones; Two second-order microphones + protocols: [] + accessories: + - Poly Video IEC Power Cord (874T5AA) + - Poly Studio E70/X70/X72/V72 Polarized Filter (875K9AA) + - Poly Studio X70/X72/V72 VESA Mount (875L2AA) + - Poly Studio X70/X72/V72 Table Stand (875L3AA) + - Poly Studio R30/USB/V12/V52/V72 Bluetooth Remote Control (875L4AA) + - Poly Studio X50/X52/X70/USB Expansion Microphone Cable Extender Pack (875M4AA) + - Poly Studio X50/X52/X70/X72/USB Table Microphone (875M6AA) + kits: [] + restrictions: + - TAA, JITC and no radio versions available. + - AC3 localization does not include the power cable. + - USB Type-A ports will only support mouse and keyboard peripherals. + lifecycle: null + source: + doc_id: a49da42e873d + url: null + quote: 'Poly Studio V72 USB Video Bar ... Product number: AV1E3AA ... Product + name: Poly Studio V72 USB Video Bar' + level: L1 + review: needs_review + existing: true + existing_file: catalog-poly.yaml +- vendor: poly + model: Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms + family: Poly Studio + role: base kit + form_factor: null + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: + - HP Mini IP Conferencing PC + - HP Poly TC10 touch controller + kits: [] + restrictions: + - A complete Microsoft Teams Room requires audio and video devices, not included + in the HP Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms. + lifecycle: null + source: + doc_id: b116c4ed7683 + url: null + quote: HP Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms consists of HP + Mini IP Conferencing PC with 13th Gen Intel® Core i7 and HP Poly TC10 touch + controller. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Mini IP Conferencing PC + family: null + role: conferencing PC + form_factor: Desktop Mini + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: [] + kits: [] + restrictions: [] + lifecycle: null + source: + doc_id: b116c4ed7683 + url: null + quote: HP Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms consists of HP + Mini IP Conferencing PC with 13th Gen Intel® Core i7 and HP Poly TC10 touch + controller. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly TC10 + family: Poly TC + role: touch controller + form_factor: null + market: null + variant_of: null + protocols: [] + specs: + 4k: null + zoom_optical: null + fov_h: null + pickup_m: null + mic_count: null + protocols: [] + accessories: + - stand + - 3.66m/12ft Ethernet cable + - Wall mount kit + kits: [] + restrictions: + - Up to four HP Poly TC10s are supported. + lifecycle: null + source: + doc_id: b116c4ed7683 + url: null + quote: HP Poly Studio Base Kit G9 Plus for Microsoft Teams Rooms consists of HP + Mini IP Conferencing PC with 13th Gen Intel® Core i7 and HP Poly TC10 touch + controller. + level: L1 + review: needs_review + existing: false + existing_file: null +- vendor: poly + model: Poly Studio E60 + family: Poly Studio + role: smart MPTZ optical zoom camera + form_factor: PTZ camera + market: null + variant_of: null + protocols: &id005 + - USB-B + - RJ-45 (10/100/1000 Mbps) Ethernet interface (supporting PoE+ power supply) + - AC/DC power jack + specs: + 4k: '4K UHD (3840 x 2160); People video resolution: 4K, 30 fps (TX and RX) from + 2048 Kbps' + zoom_optical: 12x optical + fov_h: 71° (PTZ camera); 107° (panoramic camera) + pickup_m: Up to 32.8 ft + mic_count: Two-element beamforming microphone array + protocols: *id005 + accessories: + - Poly Video IEC Power Cord (874T5AA) + - Poly EagleEye IV USB Camera Mounting Kit (93S75AA) + - Poly Studio E60 Ceiling Mount (9W1A8AA) + - Poly Studio E60 Power Accessory (9W1A9AA) + kits: + - Ethernet cable (5 m) + - Wall mount kit + - Quick start guide + - Warranty card + - Poly Studio E60 + - USB-B to USB Type-A cable (2 m) + - IR remote control + restrictions: + - It connects over IP only with Poly Studio G62 and Poly G7500 + - IP connection supports up to 1080p + - Requires downloadable software on Poly.com/lens. Host PC requires Windows 10 or + higher + - Compatibility with native applications and meeting services is limited by each + 3rd party service's own terms and certification conditions + lifecycle: null + source: + doc_id: ba39cff89698 + url: null + quote: 'Poly Studio E60 Smart Camera 4K MPTZ with 12x Optical Zoom ... Product + number: 9W1A6AA' + level: L1 + review: needs_review + existing: true + existing_file: catalog-poly.yaml +- vendor: poly + model: Poly Studio V12 + family: Poly Studio + role: USB video bar + form_factor: USB video bar + market: null + variant_of: null + protocols: &id006 + - Wi-Fi 802.11a/b/g/n/ac + - Bluetooth 5.0 + specs: + 4k: 2160p, 4K UHD (3840 x 2160) + zoom_optical: null + fov_h: 120° + pickup_m: Up to 15 ft (4.57 m) + mic_count: Four digital MEMS + protocols: *id006 + accessories: + - HP Poly Studio R30/USB/V12 Bluetooth Remote Control + - HP Poly USB-C 65W Power Adapter and Power Cord Kit + - HP Poly PoE++ 65W 2.5G Adapter with 3.66m CAT6a and Power Cord + - HP Poly Studio X30/X32/V12 Table Stand + - HP Poly Studio X30/X32/V12 VESA and Wall Mount + kits: [] + restrictions: + - power accessories are sold separately + lifecycle: null + source: + doc_id: cfd951466730 + url: null + quote: HP Poly Studio V12 Product Brief — Turn any small room into an AI-driven + AV experience with the HP Poly Studio V12 USB video bar. + level: L1 + review: needs_review + existing: true + existing_file: catalog-poly.yaml +- vendor: poly + model: Poly Studio V52 + family: Poly Studio + role: USB video bar + form_factor: soundbar-style video bar + market: null + variant_of: null + protocols: &id007 + - UVC 1.1 + - UAC 2.0 + - Wi-Fi 802.11a/b/g/n/ac/ax (MIMO) + - Bluetooth 5.0 + specs: + 4k: 2160p, 4K UHD (3840 x 2160) + zoom_optical: null + fov_h: 95° + pickup_m: Up to 6.09 m Up to 20 ft + mic_count: Two MEMS microphones; Two second-order microphones + protocols: *id007 + accessories: + - Monitor clamp + - Privacy cover + - AC power adapter + - HDMI cable + - Power cable + - USB Type-C to USB Type-C cable + kits: [] + restrictions: + - Bluetooth 5.0 (audio sink not supported) + - HDMI-in 1.4 (not supported) + - 2 USB Type-A 5Gbps signaling rate (disabled by default, can be enabled in Poly + Lens app) + lifecycle: null + source: + doc_id: d38a164e25b1 + url: null + quote: Poly Studio V52 USB Video Bar ... Datasheet ... © Copyright 2026 HP Development + Company, L.P. + level: L1 + review: needs_review + existing: true + existing_file: catalog-poly.yaml diff --git a/ops/work/web/app.py b/ops/work/web/app.py index 3a53d7b..fcbe648 100644 --- a/ops/work/web/app.py +++ b/ops/work/web/app.py @@ -68,8 +68,8 @@ CLASS_LABELS = { "passive.power": "Питание", "infrastructure.network": "Сеть / инфраструктура", } -ROLE_LABELS = { - "codec": "Кодек / терминал", "pc": "ПК", "kit": "Комплект", +MARKET_LABELS = {"ru": "РФ", "global": "Global", "both": "РФ + Global"} +ROLE_LABELS = { "codec": "Кодек / терминал", "pc": "ПК", "kit": "Комплект", "camera": "Камера", "audio": "Аудио", "speaker": "Спикер", "touch": "Панель", "display": "Дисплей", "mount": "Крепление", "sharing_hub": "Презентация", "phone": "Телефон", "headset": "Гарнитура", @@ -92,6 +92,10 @@ def role_label(v): return ROLE_LABELS.get(v, str(v or "—").title()) +def market_label(v): + return MARKET_LABELS.get(v, str(v or "—")) + + def norm(s): return re.sub(r"[^a-z0-9]", "", str(s).lower()) @@ -1239,6 +1243,7 @@ def search_catalog(params): protocol = (params.get("protocol", [""])[0] or "").strip().upper() feature = (params.get("feature", [""])[0] or "").strip() arch_mode = (params.get("archived", ["all"])[0] or "all").lower() + market = (params.get("market", ["all"])[0] or "all").lower() low = q.lower() interpreted = [] if not cls: @@ -1271,6 +1276,11 @@ def search_catalog(params): continue if arch_mode not in ("only", "all") and is_archived(d): continue + if market not in ("", "all"): + mv = d.get("market") or "both" + mvs = d.get("markets") or [mv] + if market not in mvs and mv not in (market, "both"): + continue if vendor not in ("", "all") and d.get("vendor") != vendor: continue if domain not in ("", "all") and d.get("domain") != domain: @@ -1315,6 +1325,8 @@ def search_catalog(params): items.sort(key=lambda d: ((d.get("vendor") or ""), (d.get("solution_class") or ""), _dev_name(d))) out = [{"key": _key(d), "name": _dev_name(d), "vendor": d.get("vendor"), "domain": d.get("domain"), "domain_label": domain_label(d.get("domain")), + "market": d.get("market"), "markets": d.get("markets") or [], + "market_label": market_label(d.get("market")), "solution_class": d.get("solution_class"), "class_label": class_label(d.get("solution_class")), "role": d.get("role"), "role_label": role_label(d.get("role")), "form_factor": d.get("form_factor"), @@ -1347,6 +1359,8 @@ def product_info(key): return {"error": "not_found", "key": key} return {"product": {"key": _key(d), "name": _dev_name(d), "vendor": d.get("vendor"), "domain": d.get("domain"), "domain_label": domain_label(d.get("domain")), + "market": d.get("market"), "markets": d.get("markets") or [], + "market_label": market_label(d.get("market")), "solution_class": d.get("solution_class"), "class_label": class_label(d.get("solution_class")), "role": d.get("role"), "role_label": role_label(d.get("role")), "form_factor": d.get("form_factor"), diff --git a/ops/work/web/studio.html b/ops/work/web/studio.html index 99da835..f8ef0bd 100644 --- a/ops/work/web/studio.html +++ b/ops/work/web/studio.html @@ -69,6 +69,7 @@ main{max-width:1560px;margin:0 auto;padding:22px 26px 70px}.view{display:none}.v Тип оборудования + @@ -144,7 +145,7 @@ main{max-width:1560px;margin:0 auto;padding:22px 26px 70px}.view{display:none}.v