@josephyan/qingflow-app-builder-mcp 0.2.0-beta.4 → 0.2.0-beta.41

package/src/qingflow_mcp/builder_facade/models.py

@@ -43,11 +43,38 @@ FIELD_TYPE_ALIASES: dict[str, PublicFieldType] = {
     "departments": PublicFieldType.department,
 }
 
+FIELD_TYPE_ID_ALIASES: dict[int, PublicFieldType] = {
+    2: PublicFieldType.text,
+    3: PublicFieldType.long_text,
+    4: PublicFieldType.date,
+    5: PublicFieldType.member,
+    6: PublicFieldType.email,
+    7: PublicFieldType.phone,
+    8: PublicFieldType.number,
+    10: PublicFieldType.boolean,
+    11: PublicFieldType.single_select,
+    12: PublicFieldType.multi_select,
+    13: PublicFieldType.attachment,
+    18: PublicFieldType.subtable,
+    21: PublicFieldType.address,
+    22: PublicFieldType.department,
+    25: PublicFieldType.relation,
+}
+
 
 class PublicViewType(str, Enum):
     table = "table"
     card = "card"
     board = "board"
+    gantt = "gantt"
+
+
+class PublicChartType(str, Enum):
+    target = "target"
+    pie = "pie"
+    bar = "bar"
+    line = "line"
+    table = "table"
 
 
 class LayoutApplyMode(str, Enum):
@@ -69,6 +96,7 @@ class FlowPreset(str, Enum):
 class ViewsPreset(str, Enum):
     default_table = "default_table"
     status_board = "status_board"
+    default_gantt = "default_gantt"
 
 
 class PublicFlowNodeType(str, Enum):
@@ -82,6 +110,143 @@ class PublicFlowNodeType(str, Enum):
     end = "end"
 
 
+class FlowConditionOperator(str, Enum):
+    eq = "eq"
+    neq = "neq"
+    in_ = "in"
+    contains = "contains"
+    gte = "gte"
+    lte = "lte"
+    is_empty = "is_empty"
+    not_empty = "not_empty"
+
+
+class ViewFilterOperator(str, Enum):
+    eq = "eq"
+    neq = "neq"
+    in_ = "in"
+    contains = "contains"
+    gte = "gte"
+    lte = "lte"
+    is_empty = "is_empty"
+    not_empty = "not_empty"
+
+
+class FlowAssigneePatch(StrictModel):
+    role_ids: list[int] = Field(default_factory=list)
+    role_names: list[str] = Field(default_factory=list)
+    member_uids: list[int] = Field(default_factory=list)
+    member_emails: list[str] = Field(default_factory=list)
+    member_names: list[str] = Field(default_factory=list)
+    include_sub_departs: bool | None = None
+
+
+class FlowNodePermissionsPatch(StrictModel):
+    editable_fields: list[str] = Field(default_factory=list)
+
+
+class FlowConditionRulePatch(StrictModel):
+    field_name: str = Field(validation_alias=AliasChoices("field_name", "fieldName", "field", "name"))
+    operator: FlowConditionOperator = Field(validation_alias=AliasChoices("operator", "op"))
+    values: list[Any] = 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 "value" in payload and "values" not in payload:
+            payload["values"] = [payload.pop("value")]
+        raw_operator = payload.get("operator", payload.get("op"))
+        if isinstance(raw_operator, str):
+            normalized = raw_operator.strip().lower()
+            operator_aliases = {
+                "equals": FlowConditionOperator.eq.value,
+                "equal": FlowConditionOperator.eq.value,
+                "=": FlowConditionOperator.eq.value,
+                "not_equals": FlowConditionOperator.neq.value,
+                "not_equal": FlowConditionOperator.neq.value,
+                "!=": FlowConditionOperator.neq.value,
+                ">=": FlowConditionOperator.gte.value,
+                "<=": FlowConditionOperator.lte.value,
+                "any_of": FlowConditionOperator.in_.value,
+                "one_of": FlowConditionOperator.in_.value,
+                "between_any": FlowConditionOperator.in_.value,
+                "empty": FlowConditionOperator.is_empty.value,
+                "is blank": FlowConditionOperator.is_empty.value,
+                "blank": FlowConditionOperator.is_empty.value,
+                "not_empty": FlowConditionOperator.not_empty.value,
+                "not blank": FlowConditionOperator.not_empty.value,
+            }
+            if normalized in operator_aliases:
+                payload["operator"] = operator_aliases[normalized]
+            elif "operator" not in payload:
+                payload["operator"] = normalized
+        payload.pop("op", None)
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "FlowConditionRulePatch":
+        if self.operator in {FlowConditionOperator.is_empty, FlowConditionOperator.not_empty}:
+            self.values = []
+            return self
+        if not self.values:
+            raise ValueError("condition rule requires values")
+        return self
+
+
+class ViewFilterRulePatch(StrictModel):
+    field_name: str = Field(validation_alias=AliasChoices("field_name", "fieldName", "field", "name"))
+    operator: ViewFilterOperator = Field(validation_alias=AliasChoices("operator", "op"))
+    values: list[Any] = 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 "value" in payload and "values" not in payload:
+            payload["values"] = [payload.pop("value")]
+        raw_operator = payload.get("operator", payload.get("op"))
+        if isinstance(raw_operator, str):
+            normalized = raw_operator.strip().lower()
+            operator_aliases = {
+                "equals": ViewFilterOperator.eq.value,
+                "equal": ViewFilterOperator.eq.value,
+                "=": ViewFilterOperator.eq.value,
+                "not_equals": ViewFilterOperator.neq.value,
+                "not_equal": ViewFilterOperator.neq.value,
+                "!=": ViewFilterOperator.neq.value,
+                ">=": ViewFilterOperator.gte.value,
+                "<=": ViewFilterOperator.lte.value,
+                "any_of": ViewFilterOperator.in_.value,
+                "one_of": ViewFilterOperator.in_.value,
+                "between_any": ViewFilterOperator.in_.value,
+                "empty": ViewFilterOperator.is_empty.value,
+                "is blank": ViewFilterOperator.is_empty.value,
+                "blank": ViewFilterOperator.is_empty.value,
+                "not_empty": ViewFilterOperator.not_empty.value,
+                "not blank": ViewFilterOperator.not_empty.value,
+            }
+            if normalized in operator_aliases:
+                payload["operator"] = operator_aliases[normalized]
+            elif "operator" not in payload:
+                payload["operator"] = normalized
+        payload.pop("op", None)
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "ViewFilterRulePatch":
+        if self.operator in {ViewFilterOperator.is_empty, ViewFilterOperator.not_empty}:
+            self.values = []
+            return self
+        if not self.values:
+            raise ValueError("view filter rule requires values")
+        return self
+
+
 class FieldSelector(StrictModel):
     field_id: str | None = None
     que_id: int | None = None
