FourCIPP 1.26.0__py3-none-any.whl → 1.28.0__py3-none-any.whl

fourcipp/fourc_input.py

@@ -75,8 +75,12 @@ def sort_by_section_names(data: dict) -> dict:
     This sorts the dictionary in the following style:
 
         1. "TITLE" section
-        2. Alphabetically sorted sections
-        3. Alphabetically sorted legacy sections
+        2. Required sections (in schema order)
+        3. Typed sections (alphabetically, case-insensitive)
+            3.1 MATERIALS section
+            3.2 'DESIGN *' sections (alphabetically, case-insensitive)
+        4. FUNCT sections (numeric order)
+        5. Legacy sections (alphabetically)
 
     Args:
         data: Dictionary to sort.
@@ -89,10 +93,23 @@ def sort_by_section_names(data: dict) -> dict:
     required_sections = CONFIG.fourc_json_schema["required"]
     n_sections_splitter = len(CONFIG.sections.all_sections) * 1000
 
-    # collect typed sections + numeric FUNCT sections
-    typed_and_funct = sorted(
-        sorted(CONFIG.sections.typed_sections, key=str.lower)
-        + [s for s in data.keys() if s.startswith("FUNCT") and s[5:].isdigit()],
+    # typed sections (sorted alphabetically + case insensitive, 'DESIGN *' + 'MATERIALS' at the end)
+    design_sections = [
+        s for s in CONFIG.sections.typed_sections if s.startswith("DESIGN")
+    ]
+    remaining_typed_sections = list(
+        set(CONFIG.sections.typed_sections) - set(design_sections) - set(["MATERIALS"])
+    )
+
+    typed_sections = (
+        sorted(remaining_typed_sections, key=str.lower)
+        + ["MATERIALS"]
+        + sorted(design_sections, key=str.lower)
+    )
+
+    # function sections (sorted numerically)
+    functions = sorted(
+        [s for s in data.keys() if s.startswith("FUNCT") and s[5:].isdigit()],
         key=lambda s: (
             s.lower() if not s.startswith("FUNCT") else f"funct{s[5:].zfill(10)}"
         ),
@@ -115,12 +132,15 @@ def sort_by_section_names(data: dict) -> dict:
         # Required sections
         elif section in required_sections:
             return 1 * n_sections_splitter + required_sections.index(section)
-        # Typed + FUNCT sections (alphabetical + case insensitive)
-        elif section in typed_and_funct:
-            return 2 * n_sections_splitter + typed_and_funct.index(section)
+        # Typed sections (alphabetical + case insensitive)
+        elif section in typed_sections:
+            return 2 * n_sections_splitter + typed_sections.index(section)
+        # Function sections (numeric order)
+        elif section in functions:
+            return 3 * n_sections_splitter + functions.index(section)
         # Legacy sections
         elif section in CONFIG.sections.legacy_sections:
-            return 3 * n_sections_splitter + CONFIG.sections.legacy_sections.index(
+            return 4 * n_sections_splitter + CONFIG.sections.legacy_sections.index(
                 section
             )
         # Unknown section

fourcipp/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.26.0'
-__version_tuple__ = version_tuple = (1, 26, 0)
+__version__ = version = '1.28.0'
+__version_tuple__ = version_tuple = (1, 28, 0)
 
 __commit_id__ = commit_id = None

{fourcipp-1.26.0.dist-info → fourcipp-1.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FourCIPP
-Version: 1.26.0
+Version: 1.28.0
 Summary: A streamlined Python Parser for 4C input files
 Author: FourCIPP Authors
 License: The MIT License (MIT)

{fourcipp-1.26.0.dist-info → fourcipp-1.28.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 fourcipp/__init__.py,sha256=4pz7DVXErSbUcLqPTaHnQfdJzKkpfZDivBqbHbTgpRE,1388
-fourcipp/fourc_input.py,sha256=1-EMbwc5tWbWtbZqzRF4_ytrvkcQVgtC5ZX1uz6NFuQ,23954
-fourcipp/version.py,sha256=OJL4aLvV9b9o3TB1YSHMVZLqQpEC2WPemRenYqUjoPU,706
-fourcipp/config/4C_metadata.yaml,sha256=7DMWX_u6rOWLls07duxIp42lkGRt0r6RneQlq9uI7Ck,11890571
-fourcipp/config/4C_schema.json,sha256=LXrYpy2oLIJ5L9aXTiYNBXnoA_LIFOPWijhpxpNQ97c,16497399
+fourcipp/fourc_input.py,sha256=U_1b3XtZpXZfRV3ZAWiZzpAKtLWWrdBXow2r3wNPWao,24720
+fourcipp/version.py,sha256=h64Lu1BxlbxLmxb95uQFjkjl8oExEu5L2BxblyJaHmA,706
+fourcipp/config/4C_metadata.yaml,sha256=Fax9tKgIEU_SHaH4_xA3C-y8G7irVGFzRxFwQll2Zp0,11946545
+fourcipp/config/4C_schema.json,sha256=GXWu0DbVnTQmRXIaD_l95MJYmfZNWCTC4H7NEF4HH-U,16527639
 fourcipp/config/config.yaml,sha256=n2c2a6E4HKfAdNWOQz1kLUuf5p4NLxIddaAi2t5eM38,460
 fourcipp/legacy_io/__init__.py,sha256=L3MWW-WjPbPAJVX8Z0Uheftn0dRPnqNnSBic3uloFhI,5750
 fourcipp/legacy_io/element.py,sha256=rP8F-m-8ZCwCxtV_OASvvLeNYr01zsmgZsDZSJ_G1gY,3977
@@ -20,9 +20,9 @@ fourcipp/utils/not_set.py,sha256=NHf0UXDmTuZfvfnIIgkkx4EohxRsN4MVUHUpt7VOnaQ,243
 fourcipp/utils/type_hinting.py,sha256=izPEhbMdmhrIBamCLqqF_6iDZW-w7a8kplUugbQILyw,1714
 fourcipp/utils/validation.py,sha256=FejHOj1MddaU7gEpMN-f8Mz3rYjflakd1qcsKnctHqA,5292
 fourcipp/utils/yaml_io.py,sha256=jPgVnxE858XTpDC6BVhfbbljQegL58zc3u2VPYCTvGE,5771
-fourcipp-1.26.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
-fourcipp-1.26.0.dist-info/METADATA,sha256=_HPMMt_epVpIreCcJKopgvzwbrNqdkr04fJtHSvAJ4s,7916
-fourcipp-1.26.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fourcipp-1.26.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
-fourcipp-1.26.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
-fourcipp-1.26.0.dist-info/RECORD,,
+fourcipp-1.28.0.dist-info/licenses/LICENSE,sha256=lkSOHdH9IZ8c3Vnz0fFjqls1cRlmLADBP8QEIwUlH3o,1082
+fourcipp-1.28.0.dist-info/METADATA,sha256=1oVsqGq_Htde7uhrtVGGozfq6DEOM2ocI4OFTN7nveo,7916
+fourcipp-1.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fourcipp-1.28.0.dist-info/entry_points.txt,sha256=44XBG4bwhuq1EwOZ0U055HYP8_qN6_d30ecVsa5Igng,53
+fourcipp-1.28.0.dist-info/top_level.txt,sha256=oZ6jgFFmvi157VwGUEFuKT3D8oS5mOkpOVx8zZURZrQ,9
+fourcipp-1.28.0.dist-info/RECORD,,