merge post_integration to validation

Author: b4pm-devops

energy_models/core/energy_mix/energy_mix_disc.py

@@ -1,6 +1,6 @@
 '''
 Copyright 2022 Airbus SAS
-Modifications on 2023/04/19-2025/01/17 Copyright 2025 Capgemini
+Modifications on 2023/04/19-2025/01/23 Copyright 2025 Capgemini
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,11 +26,6 @@
 from climateeconomics.core.core_witness.climateeco_discipline import (
     ClimateEcoDiscipline,
 )
-from climateeconomics.core.tools.colormaps import available_colormaps
-from climateeconomics.core.tools.plot_factories import create_sankey_with_slider
-from climateeconomics.core.tools.plotting import (
-    InstantiatedPlotlyNativeChart,
-)
 from climateeconomics.sos_wrapping.sos_wrapping_agriculture.agriculture.agriculture_mix_disc import (
     AgricultureMixDiscipline,
 )
@@ -54,6 +49,15 @@
 from sostrades_optimization_plugins.tools.cst_manager.func_manager_common import (
     get_dsmooth_dvariable,
 )
+from sostrades_optimization_plugins.tools.plot_tools.colormaps import (
+    available_colormaps,
+)
+from sostrades_optimization_plugins.tools.plot_tools.plot_factories import (
+    create_sankey_with_slider,
+)
+from sostrades_optimization_plugins.tools.plot_tools.plotting import (
+    InstantiatedPlotlyNativeChart,
+)
 
 from energy_models.core.energy_mix.energy_mix import EnergyMix
 from energy_models.core.stream_type.carbon_models.carbon_capture import CarbonCapture

energy_models/core/stream_type/stream_disc.py

@@ -1,6 +1,6 @@
 '''
 Copyright 2022 Airbus SAS
-Modifications on 2023/03/27-2025/01/17 Copyright 2025 Capgemini
+Modifications on 2023/03/27-2025/01/23 Copyright 2025 Capgemini
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,18 +25,24 @@
 from climateeconomics.core.core_witness.climateeco_discipline import (
     ClimateEcoDiscipline,
 )
-from climateeconomics.core.tools.colormaps import available_colormaps
-from climateeconomics.core.tools.plot_factories import create_sankey_with_slider
-from climateeconomics.core.tools.plotting import InstantiatedPlotlyNativeChart
 from sostrades_core.execution_engine.sos_wrapp import SoSWrapp
 from sostrades_core.tools.post_processing.charts.chart_filter import ChartFilter
 from sostrades_core.tools.post_processing.charts.two_axes_instanciated_chart import (
     InstanciatedSeries,
-    TwoAxesInstanciatedChart,
 )
 from sostrades_core.tools.post_processing.pie_charts.instanciated_pie_chart import (
     InstanciatedPieChart,
 )
+from sostrades_optimization_plugins.tools.plot_tools.colormaps import (
+    available_colormaps,
+)
+from sostrades_optimization_plugins.tools.plot_tools.plot_factories import (
+    create_sankey_with_slider,
+)
+from sostrades_optimization_plugins.tools.plot_tools.plotting import (
+    InstantiatedPlotlyNativeChart,
+    TwoAxesInstanciatedChart,
+)
 
 from energy_models.glossaryenergy import GlossaryEnergy
 
@@ -572,7 +578,11 @@ def get_post_processing_list(self, filters=None):
             instanciated_charts.append(chart)
 
         if "Stream Flow" in charts or True:
-            new_chart = self.get_chart_sankey_fluxes(years_list, chart_name="Flow of energy streams (TWh)", split_external=True)
+            new_chart = self.get_chart_sankey_fluxes(
+                years_list,
+                chart_name=f"Flow of energy streams for {self.sos_name.split('.')[-1]} production (TWh)",
+                split_external=True,
+            )
             new_chart.post_processing_section_name = "Detailed Stream Flow"
             instanciated_charts.append(new_chart)
 

platform_version_required.txt

@@ -1 +1 @@
-v5.0.0
+v5.0.1