Skip to content

Feat/input file #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 61 commits into from
Aug 4, 2025
Merged

Feat/input file #168

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
b6de855
remove imgs from test folder
MaxNumerique Jul 30, 2025
b817fff
update requirements
MaxNumerique Jul 30, 2025
bcd349f
opengeode-gosciences additional files added
MaxNumerique Jul 30, 2025
d13008c
test
MaxNumerique Jul 30, 2025
c41ab44
rmv upload_file replace if exist function
MaxNumerique Jul 31, 2025
b593f66
simplified blueprint & adapt tests
MaxNumerique Jul 31, 2025
37528dc
test
MaxNumerique Jul 31, 2025
dc46fe3
rename test dataa
MaxNumerique Jul 31, 2025
5b0ba3c
changed path
MaxNumerique Jul 31, 2025
ae189c4
feat(additional_files): update additional files
MaxNumerique Jul 31, 2025
a0b0714
new test files & renamed geode_objects
MaxNumerique Aug 1, 2025
1da5e31
requirements updated
MaxNumerique Aug 1, 2025
a86a117
rmv geode_functions
MaxNumerique Aug 1, 2025
3c1b97a
rmv mkdir
MaxNumerique Aug 1, 2025
53e6f58
added 3rd param to generate viewable function to add additional files…
MaxNumerique Aug 1, 2025
dfcd994
Apply prepare changes
MaxNumerique Aug 1, 2025
9bfb697
restored test files
MaxNumerique Aug 1, 2025
f903281
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
eb82189
rm comments
MaxNumerique Aug 1, 2025
f73fa41
last one
MaxNumerique Aug 1, 2025
ad1b5b8
original_file to input_file
MaxNumerique Aug 1, 2025
222b0bb
Apply prepare changes
MaxNumerique Aug 1, 2025
ebf438f
better syntax
MaxNumerique Aug 1, 2025
0eee532
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
aba0a7a
Apply prepare changes
MaxNumerique Aug 1, 2025
f18abff
temporary comment
MaxNumerique Aug 1, 2025
4a8d21c
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
8411efa
filepath needed
MaxNumerique Aug 1, 2025
45eef80
tests/data
MaxNumerique Aug 1, 2025
4571c00
refact generates functions
MaxNumerique Aug 1, 2025
19e1ddc
Apply prepare changes
MaxNumerique Aug 1, 2025
9eb853e
rename var
MaxNumerique Aug 1, 2025
3ac1798
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
167847c
renamed test
MaxNumerique Aug 1, 2025
e2eac3e
data_id added to generate_native_viewable_and_light_viewable_from_file
MaxNumerique Aug 1, 2025
f23a73e
Apply prepare changes
MaxNumerique Aug 1, 2025
12ce6ac
test
MaxNumerique Aug 1, 2025
808f805
test
MaxNumerique Aug 1, 2025
e7734c8
Apply prepare changes
MaxNumerique Aug 1, 2025
67feb2d
test
MaxNumerique Aug 1, 2025
bdb1758
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
43bb4be
Apply prepare changes
MaxNumerique Aug 1, 2025
16b1000
revert
MaxNumerique Aug 1, 2025
f629297
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
25d9e2d
Apply prepare changes
MaxNumerique Aug 1, 2025
a3f73bd
test
MaxNumerique Aug 1, 2025
c4a7035
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
9d0db3b
Apply prepare changes
MaxNumerique Aug 1, 2025
091d2b5
test
MaxNumerique Aug 1, 2025
9d82994
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 1, 2025
22d6eef
Apply prepare changes
MaxNumerique Aug 1, 2025
14c1323
test
MaxNumerique Aug 4, 2025
f2cd84e
Merge branch 'feat/input_file' of https://github.com/Geode-solutions/…
MaxNumerique Aug 4, 2025
390c079
Apply prepare changes
MaxNumerique Aug 4, 2025
2075754
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWe…
MaxNumerique Aug 4, 2025
4f43fc7
data_id added to save_viewable route
MaxNumerique Aug 4, 2025
d3704c3
feat(input_file): added unique path for files from input file
MaxNumerique Aug 4, 2025
bfeb069
feat(input_file): added tests
MaxNumerique Aug 4, 2025
173c252
removed com
MaxNumerique Aug 4, 2025
a8895e9
feat(input_file): test using context
MaxNumerique Aug 4, 2025
900440c
feat(input_file): removed unused params
MaxNumerique Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 16 additions & 30 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,26 @@
#
# pip-compile requirements.in
#
asgiref==3.8.1
asgiref==3.9.1
# via flask
attrs==25.3.0
# via
# jsonschema
# referencing
blinker==1.9.0
# via flask
click==8.2.1
# via flask
fastjsonschema==2.21.1
# via -r requirements.in
# via -r requirements.in
flask[async]==3.1.1
# via
# -r requirements.in
# flask-cors
flask-cors==6.0.1
# via -r requirements.in
geode-background==9.2.9
geode-background==9.4.0
# via
# geode-explicit
# geode-implicit
# geode-simplex
geode-common==33.8.8
geode-common==33.9.0
# via
# -r requirements.in
# geode-background
Expand All @@ -37,26 +33,26 @@ geode-common==33.8.8
# geode-numerics
# geode-simplex
# geode-viewables
geode-conversion==6.3.3
geode-conversion==6.4.0
# via
# geode-explicit
# geode-implicit
geode-explicit==6.2.3
geode-explicit==6.3.0
# via
# -r requirements.in
# geode-implicit
geode-implicit==3.9.4
geode-implicit==4.1.1
# via -r requirements.in
geode-numerics==6.2.2
geode-numerics==6.3.0
# via
# -r requirements.in
# geode-implicit
# geode-simplex
geode-simplex==9.4.2
geode-simplex==9.6.0
# via
# -r requirements.in
# geode-implicit
geode-viewables==3.1.4
geode-viewables==3.2.0
# via -r requirements.in
itsdangerous==2.2.0
# via flask
Expand All @@ -67,7 +63,7 @@ markupsafe==3.0.2
# flask
# jinja2
# werkzeug
opengeode-core==15.21.2
opengeode-core==15.24.1
# via
# -r requirements.in
# geode-background
Expand All @@ -82,40 +78,30 @@ opengeode-core==15.21.2
# opengeode-geosciencesio
# opengeode-inspector
# opengeode-io
opengeode-geosciences==9.0.0
opengeode-geosciences==9.2.1
# via
# -r requirements.in
# geode-implicit
# geode-viewables
# opengeode-geosciencesio
opengeode-geosciencesio==5.4.2
opengeode-geosciencesio==5.7.1
# via
# -r requirements.in
# geode-implicit
opengeode-inspector==6.6.1
opengeode-inspector==6.7.0
# via
# -r requirements.in
# geode-explicit
# geode-implicit
# geode-simplex
opengeode-io==7.2.1
opengeode-io==7.3.1
# via
# -r requirements.in
# geode-implicit
# geode-viewables
# opengeode-geosciencesio
referencing==0.36.2
# via
# jsonschema
# jsonschema-specifications
rpds-py==0.25.1
# via
# jsonschema
# referencing
typing-extensions==4.14.0
# via referencing
werkzeug==3.1.3
# via
# -r requirements.in
# flask
# flask-cors
# flask-cors
15 changes: 13 additions & 2 deletions src/opengeodeweb_back/geode_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def output_factory(geode_object: str):
return geode_object_value(geode_object)["output_factory"]


