OpenGeodeWeb-Back 1.3.0rc2__tar.gz → 1.3.0rc4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. {OpenGeodeWeb-Back-1.3.0rc2/src/OpenGeodeWeb_Back.egg-info → OpenGeodeWeb-Back-1.3.0rc4}/PKG-INFO +7 -7
  2. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/pyproject.toml +1 -1
  3. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/requirements.txt +6 -6
  4. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO +7 -7
  5. OpenGeodeWeb-Back-1.3.0rc4/src/OpenGeodeWeb_Back.egg-info/requires.txt +7 -0
  6. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/opengeodeweb_back/geode_functions.py +63 -63
  7. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/opengeodeweb_back/geode_objects.py +45 -49
  8. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/tests/test_functions.py +61 -34
  9. OpenGeodeWeb-Back-1.3.0rc2/src/OpenGeodeWeb_Back.egg-info/requires.txt +0 -7
  10. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/LICENSE +0 -0
  11. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/README.md +0 -0
  12. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/setup.cfg +0 -0
  13. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt +0 -0
  14. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/OpenGeodeWeb_Back.egg-info/dependency_links.txt +0 -0
  15. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/OpenGeodeWeb_Back.egg-info/top_level.txt +0 -0
  16. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/opengeodeweb_back/__init__.py +0 -0
  17. {OpenGeodeWeb-Back-1.3.0rc2 → OpenGeodeWeb-Back-1.3.0rc4}/src/opengeodeweb_back/inspector_functions.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: OpenGeodeWeb-Back
3
- Version: 1.3.0rc2
3
+ Version: 1.3.0rc4
4
4
  Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -11,13 +11,13 @@ Classifier: Operating System :: OS Independent
11
11
  Requires-Python: >=3.8
12
12
  Description-Content-Type: text/markdown
13
13
  License-File: LICENSE
14
- Requires-Dist: geode-common==26.3.0
15
- Requires-Dist: geode-viewables==2.1.0
16
- Requires-Dist: opengeode-core==14.9.0
17
- Requires-Dist: opengeode-geosciences==7.2.0
18
- Requires-Dist: opengeode-geosciencesio==4.5.0
14
+ Requires-Dist: geode-common==29.0.0
15
+ Requires-Dist: geode-viewables==2.1.2
16
+ Requires-Dist: opengeode-core==14.9.1
17
+ Requires-Dist: opengeode-geosciences==7.2.1
18
+ Requires-Dist: opengeode-geosciencesio==4.5.1
19
19
  Requires-Dist: opengeode-inspector==4.0.0
20
- Requires-Dist: opengeode-io==6.2.0
20
+ Requires-Dist: opengeode-io==6.2.1
21
21
 
22
22
 
23
23
  <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
5
5
 
6
6
  [project]
7
7
  name = "OpenGeodeWeb-Back"
8
- version = "1.3.0-rc.2"
8
+ version = "1.3.0-rc.4"
9
9
  dynamic = ["dependencies"]
10
10
  authors = [
11
11
  { name="Geode-solutions", email="team-web@geode-solutions.com" },
@@ -4,11 +4,11 @@
4
4
  #
5
5
  # pip-compile --resolver=backtracking requirements.in
6
6
  #
7
- geode-common==26.3.0
7
+ geode-common==29.0.0
8
8
  # via geode-viewables
9
- geode-viewables==2.1.0
9
+ geode-viewables==2.1.2
10
10
  # via -r requirements.in
11
- opengeode-core==14.9.0
11
+ opengeode-core==14.9.1
12
12
  # via
13
13
  # -r requirements.in
14
14
  # geode-common
@@ -17,19 +17,19 @@ opengeode-core==14.9.0
17
17
  # opengeode-geosciencesio
18
18
  # opengeode-inspector
19
19
  # opengeode-io
20
- opengeode-geosciences==7.2.0
20
+ opengeode-geosciences==7.2.1
21
21
  # via
22
22
  # -r requirements.in
23
23
  # geode-viewables
24
24
  # opengeode-geosciencesio
25
25
  # opengeode-inspector
26
- opengeode-geosciencesio==4.5.0
26
+ opengeode-geosciencesio==4.5.1
27
27
  # via
28
28
  # -r requirements.in
29
29
  # opengeode-inspector
30
30
  opengeode-inspector==4.0.0
31
31
  # via -r requirements.in
32
- opengeode-io==6.2.0
32
+ opengeode-io==6.2.1
33
33
  # via
34
34
  # -r requirements.in
35
35
  # geode-viewables
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: OpenGeodeWeb-Back
3
- Version: 1.3.0rc2
3
+ Version: 1.3.0rc4
4
4
  Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -11,13 +11,13 @@ Classifier: Operating System :: OS Independent
11
11
  Requires-Python: >=3.8
12
12
  Description-Content-Type: text/markdown
13
13
  License-File: LICENSE
14
- Requires-Dist: geode-common==26.3.0
15
- Requires-Dist: geode-viewables==2.1.0
16
- Requires-Dist: opengeode-core==14.9.0
17
- Requires-Dist: opengeode-geosciences==7.2.0
18
- Requires-Dist: opengeode-geosciencesio==4.5.0
14
+ Requires-Dist: geode-common==29.0.0
15
+ Requires-Dist: geode-viewables==2.1.2
16
+ Requires-Dist: opengeode-core==14.9.1
17
+ Requires-Dist: opengeode-geosciences==7.2.1
18
+ Requires-Dist: opengeode-geosciencesio==4.5.1
19
19
  Requires-Dist: opengeode-inspector==4.0.0
20
- Requires-Dist: opengeode-io==6.2.0
20
+ Requires-Dist: opengeode-io==6.2.1
21
21
 
22
22
 
23
23
  <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>
@@ -0,0 +1,7 @@
1
+ geode-common==29.0.0
2
+ geode-viewables==2.1.2
3
+ opengeode-core==14.9.1
4
+ opengeode-geosciences==7.2.1
5
+ opengeode-geosciencesio==4.5.1
6
+ opengeode-inspector==4.0.0
7
+ opengeode-io==6.2.1
@@ -13,43 +13,47 @@ import pkg_resources
13
13
  import werkzeug
14
14
 
15
15
  # Local application imports
16
- from .geode_objects import objects_list
16
+ from .geode_objects import geode_objects_dict
17
17
 
18
18
 
19
- def get_input_factory(geode_object: str):
20
- return objects_list()[geode_object]["input_factory"]
19
+ def geode_object_value(geode_object: str):
20
+ return geode_objects_dict()[geode_object]
21
21
 
22
22
 
23
- def get_output_factory(geode_object: str):
24
- return objects_list()[geode_object]["output_factory"]
23
+ def input_factory(geode_object: str):
24
+ return geode_object_value(geode_object)["input_factory"]
25
+
26
+
27
+ def output_factory(geode_object: str):
28
+ return geode_object_value(geode_object)["output_factory"]
25
29
 
26
30
 
27
31
  def missing_files(geode_object: str, file_absolute_path: str):
28
- return objects_list()[geode_object]["missing_files"](file_absolute_path)
32
+ return geode_object_value(geode_object)["missing_files"](file_absolute_path)
29
33
 
30
34
 
31
35
  def load(geode_object: str, file_absolute_path: str):
32
- return objects_list()[geode_object]["load"](file_absolute_path)
36
+ return geode_object_value(geode_object)["load"](file_absolute_path)
33
37
 
34
38
 
35
39
  def save(geode_object: str, data, folder_absolute_path: str, filename: str):
36
- return objects_list()[geode_object]["save"](
40
+ return geode_object_value(geode_object)["save"](
37
41
  data, os.path.join(folder_absolute_path, filename)
38
42
  )
39
43
 
40
44
 
41
45
  def create_builder(geode_object: str, data):
42
- return objects_list()[geode_object]["builder"](data)
46
+ return geode_object_value(geode_object)["builder"](data)
43
47
 
44
48
 
45
49
  def assign_crs(geode_object: str, data, crs_name: str, info):
46
50
  builder = create_builder(geode_object, data)
47
- objects_list()[geode_object]["crs"]["assign"](data, builder, crs_name, info)
51
+ geode_object_value(geode_object)["crs"]["assign"](data, builder, crs_name, info)
48
52
 
49
53
 
50
54
  def convert_crs(geode_object: str, data, crs_name: str, info):
51
55
  builder = create_builder(geode_object, data)
52
- objects_list()[geode_object]["crs"]["convert"](data, builder, crs_name, info)
56
+ geode_object_value(geode_object)["crs"]["convert"](data, builder, crs_name, info)
53
57
 
54
58
 
55
59
  def create_crs(
@@ -60,70 +64,57 @@ def create_crs(
60
64
  output_coordiante_system,
61
65
  ):
62
66
  builder = create_builder(geode_object, data)
63
- objects_list()[geode_object]["crs"]["create"](
67
+ geode_object_value(geode_object)["crs"]["create"](
64
68
  data, builder, name, input_coordiante_system, output_coordiante_system
65
69
  )
66
70
 
67
71
 
68
72
  def is_model(geode_object: str):
69
- return objects_list()[geode_object]["is_model"]
73
+ return geode_object_value(geode_object)["is_model"]
70
74
 
71
75
 
72
76
  def is_3D(geode_object: str):
73
- return objects_list()[geode_object]["is_3D"]
77
+ return geode_object_value(geode_object)["is_3D"]
74
78
 
75
79
 
76
80
  def is_viewable(geode_object: str):
77
- return objects_list()[geode_object]["is_viewable"]
81
+ return geode_object_value(geode_object)["is_viewable"]
78
82
 
79
83
 
80
- def get_inspector(geode_object: str, data):
81
- return objects_list()[geode_object]["inspector"](data)
84
+ def inspector(geode_object: str, data):
85
+ return geode_object_value(geode_object)["inspector"](data)
82
86
 
83
87
 
84
88
  def save_viewable(geode_object: str, data, folder_absolute_path: str, id: str):
85
- return objects_list()[geode_object]["save_viewable"](
89
+ return geode_object_value(geode_object)["save_viewable"](
86
90
  data, os.path.join(folder_absolute_path, id)
87
91
  )
88
92
 
89
93
 
90
- def get_geode_object_input_extensions(geode_object: str):
91
- inputs_list = []
92
- geode_object_inputs = get_input_factory(geode_object)
93
- for input in geode_object_inputs:
94
- list_creators = input.list_creators()
95
- inputs_list = inputs_list + list_creators
96
- inputs_list = list(set(inputs_list))
97
- inputs_list.sort()
98
- return inputs_list
99
-
94
+ def geode_object_input_extensions(geode_object: str):
95
+ geode_object_input_list_creators = input_factory(geode_object).list_creators()
96
+ geode_object_input_list_creators.sort()
97
+ return geode_object_input_list_creators
100
98
 
101
- def get_geode_object_output_extensions(geode_object: str):
102
- output_list = []
103
- geode_object_outputs = get_output_factory(geode_object)
104
99
 
105
- for output in geode_object_outputs:
106
- list_creators = output.list_creators()
107
- output_list = output_list + list_creators
108
- output_list = list(set(output_list))
109
- output_list.sort()
110
- return output_list
100
+ def geode_object_output_extensions(geode_object: str):
101
+ geode_object_output_list_creators = output_factory(geode_object).list_creators()
102
+ geode_object_output_list_creators.sort()
103
+ return geode_object_output_list_creators
111
104
 
112
105
 
113
106
  def list_input_extensions(key: str = None):
114
107
  extensions_list = []
115
- for geode_object, value in objects_list().items():
108
+ for geode_object, value in geode_objects_dict().items():
116
109
  if key != None:
117
110
  if key in value:
118
111
  if type(value[key]) == bool:
119
112
  if value[key] == True:
120
- extensions_list += get_geode_object_input_extensions(
121
- geode_object
122
- )
113
+ extensions_list += geode_object_input_extensions(geode_object)
123
114
  else:
124
- extensions_list += get_geode_object_input_extensions(geode_object)
115
+ extensions_list += geode_object_input_extensions(geode_object)
125
116
  else:
126
- extensions_list += get_geode_object_input_extensions(geode_object)
117
+ extensions_list += geode_object_input_extensions(geode_object)
127
118
 
128
119
  extensions_list = list(set(extensions_list))
129
120
  extensions_list.sort()
@@ -131,16 +122,12 @@ def list_input_extensions(key: str = None):
131
122
 
132
123
 
133
124
  def has_creator(geode_object: str, extension: str):
134
- geode_object_input_factory = get_input_factory(geode_object)
135
- for input in geode_object_input_factory:
136
- if input.has_creator(extension):
137
- return True
138
- return False
125
+ return input_factory(geode_object).has_creator(extension)
139
126
 
140
127
 
141
128
  def list_geode_objects(extension: str, key: str = None):
142
129
  geode_objects_list = []
143
- for geode_object, value in objects_list().items():
130
+ for geode_object, value in geode_objects_dict().items():
144
131
  if key != None:
145
132
  if key in value:
146
133
  if type(value[key]) == bool:
@@ -157,7 +144,24 @@ def list_geode_objects(extension: str, key: str = None):
157
144
  return geode_objects_list
158
145
 
159
146
 
160
- def get_versions(list_packages: list):
147
+ def geode_objects_output_extensions(geode_object: str):
148
+ return_list = []
149
+ geode_object_dict = {}
150
+ geode_object_dict["geode_object"] = geode_object
151
+ geode_object_dict["output_extensions"] = geode_object_output_extensions(
152
+ geode_object
153
+ )
154
+
155
+ return_list.append(geode_object_dict)
156
+
157
+ if "parent" in geode_object_value(geode_object).keys():
158
+ parent_key = geode_object_value(geode_object)["parent"]
159
+ return_list += geode_objects_output_extensions(parent_key)
160
+
161
+ return return_list
162
+
163
+
164
+ def versions(list_packages: list):
161
165
  list_with_versions = []
162
166
  for package in list_packages:
163
167
  list_with_versions.append(
@@ -226,11 +230,11 @@ def set_interval(func, sec):
226
230
  return t
227
231
 
228
232
 
229
- def get_extension_from_filename(filename):
233
+ def extension_from_filename(filename):
230
234
  return os.path.splitext(filename)[1][1:]
231
235
 
232
236
 
233
- def get_form_variables(form, variables_array):
237
+ def form_variables(form, variables_array):
234
238
  variables_dict = {}
235
239
  for variable in variables_array:
236
240
  if form.get(variable) is None:
@@ -240,14 +244,14 @@ def get_form_variables(form, variables_array):
240
244
  return variables_dict
241
245
 
242
246
 
243
- def get_geographic_coordinate_systems(geode_object: str):
247
+ def geographic_coordinate_systems(geode_object: str):
244
248
  if is_3D(geode_object):
245
249
  return og_gs.GeographicCoordinateSystem3D.geographic_coordinate_systems()
246
250
  else:
247
251
  return og_gs.GeographicCoordinateSystem2D.geographic_coordinate_systems()
248
252
 
249
253
 
250
- def get_geographic_coordinate_systems_info(geode_object: str, crs):
254
+ def geographic_coordinate_systems_info(geode_object: str, crs):
251
255
  if is_3D(geode_object):
252
256
  return og_gs.GeographicCoordinateSystemInfo3D(
253
257
  crs["authority"], crs["code"], crs["name"]
@@ -258,7 +262,7 @@ def get_geographic_coordinate_systems_info(geode_object: str, crs):
258
262
  )
259
263
 
260
264
 
261
- def get_coordinate_system(geode_object: str, coordinate_system):
265
+ def coordinate_system(geode_object: str, coordinate_system):
262
266
  return og.CoordinateSystem2D(
263
267
  [
264
268
  og.Vector2D(
@@ -283,24 +287,20 @@ def get_coordinate_system(geode_object: str, coordinate_system):
283
287
 
284
288
 
285
289
  def assign_geographic_coordinate_system_info(geode_object: str, data, input_crs):
286
- info = get_geographic_coordinate_systems_info(geode_object, input_crs)
290
+ info = geographic_coordinate_systems_info(geode_object, input_crs)
287
291
  assign_crs(geode_object, data, input_crs["name"], info)
288
292
 
289
293
 
290
294
  def convert_geographic_coordinate_system_info(geode_object: str, data, output_crs):
291
- info = get_geographic_coordinate_systems_info(geode_object, output_crs)
295
+ info = geographic_coordinate_systems_info(geode_object, output_crs)
292
296
  convert_crs(geode_object, data, output_crs["name"], info)
293
297
 
294
298
 
295
299
  def create_coordinate_system(
296
300
  geode_object: str, data, name, input_coordinate_points, output_coordinate_points
297
301
  ):
298
- input_coordiante_system = get_coordinate_system(
299
- geode_object, input_coordinate_points
300
- )
301
- output_coordiante_system = get_coordinate_system(
302
- geode_object, output_coordinate_points
303
- )
302
+ input_coordiante_system = coordinate_system(geode_object, input_coordinate_points)
303
+ output_coordiante_system = coordinate_system(geode_object, output_coordinate_points)
304
304
  create_crs(
305
305
  geode_object, data, name, input_coordiante_system, output_coordiante_system
306
306
  )
@@ -6,11 +6,11 @@ import opengeode_geosciencesio as og_gs_io
6
6
  import geode_viewables as g_v
7
7
 
8
8
 
9
- def objects_list():
9
+ def geode_objects_dict():
10
10
  return {
11
11
  "BRep": {
12
- "input_factory": [og.BRepInputFactory],
13
- "output_factory": [og.BRepOutputFactory],
12
+ "input_factory": og.BRepInputFactory,
13
+ "output_factory": og.BRepOutputFactory,
14
14
  "missing_files": og.check_brep_missing_files,
15
15
  "load": og.load_brep,
16
16
  "save": og.save_brep,
@@ -27,11 +27,9 @@ def objects_list():
27
27
  "inspector": og_inspector.BRepInspector,
28
28
  },
29
29
  "CrossSection": {
30
- "input_factory": [og_gs.CrossSectionInputFactory],
31
- "output_factory": [
32
- og.SectionOutputFactory,
33
- og_gs.CrossSectionOutputFactory,
34
- ],
30
+ "parent": "Section",
31
+ "input_factory": og_gs.CrossSectionInputFactory,
32
+ "output_factory": og_gs.CrossSectionOutputFactory,
35
33
  "missing_files": og_gs.check_cross_section_missing_files,
36
34
  "load": og_gs.load_cross_section,
37
35
  "save": og_gs.save_cross_section,
@@ -48,8 +46,8 @@ def objects_list():
48
46
  "inspector": og_inspector.SectionInspector,
49
47
  },
50
48
  "EdgedCurve2D": {
51
- "input_factory": [og.EdgedCurveInputFactory2D],
52
- "output_factory": [og.EdgedCurveOutputFactory2D],
49
+ "input_factory": og.EdgedCurveInputFactory2D,
50
+ "output_factory": og.EdgedCurveOutputFactory2D,
53
51
  "missing_files": og.check_edged_curve_missing_files2D,
54
52
  "load": og.load_edged_curve2D,
55
53
  "save": og.save_edged_curve2D,
@@ -66,8 +64,8 @@ def objects_list():
66
64
  "inspector": og_inspector.EdgedCurveInspector2D,
67
65
  },
68
66
  "EdgedCurve3D": {
69
- "input_factory": [og.EdgedCurveInputFactory3D],
70
- "output_factory": [og.EdgedCurveOutputFactory3D],
67
+ "input_factory": og.EdgedCurveInputFactory3D,
68
+ "output_factory": og.EdgedCurveOutputFactory3D,
71
69
  "missing_files": og.check_edged_curve_missing_files3D,
72
70
  "load": og.load_edged_curve3D,
73
71
  "save": og.save_edged_curve3D,
@@ -84,8 +82,8 @@ def objects_list():
84
82
  "inspector": og_inspector.EdgedCurveInspector3D,
85
83
  },
86
84
  "Graph": {
87
- "input_factory": [og.GraphInputFactory],
88
- "output_factory": [og.GraphOutputFactory],
85
+ "input_factory": og.GraphInputFactory,
86
+ "output_factory": og.GraphOutputFactory,
89
87
  "missing_files": og.check_graph_missing_files,
90
88
  "load": og.load_graph,
91
89
  "save": og.save_graph,
@@ -95,8 +93,8 @@ def objects_list():
95
93
  "is_viewable": True,
96
94
  },
97
95
  "HybridSolid3D": {
98
- "input_factory": [og.HybridSolidInputFactory3D],
99
- "output_factory": [og.HybridSolidOutputFactory3D],
96
+ "input_factory": og.HybridSolidInputFactory3D,
97
+ "output_factory": og.HybridSolidOutputFactory3D,
100
98
  "missing_files": og.check_hybrid_solid_missing_files3D,
101
99
  "load": og.load_hybrid_solid3D,
102
100
  "save": og.save_hybrid_solid3D,
@@ -113,8 +111,8 @@ def objects_list():
113
111
  "inspector": og_inspector.SolidMeshInspector3D,
114
112
  },
115
113
  "PointSet2D": {
116
- "input_factory": [og.PointSetInputFactory2D],
117
- "output_factory": [og.PointSetOutputFactory2D],
114
+ "input_factory": og.PointSetInputFactory2D,
115
+ "output_factory": og.PointSetOutputFactory2D,
118
116
  "missing_files": og.check_point_set_missing_files2D,
119
117
  "load": og.load_point_set2D,
120
118
  "save": og.save_point_set2D,
@@ -131,8 +129,8 @@ def objects_list():
131
129
  "inspector": og_inspector.PointSetInspector2D,
132
130
  },
133
131
  "PointSet3D": {
134
- "input_factory": [og.PointSetInputFactory3D],
135
- "output_factory": [og.PointSetOutputFactory3D],
132
+ "input_factory": og.PointSetInputFactory3D,
133
+ "output_factory": og.PointSetOutputFactory3D,
136
134
  "missing_files": og.check_point_set_missing_files3D,
137
135
  "load": og.load_point_set3D,
138
136
  "save": og.save_point_set3D,
@@ -149,8 +147,8 @@ def objects_list():
149
147
  "inspector": og_inspector.PointSetInspector3D,
150
148
  },
151
149
  "PolygonalSurface2D": {
152
- "input_factory": [og.PolygonalSurfaceInputFactory2D],
153
- "output_factory": [og.PolygonalSurfaceOutputFactory2D],
150
+ "input_factory": og.PolygonalSurfaceInputFactory2D,
151
+ "output_factory": og.PolygonalSurfaceOutputFactory2D,
154
152
  "missing_files": og.check_polygonal_surface_missing_files2D,
155
153
  "load": og.load_polygonal_surface2D,
156
154
  "save": og.save_polygonal_surface2D,
@@ -167,8 +165,8 @@ def objects_list():
167
165
  "inspector": og_inspector.SurfaceMeshInspector2D,
168
166
  },
169
167
  "PolygonalSurface3D": {
170
- "input_factory": [og.PolygonalSurfaceInputFactory3D],
171
- "output_factory": [og.PolygonalSurfaceOutputFactory3D],
168
+ "input_factory": og.PolygonalSurfaceInputFactory3D,
169
+ "output_factory": og.PolygonalSurfaceOutputFactory3D,
172
170
  "missing_files": og.check_polygonal_surface_missing_files3D,
173
171
  "load": og.load_polygonal_surface3D,
174
172
  "save": og.save_polygonal_surface3D,
@@ -185,8 +183,8 @@ def objects_list():
185
183
  "inspector": og_inspector.SurfaceMeshInspector3D,
186
184
  },
187
185
  "PolyhedralSolid3D": {
188
- "input_factory": [og.PolyhedralSolidInputFactory3D],
189
- "output_factory": [og.PolyhedralSolidOutputFactory3D],
186
+ "input_factory": og.PolyhedralSolidInputFactory3D,
187
+ "output_factory": og.PolyhedralSolidOutputFactory3D,
190
188
  "missing_files": og.check_polyhedral_solid_missing_files3D,
191
189
  "load": og.load_polyhedral_solid3D,
192
190
  "save": og.save_polyhedral_solid3D,
@@ -203,8 +201,8 @@ def objects_list():
203
201
  "inspector": og_inspector.SolidMeshInspector3D,
204
202
  },
205
203
  "RasterImage2D": {
206
- "input_factory": [og.RasterImageInputFactory2D],
207
- "output_factory": [og.RasterImageOutputFactory2D],
204
+ "input_factory": og.RasterImageInputFactory2D,
205
+ "output_factory": og.RasterImageOutputFactory2D,
208
206
  "missing_files": og.check_raster_image_missing_files2D,
209
207
  "load": og.load_raster_image2D,
210
208
  "save": og.save_raster_image2D,
@@ -214,8 +212,8 @@ def objects_list():
214
212
  "save_viewable": g_v.save_viewable_raster_image2D,
215
213
  },
216
214
  "RasterImage3D": {
217
- "input_factory": [og.RasterImageInputFactory3D],
218
- "output_factory": [og.RasterImageOutputFactory3D],
215
+ "input_factory": og.RasterImageInputFactory3D,
216
+ "output_factory": og.RasterImageOutputFactory3D,
219
217
  "missing_files": og.check_raster_image_missing_files3D,
220
218
  "load": og.load_raster_image3D,
221
219
  "save": og.save_raster_image3D,
@@ -225,8 +223,8 @@ def objects_list():
225
223
  "save_viewable": g_v.save_viewable_raster_image3D,
226
224
  },
227
225
  "RegularGrid2D": {
228
- "input_factory": [og.RegularGridInputFactory2D],
229
- "output_factory": [og.RegularGridOutputFactory2D],
226
+ "input_factory": og.RegularGridInputFactory2D,
227
+ "output_factory": og.RegularGridOutputFactory2D,
230
228
  "missing_files": og.check_regular_grid_missing_files2D,
231
229
  "load": og.load_regular_grid2D,
232
230
  "save": og.save_regular_grid2D,
@@ -242,8 +240,8 @@ def objects_list():
242
240
  "save_viewable": g_v.save_viewable_regular_grid2D,
243
241
  },
244
242
  "RegularGrid3D": {
245
- "input_factory": [og.RegularGridInputFactory3D],
246
- "output_factory": [og.RegularGridOutputFactory3D],
243
+ "input_factory": og.RegularGridInputFactory3D,
244
+ "output_factory": og.RegularGridOutputFactory3D,
247
245
  "missing_files": og.check_regular_grid_missing_files3D,
248
246
  "load": og.load_regular_grid3D,
249
247
  "save": og.save_regular_grid3D,
@@ -259,8 +257,8 @@ def objects_list():
259
257
  "save_viewable": g_v.save_viewable_regular_grid3D,
260
258
  },
261
259
  "Section": {
262
- "input_factory": [og.SectionInputFactory],
263
- "output_factory": [og.SectionOutputFactory],
260
+ "input_factory": og.SectionInputFactory,
261
+ "output_factory": og.SectionOutputFactory,
264
262
  "missing_files": og.check_section_missing_files,
265
263
  "load": og.load_section,
266
264
  "save": og.save_section,
@@ -277,11 +275,9 @@ def objects_list():
277
275
  "inspector": og_inspector.SectionInspector,
278
276
  },
279
277
  "StructuralModel": {
280
- "input_factory": [og_gs.StructuralModelInputFactory],
281
- "output_factory": [
282
- og.BRepOutputFactory,
283
- og_gs.StructuralModelOutputFactory,
284
- ],
278
+ "parent": "BRep",
279
+ "input_factory": og_gs.StructuralModelInputFactory,
280
+ "output_factory": og_gs.StructuralModelOutputFactory,
285
281
  "missing_files": og_gs.check_structural_model_missing_files,
286
282
  "load": og_gs.load_structural_model,
287
283
  "save": og_gs.save_structural_model,
@@ -298,8 +294,8 @@ def objects_list():
298
294
  "inspector": og_inspector.BRepInspector,
299
295
  },
300
296
  "TetrahedralSolid3D": {
301
- "input_factory": [og.TetrahedralSolidInputFactory3D],
302
- "output_factory": [og.TetrahedralSolidOutputFactory3D],
297
+ "input_factory": og.TetrahedralSolidInputFactory3D,
298
+ "output_factory": og.TetrahedralSolidOutputFactory3D,
303
299
  "load": og.load_tetrahedral_solid3D,
304
300
  "missing_files": og.check_tetrahedral_solid_missing_files3D,
305
301
  "save": og.save_tetrahedral_solid3D,
@@ -316,8 +312,8 @@ def objects_list():
316
312
  "inspector": og_inspector.SolidMeshInspector3D,
317
313
  },
318
314
  "TriangulatedSurface2D": {
319
- "input_factory": [og.TriangulatedSurfaceInputFactory2D],
320
- "output_factory": [og.TriangulatedSurfaceOutputFactory2D],
315
+ "input_factory": og.TriangulatedSurfaceInputFactory2D,
316
+ "output_factory": og.TriangulatedSurfaceOutputFactory2D,
321
317
  "missing_files": og.check_triangulated_surface_missing_files2D,
322
318
  "load": og.load_triangulated_surface2D,
323
319
  "save": og.save_triangulated_surface2D,
@@ -334,8 +330,8 @@ def objects_list():
334
330
  "inspector": og_inspector.TriangulatedSurfaceInspector2D,
335
331
  },
336
332
  "TriangulatedSurface3D": {
337
- "input_factory": [og.TriangulatedSurfaceInputFactory3D],
338
- "output_factory": [og.TriangulatedSurfaceOutputFactory3D],
333
+ "input_factory": og.TriangulatedSurfaceInputFactory3D,
334
+ "output_factory": og.TriangulatedSurfaceOutputFactory3D,
339
335
  "missing_files": og.check_triangulated_surface_missing_files3D,
340
336
  "load": og.load_triangulated_surface3D,
341
337
  "save": og.save_triangulated_surface3D,
@@ -352,8 +348,8 @@ def objects_list():
352
348
  "inspector": og_inspector.TriangulatedSurfaceInspector3D,
353
349
  },
354
350
  "VertexSet": {
355
- "input_factory": [og.VertexSetInputFactory],
356
- "output_factory": [og.VertexSetOutputFactory],
351
+ "input_factory": og.VertexSetInputFactory,
352
+ "output_factory": og.VertexSetOutputFactory,
357
353
  "missing_files": og.check_vertex_set_missing_files,
358
354
  "load": og.load_vertex_set,
359
355
  "save": og.save_vertex_set,
@@ -2,23 +2,41 @@ import os
2
2
  from src.opengeodeweb_back import geode_functions, geode_objects
3
3
 
4
4
 
5
- def test_get_input_factory():
6
- for geode_object, value in geode_objects.objects_list().items():
7
- geode_object_input = geode_functions.get_input_factory(geode_object)
8
- assert type(geode_object_input) is list
5
+ def test_geode_object_value():
6
+ for geode_object, value in geode_objects.geode_objects_dict().items():
7
+ geode_object_value = geode_functions.geode_object_value(geode_object)
8
+ assert type(geode_object_value) is dict
9
9
 
10
10
 
11
- def test_get_output_factory():
12
- for geode_object, value in geode_objects.objects_list().items():
13
- geode_object_input = geode_functions.get_output_factory(geode_object)
14
- assert type(geode_object_input) is list
11
+ def test_input_factory():
12
+ for geode_object, value in geode_objects.geode_objects_dict().items():
13
+ geode_object_input = geode_functions.input_factory(geode_object)
14
+ assert type(geode_object_input.list_creators()) is list
15
15
 
16
16
 
17
- def test_missing_files():
18
- for geode_object, value in geode_objects.objects_list().items():
19
- input_extensions = geode_functions.get_geode_object_input_extensions(
17
+ def test_input_extensions():
18
+ for geode_object, value in geode_objects.geode_objects_dict().items():
19
+ geode_object_input_extensions = geode_functions.geode_object_input_extensions(
20
20
  geode_object
21
21
  )
22
+
23
+ assert type(geode_object_input_extensions) is list
24
+ for extension in geode_object_input_extensions:
25
+ assert type(extension) is str
26
+
27
+
28
+ def test_output_factory():
29
+ for geode_object, value in geode_objects.geode_objects_dict().items():
30
+ geode_object_output = geode_functions.output_factory(geode_object)
31
+ geode_object_output_list = geode_object_output.list_creators()
32
+ assert type(geode_object_output_list) is list
33
+ for output in geode_object_output_list:
34
+ assert type(output) is str
35
+
36
+
37
+ def test_missing_files():
38
+ for geode_object, value in geode_objects.geode_objects_dict().items():
39
+ input_extensions = geode_functions.geode_object_input_extensions(geode_object)
22
40
  for input_extension in input_extensions:
23
41
  file_absolute_path = os.path.abspath(f"tests/data/test.{input_extension}")
24
42
  missing_files = geode_functions.missing_files(
@@ -33,46 +51,42 @@ def test_missing_files():
33
51
 
34
52
 
35
53
  def test_is_model():
36
- for geode_object, value in geode_objects.objects_list().items():
54
+ for geode_object, value in geode_objects.geode_objects_dict().items():
37
55
  is_model = geode_functions.is_model(geode_object)
38
56
  assert type(is_model) is bool
39
57
 
40
58
 
41
59
  def test_is_3D():
42
- for geode_object, value in geode_objects.objects_list().items():
60
+ for geode_object, value in geode_objects.geode_objects_dict().items():
43
61
  is_3D = geode_functions.is_3D(geode_object)
44
62
  assert type(is_3D) is bool
45
63
 
46
64
 
47
65
  def test_is_viewable():
48
- for geode_object, value in geode_objects.objects_list().items():
66
+ for geode_object, value in geode_objects.geode_objects_dict().items():
49
67
  is_viewable = geode_functions.is_viewable(geode_object)
50
68
  assert type(is_viewable) is bool
51
69
 
52
70
 
53
- def test_get_geode_object_input_extensions():
54
- for geode_object, value in geode_objects.objects_list().items():
55
- input_extensions = geode_functions.get_geode_object_input_extensions(
56
- geode_object
57
- )
71
+ def test_geode_object_input_extensions():
72
+ for geode_object, value in geode_objects.geode_objects_dict().items():
73
+ input_extensions = geode_functions.geode_object_input_extensions(geode_object)
58
74
  assert type(input_extensions) is list
59
- for extension in input_extensions:
60
- assert type(extension) is str
75
+ for input_extension in input_extensions:
76
+ assert type(input_extension) is str
61
77
 
62
78
 
63
- def test_get_geode_object_output_extensions():
64
- for geode_object, value in geode_objects.objects_list().items():
65
- output_extensions = geode_functions.get_geode_object_output_extensions(
66
- geode_object
67
- )
79
+ def test_geode_object_output_extensions():
80
+ for geode_object, value in geode_objects.geode_objects_dict().items():
81
+ output_extensions = geode_functions.geode_object_output_extensions(geode_object)
68
82
  assert type(output_extensions) is list
69
- for extension in output_extensions:
70
- assert type(extension) is str
83
+ for output_extension in output_extensions:
84
+ assert type(output_extension) is str
71
85
 
72
86
 
73
87
  def test_list_input_extensions():
74
88
  keys_array = ["crs", "inspector", None]
75
- for geode_object, value in geode_objects.objects_list().items():
89
+ for geode_object, value in geode_objects.geode_objects_dict().items():
76
90
  for keys in keys_array:
77
91
  input_extensions = geode_functions.list_input_extensions(keys)
78
92
  assert type(input_extensions) is list
@@ -110,7 +124,7 @@ def test_list_geode_objects():
110
124
  invalid_geode_objects = test["invalid_geode_objects"]
111
125
 
112
126
  input_extensions = geode_functions.list_input_extensions(key)
113
- for geode_object, value in geode_objects.objects_list().items():
127
+ for geode_object, value in geode_objects.geode_objects_dict().items():
114
128
  for input_extension in input_extensions:
115
129
  geode_objects_list = geode_functions.list_geode_objects(
116
130
  input_extension, key
@@ -125,20 +139,33 @@ def test_list_geode_objects():
125
139
  assert len(geode_objects_list) >= 1
126
140
 
127
141
 
128
- def test_get_versions():
142
+ def test_geode_objects_output_extensions():
143
+ for geode_object, value in geode_objects.geode_objects_dict().items():
144
+ geode_objects_and_output_extensions_list = (
145
+ geode_functions.geode_objects_output_extensions(geode_object)
146
+ )
147
+ print(f"{geode_objects_and_output_extensions_list=}")
148
+ assert type(geode_objects_and_output_extensions_list) is list
149
+ for (
150
+ geode_object_and_output_extensions
151
+ ) in geode_objects_and_output_extensions_list:
152
+ assert type(geode_object_and_output_extensions) is dict
153
+
154
+
155
+ def test_versions():
129
156
  list_packages = [
130
157
  "OpenGeode-core",
131
158
  "OpenGeode-IO",
132
159
  "OpenGeode-Geosciences",
133
160
  "OpenGeode-GeosciencesIO",
134
161
  ]
135
- versions = geode_functions.get_versions(list_packages)
162
+ versions = geode_functions.versions(list_packages)
136
163
  assert type(versions) is list
137
164
  for version in versions:
138
165
  assert type(version) is dict
139
166
 
140
167
 
141
- def test_get_extension_from_filename():
142
- extension = geode_functions.get_extension_from_filename("test.toto")
168
+ def test_extension_from_filename():
169
+ extension = geode_functions.extension_from_filename("test.toto")
143
170
  assert type(extension) is str
144
171
  assert extension.count(".") == 0
@@ -1,7 +0,0 @@
1
- geode-common==26.3.0
2
- geode-viewables==2.1.0
3
- opengeode-core==14.9.0
4
- opengeode-geosciences==7.2.0
5
- opengeode-geosciencesio==4.5.0
6
- opengeode-inspector==4.0.0
7
- opengeode-io==6.2.0