better way to have predefined cast in types file

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -4,14 +4,10 @@
 # Third party imports
 import werkzeug
 import flask
-from typing import cast
 
 # Local application imports
 from .geode_objects import geode_objects
-from .geode_objects.types import (
-    GeodeObjectType,
-    geode_object_type,
-)
+from .geode_objects.types import GeodeObjectType, geode_object_type, cast_str
 from .geode_objects.geode_object import GeodeObject
 from opengeodeweb_microservice.database.data import Data
 
@@ -49,7 +45,7 @@ def get_data_info(data_id: str) -> Data:
 def upload_file_path(filename: str) -> str:
     upload_folder = flask.current_app.config["UPLOAD_FOLDER"]
     secure_filename = werkzeug.utils.secure_filename(filename)
-    return cast(str, os.path.abspath(os.path.join(upload_folder, secure_filename)))
+    return cast_str(os.path.abspath(os.path.join(upload_folder, secure_filename)))
 
 
 def geode_object_output_extensions(

src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -1,6 +1,6 @@
 # Standard library imports
 from __future__ import annotations
-from typing import cast, Any
+from typing import cast
 
 # Third party imports
 import opengeode as og
@@ -9,7 +9,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeModelType
+from .types import GeodeModelType, cast_str, cast_list_str, cast_int, cast_bool
 from .geode_model import GeodeModel, ComponentRegistry
 
 
@@ -25,7 +25,7 @@ def geode_object_type(cls) -> GeodeModelType:
         return "BRep"
 
     def native_extension(self) -> str:
-        return cast(str, self.brep.native_extension())
+        return cast_str(self.brep.native_extension())
 
     @classmethod
     def is_3D(cls) -> bool:
@@ -52,35 +52,34 @@ def is_loadable(cls, filename: str) -> og.Percentage:
 
     @classmethod
     def input_extensions(cls) -> list[str]:
-        return cast(list[str], og.BRepInputFactory.list_creators())
+        return cast_list_str(og.BRepInputFactory.list_creators())
 
     @classmethod
     def output_extensions(cls) -> list[str]:
-        return cast(list[str], og.BRepOutputFactory.list_creators())
+        return cast_list_str(og.BRepOutputFactory.list_creators())
 
     @classmethod
     def object_priority(cls, filename: str) -> int:
-        return cast(int, og.brep_object_priority(filename))
+        return cast_int(og.brep_object_priority(filename))
 
     def is_saveable(self, filename: str) -> bool:
-        return cast(bool, og.is_brep_saveable(self.brep, filename))
+        return cast_bool(og.is_brep_saveable(self.brep, filename))
 
     def save(self, filename: str) -> list[str]:
-        return cast(list[str], og.save_brep(self.brep, filename))
+        return cast_list_str(og.save_brep(self.brep, filename))
 
     def save_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str, viewables.save_viewable_brep(self.brep, filename_without_extension)
+        return cast_str(
+            viewables.save_viewable_brep(self.brep, filename_without_extension)
         )
 
     def save_light_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
-            viewables.save_light_viewable_brep(self.brep, filename_without_extension),
+        return cast_str(
+            viewables.save_light_viewable_brep(self.brep, filename_without_extension)
         )
 
     def mesh_components(self) -> ComponentRegistry:
-        return cast(dict[Any, list[Any]], self.brep.mesh_components())
+        return cast(ComponentRegistry, self.brep.mesh_components())
 
     def inspect(self) -> og_inspector.BRepInspectionResult:
         return og_inspector.inspect_brep(self.brep)

src/opengeodeweb_back/geode_objects/geode_cross_section.py

@@ -1,14 +1,13 @@
 # Standard library imports
 from __future__ import annotations
-from typing import cast
 
 # Third party imports
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeModelType
+from .types import GeodeModelType, cast_str, cast_list_str, cast_int, cast_bool
 from .geode_section import GeodeSection
 
 
@@ -30,7 +29,7 @@ def geode_object_type(cls) -> GeodeModelType:
         return "CrossSection"
 
     def native_extension(self) -> str:
-        return cast(str, self.cross_section.native_extension())
+        return cast_str(self.cross_section.native_extension())
 
     def builder(self) -> og_geosciences.CrossSectionBuilder:
         return og_geosciences.CrossSectionBuilder(self.cross_section)
@@ -49,38 +48,36 @@ def is_loadable(cls, filename: str) -> og.Percentage:
 
     @classmethod
     def input_extensions(cls) -> list[str]:
-        return cast(list[str], og_geosciences.CrossSectionInputFactory.list_creators())
+        return cast_list_str(og_geosciences.CrossSectionInputFactory.list_creators())
 
     @classmethod
     def output_extensions(cls) -> list[str]:
-        return cast(list[str], og_geosciences.CrossSectionOutputFactory.list_creators())
+        return cast_list_str(og_geosciences.CrossSectionOutputFactory.list_creators())
 
     @classmethod
     def object_priority(cls, filename: str) -> int:
-        return cast(int, og_geosciences.cross_section_object_priority(filename))
+        return cast_int(og_geosciences.cross_section_object_priority(filename))
 
     def is_saveable(self, filename: str) -> bool:
-        return cast(
-            bool, og_geosciences.is_cross_section_saveable(self.cross_section, filename)
+        return cast_bool(
+            og_geosciences.is_cross_section_saveable(self.cross_section, filename)
         )
 
     def save(self, filename: str) -> list[str]:
-        return cast(
-            list[str], og_geosciences.save_cross_section(self.cross_section, filename)
+        return cast_list_str(
+            og_geosciences.save_cross_section(self.cross_section, filename)
         )
 
     def save_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_viewable_cross_section(
                 self.cross_section, filename_without_extension
-            ),
+            )
         )
 
     def save_light_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_light_viewable_cross_section(
                 self.cross_section, filename_without_extension
-            ),
+            )
         )

