34: Add new Grow workflows.

.env-template

@@ -15,7 +15,7 @@ POSTGRESQL_HOSTNAME=localhost
 POSTGRESQL_PORT=5432
 POSTGRESQL_DATABASE=omotes_celery
 
-# May be grow_optimizer or grow_simulator
+# May be grow_optimizer, grow_simulator, grow_optimizer_no_heat_losses, grow_optimizer_no_heat_losses_discounted_capex
 GROW_TASK_TYPE=grow_optimizer
 LOG_LEVEL=INFO
 

dev-requirements.txt

@@ -192,7 +192,7 @@ pyecore==0.12.1
     #   -c requirements.txt
     #   pyesdl
     #   rtc-tools-heat-network
-pyesdl==23.11.1
+pyesdl==24.2
     # via
     #   -c requirements.txt
     #   rtc-tools-heat-network
@@ -243,7 +243,7 @@ rtc-tools-channel-flow==1.1.2
     # via
     #   -c requirements.txt
     #   rtc-tools
-rtc-tools-heat-network==0.4.5
+rtc-tools-heat-network==0.4.6
     # via
     #   -c requirements.txt
     #   omotes-grow-worker (pyproject.toml)

pyproject.toml

@@ -24,7 +24,7 @@ requires-python = ">=3.10"
 
 dependencies = [
     "python-dotenv ~= 1.0.0",
-    "rtc-tools-heat-network ~= 0.4.5",
+    "rtc-tools-heat-network ~= 0.4.6",
     "omotes-sdk-python ~= 0.0.9"
 ]
 

requirements.txt

@@ -81,7 +81,7 @@ pyecore==0.12.1
     # via
     #   pyesdl
     #   rtc-tools-heat-network
-pyesdl==23.11.1
+pyesdl==24.2
     # via rtc-tools-heat-network
 pymoca==0.9.0
     # via
@@ -107,7 +107,7 @@ rtc-tools==2.6.0a3
     # via rtc-tools-heat-network
 rtc-tools-channel-flow==1.1.2
     # via rtc-tools
-rtc-tools-heat-network==0.4.5
+rtc-tools-heat-network==0.4.6
     # via omotes-grow-worker (pyproject.toml)
 scipy==1.10.1
     # via rtc-tools

src/grow_worker/worker.py

@@ -8,9 +8,13 @@
 # from celery.signals import after_setup_logger
 
 from omotes_sdk.internal.worker.worker import initialize_worker, UpdateProgressHandler
-from rtctools_heat_network.workflows import run_end_scenario_sizing
 
-from grow_worker.worker_types import GrowTaskType, GROWProblem, get_problem_type
+from grow_worker.worker_types import (
+    GrowTaskType,
+    GROWProblem,
+    get_problem_type,
+    get_problem_function,
+)
 
 logger = logging.getLogger("grow_worker")
 GROW_TASK_TYPE = GrowTaskType(os.environ.get("GROW_TASK_TYPE"))
@@ -41,7 +45,7 @@ def grow_worker_task(
         f"At {influxdb_host}:{influxdb_port}"
     )
 
-    solution: GROWProblem = run_end_scenario_sizing(
+    solution: GROWProblem = get_problem_function(GROW_TASK_TYPE)(
         get_problem_type(GROW_TASK_TYPE),
         base_folder=base_folder,
         esdl_string=base64.encodebytes(input_esdl.encode("utf-8")),

src/grow_worker/worker_types.py

@@ -1,9 +1,15 @@
 from enum import Enum
-from typing import Type, Union
+from typing import Type, Union, Callable
 
 from rtctools_heat_network.workflows import (
     EndScenarioSizingHIGHS,
     NetworkSimulatorHIGHSWeeklyTimeStep,
+    EndScenarioSizingStagedHIGHS,
+    EndScenarioSizingDiscountedHIGHS,
+)
+from rtctools_heat_network.workflows import (
+    run_end_scenario_sizing,
+    run_end_scenario_sizing_no_heat_losses,
 )
 
 
@@ -13,10 +19,21 @@ class GrowTaskType(Enum):
     GROW_OPTIMIZER = "grow_optimizer"
     """Run the Grow Optimizer."""
     GROW_SIMULATOR = "grow_simulator"
-    """Run the Grow simulator."""
+    """Run the Grow Simulator."""
+    GROW_OPTIMIZER_NO_HEAT_LOSSES = "grow_optimizer_no_heat_losses"
+    """Run the Grow Optimizer without heat losses."""
+    GROW_OPTIMIZER_NO_HEAT_LOSSES_DISCOUNTED_CAPEX = (
+        "grow_optimizer_no_heat_losses_discounted_capex"
+    )
+    """Run the Grow Optimizer without heat losses and a discounted CAPEX."""
 
 
-GROWProblem = Union[Type[EndScenarioSizingHIGHS], Type[NetworkSimulatorHIGHSWeeklyTimeStep]]
+GROWProblem = Union[
+    Type[EndScenarioSizingHIGHS],
+    Type[NetworkSimulatorHIGHSWeeklyTimeStep],
+    Type[EndScenarioSizingStagedHIGHS],
+    Type[EndScenarioSizingDiscountedHIGHS],
+]
 
 
 def get_problem_type(task_type: GrowTaskType) -> GROWProblem:
@@ -30,6 +47,32 @@ def get_problem_type(task_type: GrowTaskType) -> GROWProblem:
         result = EndScenarioSizingHIGHS
     elif task_type == GrowTaskType.GROW_SIMULATOR:
         result = NetworkSimulatorHIGHSWeeklyTimeStep
+    elif task_type == GrowTaskType.GROW_OPTIMIZER_NO_HEAT_LOSSES:
+        result = EndScenarioSizingStagedHIGHS
+    elif task_type == GrowTaskType.GROW_OPTIMIZER_NO_HEAT_LOSSES_DISCOUNTED_CAPEX:
+        result = EndScenarioSizingDiscountedHIGHS
+    else:
+        raise RuntimeError(f"Unknown workflow type, please implement {task_type}")
+
+    return result
+
+
+def get_problem_function(
+    task_type: GrowTaskType,
+) -> Callable[..., GROWProblem]:
+    """Convert the Grow task type to the Grow function that should be run.
+
+    :param task_type: Grow task type.
+    :return: Grow problem function.
+    """
+    result: GROWProblem
+    if task_type in [GrowTaskType.GROW_OPTIMIZER, GrowTaskType.GROW_SIMULATOR]:
+        result = run_end_scenario_sizing
+    elif task_type in [
+        GrowTaskType.GROW_OPTIMIZER_NO_HEAT_LOSSES,
+        GrowTaskType.GROW_OPTIMIZER_NO_HEAT_LOSSES_DISCOUNTED_CAPEX,
+    ]:
+        result = run_end_scenario_sizing_no_heat_losses
     else:
         raise RuntimeError(f"Unknown workflow type, please implement {task_type}")