Merge pull request #1211 from Geode-solutions/fix/python-additional-file

fix(Python): simpler additional file naming

Author: BotellaA

bindings/python/src/basic/CMakeLists.txt

@@ -27,6 +27,7 @@ add_geode_python_binding(
         "cell_array.cpp"
         "identifier.cpp"
         "identifier_builder.cpp"
+        "input.cpp"
         "mapping.cpp"
         "percentage.cpp"
         "uuid.cpp"

bindings/python/src/basic/basic.cpp

@@ -33,6 +33,7 @@ namespace geode
     void define_attribute_manager( pybind11::module& );
     void define_identifier( pybind11::module& );
     void define_identifier_builder( pybind11::module& );
+    void define_input( pybind11::module& );
     void define_mapping( pybind11::module& );
     void define_percentage( pybind11::module& );
     void define_uuid( pybind11::module& );
@@ -54,6 +55,7 @@ PYBIND11_MODULE( opengeode_py_basic, module )
     geode::define_attribute_manager( module );
     geode::define_identifier( module );
     geode::define_identifier_builder( module );
+    geode::define_input( module );
     geode::define_mapping( module );
     geode::define_percentage( module );
 }

bindings/python/src/basic/input.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019 - 2025 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "../common.hpp"
+
+#include <geode/basic/input.hpp>
+
+namespace geode
+{
+    void define_input( pybind11::module& module )
+    {
+        pybind11::class_< AdditionalFile >( module, "AdditionalFile" )
+            .def_readwrite( "filename", &AdditionalFile::filename )
+            .def_readwrite( "is_missing", &AdditionalFile::is_missing );
+        pybind11::class_< AdditionalFiles >( module, "AdditionalFiles" )
+            .def(
+                "has_additional_files", &AdditionalFiles::has_additional_files )
+            .def_readwrite( "optional_files", &AdditionalFiles::optional_files )
+            .def_readwrite(
+                "mandatory_files", &AdditionalFiles::mandatory_files );
+    }
+} // namespace geode

bindings/python/src/basic/input.hpp

@@ -26,7 +26,6 @@
 #include "../../common.hpp"
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 
 #include <geode/basic/percentage.hpp>
 
@@ -49,8 +48,6 @@
         "is_raster_image_loadable" + std::to_string( dimension ) + "D";        \
     module.def(                                                                \
         loadable##dimension.c_str(), &is_raster_image_loadable< dimension > ); \
-    PYTHON_INPUT_CLASS( RasterImage##dimension##D,                             \
-        "RasterImage" + std::to_string( dimension ) + "D" );                   \
     const auto check##dimension =                                              \
         "raster_image_additional_files" + std::to_string( dimension ) + "D";   \
     module.def( check##dimension.c_str(),                                      \

bindings/python/src/image/io/raster_image.cpp

@@ -24,7 +24,6 @@
 #include <string>
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 #include "../../common.hpp"
 
 #include <geode/mesh/core/edged_curve.hpp>
@@ -48,8 +47,6 @@
         "is_edged_curve_loadable" + std::to_string( dimension ) + "D";         \
     module.def(                                                                \
         loadable##dimension.c_str(), &is_edged_curve_loadable< dimension > );  \
-    PYTHON_INPUT_MESH_CLASS( std::unique_ptr< EdgedCurve< dimension > >,       \
-        "EdgedCurve" + std::to_string( dimension ) + "D" );                    \
     const auto check##dimension =                                              \
         "edged_curve_additional_files" + std::to_string( dimension ) + "D";    \
     module.def( check##dimension.c_str(),                                      \

bindings/python/src/mesh/io/edged_curve.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 #include "../../common.hpp"
 
 #include <geode/mesh/core/graph.hpp>
@@ -40,7 +39,6 @@ namespace geode
         module.def( "graph_object_priority", &graph_object_priority );
         module.def( "is_graph_loadable", &is_graph_loadable );
         module.def( "is_graph_saveable", &is_graph_saveable );
-        PYTHON_INPUT_MESH_CLASS( std::unique_ptr< Graph >, "Graph" );
         module.def( "graph_additional_files", &graph_additional_files );
         PYTHON_FACTORY_CLASS( GraphInputFactory );
         PYTHON_FACTORY_CLASS( GraphOutputFactory );

bindings/python/src/mesh/io/graph.cpp

@@ -24,7 +24,6 @@
 #include <string>
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 #include "../../common.hpp"
 
 #include <geode/mesh/core/hybrid_solid.hpp>
@@ -48,8 +47,6 @@
         "is_hybrid_solid_loadable" + std::to_string( dimension ) + "D";        \
     module.def(                                                                \
         loadable##dimension.c_str(), &is_hybrid_solid_loadable< dimension > ); \
-    PYTHON_INPUT_MESH_CLASS( std::unique_ptr< HybridSolid< dimension > >,      \
-        "HybridSolid" + std::to_string( dimension ) + "D" );                   \
     const auto check##dimension =                                              \
         "hybrid_solid_additional_files" + std::to_string( dimension ) + "D";   \
     module.def( check##dimension.c_str(),                                      \

bindings/python/src/mesh/io/hybrid_solid.cpp

@@ -24,7 +24,6 @@
 #include <string>
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 #include "../../common.hpp"
 
 #include <geode/mesh/core/light_regular_grid.hpp>
@@ -49,8 +48,6 @@
         "is_light_regular_grid_loadable" + std::to_string( dimension ) + "D";  \
     module.def( loadable##dimension.c_str(),                                   \
         &is_light_regular_grid_loadable< dimension > );                        \
-    PYTHON_INPUT_CLASS( LightRegularGrid< dimension >,                         \
-        "LightRegularGrid" + std::to_string( dimension ) + "D" );              \
     const auto check##dimension = "light_regular_grid_additional_files"        \
                                   + std::to_string( dimension ) + "D";         \
     module.def( check##dimension.c_str(),                                      \

bindings/python/src/mesh/io/light_regular_grid.cpp

@@ -24,7 +24,6 @@
 #include <string>
 
 #include "../../basic/factory.hpp"
-#include "../../basic/input.hpp"
 #include "../../common.hpp"
 
 #include <geode/mesh/core/point_set.hpp>
@@ -48,8 +47,6 @@
         "is_point_set_loadable" + std::to_string( dimension ) + "D";           \
     module.def(                                                                \
         loadable##dimension.c_str(), &is_point_set_loadable< dimension > );    \
-    PYTHON_INPUT_MESH_CLASS( std::unique_ptr< PointSet< dimension > >,         \
-        "PointSet" + std::to_string( dimension ) + "D" );                      \
     const auto check##dimension =                                              \
         "point_set_additional_files" + std::to_string( dimension ) + "D";      \
     module.def(                                                                \