From 2f39ab52a635e2ce9fdedf9196a8aaf1b20dcf4b Mon Sep 17 00:00:00 2001 From: Hans Kallekleiv <16436291+HansKallekleiv@users.noreply.github.com> Date: Wed, 29 Jan 2025 09:06:24 +0100 Subject: [PATCH] wip --- .../primary/routers/relperm/converters.py | 4 +- .../primary/routers/relperm/schemas.py | 9 ---- .../relperm_assembler/relperm_assembler.py | 45 ++++++------------- 3 files changed, 15 insertions(+), 43 deletions(-) diff --git a/backend_py/primary/primary/routers/relperm/converters.py b/backend_py/primary/primary/routers/relperm/converters.py index 91aca0c92..6bc24ddcb 100644 --- a/backend_py/primary/primary/routers/relperm/converters.py +++ b/backend_py/primary/primary/routers/relperm/converters.py @@ -23,7 +23,7 @@ def to_api_relperm_saturation_axis(axis: RelPermSaturationAxis) -> schemas.RelPe return schemas.RelPermSaturationAxis( saturation_name=axis.saturation_name, - relperm_curve_names=[schemas.RelPermCurveNames(curvename) for curvename in axis.relperm_curve_names], + relperm_curve_names=axis.relperm_curve_names, capillary_pressure_curve_names=axis.capillary_pressure_curve_names, ) @@ -31,7 +31,7 @@ def to_api_relperm_saturation_axis(axis: RelPermSaturationAxis) -> schemas.RelPe def to_api_relperm_realization_data( data: RelPermRealizationData, ) -> schemas.RelPermRealizationData: - print("*****************************", data) + return schemas.RelPermRealizationData( saturation_axis_data=schemas.CurveData( curve_name=data.saturation_axis_data.curve_name, diff --git a/backend_py/primary/primary/routers/relperm/schemas.py b/backend_py/primary/primary/routers/relperm/schemas.py index 4a0037e32..e036b5ce9 100644 --- a/backend_py/primary/primary/routers/relperm/schemas.py +++ b/backend_py/primary/primary/routers/relperm/schemas.py @@ -34,15 +34,6 @@ class RelPermRealizationData(BaseModel): relperm_curve_data: List[RelPermRealizationCurveData] -class RelPermCurveNames(StrEnum): - KRW = "Relative permeability water" - KRG = "Relative permeability gas" - KROW = "Relative permeability oil water" - KROG = "Relative permeability oil gas" - PCOW = "Capilar pressure oil water" - PCOG = "Capilar pressure oil gas" - - class Statistic(StrEnum): """ Definition of possible statistics diff --git a/backend_py/primary/primary/services/relperm_assembler/relperm_assembler.py b/backend_py/primary/primary/services/relperm_assembler/relperm_assembler.py index a783073b3..7124d75f5 100644 --- a/backend_py/primary/primary/services/relperm_assembler/relperm_assembler.py +++ b/backend_py/primary/primary/services/relperm_assembler/relperm_assembler.py @@ -1,4 +1,4 @@ -from enum import StrEnum +from enum import Enum from typing import List, Callable, Dict import logging from dataclasses import dataclass @@ -15,7 +15,7 @@ LOGGER = logging.getLogger(__name__) -class RelPermFamily(StrEnum): +class RelPermFamily(str, Enum): """Enumeration of relative permeability keyword families""" FAMILY_1 = "family_1" # SWOF, SGOF, SLGOF family @@ -28,19 +28,10 @@ class RelPermFamily(StrEnum): } -class RelPermCurveNames(StrEnum): - KRW = "Relative permeability water" - KRG = "Relative permeability gas" - KROW = "Relative permeability oil water" - KROG = "Relative permeability oil gas" - PCOW = "Capilar pressure oil water" - PCOG = "Capilar pressure oil gas" - - @dataclass class RelPermSaturationAxis: saturation_name: str - relperm_curve_names: List[RelPermCurveNames] + relperm_curve_names: List[str] capillary_pressure_curve_names: List[str] @@ -65,7 +56,7 @@ class RelPermRealizationCurveData: realization_id: int -class Statistic(StrEnum): +class Statistic(str, Enum): """ Definition of possible statistics for a result column in an inplace volumetrics table """ @@ -337,12 +328,10 @@ def extract_saturation_axes_from_relperm_table( RelPermSaturationAxis( saturation_name="SW", relperm_curve_names=[ - curve_name - for curve_name in [RelPermCurveNames.KROW, RelPermCurveNames.KRW] - if curve_name in relperm_table_columns + curve_name for curve_name in ["KROW", "KRW"] if curve_name in relperm_table_columns ], capillary_pressure_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.PCOW] if curve_name in relperm_table_columns + curve_name for curve_name in ["PCOW"] if curve_name in relperm_table_columns ], ) ) @@ -351,12 +340,10 @@ def extract_saturation_axes_from_relperm_table( RelPermSaturationAxis( saturation_name="SG", relperm_curve_names=[ - curve_name - for curve_name in [RelPermCurveNames.KRG, RelPermCurveNames.KROG] - if curve_name in relperm_table_columns + curve_name for curve_name in ["KRG", "KROG"] if curve_name in relperm_table_columns ], capillary_pressure_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.PCOG] if curve_name in relperm_table_columns + curve_name for curve_name in ["PCOG"] if curve_name in relperm_table_columns ], ) ) @@ -366,11 +353,9 @@ def extract_saturation_axes_from_relperm_table( saturation_infos.append( RelPermSaturationAxis( saturation_name="SW", - relperm_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.KRW] if curve_name in relperm_table_columns - ], + relperm_curve_names=[curve_name for curve_name in ["KRW"] if curve_name in relperm_table_columns], capillary_pressure_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.PCOW] if curve_name in relperm_table_columns + curve_name for curve_name in ["PCOW"] if curve_name in relperm_table_columns ], ) ) @@ -378,11 +363,9 @@ def extract_saturation_axes_from_relperm_table( saturation_infos.append( RelPermSaturationAxis( saturation_name="SG", - relperm_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.KRG] if curve_name in relperm_table_columns - ], + relperm_curve_names=[curve_name for curve_name in ["KRG"] if curve_name in relperm_table_columns], capillary_pressure_curve_names=[ - curve_name for curve_name in [RelPermCurveNames.PCOG] if curve_name in relperm_table_columns + curve_name for curve_name in ["PCOG"] if curve_name in relperm_table_columns ], ) ) @@ -391,9 +374,7 @@ def extract_saturation_axes_from_relperm_table( RelPermSaturationAxis( saturation_name="SO", relperm_curve_names=[ - curve_name - for curve_name in [RelPermCurveNames.KROW, RelPermCurveNames.KROG] - if curve_name in relperm_table_columns + curve_name for curve_name in ["KROW", "KROG"] if curve_name in relperm_table_columns ], capillary_pressure_curve_names=[], )