framework-m-core 0.30.0__tar.gz → 0.30.2__tar.gz

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/CHANGELOG.md

@@ -1,3 +1,15 @@
+## framework-m-core v0.30.2
+
+### Bug Fixes
+
+- dynamic resolution of app template directories via MetaRegistry (f4d3e66)
+
+## framework-m-core v0.30.1
+
+### Bug Fixes
+
+- hide docstatus and support optional literal unions in schema enrichment (7b1e181)
+
 ## framework-m-core v0.30.0
 
 ### Features

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: framework-m-core
-Version: 0.30.0
+Version: 0.30.2
 Summary: Core protocols and dependency injection for Framework M
 Author: Framework M Contributors
 License: Apache-2.0
 License-File: LICENSE
 Requires-Python: >=3.12
-Requires-Dist: cyclopts>=4.22.2
+Requires-Dist: cyclopts>=4.22.4
 Requires-Dist: pydantic-settings>=2.14.2
 Requires-Dist: pydantic>=2.13.4
 Description-Content-Type: text/markdown

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "framework-m-core"
-version = "0.30.0"
+version = "0.30.2"
 description = "Core protocols and dependency injection for Framework M"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -11,7 +11,7 @@ authors = [
 dependencies = [
     "pydantic>=2.13.4",
     "pydantic-settings>=2.14.2",
-    "cyclopts>=4.22.2",
+    "cyclopts>=4.22.4",
 ]
 
 [build-system]

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/src/framework_m_core/doctypes/print_format.py

@@ -157,6 +157,55 @@ class PrintFormat(BaseDocType):
         # List view defaults to the first 4 schema fields, which would put the
         # raw Jinja template path/HTML in a table cell. Pick scannable columns.
         ui_meta = {  # noqa: RUF012
+            "form": {
+                "tabs": [
+                    {
+                        "label": "Basic Info",
+                        "sections": [
+                            {
+                                "label": "Format Details",
+                                "fields": ["name", "doctype", "is_default"],
+                                "columns": 2,
+                            },
+                            {
+                                "label": "Template",
+                                "fields": ["template", "custom_html"],
+                                "columns": 2,
+                            },
+                            {
+                                "label": "Styling",
+                                "fields": ["css", "header_html", "footer_html"],
+                                "columns": 2,
+                            },
+                        ],
+                    },
+                    {
+                        "label": "Page Settings",
+                        "sections": [
+                            {
+                                "label": "Page Layout",
+                                "fields": ["page_size", "orientation", "repeat_header"],
+                                "columns": 2,
+                            },
+                            {
+                                "label": "Page Numbers",
+                                "fields": ["show_page_numbers", "page_number_style"],
+                                "columns": 2,
+                            },
+                            {
+                                "label": "Margins (inches)",
+                                "fields": [
+                                    "margin_top",
+                                    "margin_bottom",
+                                    "margin_left",
+                                    "margin_right",
+                                ],
+                                "columns": 2,
+                            },
+                        ],
+                    },
+                ],
+            },
             "list": {
                 "columns": [
                     {"field": "name", "label": "Name"},
@@ -164,7 +213,7 @@ class PrintFormat(BaseDocType):
                     {"field": "is_default", "label": "Default", "width": 90},
                     {"field": "page_size", "label": "Page Size", "width": 100},
                 ],
-            }
+            },
         }
 
         # Permissions - admins manage, all read

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/src/framework_m_core/domain/mixins.py