@@ -101,6 +266,8 @@ class FieldPatch(StrictModel):
     description: str | None = None
     options: list[str] = Field(default_factory=list)
     target_app_key: str | None = None
+    display_field: FieldSelector | None = None
+    visible_fields: list[FieldSelector] = Field(default_factory=list)
     subfields: list["FieldPatch"] = Field(default_factory=list)
 
     @model_validator(mode="after")
@@ -109,6 +276,8 @@ class FieldPatch(StrictModel):
             raise ValueError("relation field requires target_app_key")
         if self.type != PublicFieldType.relation and self.target_app_key:
             raise ValueError("target_app_key is only allowed for relation fields")
+        if self.type != PublicFieldType.relation and (self.display_field is not None or self.visible_fields):
+            raise ValueError("display_field and visible_fields are only allowed for relation fields")
         if self.type == PublicFieldType.subtable and not self.subfields:
             raise ValueError("subtable field requires subfields")
         if self.type != PublicFieldType.subtable and self.subfields:
@@ -128,12 +297,16 @@ class FieldMutation(StrictModel):
     description: str | None = None
     options: list[str] | None = None
     target_app_key: str | None = None
+    display_field: FieldSelector | None = None
+    visible_fields: list[FieldSelector] | None = None
     subfields: list[FieldPatch] | None = None
 
     @model_validator(mode="after")
     def validate_shape(self) -> "FieldMutation":
         if self.type == PublicFieldType.relation and not self.target_app_key:
             raise ValueError("relation field requires target_app_key")
+        if self.type is not None and self.type != PublicFieldType.relation and (self.display_field is not None or self.visible_fields):
+            raise ValueError("display_field and visible_fields are only allowed for relation fields")
         if self.type == PublicFieldType.subtable and not self.subfields:
             raise ValueError("subtable field requires subfields")
         return self
@@ -161,15 +334,65 @@ class FieldRemovePatch(StrictModel):
         return self
 
 
