answer42 0.4.76__tar.gz → 0.4.78__tar.gz

{answer42-0.4.76 → answer42-0.4.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: answer42
-Version: 0.4.76
+Version: 0.4.78
 Summary: Answer42 — The Answer to Life, Universe, and 1C — UI Driver. MCP-powered 1C:Enterprise UI automation: click, fill, navigate, test, and introspect managed forms through the test-client API
 Author: Marvin (AI Assistant), 42Clouds, and contributors
 Author-email: "Kosolapov Stanislav (proDOOMman)" <prodoomman@gmail.com>

{answer42-0.4.76 → answer42-0.4.78}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "answer42"
-version = "0.4.76"
+version = "0.4.78"
 description = "Answer42 — The Answer to Life, Universe, and 1C — UI Driver. MCP-powered 1C:Enterprise UI automation: click, fill, navigate, test, and introspect managed forms through the test-client API"
 readme = "README.md"
 requires-python = ">=3.11"

{answer42-0.4.76 → answer42-0.4.78}/src/mcp_1c/assets/skills/answer42-rag/SKILL.md

@@ -61,7 +61,7 @@ rag_session_autoconfigure()
 
 ```text
 # Прямое серверное подключение
-rag_session_autoconfigure(dump_if_missing=true, dump_connection_value="dev-area-01.42clouds.com/ms", dump_username="Admin", dump_password="...")
+rag_session_autoconfigure(dump_if_missing=true, dump_connection_value="<DIRECT_SERVER_INFOBASE>", dump_username="<DUMP_USERNAME>", dump_password="<DUMP_PASSWORD>")
 
 # Из CF/CFE файлов
 rag_session_autoconfigure(dump_if_missing=true, cf_files="config.cf", cfe_files="ext1.cfe,ext2.cfe")

{answer42-0.4.76 → answer42-0.4.78}/src/mcp_1c/server.py

@@ -8139,22 +8139,38 @@ async def _set_universal_report_quick_setting_by_titles(
     warnings: list[str],
 ) -> bool:
     local_warnings: list[str] = []
+    value_norm = _normalize_match_text(value)
     for title in titles:
         try:
             info = await _bridge_call_recorded(session_id, "field_info", {
                 "field_name": title,
                 "search_by_title": True,
-            }, timeout=10)
+            }, timeout=30)
             if not isinstance(info, dict) or not info.get("found"):
                 raise RuntimeError(f"Поле не найдено по заголовку: {title}")
             current = str(info.get("data_text") or "").strip()
-            if current == value or (value and value in current):
+            current_norm = _normalize_match_text(current)
+            if current == value or (value_norm and value_norm in current_norm):
                 return True
+            # On some BSP report forms title lookup for "Объект" can match the
+            # previous quick-setting row (for example the object-family field
+            # currently containing "Справочники").  Do not overwrite such a row
+            # with a catalog object name; try the next candidate title instead.
+            if value_norm and "идентификаторыобъектовметаданных" in value_norm and current_norm in {
+                "справочники",
+                "справочник",
+                "каталоги",
+            }:
+                local_warnings.append(
+                    f"Universal report quick setting {title!r} looked like object-family field"
+                    f" (current={current!r}); trying next title"
+                )
+                continue
             field_name = str(info.get("name") or title)
             await _bridge_call_recorded(session_id, "set_field_value", {
                 "field_name": field_name,
                 "value": value,
-            }, timeout=15)
+            }, timeout=75)
             return True
         except Exception as exc:
             local_warnings.append(f"Universal report quick setting {title!r} was not set by title: {exc}")
@@ -8201,15 +8217,153 @@ async def _configure_universal_report_metadata_settings(session_id: str, query:
             "Universal report selected fields are not enabled in UI settings;"
             f" leaving report settings unchanged and relying on parse/post-filtering: {', '.join(disabled)}"
         )
-    filter_occurrences: dict[str, int] = {}
-    for spec in _metadata_universal_report_filter_specs():
-        field = spec.get("field", "")
-        filter_occurrences[field] = filter_occurrences.get(field, 0) + 1
-        await _add_universal_report_filter(session_id, spec, warnings, filter_occurrences[field])
+    # Do not add report-level filters here.  On live BSP Universal Report forms
+    # the filter-add button can open the formula editor instead of the field
+    # chooser, leaving the tool in an unrelated modal form.  Correctness is
+    # enforced by the confirmed report source plus parser-side validation and
+    # metadata-row filtering; this keeps the user-visible report on the right
+    # catalog without risking another noisy/stuck UI mutation.
+    warnings.append("Universal report row filters were not mutated; using confirmed source and parser-side metadata filtering")
     await _bridge_call_recorded(session_id, "click_button", {"name": "ЗакрытьИСформировать"}, timeout=35)
     return warnings
 
 
+def _universal_report_metadata_source_title_found(value: Any) -> bool:
+    if not isinstance(value, dict):
+        return False
+    diagnostics = value.get("client_diagnostics") if isinstance(value.get("client_diagnostics"), dict) else {}
+    candidates = [
+        value.get("title"),
+        value.get("window_title_after"),
+        value.get("window_title_before"),
+        diagnostics.get("active_window_title"),
+        diagnostics.get("modal_title"),
+    ]
+    for item in candidates:
+        normalized = _normalize_match_text(str(item or ""))
+        if "идентификаторыобъектовметаданных" in normalized:
+            return True
+    return False
+
+
+def _active_window_looks_like_startup_noise(value: Any) -> bool:
+    if not isinstance(value, dict):
+        return False
+    title = str(value.get("title") or "")
+    form_name = str(value.get("form_name") or "")
+    diagnostics = value.get("client_diagnostics") if isinstance(value.get("client_diagnostics"), dict) else {}
+    diagnostic_title = str(diagnostics.get("active_window_title") or diagnostics.get("modal_title") or "")
+    diagnostic_form = str(diagnostics.get("active_form_name") or diagnostics.get("modal_form_name") or "")
+    return (
+        title.startswith("Новое в версии")
+        or diagnostic_title.startswith("Новое в версии")
+        or "Справочник.Новости.Форма.ФормаНовости" in form_name
+        or "Справочник.Новости.Форма.ФормаНовости" in diagnostic_form
+    )
+
+
+async def _active_universal_report_window(session_id: str, warnings: list[str], *, timeout: int = 30) -> dict[str, Any]:
+    navigation_link = "e1cib/app/Отчет.УниверсальныйОтчет"
+    deadline = time.monotonic() + max(timeout, 1)
+    last: dict[str, Any] = {}
+    while time.monotonic() < deadline:
+        try:
+            active = await _bridge_call_recorded(session_id, "active_window", {}, timeout=8)
+            if isinstance(active, dict):
+                last = active
+                title = str(active.get("title") or "")
+                form_name = str(active.get("form_name") or "")
+                if "Универсальный отчет" in title or form_name == "ОбщаяФорма.ФормаОтчета":
+                    return active
+                if _active_window_looks_like_startup_noise(active):
+                    await _bridge_call_recorded(session_id, "close_form", {}, timeout=15)
+                    warnings.append("Startup/news form was closed before Universal report source selection")
+                    try:
+                        await _bridge_call_recorded(
+                            session_id,
+                            "open_navigation_link",
+                            {"navigation_link": navigation_link},
+                            timeout=20,
+                        )
+                        warnings.append("Universal report navigation was retried after closing startup/news form")
+                    except Exception as exc:
+                        warnings.append(f"Universal report navigation retry after startup/news form failed: {exc}")
+                    await asyncio.sleep(1)
+                    continue
+        except Exception as exc:
+            warnings.append(f"Universal report active-window wait probe failed: {exc}")
+        await asyncio.sleep(1)
+    return last
+
+
+async def _ensure_universal_report_metadata_source(session_id: str, warnings: list[str], open_result: Any) -> bool:
+    if _universal_report_metadata_source_title_found(open_result):
+        warnings.append("Universal report metadata-identifiers source confirmed by opened form title")
+        return True
+    try:
+        active = await _active_universal_report_window(session_id, warnings)
+        if _universal_report_metadata_source_title_found(active):
+            warnings.append("Universal report metadata-identifiers source confirmed by active window title")
+            return True
+    except Exception as exc:
+        warnings.append(f"Universal report active-window source validation failed: {exc}")
+    warnings.append(
+        "Universal report did not open on metadata-identifiers source; trying quick settings"
+    )
+    type_ok = await _set_universal_report_quick_setting_by_titles(
+        session_id,
+        ["Тип объекта", "Тип данных", "Раздел"],
+        "Справочники",
+        warnings,
+    )
+    source_ok = await _set_universal_report_quick_setting_by_titles(
+        session_id,
+        ["Объект", "Справочник", "Имя объекта"],
+        "Идентификаторы объектов метаданных",
+        warnings,
+    )
+    if not source_ok:
+        source_ok = await _set_universal_report_quick_setting_by_titles(
+            session_id,
+            ["Объект", "Справочник", "Имя объекта"],
+            "ИдентификаторыОбъектовМетаданных",
+            warnings,
+        )
+    if type_ok and not source_ok:
+        warnings.append(
+            "Universal report object-family quick setting was set, but metadata-identifiers object was not confirmed"
+        )
+    if source_ok:
+        warnings.append("Universal report quick settings were used to select metadata-identifiers source")
+        try:
+            active = await _active_universal_report_window(session_id, warnings, timeout=20)
+            if _universal_report_metadata_source_title_found(active):
+                warnings.append("Universal report metadata-identifiers source confirmed after quick settings")
+                return True
+            warnings.append(
+                "Universal report quick settings completed but metadata-identifiers source was not confirmed"
+            )
+        except Exception as exc:
+            warnings.append(f"Universal report source confirmation after quick settings failed: {exc}")
+    return False
+
+
+def _metadata_report_rows_look_like_identifiers(rows: list[dict[str, str]]) -> bool:
+    if not rows:
+        return False
+    useful_full_names = 0
+    technical_columns = 0
+    for row in rows[:200]:
+        if _row_value(row, "Полное имя", "ПолноеИмя", "СписокПолноеИмя"):
+            technical_columns += 1
+        item = _metadata_object_from_row(row)
+        if _is_metadata_full_name_included(item.get("full_name", "")):
+            useful_full_names += 1
+            if useful_full_names >= 3:
+                return True
+    return technical_columns > 0 and useful_full_names > 0
+
+
 async def _metadata_rows_from_universal_report(
     session_id: str,
     max_rows: int,
@@ -8229,42 +8383,43 @@ async def _metadata_rows_from_universal_report(
     try:
         open_result = await _bridge_call_recorded(session_id, "open_navigation_link", {"navigation_link": navigation_link})
         await _close_message_box_from_command_diagnostics(session_id, open_result, warnings)
-        # Do not probe or mutate Universal report quick settings in the primary path.
-        # On some live web/thin-client sessions the report opens already on the
-        # required metadata-identifiers source, but title-based `field_info`
-        # probing of quick settings makes the bridge unresponsive before the
-        # report can be formed.  Prefer the stable navigation-link source and
-        # validate the produced XLSX contents after save.
-        warnings.append(
-            "Universal report quick settings probing skipped;"
-            " using the source opened by the navigation link and validating XLSX rows"
-        )
-        # Do not open the Universal report settings form in the primary path.
-        # Live thin-client/web sessions can visually open `ВсеНастройки` but
-        # leave the test bridge unresponsive for minutes; adding the first
-        # filter field can also end in `Потеряно соединение`.  The primary path
-        # must therefore form the report with the selected source and apply the
-        # mandatory filtering/normalization on the Python side.  Settings remain
-        # available as a separate best-effort diagnostic helper, not as a
-        # correctness-critical step of metadata cache building.
-        warnings.append("Universal report settings UI skipped; filtering is applied after reading rows")
-        # Avoid active_window probes before forming the report: on live web/thin
-        # sessions they can make the bridge unresponsive even when the report
-        # form is visually ready.  If navigation returned no safe MessageBox
-        # diagnostics, go straight to the form command.
-        form_result = await _dangerous_bridge_call_recorded(
+        source_configured = await _ensure_universal_report_metadata_source(
             session_id,
-            "click_button",
-            {"name": "СформироватьОтчет"},
-            timeout=180,
-            danger="metadata_objects_universal_report_form_may_block_thin_client",
+            warnings,
+            open_result,
         )
-        if isinstance(form_result, dict) and form_result.get("started_long_action"):
+        if not source_configured:
+            return [], [
+                *warnings,
+                (
+                    "Universal report metadata source was not confirmed or configured;"
+                    " refusing to read arbitrary current Universal report result"
+                ),
+            ]
+        try:
+            settings_warnings = await _configure_universal_report_metadata_settings(session_id, query)
+            warnings.extend(settings_warnings)
+            settings_applied = True
+        except Exception as exc:
+            settings_applied = False
             warnings.append(
-                "Universal report form action is still running or blocked the interface;"
-                f" form_result={_truncate_value(form_result)}"
+                "Universal report settings UI failed; falling back to report formation only"
+                f"; error={exc}"
             )
-            return [], warnings
+        if not settings_applied:
+            form_result = await _dangerous_bridge_call_recorded(
+                session_id,
+                "click_button",
+                {"name": "СформироватьОтчет"},
+                timeout=180,
+                danger="metadata_objects_universal_report_form_may_block_thin_client",
+            )
+            if isinstance(form_result, dict) and form_result.get("started_long_action"):
+                warnings.append(
+                    "Universal report form action is still running or blocked the interface;"
+                    f" form_result={_truncate_value(form_result)}"
+                )
+                return [], warnings
         ready, readiness_warnings, readiness = await _wait_tabular_document_ready(
             session_id,
             "ОтчетТабличныйДокумент",
@@ -8313,12 +8468,19 @@ async def _metadata_rows_from_universal_report(
         except Exception as exc:
             read_warnings.append(f"Universal report MXL save/read failed: {exc}")
         if rows:
-            warnings.extend(read_warnings)
-            warnings.append(
-                "Universal report MXL became parseable"
-                f"; rows={readiness.get('rows')}; columns={readiness.get('columns')}; path={last_saved_path}"
-            )
-            return rows[:max_rows], warnings
+            if not _metadata_report_rows_look_like_identifiers(rows):
+                read_warnings.append(
+                    "Universal report MXL parsed rows do not look like metadata identifiers;"
+                    " ignoring this report output"
+                )
+                rows = []
+            else:
+                warnings.extend(read_warnings)
+                warnings.append(
+                    "Universal report MXL became parseable"
+                    f"; rows={readiness.get('rows')}; columns={readiness.get('columns')}; path={last_saved_path}"
+                )
+                return rows[:max_rows], warnings
 
         report_path = Path("/tmp/answer42") / f"metadata_objects_{session_id}_{uuid.uuid4().hex}.xlsx"
         try:
@@ -8348,9 +8510,15 @@ async def _metadata_rows_from_universal_report(
                 rows = _metadata_catalog_rows_from_xlsx(Path(selected_path))
         except Exception as exc:
             read_warnings.append(f"Universal report XLSX save/read failed: {exc}")
+        if rows and not _metadata_report_rows_look_like_identifiers(rows):
+            read_warnings.append(
+                "Universal report XLSX parsed rows do not look like metadata identifiers;"
+                " ignoring this report output"
+            )
+            rows = []
         if not rows:
             warning = (
-                "Universal report returned no parseable metadata rows"
+                "Universal report returned no parseable metadata identifier rows"
                 f" after ready state; last_saved_path={last_saved_path};"
                 f" readiness={_truncate_value(readiness)};"
                 f" save_result={_truncate_value(save_diagnostics)}"