def missing_files(geode_object: str, file_absolute_path: str):
return geode_object_value(geode_object)["missing_files"](file_absolute_path)
def additional_files(geode_object: str, file_absolute_path: str):
return geode_object_value(geode_object)["additional_files"](file_absolute_path)


def is_loadable(geode_object: str, file_absolute_path: str):
Expand Down Expand Up @@ -291,3 +291,14 @@ def create_coordinate_system(
create_crs(
geode_object, data, name, input_coordiante_system, output_coordiante_system
)


# def file_exists_in_upload(filename: str) -> bool:
# """Vérifie si un fichier existe dans le dossier d'upload."""
# file_path = upload_file_path(filename)
# return os.path.exists(file_path)

# def file_exists_in_data(data_id: str, filename: str) -> bool:
# """Vérifie si un fichier existe dans le dossier de données."""
# file_path = data_file_path(data_id, filename)
# return os.path.exists(file_path)
Copy link
Member

@BotellaA BotellaA Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a supprimer ?

50 changes: 25 additions & 25 deletions src/opengeodeweb_back/geode_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def geode_objects_dict():
"class": og.BRep,
"input_factory": og.BRepInputFactory,
"output_factory": og.BRepOutputFactory,
"missing_files": og.check_brep_missing_files,
"additional_files": og.brep_additional_files,
"is_loadable": og.is_brep_loadable,
"load": og.load_brep,
"is_saveable": og.is_brep_saveable,
Expand All @@ -48,7 +48,7 @@ def geode_objects_dict():
"class": og_gs.CrossSection,
"input_factory": og_gs.CrossSectionInputFactory,
"output_factory": og_gs.CrossSectionOutputFactory,
"missing_files": og_gs.check_cross_section_missing_files,
"additional_files": og_gs.cross_section_additional_files,
"is_loadable": og_gs.is_cross_section_loadable,
"load": og_gs.load_cross_section,
"is_saveable": og_gs.is_cross_section_saveable,
Expand All @@ -70,7 +70,7 @@ def geode_objects_dict():
"class": og.EdgedCurve2D,
"input_factory": og.EdgedCurveInputFactory2D,
"output_factory": og.EdgedCurveOutputFactory2D,
"missing_files": og.check_edged_curve_missing_files2D,
"additional_files": og.edged_curve_additional_files2D,
"is_loadable": og.is_edged_curve_loadable2D,
"load": og.load_edged_curve2D,
"is_saveable": og.is_edged_curve_saveable2D,
Expand All @@ -93,7 +93,7 @@ def geode_objects_dict():
"class": og.EdgedCurve3D,
"input_factory": og.EdgedCurveInputFactory3D,
"output_factory": og.EdgedCurveOutputFactory3D,
"missing_files": og.check_edged_curve_missing_files3D,
"additional_files": og.edged_curve_additional_files3D,
"is_loadable": og.is_edged_curve_loadable3D,
"load": og.load_edged_curve3D,
"is_saveable": og.is_edged_curve_saveable3D,
Expand All @@ -116,7 +116,7 @@ def geode_objects_dict():
"class": og.Graph,
"input_factory": og.GraphInputFactory,
"output_factory": og.GraphOutputFactory,
"missing_files": og.check_graph_missing_files,
"additional_files": og.graph_additional_files,
"is_loadable": og.is_graph_loadable,
"load": og.load_graph,
"is_saveable": og.is_graph_saveable,
Expand All @@ -130,7 +130,7 @@ def geode_objects_dict():
"class": og.HybridSolid3D,
"input_factory": og.HybridSolidInputFactory3D,
"output_factory": og.HybridSolidOutputFactory3D,
"missing_files": og.check_hybrid_solid_missing_files3D,
"additional_files": og.hybrid_solid_additional_files3D,
"is_loadable": og.is_hybrid_solid_loadable3D,
"load": og.load_hybrid_solid3D,
"is_saveable": og.is_hybrid_solid_saveable3D,
Expand All @@ -154,7 +154,7 @@ def geode_objects_dict():
"class": og_gs.ImplicitCrossSection,
"input_factory": og_gs.ImplicitCrossSectionInputFactory,
"output_factory": og_gs.ImplicitCrossSectionOutputFactory,
"missing_files": og_gs.check_implicit_cross_section_missing_files,
"additional_files": og_gs.implicit_cross_section_additional_files,
"is_loadable": og_gs.is_implicit_cross_section_loadable,
"load": og_gs.load_implicit_cross_section,
"is_saveable": og_gs.is_implicit_cross_section_saveable,
Expand All @@ -177,7 +177,7 @@ def geode_objects_dict():
"class": og_gs.ImplicitStructuralModel,
"input_factory": og_gs.ImplicitStructuralModelInputFactory,
"output_factory": og_gs.ImplicitStructuralModelOutputFactory,
"missing_files": og_gs.check_implicit_structural_model_missing_files,
"additional_files": og_gs.implicit_structural_model_additional_files,
"is_loadable": og_gs.is_implicit_structural_model_loadable,
"load": og_gs.load_implicit_structural_model,
"is_saveable": og_gs.is_implicit_structural_model_saveable,
Expand All @@ -199,7 +199,7 @@ def geode_objects_dict():
"class": og.LightRegularGrid2D,
"input_factory": og.LightRegularGridInputFactory2D,
"output_factory": og.LightRegularGridOutputFactory2D,
"missing_files": og.check_light_regular_grid_missing_files2D,
"additional_files": og.light_regular_grid_additional_files2D,
"is_loadable": og.is_light_regular_grid_loadable2D,
"load": og.load_light_regular_grid2D,
"is_saveable": og.is_light_regular_grid_saveable2D,
Expand All @@ -215,7 +215,7 @@ def geode_objects_dict():
"class": og.LightRegularGrid3D,
"input_factory": og.LightRegularGridInputFactory3D,
"output_factory": og.LightRegularGridOutputFactory3D,
"missing_files": og.check_light_regular_grid_missing_files3D,
"additional_files": og.light_regular_grid_additional_files3D,
"is_loadable": og.is_light_regular_grid_loadable3D,
"load": og.load_light_regular_grid3D,
"is_saveable": og.is_light_regular_grid_saveable3D,
Expand All @@ -231,7 +231,7 @@ def geode_objects_dict():
"class": og.PointSet2D,
"input_factory": og.PointSetInputFactory2D,
"output_factory": og.PointSetOutputFactory2D,
"missing_files": og.check_point_set_missing_files2D,
"additional_files": og.point_set_additional_files2D,
"is_loadable": og.is_point_set_loadable2D,
"load": og.load_point_set2D,
"is_saveable": og.is_point_set_saveable2D,
Expand All @@ -254,7 +254,7 @@ def geode_objects_dict():
"class": og.PointSet3D,
"input_factory": og.PointSetInputFactory3D,
"output_factory": og.PointSetOutputFactory3D,
"missing_files": og.check_point_set_missing_files3D,
"additional_files": og.point_set_additional_files3D,
"is_loadable": og.is_point_set_loadable3D,
"load": og.load_point_set3D,
"is_saveable": og.is_point_set_saveable3D,
Expand All @@ -277,7 +277,7 @@ def geode_objects_dict():
"class": og.PolygonalSurface2D,
"input_factory": og.PolygonalSurfaceInputFactory2D,
"output_factory": og.PolygonalSurfaceOutputFactory2D,
"missing_files": og.check_polygonal_surface_missing_files2D,
"additional_files": og.polygonal_surface_additional_files2D,
"is_loadable": og.is_polygonal_surface_loadable2D,
"load": og.load_polygonal_surface2D,
"is_saveable": og.is_polygonal_surface_saveable2D,
Expand All @@ -300,7 +300,7 @@ def geode_objects_dict():
"class": og.PolygonalSurface3D,
"input_factory": og.PolygonalSurfaceInputFactory3D,
"output_factory": og.PolygonalSurfaceOutputFactory3D,
"missing_files": og.check_polygonal_surface_missing_files3D,
"additional_files": og.polygonal_surface_additional_files3D,
"is_loadable": og.is_polygonal_surface_loadable3D,
"load": og.load_polygonal_surface3D,
"is_saveable": og.is_polygonal_surface_saveable3D,
Expand All @@ -323,7 +323,7 @@ def geode_objects_dict():
"class": og.PolyhedralSolid3D,
"input_factory": og.PolyhedralSolidInputFactory3D,
"output_factory": og.PolyhedralSolidOutputFactory3D,
"missing_files": og.check_polyhedral_solid_missing_files3D,
"additional_files": og.polyhedral_solid_additional_files3D,
"is_loadable": og.is_polyhedral_solid_loadable3D,
"load": og.load_polyhedral_solid3D,
"is_saveable": og.is_polyhedral_solid_saveable3D,
Expand All @@ -346,7 +346,7 @@ def geode_objects_dict():
"class": og.RasterImage2D,
"input_factory": og.RasterImageInputFactory2D,
"output_factory": og.RasterImageOutputFactory2D,
"missing_files": og.check_raster_image_missing_files2D,
"additional_files": og.raster_image_additional_files2D,
"is_loadable": og.is_raster_image_loadable2D,
"load": og.load_raster_image2D,
"is_saveable": og.is_raster_image_saveable2D,
Expand All @@ -360,7 +360,7 @@ def geode_objects_dict():
"class": og.RasterImage3D,
"input_factory": og.RasterImageInputFactory3D,
"output_factory": og.RasterImageOutputFactory3D,
"missing_files": og.check_raster_image_missing_files3D,
"additional_files": og.raster_image_additional_files3D,
"is_loadable": og.is_raster_image_loadable3D,
"load": og.load_raster_image3D,
"is_saveable": og.is_raster_image_saveable3D,
Expand All @@ -374,7 +374,7 @@ def geode_objects_dict():
"class": og.RegularGrid2D,
"input_factory": og.RegularGridInputFactory2D,
"output_factory": og.RegularGridOutputFactory2D,
"missing_files": og.check_regular_grid_missing_files2D,
"additional_files": og.regular_grid_additional_files2D,
"is_loadable": og.is_regular_grid_loadable2D,
"load": og.load_regular_grid2D,
"is_saveable": og.is_regular_grid_saveable2D,
Expand All @@ -396,7 +396,7 @@ def geode_objects_dict():
"class": og.RegularGrid3D,
"input_factory": og.RegularGridInputFactory3D,
"output_factory": og.RegularGridOutputFactory3D,
"missing_files": og.check_regular_grid_missing_files3D,
"additional_files": og.regular_grid_additional_files3D,
"is_loadable": og.is_regular_grid_loadable3D,
"load": og.load_regular_grid3D,
"is_saveable": og.is_regular_grid_saveable3D,
Expand All @@ -418,7 +418,7 @@ def geode_objects_dict():
"class": og.Section,
"input_factory": og.SectionInputFactory,
"output_factory": og.SectionOutputFactory,
"missing_files": og.check_section_missing_files,
"additional_files": og.section_additional_files,
"is_loadable": og.is_section_loadable,
"load": og.load_section,
"is_saveable": og.is_section_saveable,
Expand All @@ -441,7 +441,7 @@ def geode_objects_dict():
"class": og_gs.StructuralModel,
"input_factory": og_gs.StructuralModelInputFactory,
"output_factory": og_gs.StructuralModelOutputFactory,
"missing_files": og_gs.check_structural_model_missing_files,
"additional_files": og_gs.structural_model_additional_files,
"is_loadable": og_gs.is_structural_model_loadable,
"load": og_gs.load_structural_model,
"is_saveable": og_gs.is_structural_model_saveable,
Expand All @@ -463,7 +463,7 @@ def geode_objects_dict():
"class": og.TetrahedralSolid3D,
"input_factory": og.TetrahedralSolidInputFactory3D,
"output_factory": og.TetrahedralSolidOutputFactory3D,
"missing_files": og.check_tetrahedral_solid_missing_files3D,
"additional_files": og.tetrahedral_solid_additional_files3D,
"is_loadable": og.is_tetrahedral_solid_loadable3D,
"load": og.load_tetrahedral_solid3D,
"is_saveable": og.is_tetrahedral_solid_saveable3D,
Expand All @@ -486,7 +486,7 @@ def geode_objects_dict():
"class": og.TriangulatedSurface2D,
"input_factory": og.TriangulatedSurfaceInputFactory2D,
"output_factory": og.TriangulatedSurfaceOutputFactory2D,
"missing_files": og.check_triangulated_surface_missing_files2D,
"additional_files": og.triangulated_surface_additional_files2D,
"is_loadable": og.is_triangulated_surface_loadable2D,
"load": og.load_triangulated_surface2D,
"is_saveable": og.is_triangulated_surface_saveable2D,
Expand All @@ -509,7 +509,7 @@ def geode_objects_dict():
"class": og.TriangulatedSurface3D,
"input_factory": og.TriangulatedSurfaceInputFactory3D,
"output_factory": og.TriangulatedSurfaceOutputFactory3D,
"missing_files": og.check_triangulated_surface_missing_files3D,
"additional_files": og.triangulated_surface_additional_files3D,
"is_loadable": og.is_triangulated_surface_loadable3D,
"load": og.load_triangulated_surface3D,
"is_saveable": og.is_triangulated_surface_saveable3D,
Expand All @@ -532,7 +532,7 @@ def geode_objects_dict():
"class": og.VertexSet,
"input_factory": og.VertexSetInputFactory,
"output_factory": og.VertexSetOutputFactory,
"missing_files": og.check_vertex_set_missing_files,
"additional_files": og.vertex_set_additional_files,
"is_loadable": og.is_vertex_set_loadable,
"load": og.load_vertex_set,
"is_saveable": og.is_vertex_set_saveable,
Expand Down
Loading
Loading