@@ -59,7 +59,10 @@ class SubmittableMixin(BaseModel):
         invoice.can_edit()  # False (submitted)
     """
 
-    docstatus: DocStatus = Field(default=DocStatus.DRAFT)
+    docstatus: DocStatus = Field(
+        default=DocStatus.DRAFT,
+        json_schema_extra={"ui_meta": {"hidden": True}},
+    )
 
     def is_submitted(self) -> bool:
         """Check if document is in submitted state."""

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/src/framework_m_core/schema_enrichment.py

@@ -104,11 +104,29 @@ def _enrich_property(
     if "items" in prop and isinstance(prop["items"], dict):
         prop["items"] = _enrich_property(prop["items"], defs)
 
+    # Recursively enrich schema combinations (anyOf, allOf, oneOf)
+    for comb_key in ("anyOf", "allOf", "oneOf"):
+        if comb_key in prop and isinstance(prop[comb_key], list):
+            prop[comb_key] = [
+                _enrich_property(item, defs) if isinstance(item, dict) else item
+                for item in prop[comb_key]
+            ]
+
     # Ensure ui_meta exists
     ui_meta: dict[str, Any] = copy.deepcopy(prop.get("ui_meta", {}))
 
     # Surface enum values under ui_meta.options if not already there
     enum_values: list[Any] | None = prop.get("enum")
+    if not enum_values:
+        for comb_key in ("anyOf", "allOf", "oneOf"):
+            if comb_key in prop and isinstance(prop[comb_key], list):
+                for sub_schema in prop[comb_key]:
+                    if isinstance(sub_schema, dict) and "enum" in sub_schema:
+                        enum_values = sub_schema["enum"]
+                        break
+                if enum_values:
+                    break
+
     if enum_values and "options" not in ui_meta:
         ui_meta["options"] = [
             {"value": v, "label": str(v).replace("_", " ").title()} for v in enum_values
@@ -152,6 +170,9 @@ def enrich_schema(schema: dict[str, Any]) -> dict[str, Any]:
 
     enriched_properties: dict[str, Any] = {}
     for field_name, prop in properties.items():
+        if field_name == "docstatus":
+            ui_meta = prop.setdefault("ui_meta", {})
+            ui_meta["hidden"] = True
         enriched_properties[field_name] = _enrich_property(prop, defs)
 
     schema["properties"] = enriched_properties

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/tests/unit/core/domain/test_mixins.py

@@ -105,6 +105,17 @@ class TestSubmittableMixin:
 
         assert invoice.docstatus == DocStatus.SUBMITTED
 
+    def test_docstatus_hidden_in_ui_meta(self) -> None:
+        """docstatus should have ui_meta hidden=True by default in SubmittableMixin."""
+
+        class BareSubmittable(DocType, SubmittableMixin):
+            pass
+
+        field_extra = BareSubmittable.model_fields["docstatus"].json_schema_extra
+        assert isinstance(field_extra, dict) and field_extra.get("ui_meta") == {
+            "hidden": True
+        }
+
 
 class TestMixinImports:
     """Tests for mixin imports."""

{framework_m_core-0.30.0 → framework_m_core-0.30.2}/tests/unit/core/test_schema_enrichment.py

@@ -88,6 +88,32 @@ class TestLiteralFields:
         result = enrich_schema(schema)
         assert result["properties"]["status"]["ui_meta"]["options"] == custom_options
 
+    def test_optional_literal_union_options_populated(self) -> None:
+        """Optional Literal fields (rendered as anyOf with null in Pydantic v2) must surface options."""
+        schema = _schema(
+            {
+                "valuation_method": {
+                    "anyOf": [
+                        {
+                            "type": "string",
+                            "enum": ["FIFO", "Moving Average", "Standard Costing"],
+                        },
+                        {"type": "null"},
+                    ],
+                    "default": None,
+                    "title": "Valuation Method",
+                }
+            }
+        )
+        result = enrich_schema(schema)
+        prop = result["properties"]["valuation_method"]
+
+        assert prop["ui_meta"]["options"] == [
+            {"value": "FIFO", "label": "Fifo"},
+            {"value": "Moving Average", "label": "Moving Average"},
+            {"value": "Standard Costing", "label": "Standard Costing"},
+        ]
+
 
 # ---------------------------------------------------------------------------
 # Python Enum via $ref
@@ -282,3 +308,8 @@ class TestSchemaIntegrity:
         schema = _schema({"description": {"type": "string", "title": "Description"}})
         result = enrich_schema(schema)
         assert "options" not in result["properties"]["description"]["ui_meta"]
+
+    def test_docstatus_automatically_hidden(self) -> None:
+        schema = _schema({"docstatus": {"type": "integer", "default": 0}})
+        result = enrich_schema(schema)
+        assert result["properties"]["docstatus"]["ui_meta"]["hidden"] is True