refacto geode_objects classes for model_components

Author: MaxNumerique

src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -88,11 +88,8 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]:
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.brep.items(id)
 
-    def component_name(self, id: og.uuid) -> str | None:
-        return self.brep.brep_component(id).name()
-
-    def is_active(self, id: og.uuid) -> bool:
-        return self.brep.brep_component(id).is_active()
+    def component(self, id: og.uuid) -> og.Component3D:
+        return self.brep.brep_component(id)
 
     def inspect(self) -> og_inspector.BRepInspectionResult:
         return og_inspector.inspect_brep(self.brep)

src/opengeodeweb_back/geode_objects/geode_model.py

@@ -1,6 +1,7 @@
 # Standard library imports
 from __future__ import annotations
 from abc import abstractmethod
+from typing import Union
 
 # Third party imports
 import opengeode as og
@@ -37,7 +38,4 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]: ...
     def items(self, id: og.uuid) -> list[og.ComponentID]: ...
 
     @abstractmethod
-    def component_name(self, id: og.uuid) -> str | None: ...
-
-    @abstractmethod
-    def is_active(self, id: og.uuid) -> bool: ...
+    def component(self, id: og.uuid) -> og.Component2D | og.Component3D: ...

src/opengeodeweb_back/geode_objects/geode_section.py

@@ -90,11 +90,8 @@ def internals(self, id: og.uuid) -> list[og.ComponentID]:
     def items(self, id: og.uuid) -> list[og.ComponentID]:
         return self.section.items(id)
 
-    def component_name(self, id: og.uuid) -> str | None:
-        return self.section.section_component(id).name()
-
-    def is_active(self, id: og.uuid) -> bool:
-        return self.section.section_component(id).is_active()
+    def component(self, id: og.uuid) -> og.Component2D:
+        return self.section.section_component(id)
 
     def inspect(self) -> og_inspector.SectionInspectionResult:
         return og_inspector.inspect_section(self.section)

src/opengeodeweb_back/utils_functions.py

@@ -213,8 +213,9 @@ def model_components(
     for mesh_component, ids in model_mesh_components.items():
         component_type = mesh_component.get()
         for id in ids:
+            component = model.component(id)
             geode_id = id.string()
-            component_name = model.component_name(id)
+            component_name = component.name()
             if not component_name:
                 component_name = geode_id
             viewer_id = uuid_to_flat_index[geode_id]
@@ -229,7 +230,7 @@ def model_components(
                 "type": component_type,
                 "boundaries": boundaries_uuid,
                 "internals": internals_uuid,
-                "is_active": model.is_active(id),
+                "is_active": component.is_active(),
             }
             mesh_components.append(mesh_component_object)
 
@@ -238,8 +239,9 @@ def model_components(
     for collection_component, ids in model_collection_components.items():
         component_type = collection_component.get()
         for id in ids:
+            component = model.component(id)
             geode_id = id.string()
-            component_name = model.component_name(id)
+            component_name = component.name()
             if not component_name:
                 component_name = geode_id
             items = model.items(id)
@@ -249,7 +251,7 @@ def model_components(
                 "name": component_name,
                 "type": component_type,
                 "items": items_uuid,
-                "is_active": model.is_active(id),
+                "is_active": component.is_active(),
             }
             collection_components.append(collection_component_object)
     return {