@josephyan/qingflow-cli 1.0.11 → 1.1.2

package/src/qingflow_mcp/builder_facade/models.py

@@ -9,6 +9,22 @@ from .button_style_catalog import resolve_button_style
 from ..solution.spec_models import StrictModel
 
 
+def _normalize_builder_view_key_value(value: Any) -> Any:
+    if not isinstance(value, str):
+        return value
+    raw = value.strip()
+    if raw.startswith("custom:"):
+        return raw.split(":", 1)[1].strip()
+    return raw
+
+
+def _normalize_builder_view_key_payload(payload: dict[str, Any]) -> dict[str, Any]:
+    for key in ("view_key", "viewKey", "viewgraphKey", "viewGraphKey"):
+        if key in payload:
+            payload[key] = _normalize_builder_view_key_value(payload[key])
+    return payload
+
+
 class PublicFieldType(str, Enum):
     text = "text"
     long_text = "long_text"
@@ -115,14 +131,45 @@ class PublicViewButtonType(str, Enum):
 class PublicViewButtonConfigType(str, Enum):
     top = "TOP"
     detail = "DETAIL"
+    list = "INSIDE"
+
+
+class PublicButtonPlacement(str, Enum):
+    header = "header"
+    detail = "detail"
+    list = "list"
 
 
 class PublicChartType(str, Enum):
     target = "target"
+    indicator = "indicator"
+    summary = "summary"
     pie = "pie"
     bar = "bar"
+    columnar = "columnar"
     line = "line"
     table = "table"
+    detail = "detail"
+    area = "area"
+    stacked_area = "stacked_area"
+    pct_stack_area = "pct_stack_area"
+    funnel = "funnel"
+    waterfall = "waterfall"
+    gauge = "gauge"
+    heatmap = "heatmap"
+    histogram = "histogram"
+    treemap = "treemap"
+    radar = "radar"
+    stacked_bar = "stacked_bar"
+    pct_stack_bar = "pct_stack_bar"
+    stacked_column = "stacked_column"
+    pct_stack_col = "pct_stack_col"
+    scatter = "scatter"
+    ring = "ring"
+    rose = "rose"
+    dualaxes = "dualaxes"
+    map = "map"
+    timeline = "timeline"
 
 
 class LayoutApplyMode(str, Enum):
@@ -136,10 +183,6 @@ class LayoutPreset(str, Enum):
     single_section = "single_section"
 
 
-class FlowPreset(str, Enum):
-    basic_approval = "basic_approval"
-    basic_fill_then_approve = "basic_fill_then_approve"
-
 
 class ViewsPreset(str, Enum):
     default_table = "default_table"
@@ -739,6 +782,8 @@ class FieldPatch(StrictModel):
         default=None,
         validation_alias=AliasChoices("custom_button_text", "customButtonText", "custom_btn_text", "customBtnText"),
     )
+    as_data_title: bool | None = Field(default=None, validation_alias=AliasChoices("as_data_title", "asDataTitle"))
+    as_data_cover: bool | None = Field(default=None, validation_alias=AliasChoices("as_data_cover", "asDataCover"))
     subfields: list["FieldPatch"] = Field(default_factory=list)
 
     @model_validator(mode="after")
@@ -819,6 +864,8 @@ class FieldMutation(StrictModel):
         default=None,
         validation_alias=AliasChoices("custom_button_text", "customButtonText", "custom_btn_text", "customBtnText"),
     )
+    as_data_title: bool | None = Field(default=None, validation_alias=AliasChoices("as_data_title", "asDataTitle"))
+    as_data_cover: bool | None = Field(default=None, validation_alias=AliasChoices("as_data_cover", "asDataCover"))
     subfields: list[FieldPatch] | None = None
     subfield_updates: list["FieldUpdatePatch"] | None = Field(
         default=None,
@@ -1013,6 +1060,27 @@ class FlowTransitionPatch(StrictModel):
     target: str = Field(alias="to")
 
 
+class ViewQueryConditionsPatch(StrictModel):
+    enabled: bool = Field(default=True, validation_alias=AliasChoices("enabled", "queryConditionStatus", "status"))
+    exact: bool = Field(default=False, validation_alias=AliasChoices("exact", "queryConditionExact"))
+    hide_before_query: bool = Field(default=False, validation_alias=AliasChoices("hide_before_query", "hideBeforeQuery", "hideBeforeQueryCondition"))
+    rows: list[list[str | int]] = Field(default_factory=list, validation_alias=AliasChoices("rows", "fields", "queryCondition"))
+
+
+class ViewAssociatedResourcesPatch(StrictModel):
+    visible: bool = Field(default=True, validation_alias=AliasChoices("visible", "enabled", "asosChartVisible"))
+    limit_type: str | None = Field(default=None, validation_alias=AliasChoices("limit_type", "limitType"))
+    associated_item_ids: list[Any] = Field(
+        default_factory=list,
+        validation_alias=AliasChoices(
+            "associated_item_ids",
+            "associatedItemIds",
+            "asosChartIdList",
+            "items",
+        ),
+    )
+
+
 class ViewUpsertPatch(StrictModel):
     name: str
     view_key: str | None = Field(default=None, validation_alias=AliasChoices("view_key", "viewKey"))
@@ -1025,6 +1093,22 @@ class ViewUpsertPatch(StrictModel):
     title_field: str | None = Field(default=None, validation_alias=AliasChoices("title_field", "titleField"))
     buttons: list["ViewButtonBindingPatch"] | None = None
     visibility: VisibilityPatch | None = None
+    query_conditions: ViewQueryConditionsPatch | None = Field(default=None, validation_alias=AliasChoices("query_conditions", "queryConditions", "query_condition", "queryCondition"))
+    associated_resources: ViewAssociatedResourcesPatch | None = Field(
+        default=None,
+        validation_alias=AliasChoices(
+            "associated_resources",
+            "associatedResources",
+            "associated_reports",
+            "associatedReports",
+            "asosChartConfig",
+        ),
+    )
+    partial_update: bool = Field(default=False, exclude=True, validation_alias=AliasChoices("_partial_update", "partial_update", "partialUpdate"))
+    preserve_filters: bool = Field(default=False, exclude=True, validation_alias=AliasChoices("_preserve_filters", "preserve_filters", "preserveFilters"))
+    preserve_buttons: bool = Field(default=False, exclude=True, validation_alias=AliasChoices("_preserve_buttons", "preserve_buttons", "preserveButtons"))
+    preserve_query_conditions: bool = Field(default=False, exclude=True, validation_alias=AliasChoices("_preserve_query_conditions", "preserve_query_conditions", "preserveQueryConditions"))
+    preserve_associated_resources: bool = Field(default=False, exclude=True, validation_alias=AliasChoices("_preserve_associated_resources", "preserve_associated_resources", "preserveAssociatedResources"))
 
     @model_validator(mode="before")
     @classmethod
@@ -1032,6 +1116,7 @@ class ViewUpsertPatch(StrictModel):
         if not isinstance(value, dict):
             return value
         payload = dict(value)
+        payload = _normalize_builder_view_key_payload(payload)
         if "fields" in payload and "columns" not in payload:
             payload["columns"] = payload.pop("fields")
         if "column_names" in payload and "columns" not in payload:
@@ -1042,6 +1127,20 @@ class ViewUpsertPatch(StrictModel):
             payload["filters"] = payload.pop("filter_rules")
         if "filterRules" in payload and "filters" not in payload:
             payload["filters"] = payload.pop("filterRules")
+        if "queryConditions" in payload and "query_conditions" not in payload:
+            payload["query_conditions"] = payload.pop("queryConditions")
+        if "query_condition" in payload and "query_conditions" not in payload:
+            payload["query_conditions"] = payload.pop("query_condition")
+        if "queryCondition" in payload and "query_conditions" not in payload:
+            payload["query_conditions"] = payload.pop("queryCondition")
+        if "associatedResources" in payload and "associated_resources" not in payload:
+            payload["associated_resources"] = payload.pop("associatedResources")
+        if "associated_reports" in payload and "associated_resources" not in payload:
+            payload["associated_resources"] = payload.pop("associated_reports")
+        if "associatedReports" in payload and "associated_resources" not in payload:
+            payload["associated_resources"] = payload.pop("associatedReports")
+        if "asosChartConfig" in payload and "associated_resources" not in payload:
+            payload["associated_resources"] = payload.pop("asosChartConfig")
         raw_type = payload.get("type")
         if isinstance(raw_type, str):
             normalized = raw_type.strip().lower()
@@ -1066,6 +1165,28 @@ class ViewUpsertPatch(StrictModel):
         return self
 
 
+class ViewPartialPatch(StrictModel):
+    view_key: str | None = Field(default=None, validation_alias=AliasChoices("view_key", "viewKey", "viewgraphKey", "viewGraphKey"))
+    name: str | None = Field(default=None, validation_alias=AliasChoices("name", "view_name", "viewName"))
+    set: dict[str, Any] = Field(default_factory=dict, validation_alias=AliasChoices("set", "update", "values"))
+    unset: list[str] = Field(default_factory=list, validation_alias=AliasChoices("unset", "clear", "remove"))
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        return _normalize_builder_view_key_payload(dict(value))
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "ViewPartialPatch":
+        if not str(self.view_key or "").strip() and not str(self.name or "").strip():
+            raise ValueError("patch_views[] requires view_key or unique name")
+        if not self.set and not self.unset:
+            raise ValueError("patch_views[] requires set or unset")
+        return self
+
+
 class CustomButtonJudgeValuePatch(StrictModel):
     id: int | str | None = None
     value: Any | None = None
@@ -1128,13 +1249,44 @@ class CustomButtonMatchRulePatch(StrictModel):
         return payload
 
 
+class CustomButtonFieldMappingPatch(StrictModel):
+    source_field: Any = Field(validation_alias=AliasChoices("source_field", "sourceField", "source"))
+    target_field: Any = Field(validation_alias=AliasChoices("target_field", "targetField", "target"))
+
+
+class FieldMatchMappingPatch(StrictModel):
+    target_field: Any = Field(validation_alias=AliasChoices("target_field", "targetField", "target", "field"))
+    source_field: Any | None = Field(default=None, validation_alias=AliasChoices("source_field", "sourceField", "source"))
+    value: Any | None = Field(default=None, validation_alias=AliasChoices("value", "static_value", "staticValue"))
+    operator: str = Field(default="eq", validation_alias=AliasChoices("operator", "op", "judge_type", "judgeType"))
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "FieldMatchMappingPatch":
+        has_source = self.source_field is not None and str(self.source_field).strip() != ""
+        has_value = self.value is not None
+        if has_source == has_value:
+            raise ValueError("match_mappings[] requires exactly one of source_field or value")
+        return self
+
+
 class CustomButtonAddDataConfigPatch(StrictModel):
-    related_app_key: str | None = Field(default=None, validation_alias=AliasChoices("related_app_key", "relatedAppKey"))
+    related_app_key: str | None = Field(
+        default=None,
+        validation_alias=AliasChoices("related_app_key", "relatedAppKey", "target_app_key", "targetAppKey"),
+    )
     related_app_name: str | None = Field(default=None, validation_alias=AliasChoices("related_app_name", "relatedAppName"))
     que_relation: list[CustomButtonMatchRulePatch] = Field(
         default_factory=list,
         validation_alias=AliasChoices("que_relation", "queRelation"),
     )
+    field_mappings: list[CustomButtonFieldMappingPatch] = Field(
+        default_factory=list,
+        validation_alias=AliasChoices("field_mappings", "fieldMappings", "mappings"),
+    )
+    default_values: dict[str, Any] = Field(
+        default_factory=dict,
+        validation_alias=AliasChoices("default_values", "defaultValues", "defaults"),
+    )
 
 
 class CustomButtonExternalQRobotConfigPatch(StrictModel):
@@ -1241,6 +1393,240 @@ class CustomButtonPatch(StrictModel):
         return self
 
 
+class CustomButtonUpsertPatch(CustomButtonPatch):
+    button_id: int | None = Field(default=None, validation_alias=AliasChoices("button_id", "buttonId", "id"))
+    client_key: str | None = Field(default=None, validation_alias=AliasChoices("client_key", "clientKey"))
+
+
+class CustomButtonPartialPatch(StrictModel):
+    button_id: int | None = Field(default=None, validation_alias=AliasChoices("button_id", "buttonId", "id"))
+    button_text: str | None = Field(default=None, validation_alias=AliasChoices("button_text", "buttonText", "name"))
+    client_key: str | None = Field(default=None, validation_alias=AliasChoices("client_key", "clientKey"))
+    set: dict[str, Any] = Field(default_factory=dict, validation_alias=AliasChoices("set", "update", "values"))
+    unset: list[str] = Field(default_factory=list, validation_alias=AliasChoices("unset", "clear", "remove"))
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "CustomButtonPartialPatch":
+        if self.button_id is None and not str(self.button_text or "").strip():
+            raise ValueError("patch_buttons[] requires button_id or unique button_text")
+        if not self.set and not self.unset:
+            raise ValueError("patch_buttons[] requires set or unset")
+        return self
+
+
+class CustomButtonRemovePatch(StrictModel):
+    button_id: int | None = Field(default=None, validation_alias=AliasChoices("button_id", "buttonId", "id"))
+    button_text: str | None = Field(default=None, validation_alias=AliasChoices("button_text", "buttonText", "name"))
+
+    @model_validator(mode="after")
+    def validate_selector(self) -> "CustomButtonRemovePatch":
+        if self.button_id is None and not str(self.button_text or "").strip():
+            raise ValueError("remove_buttons[] requires button_id or button_text")
+        return self
+
+
+class CustomButtonViewButtonBindingPatch(StrictModel):
+    button_ref: Any = Field(validation_alias=AliasChoices("button_ref", "buttonRef", "button_id", "buttonId", "id"))
+    placement: PublicButtonPlacement = Field(default=PublicButtonPlacement.detail, validation_alias=AliasChoices("placement", "position"))
+    primary: bool = Field(default=False, validation_alias=AliasChoices("primary", "being_main", "beingMain"))
+    button_limit: list[list[ViewFilterRulePatch]] = Field(
+        default_factory=list,
+        validation_alias=AliasChoices("button_limit", "buttonLimit", "visible_when", "visibleWhen"),
+    )
+    button_formula: str | None = Field(default=None, validation_alias=AliasChoices("button_formula", "buttonFormula"))
+    button_formula_type: int = Field(default=1, validation_alias=AliasChoices("button_formula_type", "buttonFormulaType"))
+    print_tpls: list[Any] = Field(default_factory=list, validation_alias=AliasChoices("print_tpls", "printTpls"))
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        raw_placement = payload.get("placement", payload.get("position", payload.get("config_type", payload.get("configType"))))
+        if isinstance(raw_placement, str):
+            normalized = raw_placement.strip().lower()
+            if normalized in {"top", "header"}:
+                payload["placement"] = PublicButtonPlacement.header.value
+            elif normalized in {"detail", "data_detail"}:
+                payload["placement"] = PublicButtonPlacement.detail.value
+            elif normalized in {"list", "row", "row_action"}:
+                payload["placement"] = PublicButtonPlacement.list.value
+        raw_limits = payload.get("button_limit", payload.get("buttonLimit", payload.get("visible_when", payload.get("visibleWhen"))))
+        if isinstance(raw_limits, list) and raw_limits and all(isinstance(item, dict) for item in raw_limits):
+            payload["button_limit"] = [raw_limits]
+        return payload
+
+
+class CustomButtonViewConfigPatch(StrictModel):
+    view_key: str = Field(validation_alias=AliasChoices("view_key", "viewKey", "viewgraphKey", "viewGraphKey"))
+    mode: str = Field(default="merge", validation_alias=AliasChoices("mode", "apply_mode", "applyMode"))
+    buttons: list[CustomButtonViewButtonBindingPatch] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        return _normalize_builder_view_key_payload(dict(value))
+
+    @model_validator(mode="after")
+    def validate_mode(self) -> "CustomButtonViewConfigPatch":
+        normalized = str(self.mode or "").strip().lower()
+        if normalized not in {"merge", "replace"}:
+            raise ValueError("view_configs[].mode must be merge or replace")
+        self.mode = normalized
+        if normalized == "merge" and "buttons" not in getattr(self, "model_fields_set", set()):
+            raise ValueError("view_configs[] in merge mode requires buttons; pass buttons: [] or mode=replace to clear existing bindings")
+        return self
+
+
+class CustomButtonsApplyRequest(StrictModel):
+    app_key: str
+    upsert_buttons: list[CustomButtonUpsertPatch] = Field(default_factory=list)
+    patch_buttons: list[CustomButtonPartialPatch] = Field(default_factory=list)
+    remove_buttons: list[CustomButtonRemovePatch] = Field(default_factory=list)
+    view_configs: list[CustomButtonViewConfigPatch] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        if "buttons" in payload and "upsert_buttons" not in payload:
+            payload["upsert_buttons"] = payload.pop("buttons")
+        if "upsertButtons" in payload and "upsert_buttons" not in payload:
+            payload["upsert_buttons"] = payload.pop("upsertButtons")
+        if "patchButtons" in payload and "patch_buttons" not in payload:
+            payload["patch_buttons"] = payload.pop("patchButtons")
+        if "removeButtons" in payload and "remove_buttons" not in payload:
+            payload["remove_buttons"] = payload.pop("removeButtons")
+        if "viewConfigs" in payload and "view_configs" not in payload:
+            payload["view_configs"] = payload.pop("viewConfigs")
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "CustomButtonsApplyRequest":
+        if not self.upsert_buttons and not self.patch_buttons and not self.remove_buttons and not self.view_configs:
+            raise ValueError("custom button apply requires at least one upsert, patch, remove, or view config operation")
+        return self
+
+
+class AssociatedResourceUpsertPatch(StrictModel):
+    client_key: str | None = Field(default=None, validation_alias=AliasChoices("client_key", "clientKey"))
+    associated_item_id: int | None = Field(
+        default=None,
+        validation_alias=AliasChoices("associated_item_id", "associatedItemId", "asosChartId", "id"),
+    )
+    graph_type: str = Field(validation_alias=AliasChoices("graph_type", "graphType"))
+    target_app_key: str = Field(validation_alias=AliasChoices("target_app_key", "targetAppKey", "app_key", "appKey"))
+    chart_key: str | None = Field(default=None, validation_alias=AliasChoices("chart_key", "chartKey"))
+    view_key: str | None = Field(default=None, validation_alias=AliasChoices("view_key", "viewKey", "viewgraphKey", "viewGraphKey"))
+    report_source: str | None = Field(default=None, validation_alias=AliasChoices("report_source", "reportSource"))
+    source_type: str | None = Field(default=None, validation_alias=AliasChoices("source_type", "sourceType"))
+    match_rules: list[CustomButtonMatchRulePatch] = Field(default_factory=list, validation_alias=AliasChoices("match_rules", "matchRules"))
+    match_mappings: list[FieldMatchMappingPatch] = Field(
+        default_factory=list,
+        validation_alias=AliasChoices("match_mappings", "matchMappings"),
+    )
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        payload = _normalize_builder_view_key_payload(payload)
+        if "chart_id" in payload and "chart_key" not in payload and "chartKey" not in payload:
+            payload["chart_key"] = str(payload.pop("chart_id"))
+        raw_graph_type = str(payload.get("graph_type", payload.get("graphType", "")) or "").strip().lower()
+        raw_source_type = payload.get("source_type", payload.get("sourceType"))
+        has_report_source = "report_source" in payload or "reportSource" in payload
+        if isinstance(raw_source_type, str):
+            normalized_source = raw_source_type.strip().upper()
+            if normalized_source == "BI_QINGFLOW" and not has_report_source:
+                payload["report_source"] = "app"
+                payload.pop("source_type", None)
+                payload.pop("sourceType", None)
+            elif normalized_source == "BI_DATASET" and not has_report_source:
+                payload["report_source"] = "dataset"
+                payload.pop("source_type", None)
+                payload.pop("sourceType", None)
+            elif normalized_source == "QINGFLOW" and raw_graph_type in {"view", "viewgraph"}:
+                payload.pop("source_type", None)
+                payload.pop("sourceType", None)
+        return payload
+
+
+class AssociatedResourcePartialPatch(StrictModel):
+    associated_item_id: int = Field(validation_alias=AliasChoices("associated_item_id", "associatedItemId", "asosChartId", "id"))
+    client_key: str | None = Field(default=None, validation_alias=AliasChoices("client_key", "clientKey"))
+    set: dict[str, Any] = Field(default_factory=dict, validation_alias=AliasChoices("set", "update", "values"))
+    unset: list[str] = Field(default_factory=list, validation_alias=AliasChoices("unset", "clear", "remove"))
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "AssociatedResourcePartialPatch":
+        if self.associated_item_id <= 0:
+            raise ValueError("patch_resources[].associated_item_id must be a positive integer")
+        if not self.set and not self.unset:
+            raise ValueError("patch_resources[] requires set or unset")
+        return self
+
+
+class AssociatedResourceViewConfigPatch(StrictModel):
+    view_key: str = Field(validation_alias=AliasChoices("view_key", "viewKey", "viewgraphKey", "viewGraphKey"))
+    visible: bool = Field(default=True, validation_alias=AliasChoices("visible", "enabled", "asosChartVisible"))
+    limit_type: str | None = Field(default=None, validation_alias=AliasChoices("limit_type", "limitType"))
+    associated_item_ids: list[Any] = Field(
+        default_factory=list,
+        validation_alias=AliasChoices("associated_item_ids", "associatedItemIds", "asosChartIdList"),
+    )
+    associated_item_refs: list[str] = Field(default_factory=list, validation_alias=AliasChoices("associated_item_refs", "associatedItemRefs", "refs"))
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        return _normalize_builder_view_key_payload(dict(value))
+
+
+class AssociatedResourcesApplyRequest(StrictModel):
+    app_key: str
+    upsert_resources: list[AssociatedResourceUpsertPatch] = Field(default_factory=list)
+    patch_resources: list[AssociatedResourcePartialPatch] = Field(default_factory=list)
+    remove_associated_item_ids: list[Any] = Field(default_factory=list)
+    reorder_associated_item_ids: list[Any] = Field(default_factory=list)
+    view_configs: list[AssociatedResourceViewConfigPatch] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        if "upsertResources" in payload and "upsert_resources" not in payload:
+            payload["upsert_resources"] = payload.pop("upsertResources")
+        if "patchResources" in payload and "patch_resources" not in payload:
+            payload["patch_resources"] = payload.pop("patchResources")
+        if "resources" in payload and "upsert_resources" not in payload:
+            payload["upsert_resources"] = payload.pop("resources")
+        if "removeAssociatedItemIds" in payload and "remove_associated_item_ids" not in payload:
+            payload["remove_associated_item_ids"] = payload.pop("removeAssociatedItemIds")
+        if "reorderAssociatedItemIds" in payload and "reorder_associated_item_ids" not in payload:
+            payload["reorder_associated_item_ids"] = payload.pop("reorderAssociatedItemIds")
+        if "viewConfigs" in payload and "view_configs" not in payload:
+            payload["view_configs"] = payload.pop("viewConfigs")
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "AssociatedResourcesApplyRequest":
+        if not self.upsert_resources and not self.patch_resources and not self.remove_associated_item_ids and not self.reorder_associated_item_ids and not self.view_configs:
+            raise ValueError("associated resources apply requires at least one upsert, patch, remove, reorder, or view config operation")
+        return self
+
+
 class ViewButtonBindingPatch(StrictModel):
     button_type: PublicViewButtonType = Field(validation_alias=AliasChoices("button_type", "buttonType"))
     config_type: PublicViewButtonConfigType = Field(validation_alias=AliasChoices("config_type", "configType"))
@@ -1278,10 +1664,12 @@ class ViewButtonBindingPatch(StrictModel):
         raw_config_type = payload.get("config_type", payload.get("configType"))
         if isinstance(raw_config_type, str):
             normalized_config = raw_config_type.strip().lower()
-            if normalized_config == "top":
+            if normalized_config in {"top", "header"}:
                 payload["config_type"] = "TOP"
             elif normalized_config == "detail":
                 payload["config_type"] = "DETAIL"
+            elif normalized_config in {"inside", "list", "row", "row_action"}:
+                payload["config_type"] = "INSIDE"
         raw_limits = payload.get("button_limit", payload.get("buttonLimit"))
         if isinstance(raw_limits, list) and raw_limits and all(isinstance(item, dict) for item in raw_limits):
             payload["button_limit"] = [raw_limits]
@@ -1407,10 +1795,18 @@ class ChartUpsertPatch(StrictModel):
             normalized = raw_type.strip().lower()
             aliases = {
                 "targetchart": PublicChartType.target.value,
+                "indicatorchart": PublicChartType.indicator.value,
+                "summarychart": PublicChartType.summary.value,
                 "piechart": PublicChartType.pie.value,
                 "barchart": PublicChartType.bar.value,
+                "columnchart": PublicChartType.columnar.value,
+                "columnarchart": PublicChartType.columnar.value,
                 "linechart": PublicChartType.line.value,
                 "tablechart": PublicChartType.table.value,
+                "detailchart": PublicChartType.detail.value,
+                "percent_stacked_column": PublicChartType.pct_stack_col.value,
+                "percent_stacked_bar": PublicChartType.pct_stack_bar.value,
+                "percent_stacked_area": PublicChartType.pct_stack_area.value,
             }
             if normalized in aliases:
                 payload["chart_type"] = aliases[normalized]
@@ -1423,9 +1819,39 @@ class ChartUpsertPatch(StrictModel):
         return payload
 
 
+class ChartPartialPatch(StrictModel):
+    chart_id: str | None = None
+    name: str | None = None
+    set: dict[str, Any] = Field(default_factory=dict, validation_alias=AliasChoices("set", "update", "values"))
+    unset: list[str] = Field(default_factory=list, validation_alias=AliasChoices("unset", "clear", "remove"))
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        if "id" in payload and "chart_id" not in payload:
+            payload["chart_id"] = str(payload.pop("id"))
+        if "chart_name" in payload and "name" not in payload:
+            payload["name"] = payload.pop("chart_name")
+        if "chartName" in payload and "name" not in payload:
+            payload["name"] = payload.pop("chartName")
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "ChartPartialPatch":
+        if not str(self.chart_id or "").strip() and not str(self.name or "").strip():
+            raise ValueError("patch_charts[] requires chart_id or unique name")
+        if not self.set and not self.unset:
+            raise ValueError("patch_charts[] requires set or unset")
+        return self
+
+
 class ChartApplyRequest(StrictModel):
     app_key: str
     upsert_charts: list[ChartUpsertPatch] = Field(default_factory=list)
+    patch_charts: list[ChartPartialPatch] = Field(default_factory=list)
     remove_chart_ids: list[str] = Field(default_factory=list)
     reorder_chart_ids: list[str] = Field(default_factory=list)
 
@@ -1435,6 +1861,14 @@ class ChartApplyRequest(StrictModel):
         if not isinstance(value, dict):
             return value
         payload = dict(value)
+        if "upsertCharts" in payload and "upsert_charts" not in payload:
+            payload["upsert_charts"] = payload.pop("upsertCharts")
+        if "patchCharts" in payload and "patch_charts" not in payload:
+            payload["patch_charts"] = payload.pop("patchCharts")
+        if "removeChartIds" in payload and "remove_chart_ids" not in payload:
+            payload["remove_chart_ids"] = payload.pop("removeChartIds")
+        if "reorderChartIds" in payload and "reorder_chart_ids" not in payload:
+            payload["reorder_chart_ids"] = payload.pop("reorderChartIds")
         for key in ("remove_chart_ids", "reorder_chart_ids"):
             raw = payload.get(key)
             if isinstance(raw, list):
@@ -1443,8 +1877,8 @@ class ChartApplyRequest(StrictModel):
 
     @model_validator(mode="after")
     def validate_shape(self) -> "ChartApplyRequest":
-        if not self.upsert_charts and not self.remove_chart_ids and not self.reorder_chart_ids:
-            raise ValueError("chart apply requires at least one upsert, remove, or reorder operation")
+        if not self.upsert_charts and not self.patch_charts and not self.remove_chart_ids and not self.reorder_chart_ids:
+            raise ValueError("chart apply requires at least one upsert, patch, remove, or reorder operation")
         return self
 
 
@@ -1455,8 +1889,9 @@ class PortalComponentPositionPatch(StrictModel):
     pc_h: int = Field(default=8, validation_alias=AliasChoices("pc_h", "pcH", "h"))
     mobile_x: int = Field(default=0, validation_alias=AliasChoices("mobile_x", "mobileX"))
     mobile_y: int = Field(default=0, validation_alias=AliasChoices("mobile_y", "mobileY"))
-    mobile_w: int = Field(default=12, validation_alias=AliasChoices("mobile_w", "mobileW"))
+    mobile_w: int = Field(default=6, validation_alias=AliasChoices("mobile_w", "mobileW"))
     mobile_h: int = Field(default=8, validation_alias=AliasChoices("mobile_h", "mobileH"))
+    mobile_provided: bool = Field(default=False, exclude=True)
 
     @model_validator(mode="before")
     @classmethod
@@ -1466,6 +1901,8 @@ class PortalComponentPositionPatch(StrictModel):
         payload = dict(value)
         pc = payload.pop("pc", None)
         mobile = payload.pop("mobile", None)
+        mobile_keys = {"mobile_x", "mobileX", "mobile_y", "mobileY", "mobile_w", "mobileW", "mobile_h", "mobileH"}
+        mobile_provided = isinstance(mobile, dict) or any(key in payload for key in mobile_keys)
         if isinstance(pc, dict):
             if "pc_x" not in payload and "x" in pc:
                 payload["pc_x"] = pc.get("x")
@@ -1484,18 +1921,40 @@ class PortalComponentPositionPatch(StrictModel):
                 payload["mobile_w"] = mobile.get("cols")
             if "mobile_h" not in payload and "rows" in mobile:
                 payload["mobile_h"] = mobile.get("rows")
+        payload["mobile_provided"] = mobile_provided
         return payload
 
 
 class PortalChartRefPatch(StrictModel):
-    app_key: str
+    app_key: str | None = None
     chart_id: str | None = None
+    chart_key: str | None = None
     chart_name: str | None = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        if "chartKey" in payload and "chart_key" not in payload:
+            payload["chart_key"] = payload.pop("chartKey")
+        if "chartId" in payload and "chart_id" not in payload:
+            payload["chart_id"] = payload.pop("chartId")
+        if "biChartId" in payload and "chart_id" not in payload:
+            payload["chart_id"] = payload.pop("biChartId")
+        if "chartName" in payload and "chart_name" not in payload:
+            payload["chart_name"] = payload.pop("chartName")
+        if "appKey" in payload and "app_key" not in payload:
+            payload["app_key"] = payload.pop("appKey")
+        return payload
+
     @model_validator(mode="after")
     def validate_target(self) -> "PortalChartRefPatch":
-        if not (self.chart_id or self.chart_name):
-            raise ValueError("chart_ref requires chart_id or chart_name")
+        if not (self.chart_id or self.chart_key or self.chart_name):
+            raise ValueError("chart_ref requires chart_id, chart_key, or chart_name")
+        if self.chart_name and not self.app_key and not (self.chart_id or self.chart_key):
+            raise ValueError("chart_ref with chart_name requires app_key unless chart_id/chart_key is also provided")
         return self
 
 
@@ -1504,6 +1963,13 @@ class PortalViewRefPatch(StrictModel):
     view_key: str | None = None
     view_name: str | None = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        return _normalize_builder_view_key_payload(dict(value))
+
     @model_validator(mode="after")
     def validate_target(self) -> "PortalViewRefPatch":
         if not (self.view_key or self.view_name):
@@ -1558,9 +2024,10 @@ class PortalSectionPatch(StrictModel):
 class PortalApplyRequest(StrictModel):
     dash_key: str | None = None
     dash_name: str | None = None
-    package_tag_id: int | None = None
+    package_tag_id: int | None = Field(default=None, validation_alias=AliasChoices("package_tag_id", "packageTagId", "package_id", "packageId"))
     publish: bool = True
     sections: list[PortalSectionPatch] = Field(default_factory=list)
+    layout_preset: str | None = Field(default=None, validation_alias=AliasChoices("layout_preset", "layoutPreset"))
     visibility: VisibilityPatch | None = None
     auth: dict[str, Any] | None = None
     icon: str | None = None
@@ -1569,6 +2036,33 @@ class PortalApplyRequest(StrictModel):
     dash_global_config: dict[str, Any] | None = Field(default=None, validation_alias=AliasChoices("dash_global_config", "dashGlobalConfig"))
     config: dict[str, Any] = Field(default_factory=dict)
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_compat_payload(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        if "dash_name" not in payload and "dashName" not in payload and "name" in payload:
+            payload["dash_name"] = payload.pop("name")
+        if "sections" not in payload and "pages" in payload:
+            pages = payload.pop("pages")
+            if not isinstance(pages, list):
+                raise ValueError("portal pages must be a list")
+            if len(pages) != 1:
+                raise ValueError("portal_apply currently supports a single page; pass one page or flatten components into sections")
+            page = pages[0]
+            if not isinstance(page, dict):
+                raise ValueError("portal pages[0] must be an object")
+            components = page.get("components")
+            if not isinstance(components, list) or not components:
+                raise ValueError("portal pages[0].components must be a non-empty list")
+            payload["sections"] = components
+        if "theme" in payload:
+            payload.pop("theme")
+        if "type" in payload:
+            payload.pop("type")
+        return payload
+
     @model_validator(mode="after")
     def validate_shape(self) -> "PortalApplyRequest":
         if not self.dash_key and not self.package_tag_id:
@@ -1579,6 +2073,8 @@ class PortalApplyRequest(StrictModel):
             raise ValueError("portal apply requires a non-empty sections list when creating a portal")
         if self.visibility is not None and self.auth is not None:
             raise ValueError("visibility and auth cannot be provided together")
+        if self.layout_preset is not None and self.layout_preset not in {"auto", "dashboard_2col", "dashboard_3col"}:
+            raise ValueError("layout_preset must be one of: auto, dashboard_2col, dashboard_3col")
         return self
 
 
@@ -1589,23 +2085,38 @@ FieldUpdatePatch.model_rebuild()
 
 class AppGetResponse(StrictModel):
     app_key: str
+    app_name: str | None = None
+    name: str | None = None
     title: str | None = None
     app_icon: str | None = None
+    icon_config: dict[str, Any] = Field(default_factory=dict)
     visibility: dict[str, Any] = Field(default_factory=dict)
     tag_ids: list[int] = Field(default_factory=list)
     publish_status: int | None = None
     field_count: int = 0
     layout_section_count: int = 0
     view_count: int = 0
+    chart_count: int = 0
+    associated_resource_count: int = 0
+    custom_button_count: int = 0
     workflow_enabled: bool = False
+    counts: dict[str, int] = Field(default_factory=dict)
+    views: list[dict[str, Any]] = Field(default_factory=list)
+    charts: list[dict[str, Any]] = Field(default_factory=list)
+    associated_resources: list[dict[str, Any]] = Field(default_factory=list)
+    custom_buttons: list[dict[str, Any]] = Field(default_factory=list)
     verification_hints: list[str] = Field(default_factory=list)
     editability: dict[str, bool | None] = Field(default_factory=dict)
+    form_settings: dict[str, Any] = Field(default_factory=dict)
 
 
 class AppGetFieldsResponse(StrictModel):
     app_key: str
     fields: list[dict[str, Any]] = Field(default_factory=list)
     field_count: int = 0
+    chart_fields: list[dict[str, Any]] = Field(default_factory=list)
+    chart_field_count: int = 0
+    form_settings: dict[str, Any] = Field(default_factory=dict)
 
 
 class AppGetLayoutResponse(StrictModel):
@@ -1637,7 +2148,6 @@ AppReadSummaryResponse = AppGetResponse
 AppFieldsReadResponse = AppGetFieldsResponse
 AppLayoutReadResponse = AppGetLayoutResponse
 AppViewsReadResponse = AppGetViewsResponse
-AppFlowReadResponse = AppGetFlowResponse
 AppChartsReadResponse = AppGetChartsResponse
 
 
@@ -1652,6 +2162,7 @@ class PortalReadSummaryResponse(StrictModel):
     dash_name: str | None = None
     package_tag_ids: list[int] = Field(default_factory=list)
     dash_icon: str | None = None
+    icon_config: dict[str, Any] = Field(default_factory=dict)
     hide_copyright: bool | None = None
     config_keys: list[str] = Field(default_factory=list)
     dash_global_config_keys: list[str] = Field(default_factory=list)
@@ -1665,6 +2176,7 @@ class PortalGetResponse(StrictModel):
     dash_name: str | None = None
     package_tag_ids: list[int] = Field(default_factory=list)
     dash_icon: str | None = None
+    icon_config: dict[str, Any] = Field(default_factory=dict)
     hide_copyright: bool | None = None
     visibility: dict[str, Any] = Field(default_factory=dict)
     auth: dict[str, Any] = Field(default_factory=dict)
@@ -1681,6 +2193,8 @@ class ViewGetResponse(StrictModel):
     config: dict[str, Any] = Field(default_factory=dict)
     questions: list[dict[str, Any]] = Field(default_factory=list)
     associations: list[dict[str, Any]] = Field(default_factory=list)
+    buttons_config: dict[str, Any] = Field(default_factory=dict)
+    associated_resources_config: dict[str, Any] = Field(default_factory=dict)
 
 
 class ChartGetResponse(StrictModel):
@@ -1720,43 +2234,10 @@ class LayoutPlanRequest(StrictModel):
         return payload
 
 
-class FlowPlanRequest(StrictModel):
-    app_key: str
-    mode: str = "replace"
-    nodes: list[FlowNodePatch] = Field(default_factory=list)
-    transitions: list[FlowTransitionPatch] = Field(default_factory=list)
-    preset: FlowPreset | None = None
-
-    @model_validator(mode="before")
-    @classmethod
-    def normalize_mode_alias(cls, value: Any) -> Any:
-        if not isinstance(value, dict):
-            return value
-        payload = dict(value)
-        if str(payload.get("mode") or "").strip().lower() == "overwrite":
-            payload["mode"] = "replace"
-        raw_preset = payload.get("preset")
-        if raw_preset is None and isinstance(payload.get("base_preset"), str):
-            raw_preset = payload["base_preset"]
-            payload["preset"] = raw_preset
-        if isinstance(raw_preset, str):
-            normalized_preset = raw_preset.strip().lower()
-            preset_aliases = {
-                "default_approval": FlowPreset.basic_approval.value,
-                "approval": FlowPreset.basic_approval.value,
-                "basic approval": FlowPreset.basic_approval.value,
-                "default_fill_then_approve": FlowPreset.basic_fill_then_approve.value,
-                "default-fill-then-approve": FlowPreset.basic_fill_then_approve.value,
-                "fill_then_approve": FlowPreset.basic_fill_then_approve.value,
-            }
-            if normalized_preset in preset_aliases:
-                payload["preset"] = preset_aliases[normalized_preset]
-        return payload
-
-
 class ViewsPlanRequest(StrictModel):
     app_key: str
     upsert_views: list[ViewUpsertPatch] = Field(default_factory=list)
+    patch_views: list[ViewPartialPatch] = Field(default_factory=list)
     remove_views: list[str] = Field(default_factory=list)
     preset: ViewsPreset | None = None
 
@@ -1879,7 +2360,10 @@ def _normalize_public_department_scope_mode(value: Any) -> str | None:
 
 
 CustomButtonMatchRulePatch.model_rebuild()
+CustomButtonFieldMappingPatch.model_rebuild()
 CustomButtonAddDataConfigPatch.model_rebuild()
+CustomButtonViewButtonBindingPatch.model_rebuild()
+CustomButtonViewConfigPatch.model_rebuild()
 CodeBlockAliasPathPatch.model_rebuild()
 ViewButtonBindingPatch.model_rebuild()
 ViewUpsertPatch.model_rebuild()