processforge 0.2.12__tar.gz → 0.2.14__tar.gz

{processforge-0.2.12/src/processforge.egg-info → processforge-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: processforge
-Version: 0.2.12
+Version: 0.2.14
 Summary: A Python-based process simulation framework for chemical engineering applications.
 Author-email: Process Forge Team <team@processforge.dev>
 License-Expression: BSD-3-Clause

{processforge-0.2.12 → processforge-0.2.14}/flowsheets/closed-loop-chain.json

@@ -40,6 +40,7 @@
   },
   "material_mixes": {
     "Benzene_Toluene_Mix": {
+      "friendly_material_mix_id": 1,
       "percent_type": "ao",
       "components": [
         {"name": "Benzene", "fraction": 0.5},
@@ -55,7 +56,8 @@
         "Benzene": 0.5,
         "Toluene": 0.5
       },
-      "flowrate": 0.1
+      "flowrate": 0.1,
+      "material_mix": 1
     }
   },
   "units": {

{processforge-0.2.12 → processforge-0.2.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "processforge"
-version = "0.2.12"
+version = "0.2.14"
 description = "A Python-based process simulation framework for chemical engineering applications."
 readme = "README.md"
 license = "BSD-3-Clause"

{processforge-0.2.12 → processforge-0.2.14}/src/processforge/schemas/flowsheet_schema.json

@@ -86,8 +86,12 @@
       "patternProperties": {
         "^[a-zA-Z0-9_]+$": {
           "type": "object",
-          "required": ["components"],
+          "required": ["friendly_material_mix_id", "components"],
           "properties": {
+            "friendly_material_mix_id": {
+              "type": "integer",
+              "description": "Unique numeric ID for this material mix"
+            },
             "percent_type": {
               "type": "string",
               "enum": ["ao", "wo", "vo"],
@@ -143,6 +147,10 @@
             },
             "z": {
               "type": "object"
+            },
+            "material_mix": {
+              "type": "integer",
+              "description": "friendly_material_mix_id of the material mix carried by this stream"
             }
           },
           "additionalProperties": true

{processforge-0.2.12 → processforge-0.2.14}/src/processforge/utils/validate_flowsheet.py

@@ -192,7 +192,22 @@ def _check_material_semantics(config):
                 f"❌ Duplicate friendly_material_id values found: {sorted(dupes)}"
             )
 
-        # 3 & 4. Mix component name resolution and fraction sum
+        # 3. friendly_material_mix_id uniqueness
+        mix_ids = [
+            mix_def["friendly_material_mix_id"]
+            for mix_def in material_mixes.values()
+        ]
+        if len(mix_ids) != len(set(mix_ids)):
+            seen, dupes = set(), set()
+            for i in mix_ids:
+                if i in seen:
+                    dupes.add(i)
+                seen.add(i)
+            raise ValueError(
+                f"❌ Duplicate friendly_material_mix_id values found: {sorted(dupes)}"
+            )
+
+        # 4 & 5. Mix component name resolution and fraction sum
         for mix_name, mix_def in material_mixes.items():
             fractions = []
             for component in mix_def.get("components", []):
@@ -222,7 +237,20 @@ def _check_material_semantics(config):
                         f"❌ Stream '{stream_name}' z-key '{comp_name}' is not defined in materials."
                     )
 
-    # 6. Every unit must reference a valid friendly_material_id
+        # 6. Stream material_mix references must resolve to a valid friendly_material_mix_id
+        valid_mix_ids = {
+            mix_def["friendly_material_mix_id"]
+            for mix_def in material_mixes.values()
+        }
+        for stream_name, stream_def in config.get("streams", {}).items():
+            mix_ref = stream_def.get("material_mix")
+            if mix_ref is not None and mix_ref not in valid_mix_ids:
+                raise ValueError(
+                    f"❌ Stream '{stream_name}' references material_mix id {mix_ref}, "
+                    f"which does not match any friendly_material_mix_id in material_mixes."
+                )
+
+    # 7. Every unit must reference a valid friendly_material_id
     hint = " (no materials section defined)" if not materials else ""
     for unit_name, unit_def in config.get("units", {}).items():
         mat_id = unit_def.get("material")

{processforge-0.2.12 → processforge-0.2.14/src/processforge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: processforge
-Version: 0.2.12
+Version: 0.2.14
 Summary: A Python-based process simulation framework for chemical engineering applications.
 Author-email: Process Forge Team <team@processforge.dev>
 License-Expression: BSD-3-Clause