OpenGeodeWeb-Microservice 1.3.2__tar.gz → 1.3.3__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.
- {opengeodeweb_microservice-1.3.2/src/OpenGeodeWeb_Microservice.egg-info → opengeodeweb_microservice-1.3.3}/PKG-INFO +1 -2
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/pyproject.toml +1 -1
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/requirements.txt +1 -3
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3/src/OpenGeodeWeb_Microservice.egg-info}/PKG-INFO +1 -2
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/OpenGeodeWeb_Microservice.egg-info/requires.txt +0 -1
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/database/data.py +15 -9
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/database/data_types.py +1 -1
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/schemas.py +2 -2
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/tests/test_database.py +10 -10
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/LICENSE +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/README.md +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/setup.cfg +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/OpenGeodeWeb_Microservice.egg-info/SOURCES.txt +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/OpenGeodeWeb_Microservice.egg-info/dependency_links.txt +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/OpenGeodeWeb_Microservice.egg-info/top_level.txt +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/__init__.py +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/database/__init__.py +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/database/base.py +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/database/connection.py +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/error.json +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/src/opengeodeweb_microservice/py.typed +0 -0
- {opengeodeweb_microservice-1.3.2 → opengeodeweb_microservice-1.3.3}/tests/test_schemas.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: OpenGeodeWeb-Microservice
|
|
3
|
-
Version: 1.3.
|
|
3
|
+
Version: 1.3.3
|
|
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
|
|
@@ -13,7 +13,6 @@ Description-Content-Type: text/markdown
|
|
|
13
13
|
License-File: LICENSE
|
|
14
14
|
Requires-Dist: dataclasses-json==0.6.7
|
|
15
15
|
Requires-Dist: fastjsonschema==2.21.1
|
|
16
|
-
Requires-Dist: greenlet==3.*
|
|
17
16
|
Requires-Dist: marshmallow==3.*
|
|
18
17
|
Requires-Dist: mypy-extensions==1.*
|
|
19
18
|
Requires-Dist: packaging==26.*
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "OpenGeodeWeb-Microservice"
|
|
7
|
-
version = "1.3.
|
|
7
|
+
version = "1.3.3"
|
|
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,5 +1,5 @@
|
|
|
1
1
|
#
|
|
2
|
-
# This file is autogenerated by pip-compile with Python 3.
|
|
2
|
+
# This file is autogenerated by pip-compile with Python 3.14
|
|
3
3
|
# by the following command:
|
|
4
4
|
#
|
|
5
5
|
# pip-compile --output-file=./requirements.txt ./requirements.in
|
|
@@ -8,8 +8,6 @@ dataclasses-json==0.6.7
|
|
|
8
8
|
# via -r requirements.in
|
|
9
9
|
fastjsonschema==2.21.1
|
|
10
10
|
# via -r requirements.in
|
|
11
|
-
greenlet==3.*
|
|
12
|
-
# via sqlalchemy
|
|
13
11
|
marshmallow==3.*
|
|
14
12
|
# via dataclasses-json
|
|
15
13
|
mypy-extensions==1.*
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: OpenGeodeWeb-Microservice
|
|
3
|
-
Version: 1.3.
|
|
3
|
+
Version: 1.3.3
|
|
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
|
|
@@ -13,7 +13,6 @@ Description-Content-Type: text/markdown
|
|
|
13
13
|
License-File: LICENSE
|
|
14
14
|
Requires-Dist: dataclasses-json==0.6.7
|
|
15
15
|
Requires-Dist: fastjsonschema==2.21.1
|
|
16
|
-
Requires-Dist: greenlet==3.*
|
|
17
16
|
Requires-Dist: marshmallow==3.*
|
|
18
17
|
Requires-Dist: mypy-extensions==1.*
|
|
19
18
|
Requires-Dist: packaging==26.*
|
|
@@ -5,7 +5,13 @@ from sqlalchemy.orm import Mapped, mapped_column
|
|
|
5
5
|
|
|
6
6
|
from .base import Base
|
|
7
7
|
from .connection import get_session
|
|
8
|
-
|
|
8
|
+
|
|
9
|
+
# SQLAlchemy resolves the Mapped[...] annotations at runtime: these types must be imported
|
|
10
|
+
from .data_types import ( # noqa: TC001
|
|
11
|
+
GeodeObjectType,
|
|
12
|
+
ViewerElementsType,
|
|
13
|
+
ViewerObjectType,
|
|
14
|
+
)
|
|
9
15
|
|
|
10
16
|
|
|
11
17
|
class Data(Base):
|
|
@@ -15,8 +21,8 @@ class Data(Base):
|
|
|
15
21
|
String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
|
|
16
22
|
)
|
|
17
23
|
geode_id: Mapped[str] = mapped_column(String, nullable=False)
|
|
18
|
-
|
|
19
|
-
|
|
24
|
+
geode_object_type: Mapped[GeodeObjectType] = mapped_column(String, nullable=False)
|
|
25
|
+
viewer_object_type: Mapped[ViewerObjectType] = mapped_column(String, nullable=False)
|
|
20
26
|
viewer_elements_type: Mapped[ViewerElementsType] = mapped_column(String, nullable=False)
|
|
21
27
|
native_file: Mapped[str | None] = mapped_column(String, nullable=True)
|
|
22
28
|
viewable_file: Mapped[str | None] = mapped_column(String, nullable=True)
|
|
@@ -25,14 +31,14 @@ class Data(Base):
|
|
|
25
31
|
@staticmethod
|
|
26
32
|
def create(
|
|
27
33
|
geode_id: str,
|
|
28
|
-
|
|
29
|
-
|
|
34
|
+
geode_object_type: GeodeObjectType,
|
|
35
|
+
viewer_object_type: ViewerObjectType,
|
|
30
36
|
viewer_elements_type: ViewerElementsType,
|
|
31
|
-
) ->
|
|
37
|
+
) -> Data:
|
|
32
38
|
data_entry = Data(
|
|
33
39
|
geode_id=geode_id,
|
|
34
|
-
|
|
35
|
-
|
|
40
|
+
geode_object_type=geode_object_type,
|
|
41
|
+
viewer_object_type=viewer_object_type,
|
|
36
42
|
viewer_elements_type=viewer_elements_type,
|
|
37
43
|
)
|
|
38
44
|
|
|
@@ -42,7 +48,7 @@ class Data(Base):
|
|
|
42
48
|
return data_entry
|
|
43
49
|
|
|
44
50
|
@staticmethod
|
|
45
|
-
def get(data_id: str) ->
|
|
51
|
+
def get(data_id: str) -> Data | None:
|
|
46
52
|
session = get_session()
|
|
47
53
|
data_query = select(Data).where(Data.id == data_id)
|
|
48
54
|
return session.scalars(data_query).first()
|
|
@@ -73,6 +73,6 @@ def geode_object_type(value: str) -> GeodeObjectType:
|
|
|
73
73
|
return cast("GeodeObjectType", value)
|
|
74
74
|
|
|
75
75
|
|
|
76
|
-
|
|
76
|
+
ViewerObjectType = Literal["mesh", "model"]
|
|
77
77
|
|
|
78
78
|
ViewerElementsType = Literal["points", "edges", "polygons", "polyhedra", "default"]
|
|
@@ -31,7 +31,7 @@ def _format_value(value: object, max_length: int) -> str:
|
|
|
31
31
|
return f"{text[:max_length]}... ({details})"
|
|
32
32
|
|
|
33
33
|
|
|
34
|
-
def format_dataclass(instance:
|
|
34
|
+
def format_dataclass(instance: DataclassInstance, max_length: int = MAX_VALUE_LENGTH) -> str:
|
|
35
35
|
"""Like repr(), but truncate every field value longer than max_length.
|
|
36
36
|
|
|
37
37
|
Each truncated value is followed by its type and length.
|
|
@@ -43,7 +43,7 @@ def format_dataclass(instance: "DataclassInstance", max_length: int = MAX_VALUE_
|
|
|
43
43
|
return f"{type(instance).__name__}({fields})"
|
|
44
44
|
|
|
45
45
|
|
|
46
|
-
def print_dataclass(instance:
|
|
46
|
+
def print_dataclass(instance: DataclassInstance) -> None:
|
|
47
47
|
sys.stdout.write(f"{format_dataclass(instance)}\n")
|
|
48
48
|
sys.stdout.flush()
|
|
49
49
|
|
|
@@ -11,8 +11,8 @@ GEODE_ID = "01a08187-2c4c-7e64-85c5-52c3439f0626"
|
|
|
11
11
|
def test_data_crud_operations() -> None:
|
|
12
12
|
data = Data.create(
|
|
13
13
|
geode_id=GEODE_ID,
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
geode_object_type="BRep",
|
|
15
|
+
viewer_object_type="model",
|
|
16
16
|
viewer_elements_type="test_type",
|
|
17
17
|
)
|
|
18
18
|
assert data.id is not None
|
|
@@ -22,7 +22,7 @@ def test_data_crud_operations() -> None:
|
|
|
22
22
|
retrieved = Data.get(data.id)
|
|
23
23
|
assert retrieved is not None
|
|
24
24
|
assert isinstance(retrieved, Data)
|
|
25
|
-
assert retrieved.
|
|
25
|
+
assert retrieved.geode_object_type == "BRep"
|
|
26
26
|
assert retrieved.geode_id == GEODE_ID
|
|
27
27
|
assert retrieved.id == data.id
|
|
28
28
|
non_existent = Data.get("fake_id")
|
|
@@ -33,8 +33,8 @@ def test_data_crud_operations() -> None:
|
|
|
33
33
|
def test_data_with_file_assignments() -> None:
|
|
34
34
|
data = Data.create(
|
|
35
35
|
geode_id=GEODE_ID,
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
geode_object_type="BRep",
|
|
37
|
+
viewer_object_type="model",
|
|
38
38
|
viewer_elements_type="test_type",
|
|
39
39
|
)
|
|
40
40
|
data_id = data.id
|
|
@@ -51,21 +51,21 @@ def test_data_with_file_assignments() -> None:
|
|
|
51
51
|
assert retrieved.native_file == "native.og_brep"
|
|
52
52
|
assert retrieved.viewable_file == "viewable.vtm"
|
|
53
53
|
assert retrieved.light_viewable_file == "light.vtp"
|
|
54
|
-
assert retrieved.
|
|
54
|
+
assert retrieved.geode_object_type == "BRep"
|
|
55
55
|
|
|
56
56
|
|
|
57
57
|
@pytest.mark.usefixtures("clean_database")
|
|
58
58
|
def test_data_geode_id_is_not_unique() -> None:
|
|
59
59
|
first = Data.create(
|
|
60
60
|
geode_id=GEODE_ID,
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
geode_object_type="BRep",
|
|
62
|
+
viewer_object_type="model",
|
|
63
63
|
viewer_elements_type="test_type",
|
|
64
64
|
)
|
|
65
65
|
second = Data.create(
|
|
66
66
|
geode_id=GEODE_ID,
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
geode_object_type="BRep",
|
|
68
|
+
viewer_object_type="model",
|
|
69
69
|
viewer_elements_type="test_type",
|
|
70
70
|
)
|
|
71
71
|
assert first.id != second.id
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|