src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py

@@ -1,6 +1,5 @@
 # Standard library imports
 from __future__ import annotations
-from typing import cast
 
 # Third party imports
 import opengeode as og
@@ -9,7 +8,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, cast_str, cast_list_str, cast_int, cast_bool
 from .geode_graph import GeodeGraph
 
 
@@ -27,7 +26,7 @@ def geode_object_type(cls) -> GeodeMeshType:
         return "EdgedCurve2D"
 
     def native_extension(self) -> str:
-        return cast(str, self.edged_curve.native_extension())
+        return cast_str(self.edged_curve.native_extension())
 
     @classmethod
     def is_3D(cls) -> bool:
@@ -54,33 +53,31 @@ def is_loadable(cls, filename: str) -> og.Percentage:
 
     @classmethod
     def input_extensions(cls) -> list[str]:
-        return cast(list[str], og.EdgedCurveInputFactory2D.list_creators())
+        return cast_list_str(og.EdgedCurveInputFactory2D.list_creators())
 
     @classmethod
     def output_extensions(cls) -> list[str]:
-        return cast(list[str], og.EdgedCurveOutputFactory2D.list_creators())
+        return cast_list_str(og.EdgedCurveOutputFactory2D.list_creators())
 
     @classmethod
     def object_priority(cls, filename: str) -> int:
-        return cast(int, og.edged_curve_object_priority2D(filename))
+        return cast_int(og.edged_curve_object_priority2D(filename))
 
     def is_saveable(self, filename: str) -> bool:
-        return cast(bool, og.is_edged_curve_saveable2D(self.edged_curve, filename))
+        return cast_bool(og.is_edged_curve_saveable2D(self.edged_curve, filename))
 
     def save(self, filename: str) -> list[str]:
-        return cast(list[str], og.save_edged_curve2D(self.edged_curve, filename))
+        return cast_list_str(og.save_edged_curve2D(self.edged_curve, filename))
 
     def save_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_viewable_edged_curve2D(
                 self.edged_curve, filename_without_extension
             ),
         )
 
     def save_light_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_light_viewable_edged_curve2D(
                 self.edged_curve, filename_without_extension
             ),

src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py

@@ -1,6 +1,5 @@
 # Standard library imports
 from __future__ import annotations
-from typing import cast
 
 # Third party imports
 import opengeode as og
@@ -9,7 +8,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, cast_str, cast_list_str, cast_int, cast_bool
 from .geode_graph import GeodeGraph
 
 
@@ -27,7 +26,7 @@ def geode_object_type(cls) -> GeodeMeshType:
         return "EdgedCurve3D"
 
     def native_extension(self) -> str:
-        return cast(str, self.edged_curve.native_extension())
+        return cast_str(self.edged_curve.native_extension())
 
     @classmethod
     def is_3D(cls) -> bool:
@@ -54,33 +53,31 @@ def is_loadable(cls, filename: str) -> og.Percentage:
 
     @classmethod
     def input_extensions(cls) -> list[str]:
-        return cast(list[str], og.EdgedCurveInputFactory3D.list_creators())
+        return cast_list_str(og.EdgedCurveInputFactory3D.list_creators())
 
     @classmethod
     def output_extensions(cls) -> list[str]:
-        return cast(list[str], og.EdgedCurveOutputFactory3D.list_creators())
+        return cast_list_str(og.EdgedCurveOutputFactory3D.list_creators())
 
     @classmethod
     def object_priority(cls, filename: str) -> int:
-        return cast(int, og.edged_curve_object_priority3D(filename))
+        return cast_int(og.edged_curve_object_priority3D(filename))
 
     def is_saveable(self, filename: str) -> bool:
-        return cast(bool, og.is_edged_curve_saveable3D(self.edged_curve, filename))
+        return cast_bool(og.is_edged_curve_saveable3D(self.edged_curve, filename))
 
     def save(self, filename: str) -> list[str]:
-        return cast(list[str], og.save_edged_curve3D(self.edged_curve, filename))
+        return cast_list_str(og.save_edged_curve3D(self.edged_curve, filename))
 
     def save_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_viewable_edged_curve3D(
                 self.edged_curve, filename_without_extension
             ),
         )
 
     def save_light_viewable(self, filename_without_extension: str) -> str:
-        return cast(
-            str,
+        return cast_str(
             viewables.save_light_viewable_edged_curve3D(
                 self.edged_curve, filename_without_extension
             ),

src/opengeodeweb_back/geode_objects/geode_graph.py

@@ -1,12 +1,11 @@
 # Standard library imports
 from __future__ import annotations
-from typing import cast
 
 # Third party imports
 import opengeode as og
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, cast_str, cast_list_str, cast_int, cast_bool
 from .geode_vertex_set import GeodeVertexSet
 
 
@@ -22,7 +21,7 @@ def geode_object_type(cls) -> GeodeMeshType:
         return "Graph"
 
     def native_extension(self) -> str:
-        return cast(str, self.graph.native_extension())
+        return cast_str(self.graph.native_extension())
 
     @classmethod
     def is_3D(cls) -> bool:
@@ -49,21 +48,21 @@ def is_loadable(cls, filename: str) -> og.Percentage:
 
     @classmethod
     def input_extensions(cls) -> list[str]:
-        return cast(list[str], og.GraphInputFactory.list_creators())
+        return cast_list_str(og.GraphInputFactory.list_creators())
 
     @classmethod
     def output_extensions(cls) -> list[str]:
-        return cast(list[str], og.GraphOutputFactory.list_creators())
+        return cast_list_str(og.GraphOutputFactory.list_creators())
 
     @classmethod
     def object_priority(cls, filename: str) -> int:
-        return cast(int, og.graph_object_priority(filename))
+        return cast_int(og.graph_object_priority(filename))
 
     def is_saveable(self, filename: str) -> bool:
-        return cast(bool, og.is_graph_saveable(self.graph, filename))
+        return cast_bool(og.is_graph_saveable(self.graph, filename))
 
     def save(self, filename: str) -> list[str]:
-        return cast(list[str], og.save_graph(self.graph, filename))
+        return cast_list_str(og.save_graph(self.graph, filename))
 
     def save_viewable(self, filename_without_extension: str) -> str:
         return ""