+def _coerce_layout_columns(value: Any) -> int | None:
+    if isinstance(value, bool):
+        return None
+    if isinstance(value, int):
+        return value if value > 0 else None
+    if isinstance(value, str):
+        stripped = value.strip()
+        if stripped.isdigit():
+            parsed = int(stripped)
+            return parsed if parsed > 0 else None
+    return None
+
+
+def _normalize_layout_rows(value: Any, *, columns: int | None = None) -> Any:
+    if not isinstance(value, list):
+        return value
+    if value and all(isinstance(item, list) for item in value):
+        return value
+    if not value:
+        return []
+    width = columns if columns and columns > 0 else None
+    if width is None:
+        return [list(value)]
+    return [list(value[index : index + width]) for index in range(0, len(value), width) if value[index : index + width]]
+
+
 class LayoutSectionPatch(StrictModel):
     section_id: str | None = Field(default=None, validation_alias=AliasChoices("section_id", "sectionId"))
     title: str
-    rows: list[list[str]] = Field(default_factory=list)
+    rows: list[list[Any]] = 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 "name" in payload and "title" not in payload:
+            payload["title"] = payload.pop("name")
+        shorthand: Any | None = None
+        if "rows" not in payload:
+            if "fields" in payload:
+                shorthand = payload.pop("fields")
+            elif "field_ids" in payload:
+                shorthand = payload.pop("field_ids")
+            if shorthand is not None:
+                payload["rows"] = _normalize_layout_rows(
+                    shorthand,
+                    columns=_coerce_layout_columns(payload.pop("columns", None)),
+                )
+        return payload
 
     @model_validator(mode="after")
     def validate_rows(self) -> "LayoutSectionPatch":
         if not self.rows:
             raise ValueError("section rows must be a non-empty list")
+        for row in self.rows:
+            if not isinstance(row, list) or not row:
+                raise ValueError("section rows must be a non-empty list")
         if not self.section_id:
             self.section_id = _slugify_title(self.title)
         return self
@@ -179,8 +402,54 @@ class FlowNodePatch(StrictModel):
     id: str
     type: PublicFlowNodeType
     name: str
