m/llm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(1c): separate template descriptor type from payload carrier

Browse Source
This commit is contained in:
Mikhail
2026-08-14 20:53:49 +03:00
parent 9f46d8e39e
commit 7cd24bffd4
4 changed files with 113 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/1c/connector/adapter_1c_server.py
+59 -11
View File
@@ -172,7 +172,7 @@ ONEC_TEMPLATE_PLATFORM_TYPES = [
"xml_type": "DataCompositionAppearanceTemplate",
"decoder": "data_composition_appearance",
"status": "not_implemented",
"aliases": ["МакетОформленияКомпоновкиДанных", "DataCompositionAppearanceTemplate", "AppearanceTemplate"],
"aliases": ["МакетОформленияКомпоновкиДанных", "DataCompositionAppearanceTemplate"],
},
{
"id": "external_component",
@@ -764,7 +764,7 @@ METHODS = [
{"name": "metadata.object.related", "transport": "POST /rpc", "description": "1C-facing related metadata objects such as forms and templates. Physical record paths are hidden unless include_storage=true."},
{"name": "report.inspect", "transport": "POST /rpc", "description": "Read-only aggregate of one report's confirmed modules, forms, templates and Data Composition Schemas. Does not infer an SCD from a same-named form or stream."},
{"name": "scd.inspect", "transport": "POST /rpc", "description": "Read-only inspection entry point for a report Data Composition Schema. Resolves a base report from Config or an extension report from ConfigCAS by public names, and returns partial evidence instead of inventing undecoded parameters, datasets, resources, or variants."},
{"name": "appearance.inspect", "transport": "POST /rpc", "description": "Read-only inspection of a base CommonTemplate whose payload is confirmed as AppearanceTemplate XML. Returns XML-backed appearance rules; no write route is exposed."},
{"name": "appearance.inspect", "transport": "POST /rpc", "description": "Read-only inspection of a base CommonTemplate whose payload has AppearanceTemplate XML root. That root selects a reader only, not the 1C TemplateType. Returns XML-backed appearance rules; no write route is exposed."},
{"name": "scd.prepare", "transport": "POST /rpc", "description": "Prepare the complete SQL saved-state file set required for one report SCD. For base reports it includes both report files and the separately stored Template payload group, while keeping SQL file identifiers internal."},
{"name": "scd.prepare.rollback", "transport": "POST /rpc", "description": "Remove exactly the rows inserted by one SCD preparation receipt after hash precondition checks. This is intended for controlled test cleanup and never touches active Config/ConfigCAS."},
{"name": "scd.compare", "transport": "POST /rpc", "description": "Read-only semantic comparison of active and prepared saved-state SCD XML: Config ↔ ConfigSave for base reports and ConfigCAS ↔ ConfigCASSave for extensions. Compares named parameters, datasets, fields, expressions, totals, and variants rather than storage hashes."},
@@ -4089,7 +4089,6 @@ def declared_template_platform_type_from_part(part: dict[str, Any]) -> dict[str,
classification.get("template_type"),
classification.get("platform_type_id"),
classification.get("platform_type"),
classification.get("xml_root"),
]
)
candidates.extend(classification.get("strings_sample") or [])
@@ -4100,6 +4099,24 @@ def declared_template_platform_type_from_part(part: dict[str, Any]) -> dict[str,
return None
def template_descriptor_type_code_from_part(part: dict[str, Any]) -> str | None:
"""Return an unlabelled type code from the proven Template descriptor shape.
The code is useful evidence, but its numeric-to-TemplateType mapping is
intentionally not guessed from the payload carrier or a template name.
"""
if str(part.get("role") or "") != "metadata_payload":
return None
classification = part.get("classification") if isinstance(part.get("classification"), dict) else {}
tree = classification.get("tree")
if not isinstance(tree, dict):
return None
if config_tree_scalar_at_path(tree, (0,)) != "1" or config_tree_scalar_at_path(tree, (1, 0)) != "4":
return None
value = config_tree_scalar_at_path(tree, (1, 2))
return value if value and value.isdecimal() else None
def template_type_candidates_from_features(features: dict[str, Any], content_parts: list[dict[str, Any]]) -> list[dict[str, Any]]:
candidates: list[dict[str, Any]] = []
declared = normalize_onec_template_platform_type(features.get("declared_platform_type_id") or features.get("declared_platform_type"))
@@ -4143,14 +4160,22 @@ def public_template_summary(
(template_type for template_type in (declared_template_platform_type_from_part(part) for part in parts) if template_type),
None,
)
# A payload carrier (for example XML root AppearanceTemplate) selects a
# safe reader, but is not the 1C TemplateType. The latter is determined
# only by a decoded template descriptor / confirmed template identity.
declared_type_evidence = "TemplateType metadata"
if any(
normalize_onec_template_platform_type(
((part.get("classification") or {}).get("xml_root") if isinstance(part.get("classification"), dict) else None)
)
for part in parts
):
declared_type_evidence = "payload XML root"
xml_roots = sorted(
{
str((part.get("classification") or {}).get("xml_root"))
for part in parts
if isinstance(part.get("classification"), dict)
and (part.get("classification") or {}).get("xml_root")
}
)
descriptor_type_codes = sorted(
{code for code in (template_descriptor_type_code_from_part(part) for part in parts) if code is not None},
key=int,
)
features = {
"tabular_document": any(((part.get("features") or {}).get("tabular_document")) for part in content_parts),
"html": any(((part.get("features") or {}).get("html")) for part in content_parts),
@@ -4185,6 +4210,17 @@ def public_template_summary(
"template_type_candidates": template_type_candidates,
"counts": {"parts": len(parts), "content_parts": len(content_parts)},
}
if xml_roots:
summary["content_type_evidence"] = {
"xml_roots": xml_roots,
"meaning": "payload_carrier_only_not_platform_template_type",
}
if descriptor_type_codes and not declared_platform_type and not confirmed_platform_type_id:
summary["descriptor_type_evidence"] = {
"codes": descriptor_type_codes,
"status": "unresolved_mapping",
"meaning": "Template descriptor type code; numeric mapping to 1C TemplateType is not yet fixture-proven.",
}
if confirmed_platform_type:
summary["format"] = confirmed_platform_type.get("xml_type") or confirmed_platform_type.get("id")
summary["platform_type"] = confirmed_platform_type.get("name")
@@ -36100,7 +36136,19 @@ def appearance_inspect(payload: dict[str, Any]) -> dict[str, Any]:
return {"schema": "onec_appearance_inspect.v1", "method": method, "status": "not_found", "base_id": base_id, "diagnostics": (read_error or {}).get("diagnostics") or {"code": "APPEARANCE_PAYLOAD_NOT_FOUND"}}
from parser.appearance_payload import inspect_appearance_payload
decoded = inspect_appearance_payload(data)
return {"schema": "onec_appearance_inspect.v1", "method": method, "status": decoded.get("status"), "base_id": base_id, "template": public_metadata_row(object_card), "appearance": decoded, "activation_state": "working_not_runtime_applied"}
return {
"schema": "onec_appearance_inspect.v1",
"method": method,
"status": decoded.get("status"),
"base_id": base_id,
"template": public_metadata_row(object_card),
"appearance": decoded,
"template_type": {
"status": "unresolved",
"reason": "AppearanceTemplate XML root selects this read-only decoder but does not prove the 1C TemplateType; a decoded metadata descriptor is required.",
},
"activation_state": "working_not_runtime_applied",
}
def report_inspect(payload: dict[str, Any]) -> dict[str, Any]: