Skip to content

Commit e9732fb

Browse files
committed
edit models' blueprint & test
1 parent f58f296 commit e9732fb

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

src/opengeodeweb_back/routes/models/blueprint_models.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,13 @@ def uuid_to_flat_index():
5454

5555
def extract_model_uuids(geode_object, file_path):
5656
model = geode_functions.load(geode_object, file_path)
57-
components = {
58-
"blocks": getattr(model, "blocks", lambda: [])(),
59-
"lines": getattr(model, "lines", lambda: [])(),
60-
"surfaces": getattr(model, "surfaces", lambda: [])(),
61-
"corners": getattr(model, "corners", lambda: [])(),
62-
}
63-
64-
uuid_dict = {
65-
key: [
66-
component.id().string()
67-
for component in components[key]
68-
if hasattr(component, "id")
69-
]
70-
for key in components
71-
if components[key]
72-
}
57+
mesh_components = model.mesh_components()
58+
59+
uuid_dict = {}
60+
61+
for mesh_component, ids in mesh_components.items():
62+
component_name = mesh_component.get()
63+
uuid_dict[component_name] = [id.string() for id in ids]
7364

7465
print(f"{uuid_dict=}", flush=True)
7566
return uuid_dict

tests/test_models_routes.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ def test_extract_brep_uuids(client):
2828
uuid_dict = response.json
2929
assert isinstance(uuid_dict, dict)
3030
assert (
31-
"blocks" in uuid_dict
32-
or "lines" in uuid_dict
33-
or "surfaces" in uuid_dict
34-
or "corners" in uuid_dict
31+
"Block" in uuid_dict
32+
or "Line" in uuid_dict
33+
or "Surface" in uuid_dict
34+
or "Corner" in uuid_dict
3535
)
36-
assert False

0 commit comments

Comments
 (0)