Revert breaking io changes

Author: FBumann

flixopt/elements.py

@@ -917,9 +917,8 @@ def _do_modeling(self):
             )
 
     def results_structure(self):
-        inputs = [flow.label_full for flow in self.element.inputs]
-        outputs = [flow.label_full for flow in self.element.outputs]
-        # Virtual supply/demand are variables, not flows - keep their full variable names
+        inputs = [flow.submodel.flow_rate.name for flow in self.element.inputs]
+        outputs = [flow.submodel.flow_rate.name for flow in self.element.outputs]
         if self.virtual_supply is not None:
             inputs.append(self.virtual_supply.name)
         if self.virtual_demand is not None:
@@ -997,8 +996,8 @@ def _do_modeling(self):
     def results_structure(self):
         return {
             **super().results_structure(),
-            'inputs': [flow.label_full for flow in self.element.inputs],
-            'outputs': [flow.label_full for flow in self.element.outputs],
+            'inputs': [flow.submodel.flow_rate.name for flow in self.element.inputs],
+            'outputs': [flow.submodel.flow_rate.name for flow in self.element.outputs],
             'flows': [flow.label_full for flow in self.element.inputs + self.element.outputs],
         }
 

flixopt/results.py

@@ -779,7 +779,9 @@ def get_effect_shares(
         if include_flows:
             if element not in self.components:
                 raise ValueError(f'Only use Components when retrieving Effects including flows. Got {element}')
-            flows = self.components[element].inputs + self.components[element].outputs
+            flows = [
+                label.split('|')[0] for label in self.components[element].inputs + self.components[element].outputs
+            ]
             return xr.merge(
                 [ds]
                 + [
@@ -856,7 +858,9 @@ def _compute_effect_total(
             if include_flows:
                 if element not in self.components:
                     raise ValueError(f'Only use Components when retrieving Effects including flows. Got {element}')
-                flows = self.components[element].inputs + self.components[element].outputs
+                flows = [
+                    label.split('|')[0] for label in self.components[element].inputs + self.components[element].outputs
+                ]
                 for flow in flows:
                     label = f'{flow}->{target_effect}({mode})'
                     if label in self.solution:
@@ -1267,16 +1271,6 @@ def __init__(
         # Plot accessor for new plotting API
         self.plot = ElementPlotAccessor(self)
 
-    @property
-    def _input_vars(self) -> list[str]:
-        """Variable names for inputs (flow labels + |flow_rate suffix)."""
-        return [f'{label}|flow_rate' if '|' not in label else label for label in self.inputs]
-
-    @property
-    def _output_vars(self) -> list[str]:
-        """Variable names for outputs (flow labels + |flow_rate suffix)."""
-        return [f'{label}|flow_rate' if '|' not in label else label for label in self.outputs]
-
     def plot_node_balance(
         self,
         save: bool | pathlib.Path = False,
@@ -1510,14 +1504,14 @@ def plot_node_balance_pie(
         dpi = plot_kwargs.pop('dpi', None)  # None uses CONFIG.Plotting.default_dpi
 
         inputs = sanitize_dataset(
-            ds=self.solution[self._input_vars] * self._results.hours_per_timestep,
+            ds=self.solution[self.inputs] * self._results.hours_per_timestep,
             threshold=1e-5,
             drop_small_vars=True,
             zero_small_values=True,
             drop_suffix='|',
         )
         outputs = sanitize_dataset(
-            ds=self.solution[self._output_vars] * self._results.hours_per_timestep,
+            ds=self.solution[self.outputs] * self._results.hours_per_timestep,
             threshold=1e-5,
             drop_small_vars=True,
             zero_small_values=True,
@@ -1627,18 +1621,18 @@ def node_balance(
             drop_suffix: Whether to drop the suffix from the variable names.
             select: Optional data selection dict. Supports single values, lists, slices, and index arrays.
         """
-        ds = self.solution[self._input_vars + self._output_vars]
+        ds = self.solution[self.inputs + self.outputs]
 
         ds = sanitize_dataset(
             ds=ds,
             threshold=threshold,
             timesteps=self._results.timesteps_extra if with_last_timestep else None,
             negate=(
-                self._output_vars + self._input_vars
+                self.outputs + self.inputs
                 if negate_outputs and negate_inputs
-                else self._output_vars
+                else self.outputs
                 if negate_outputs
-                else self._input_vars
+                else self.inputs
                 if negate_inputs
                 else None
             ),
@@ -1895,17 +1889,17 @@ def node_balance_with_charge_state(
         """
         if not self.is_storage:
             raise ValueError(f'Cant get charge_state. "{self.label}" is not a storage')
-        variable_names = self._input_vars + self._output_vars + [self._charge_state]
+        variable_names = self.inputs + self.outputs + [self._charge_state]
         return sanitize_dataset(
             ds=self.solution[variable_names],
             threshold=threshold,
             timesteps=self._results.timesteps_extra,
             negate=(
-                self._output_vars + self._input_vars
+                self.outputs + self.inputs
                 if negate_outputs and negate_inputs
-                else self._output_vars
+                else self.outputs
                 if negate_outputs
-                else self._input_vars
+                else self.inputs
                 if negate_inputs
                 else None
             ),