Merge pull request #469 from DHI/enum

Use strings as values for enum instead of integers

Author: jsmariegaard

modelskill/model/factory.py

@@ -53,7 +53,7 @@ def model_result(
     if gtype is None:
         geometry = _guess_gtype(data)
     else:
-        geometry = GeometryType.from_string(gtype)
+        geometry = GeometryType(gtype)
 
     return _modelresult_lookup[geometry](
         data=data,
@@ -79,7 +79,7 @@ def __new__(
         if gtype is None:
             geometry = _guess_gtype(data)
         else:
-            geometry = GeometryType.from_string(gtype)
+            geometry = GeometryType(gtype)
 
         return _modelresult_lookup[geometry](
             data=data,

modelskill/obs.py

@@ -56,7 +56,7 @@ def observation(
     if gtype is None:
         geometry = _guess_gtype(**kwargs)
     else:
-        geometry = GeometryType.from_string(gtype)
+        geometry = GeometryType(gtype)
 
     return _obs_class_lookup[geometry](
         data=data,

modelskill/types.py

@@ -1,4 +1,4 @@
-from enum import Enum, auto
+from enum import Enum
 from pathlib import Path
 from typing import Union, List, Optional
 from dataclasses import dataclass
@@ -10,10 +10,10 @@
 class GeometryType(Enum):
     """Geometry type (gtype) of data"""
 
-    POINT = auto()
-    TRACK = auto()
-    UNSTRUCTURED = auto()
-    GRID = auto()
+    POINT = "point"
+    TRACK = "track"
+    UNSTRUCTURED = "unstructured"
+    GRID = "grid"
 
     def __str__(self) -> str:
         return self.name.lower()
@@ -24,18 +24,19 @@ def from_string(s: str) -> "GeometryType":
 
         Examples
         --------
+        >>> from modelskill.types import GeometryType
         >>> GeometryType.from_string("point")
-        <GeometryType.POINT: 1>
+        <GeometryType.POINT: 'point'>
         >>> GeometryType.from_string("track")
-        <GeometryType.TRACK: 2>
+        <GeometryType.TRACK: 'track'>
         >>> GeometryType.from_string("unstructured")
-        <GeometryType.UNSTRUCTURED: 3>
+        <GeometryType.UNSTRUCTURED: 'unstructured'>
         >>> GeometryType.from_string("flexible mesh")
-        <GeometryType.UNSTRUCTURED: 3>
+        <GeometryType.UNSTRUCTURED: 'unstructured'>
         >>> GeometryType.from_string("dfsu")
-        <GeometryType.UNSTRUCTURED: 3>
+        <GeometryType.UNSTRUCTURED: 'unstructured'>
         >>> GeometryType.from_string("grid")
-        <GeometryType.GRID: 4>
+        <GeometryType.GRID: 'grid'>
         """
 
         try: