OpenGeodeWeb-Microservice 1.0.15__tar.gz → 1.0.16rc1__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 (20) hide show
  1. {opengeodeweb_microservice-1.0.15/src/OpenGeodeWeb_Microservice.egg-info → opengeodeweb_microservice-1.0.16rc1}/PKG-INFO +1 -1
  2. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/pyproject.toml +1 -1
  3. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1/src/OpenGeodeWeb_Microservice.egg-info}/PKG-INFO +1 -1
  4. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/OpenGeodeWeb_Microservice.egg-info/SOURCES.txt +1 -0
  5. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/database/data.py +9 -6
  6. opengeodeweb_microservice-1.0.16rc1/src/opengeodeweb_microservice/database/data_types.py +72 -0
  7. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/LICENSE +0 -0
  8. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/README.md +0 -0
  9. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/requirements.txt +0 -0
  10. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/setup.cfg +0 -0
  11. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/OpenGeodeWeb_Microservice.egg-info/dependency_links.txt +0 -0
  12. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/OpenGeodeWeb_Microservice.egg-info/requires.txt +0 -0
  13. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/OpenGeodeWeb_Microservice.egg-info/top_level.txt +0 -0
  14. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/__init__.py +0 -0
  15. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/database/__init__.py +0 -0
  16. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/database/base.py +0 -0
  17. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/database/connection.py +0 -0
  18. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/py.typed +0 -0
  19. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/src/opengeodeweb_microservice/schemas.py +0 -0
  20. {opengeodeweb_microservice-1.0.15 → opengeodeweb_microservice-1.0.16rc1}/tests/test_database.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: OpenGeodeWeb-Microservice
3
- Version: 1.0.15
3
+ Version: 1.0.16rc1
4
4
  Summary: Database model and ORM layer for OpenGeodeWeb ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Microservice
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "OpenGeodeWeb-Microservice"
7
- version = "1.0.15"
7
+ version = "1.0.16-rc.1"
8
8
  dynamic = ["dependencies"]
9
9
  authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
10
10
  description = "Database model and ORM layer for OpenGeodeWeb ecosystem"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: OpenGeodeWeb-Microservice
3
- Version: 1.0.15
3
+ Version: 1.0.16rc1
4
4
  Summary: Database model and ORM layer for OpenGeodeWeb ecosystem
5
5
  Author-email: Geode-solutions <team-web@geode-solutions.com>
6
6
  Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Microservice
@@ -14,4 +14,5 @@ src/opengeodeweb_microservice/database/__init__.py
14
14
  src/opengeodeweb_microservice/database/base.py
15
15
  src/opengeodeweb_microservice/database/connection.py
16
16
  src/opengeodeweb_microservice/database/data.py
17
+ src/opengeodeweb_microservice/database/data_types.py
17
18
  tests/test_database.py
@@ -2,6 +2,7 @@ from sqlalchemy import String, JSON, select
2
2
  from sqlalchemy.orm import Mapped, mapped_column
3
3
  from .connection import get_session
4
4
  from .base import Base
5
+ from .data_types import GeodeObjectType, ViewerType, ViewerElementsType
5
6
  import uuid
6
7
 
7
8
 
@@ -11,18 +12,20 @@ class Data(Base):
11
12
  id: Mapped[str] = mapped_column(
12
13
  String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
13
14
  )
14
- geode_object: Mapped[str] = mapped_column(String, nullable=False)
15
- viewer_object: Mapped[str] = mapped_column(String, nullable=False)
16
- viewer_elements_type: Mapped[str] = mapped_column(String, nullable=False)
15
+ geode_object: Mapped[GeodeObjectType] = mapped_column(String, nullable=False)
16
+ viewer_object: Mapped[ViewerType] = mapped_column(String, nullable=False)
17
+ viewer_elements_type: Mapped[ViewerElementsType] = mapped_column(
18
+ String, nullable=False
19
+ )
17
20
  native_file: Mapped[str | None] = mapped_column(String, nullable=True)
18
21
  viewable_file: Mapped[str | None] = mapped_column(String, nullable=True)
19
22
  light_viewable_file: Mapped[str | None] = mapped_column(String, nullable=True)
20
23
 
21
24
  @staticmethod
22
25
  def create(
23
- geode_object: str,
24
- viewer_object: str,
25
- viewer_elements_type: str,
26
+ geode_object: GeodeObjectType,
27
+ viewer_object: ViewerType,
28
+ viewer_elements_type: ViewerElementsType,
26
29
  ) -> "Data":
27
30
  data_entry = Data(
28
31
  geode_object=geode_object,
@@ -0,0 +1,72 @@
1
+ from typing import Literal, get_args, cast
2
+
3
+ GeodePointMeshType = Literal[
4
+ "PointSet2D",
5
+ "PointSet3D",
6
+ ]
7
+ GeodeEdgeMeshType = Literal[
8
+ "EdgedCurve2D",
9
+ "EdgedCurve3D",
10
+ ]
11
+ GeodePolygonMeshType = Literal[
12
+ "RasterImage2D",
13
+ "PolygonalSurface2D",
14
+ "PolygonalSurface3D",
15
+ "TriangulatedSurface2D",
16
+ "TriangulatedSurface3D",
17
+ "RegularGrid2D",
18
+ "LightRegularGrid2D",
19
+ ]
20
+ GeodePolyhedronMeshType = Literal[
21
+ "RasterImage3D",
22
+ "PolyhedralSolid3D",
23
+ "TetrahedralSolid3D",
24
+ "HybridSolid3D",
25
+ "RegularGrid3D",
26
+ "LightRegularGrid3D",
27
+ ]
28
+ GeodeMeshType = (
29
+ Literal[
30
+ "VertexSet",
31
+ "Graph",
32
+ ]
33
+ | GeodePointMeshType
34
+ | GeodeEdgeMeshType
35
+ | GeodePolygonMeshType
36
+ | GeodePolyhedronMeshType
37
+ )
38
+ GeodeModelType = Literal[
39
+ "BRep",
40
+ "Section",
41
+ "StructuralModel",
42
+ "CrossSection",
43
+ "ImplicitStructuralModel",
44
+ "ImplicitCrossSection",
45
+ ]
46
+ GeodeObjectType = GeodeMeshType | GeodeModelType
47
+
48
+
49
+ def _flatten_literal_args(literal: object) -> tuple[str, ...]:
50
+ flattened: list[str] = []
51
+ for arg in get_args(literal):
52
+ if isinstance(arg, str):
53
+ flattened.append(arg)
54
+ else:
55
+ flattened.extend(_flatten_literal_args(arg))
56
+ return tuple(flattened)
57
+
58
+
59
+ GeodeObjectType_values = _flatten_literal_args(GeodeObjectType)
60
+
61
+
62
+ def geode_object_type(value: str) -> GeodeObjectType:
63
+ if value not in GeodeObjectType_values:
64
+ raise ValueError(
65
+ f"Invalid GeodeObjectType: {value!r}. Must be one of {GeodeObjectType_values}"
66
+ )
67
+ return cast(GeodeObjectType, value)
68
+
69
+
70
+ ViewerType = Literal["mesh", "model"]
71
+
72
+ ViewerElementsType = Literal["points", "edges", "polygons", "polyhedra", "default"]