Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
opengeode-core==18.1.3
opengeode-io==7.8.2
opengeode-geosciences==9.7.2
opengeode-geosciencesio==5.10.1
opengeode-core==18.2.0
opengeode-io==7.8.3
opengeode-geosciences==9.8.0
opengeode-geosciencesio==5.10.2
opengeode-inspector==6.12.1
opengeode-inspector-geosciences==1.2.0
geode-common==33.26.3
opengeode-inspector-geosciences==1.2.1
geode-common==33.26.5
geode-viewables==3.5.0
flask[async]==3.1.2
flask-cors==6.0.2
Expand Down
13 changes: 6 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ flask[async]==3.*
# flask-cors
flask-cors==6.0.2
# via -r requirements.in
geode-common==33.26.3
geode-common==33.26.5
# via
# -r requirements.in
# geode-viewables
Expand All @@ -31,7 +31,7 @@ markupsafe==3.*
# flask
# jinja2
# werkzeug
opengeode-core==18.1.3
opengeode-core==18.2.0
# via
# -r requirements.in
# geode-common
Expand All @@ -41,21 +41,21 @@ opengeode-core==18.1.3
# opengeode-inspector
# opengeode-inspector-geosciences
# opengeode-io
opengeode-geosciences==9.7.2
opengeode-geosciences==9.8.0
# via
# -r requirements.in
# geode-viewables
# opengeode-geosciencesio
# opengeode-inspector-geosciences
opengeode-geosciencesio==5.10.1
opengeode-geosciencesio==5.10.2
# via -r requirements.in
opengeode-inspector==6.12.1
# via
# -r requirements.in
# opengeode-inspector-geosciences
opengeode-inspector-geosciences==1.2.0
opengeode-inspector-geosciences==1.2.1
# via -r requirements.in
opengeode-io==7.8.2
opengeode-io==7.8.3
# via
# -r requirements.in
# geode-viewables
Expand All @@ -66,4 +66,3 @@ werkzeug==3.1.8
# flask
# flask-cors

opengeodeweb-microservice==1.*,>=1.3.0rc1
5 changes: 4 additions & 1 deletion src/opengeodeweb_back/utils_functions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Standard library imports
import base64
import os
import threading
import time
Expand Down Expand Up @@ -304,7 +305,9 @@ def save_all_viewables_and_return_info(
light_path = results[2]
with open(light_path, "rb") as f:
binary_light_viewable = f.read()
binary_light_viewable_str = binary_light_viewable.decode("utf-8")
binary_light_viewable_str = base64.b64encode(binary_light_viewable).decode(
"ascii"
)
data.viewable_file = os.path.basename(viewable_path)
data.light_viewable_file = os.path.basename(light_path)
else:
Expand Down
9 changes: 8 additions & 1 deletion tests/test_utils_functions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Standard library imports
import base64
import re
import os

Expand Down Expand Up @@ -180,7 +181,11 @@ def test_generate_files_from_object(
assert re.match(r"[0-9a-f]{32}", result["id"])
assert isinstance(result["viewer_type"], str)
assert isinstance(result["binary_light_viewable"], str)
assert result["binary_light_viewable"].startswith('<?xml version="1.0"?>')
light_viewable_bytes = base64.b64decode(
result["binary_light_viewable"], validate=True
)
assert light_viewable_bytes.startswith(b'<?xml version="1.0"?>')
assert b'<AppendedData encoding="raw">' in light_viewable_bytes

data = Data.get(result["id"])
assert data is not None
Expand All @@ -191,6 +196,8 @@ def test_generate_files_from_object(
assert os.path.exists(os.path.join(data_path, result["native_file"]))
assert os.path.exists(os.path.join(data_path, result["viewable_file"]))
assert os.path.exists(os.path.join(data_path, data.light_viewable_file))
with open(os.path.join(data_path, data.light_viewable_file), "rb") as f:
assert f.read() == light_viewable_bytes


def test_generate_files_from_file(
Expand Down
Loading