+    assignees: FlowAssigneePatch = Field(default_factory=FlowAssigneePatch)
+    permissions: FlowNodePermissionsPatch = Field(default_factory=FlowNodePermissionsPatch)
+    conditions: list[FlowConditionRulePatch] = Field(default_factory=list)
+    condition_groups: list[list[FlowConditionRulePatch]] = Field(default_factory=list)
     config: dict[str, Any] = Field(default_factory=dict)
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_aliases(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        assignees = dict(payload.get("assignees") or {})
+        permissions = dict(payload.get("permissions") or {})
+
+        for key in ("role_ids", "role_names", "member_uids", "member_emails", "member_names", "include_sub_departs"):
+            if key in payload and key not in assignees:
+                assignees[key] = payload.pop(key)
+        for key in ("editable_fields",):
+            if key in payload and key not in permissions:
+                permissions[key] = payload.pop(key)
+        if "filters" in payload and "conditions" not in payload:
+            payload["conditions"] = payload.pop("filters")
+        if "rules" in payload and "conditions" not in payload:
+            payload["conditions"] = payload.pop("rules")
+        if "conditionRules" in payload and "condition_groups" not in payload:
+            payload["condition_groups"] = payload.pop("conditionRules")
+        if "conditionGroups" in payload and "condition_groups" not in payload:
+            payload["condition_groups"] = payload.pop("conditionGroups")
+        if "owners" in payload and "member_names" not in assignees:
+            assignees["member_names"] = payload.pop("owners")
+        if "approvers" in payload and "role_names" not in assignees:
+            assignees["role_names"] = payload.pop("approvers")
+        if assignees:
+            payload["assignees"] = assignees
+        if permissions:
+            payload["permissions"] = permissions
+        return payload
+
+    @model_validator(mode="after")
+    def validate_branch_conditions(self) -> "FlowNodePatch":
+        if self.conditions:
+            self.condition_groups = [list(self.conditions), *self.condition_groups]
+            self.conditions = []
+        if self.type != PublicFlowNodeType.condition and self.condition_groups:
+            raise ValueError("condition_groups are only allowed on condition nodes")
+        return self
+
 
 class FlowTransitionPatch(StrictModel):
     source: str = Field(alias="from")
@@ -189,9 +458,14 @@ class FlowTransitionPatch(StrictModel):
 
 class ViewUpsertPatch(StrictModel):
     name: str
+    view_key: str | None = Field(default=None, validation_alias=AliasChoices("view_key", "viewKey"))
     type: PublicViewType
     columns: list[str] = Field(default_factory=list)
     group_by: str | None = None
+    filters: list[ViewFilterRulePatch] = Field(default_factory=list)
+    start_field: str | None = Field(default=None, validation_alias=AliasChoices("start_field", "startField"))
+    end_field: str | None = Field(default=None, validation_alias=AliasChoices("end_field", "endField"))
+    title_field: str | None = Field(default=None, validation_alias=AliasChoices("title_field", "titleField"))
 
     @model_validator(mode="before")
     @classmethod
@@ -201,6 +475,14 @@ class ViewUpsertPatch(StrictModel):
         payload = dict(value)
         if "fields" in payload and "columns" not in payload:
             payload["columns"] = payload.pop("fields")
+        if "column_names" in payload and "columns" not in payload:
+            payload["columns"] = payload.pop("column_names")
+        if "columnNames" in payload and "columns" not in payload:
+            payload["columns"] = payload.pop("columnNames")
+        if "filter_rules" in payload and "filters" not in payload:
+            payload["filters"] = payload.pop("filter_rules")
+        if "filterRules" in payload and "filters" not in payload:
+            payload["filters"] = payload.pop("filterRules")
         raw_type = payload.get("type")
         if isinstance(raw_type, str):
             normalized = raw_type.strip().lower()
@@ -210,6 +492,8 @@ class ViewUpsertPatch(StrictModel):
                 payload["type"] = "card"
             elif normalized == "kanban":
                 payload["type"] = "board"
+            elif normalized == "ganttview":
+                payload["type"] = "gantt"
         return payload
 
     @model_validator(mode="after")
@@ -218,6 +502,263 @@ class ViewUpsertPatch(StrictModel):
             raise ValueError("table/card views require columns")
         if self.type == PublicViewType.board and not self.group_by:
             raise ValueError("board view requires group_by")
+        if self.type == PublicViewType.gantt and not (self.start_field and self.end_field):
+            raise ValueError("gantt view requires start_field and end_field")
+        return self
+
+
+class ChartFilterRulePatch(StrictModel):
+    field_name: str = Field(validation_alias=AliasChoices("field_name", "fieldName", "field", "name"))
+    operator: ViewFilterOperator = Field(validation_alias=AliasChoices("operator", "op"))
+    values: list[Any] = 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 "value" in payload and "values" not in payload:
+            payload["values"] = [payload.pop("value")]
+        raw_operator = payload.get("operator", payload.get("op"))
+        if isinstance(raw_operator, str):
+            normalized = raw_operator.strip().lower()
+            operator_aliases = {
+                "equals": ViewFilterOperator.eq.value,
+                "equal": ViewFilterOperator.eq.value,
+                "=": ViewFilterOperator.eq.value,
+                "not_equals": ViewFilterOperator.neq.value,
+                "not_equal": ViewFilterOperator.neq.value,
+                "!=": ViewFilterOperator.neq.value,
+                ">=": ViewFilterOperator.gte.value,
+                "<=": ViewFilterOperator.lte.value,
+                "any_of": ViewFilterOperator.in_.value,
+                "one_of": ViewFilterOperator.in_.value,
+                "between_any": ViewFilterOperator.in_.value,
+                "empty": ViewFilterOperator.is_empty.value,
+                "is blank": ViewFilterOperator.is_empty.value,
+                "blank": ViewFilterOperator.is_empty.value,
+                "not_empty": ViewFilterOperator.not_empty.value,
+                "not blank": ViewFilterOperator.not_empty.value,
+            }
+            if normalized in operator_aliases:
+                payload["operator"] = operator_aliases[normalized]
+            elif "operator" not in payload:
+                payload["operator"] = normalized
+        payload.pop("op", None)
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "ChartFilterRulePatch":
+        if self.operator in {ViewFilterOperator.is_empty, ViewFilterOperator.not_empty}:
+            self.values = []
+            return self
+        if not self.values:
+            raise ValueError("chart filter rule requires values")
+        return self
+
+
+class ChartUpsertPatch(StrictModel):
+    chart_id: str | None = None
+    name: str
+    chart_type: PublicChartType
+    dimension_field_ids: list[str] = Field(default_factory=list)
+    indicator_field_ids: list[str] = Field(default_factory=list)
+    filters: list[ChartFilterRulePatch] = Field(default_factory=list)
+    question_config: list[dict[str, Any]] = Field(default_factory=list)
+    user_config: list[dict[str, Any]] = Field(default_factory=list)
+    config: dict[str, Any] = Field(default_factory=dict)
+
+    @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"] = payload.pop("id")
+        if "type" in payload and "chart_type" not in payload:
+            payload["chart_type"] = payload.pop("type")
+        if "dimension_fields" in payload and "dimension_field_ids" not in payload:
+            payload["dimension_field_ids"] = payload.pop("dimension_fields")
+        if "indicator_fields" in payload and "indicator_field_ids" not in payload:
+            payload["indicator_field_ids"] = payload.pop("indicator_fields")
+        if "metric_field_ids" in payload and "indicator_field_ids" not in payload:
+            payload["indicator_field_ids"] = payload.pop("metric_field_ids")
+        raw_type = payload.get("chart_type")
+        if isinstance(raw_type, str):
+            normalized = raw_type.strip().lower()
+            aliases = {
+                "targetchart": PublicChartType.target.value,
+                "piechart": PublicChartType.pie.value,
+                "barchart": PublicChartType.bar.value,
+                "linechart": PublicChartType.line.value,
+                "tablechart": PublicChartType.table.value,
+            }
+            if normalized in aliases:
+                payload["chart_type"] = aliases[normalized]
+        if isinstance(payload.get("chart_id"), int):
+            payload["chart_id"] = str(payload["chart_id"])
+        if isinstance(payload.get("dimension_field_ids"), list):
+            payload["dimension_field_ids"] = [str(item) for item in payload["dimension_field_ids"] if item is not None and str(item).strip()]
+        if isinstance(payload.get("indicator_field_ids"), list):
+            payload["indicator_field_ids"] = [str(item) for item in payload["indicator_field_ids"] if item is not None and str(item).strip()]
+        return payload
+
+
+class ChartApplyRequest(StrictModel):
+    app_key: str
+    upsert_charts: list[ChartUpsertPatch] = Field(default_factory=list)
+    remove_chart_ids: list[str] = Field(default_factory=list)
+    reorder_chart_ids: list[str] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_ids(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        for key in ("remove_chart_ids", "reorder_chart_ids"):
+            raw = payload.get(key)
+            if isinstance(raw, list):
+                payload[key] = [str(item) for item in raw if item is not None and str(item).strip()]
+        return payload
+
+    @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")
+        return self
+
+
+class PortalComponentPositionPatch(StrictModel):
+    pc_x: int = Field(default=0, validation_alias=AliasChoices("pc_x", "pcX", "x"))
+    pc_y: int = Field(default=0, validation_alias=AliasChoices("pc_y", "pcY", "y"))
+    pc_w: int = Field(default=12, validation_alias=AliasChoices("pc_w", "pcW", "w"))
+    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_h: int = Field(default=8, validation_alias=AliasChoices("mobile_h", "mobileH"))
+
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_nested_layout(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+        payload = dict(value)
+        pc = payload.pop("pc", None)
+        mobile = payload.pop("mobile", None)
+        if isinstance(pc, dict):
+            if "pc_x" not in payload and "x" in pc:
+                payload["pc_x"] = pc.get("x")
+            if "pc_y" not in payload and "y" in pc:
+                payload["pc_y"] = pc.get("y")
+            if "pc_w" not in payload and "cols" in pc:
+                payload["pc_w"] = pc.get("cols")
+            if "pc_h" not in payload and "rows" in pc:
+                payload["pc_h"] = pc.get("rows")
+        if isinstance(mobile, dict):
+            if "mobile_x" not in payload and "x" in mobile:
+                payload["mobile_x"] = mobile.get("x")
+            if "mobile_y" not in payload and "y" in mobile:
+                payload["mobile_y"] = mobile.get("y")
+            if "mobile_w" not in payload and "cols" in mobile:
+                payload["mobile_w"] = mobile.get("cols")
+            if "mobile_h" not in payload and "rows" in mobile:
+                payload["mobile_h"] = mobile.get("rows")
+        return payload
+
+
+class PortalChartRefPatch(StrictModel):
+    app_key: str
+    chart_id: str | None = None
+    chart_name: str | None = None
+
+    @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")
+        return self
+
+
+class PortalViewRefPatch(StrictModel):
+    app_key: str
+    view_key: str | None = None
+    view_name: str | None = None
+
+    @model_validator(mode="after")
+    def validate_target(self) -> "PortalViewRefPatch":
+        if not (self.view_key or self.view_name):
+            raise ValueError("view_ref requires view_key or view_name")
+        return self
+
+
+class PortalSectionPatch(StrictModel):
+    title: str
+    source_type: str = Field(validation_alias=AliasChoices("source_type", "sourceType"))
+    position: PortalComponentPositionPatch | None = None
+    dash_style_config: dict[str, Any] | None = Field(default=None, validation_alias=AliasChoices("dash_style_config", "dashStyleConfigBO"))
+    config: dict[str, Any] = Field(default_factory=dict)
+    chart_ref: PortalChartRefPatch | None = None
+    view_ref: PortalViewRefPatch | None = None
+    text: str | None = None
+    url: 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)
+        raw_type = payload.get("source_type", payload.get("sourceType"))
+        if isinstance(raw_type, str):
+            payload["source_type"] = raw_type.strip().lower()
+        if "chartRef" in payload and "chart_ref" not in payload:
+            payload["chart_ref"] = payload.pop("chartRef")
+        if "viewRef" in payload and "view_ref" not in payload:
+            payload["view_ref"] = payload.pop("viewRef")
+        if "dashStyleConfigBO" in payload and "dash_style_config" not in payload:
+            payload["dash_style_config"] = payload.pop("dashStyleConfigBO")
+        return payload
+
+    @model_validator(mode="after")
+    def validate_shape(self) -> "PortalSectionPatch":
+        supported = {"chart", "view", "grid", "filter", "text", "link"}
+        if self.source_type not in supported:
+            raise ValueError(f"unsupported portal source_type '{self.source_type}'")
+        if self.source_type == "chart" and self.chart_ref is None:
+            raise ValueError("chart section requires chart_ref")
+        if self.source_type == "view" and self.view_ref is None:
+            raise ValueError("view section requires view_ref")
+        if self.source_type == "text" and self.text is None:
+            raise ValueError("text section requires text")
+        if self.source_type == "link" and self.url is None:
+            raise ValueError("link section requires url")
+        return self
+
+
+class PortalApplyRequest(StrictModel):
+    dash_key: str | None = None
+    dash_name: str | None = None
+    package_tag_id: int | None = None
+    publish: bool = True
+    sections: list[PortalSectionPatch] = Field(default_factory=list)
+    auth: dict[str, Any] | None = None
+    icon: str | None = None
+    color: str | None = None
+    hide_copyright: bool | None = Field(default=None, validation_alias=AliasChoices("hide_copyright", "hideCopyright"))
+    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="after")
+    def validate_shape(self) -> "PortalApplyRequest":
+        if not self.dash_key and not self.package_tag_id:
+            raise ValueError("package_tag_id is required when dash_key is empty")
+        if not self.dash_key and not self.dash_name:
+            raise ValueError("dash_name is required when creating a portal")
+        if not self.sections:
+            raise ValueError("portal apply requires a non-empty sections list")
         return self
 
 
@@ -261,6 +802,25 @@ class AppFlowReadResponse(StrictModel):
     transitions: list[dict[str, Any]] = Field(default_factory=list)
 
 
+class AppChartsReadResponse(StrictModel):
+    app_key: str
+    charts: list[dict[str, Any]] = Field(default_factory=list)
+    chart_count: int = 0
+
+
+class PortalReadSummaryResponse(StrictModel):
+    dash_key: str
+    being_draft: bool = True
+    dash_name: str | None = None
+    package_tag_ids: list[int] = Field(default_factory=list)
+    dash_icon: str | None = None
+    hide_copyright: bool | None = None
+    config_keys: list[str] = Field(default_factory=list)
+    dash_global_config_keys: list[str] = Field(default_factory=list)
+    section_count: int = 0
+    sections: list[dict[str, Any]] = Field(default_factory=list)
+
+
 class SchemaPlanRequest(StrictModel):
     app_key: str = ""
     package_tag_id: int | None = None
@@ -303,6 +863,22 @@ class FlowPlanRequest(StrictModel):
         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
 
 
@@ -332,7 +908,14 @@ def _normalize_field_payload(value: Any) -> Any:
     if not isinstance(value, dict):
         return value
     payload = dict(value)
+    if "fields" in payload and "subfields" not in payload:
+        payload["subfields"] = payload.pop("fields")
     raw_type = payload.get("type")
+    if isinstance(raw_type, int):
+        normalized_from_id = FIELD_TYPE_ID_ALIASES.get(raw_type)
+        if normalized_from_id is not None:
+            payload["type"] = normalized_from_id.value
+            return payload
     if isinstance(raw_type, str):
         normalized = FIELD_TYPE_ALIASES.get(raw_type.strip().lower())
         if normalized is not None: