OpenGeodeWeb-Back 5.10.0rc9__py3-none-any.whl → 5.10.0rc11__py3-none-any.whl

opengeodeweb_back/app_config.py

@@ -4,7 +4,9 @@ import time
 
 # Third party imports
 # Local application imports
-from .database import DATABASE_FILENAME
+from opengeodeweb_microservice.database.connection import get_database
+
+DATABASE_FILENAME = "project.db"
 
 
 class Config(object):

opengeodeweb_back/geode_functions.py

@@ -11,8 +11,8 @@ from typing import Any
 # Local application imports
 from .geode_objects import geode_objects_dict
 from . import utils_functions
-from .data import Data
-from .database import database
+from opengeodeweb_microservice.database.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 
 
 def geode_object_value(geode_object: str):
@@ -61,12 +61,12 @@ def load_data(data_id: str) -> Any:
         flask.abort(404, f"Data with id {data_id} not found")
 
     file_absolute_path = data_file_path(data_id, data_entry.native_file_name)
+    print("Loading file: ", file_absolute_path)
+    print("File exists: ", os.path.exists(file_absolute_path))
     return load(data_entry.geode_object, file_absolute_path)
 
 
 def get_data_info(data_id: str) -> Data:
-    from .data import Data
-
     data_entry = Data.get(data_id)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")

opengeodeweb_back/geode_objects.py

@@ -217,7 +217,7 @@ def geode_objects_dict():
             "elements": [points, polygons],
             "is_3D": False,
             "is_viewable": True,
-            "save_viewable": g_v.save_light_viewable_light_regular_grid2D,
+            "save_viewable": g_v.save_viewable_light_regular_grid2D,
             "save_light_viewable": g_v.save_light_viewable_light_regular_grid2D,
         },
         "LightRegularGrid3D": {

opengeodeweb_back/py.typed

@@ -0,0 +1 @@
+partial

opengeodeweb_back/utils_functions.py

@@ -16,8 +16,8 @@ import werkzeug
 
 # Local application imports
 from . import geode_functions
-from .data import Data
-from .database import database
+from opengeodeweb_microservice.database.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 
 
 def increment_request_counter(current_app: flask.Flask) -> None:
@@ -193,7 +193,9 @@ def save_all_viewables_and_return_info(
     data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
     data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
 
-    database.session.commit()
+    session = get_session()
+    if session:
+        session.commit()
 
     return {
         "native_file_name": data_entry.native_file_name,
@@ -247,8 +249,14 @@ def generate_native_viewable_and_light_viewable_from_file(
 
     data = geode_functions.load(geode_object, copied_full_path)
 
-    database.session.delete(temp_data_entry)
-    database.session.flush()
+    # Remplacer :
+    # database.session.delete(temp_data_entry)
+    # database.session.flush()
+    # Par :
+    session = get_session()
+    if session:
+        session.delete(temp_data_entry)
+        session.flush()
 
     return save_all_viewables_and_return_info(
         geode_object,

{opengeodeweb_back-5.10.0rc9.dist-info → opengeodeweb_back-5.10.0rc11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.0rc9
+Version: 5.10.0rc11
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{opengeodeweb_back-5.10.0rc9.dist-info → opengeodeweb_back-5.10.0rc11.dist-info}/RECORD

@@ -1,11 +1,10 @@
 opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opengeodeweb_back/app_config.py,sha256=XFl5KqrOWifVxdudiLm-LXmczYDBCbZtNboSYnNbLf8,1142
-opengeodeweb_back/data.py,sha256=wwLcWoYfPdE6jILnmkDQfkRJkMrHH9CB6VzPblrUgnk,1562
-opengeodeweb_back/database.py,sha256=lXbbJRZCdqLcQU-Xqi1jPmo8cIitbHOqUJW5uLBF85w,381
-opengeodeweb_back/geode_functions.py,sha256=uEWJSjlBpaJC4Qd5JPpiWiqLlCitb7peSMWzYRIVho8,10648
-opengeodeweb_back/geode_objects.py,sha256=uXCKX8AOdXkItqmYItLnFfHcIBiMFaeN_WmGs4j64Ro,27782
+opengeodeweb_back/app_config.py,sha256=WH0f-J-cXgIU23wAhn-lujwqN2-htUw9nSWkrgyW5xc,1207
+opengeodeweb_back/geode_functions.py,sha256=NzELy9s6AETDnm7tyA_uM2N89zrfeLdblRhzYrBONmw,10804
+opengeodeweb_back/geode_objects.py,sha256=_NclGPa024kCwUHdORkFuXYtiZBmQpgq6sO3LRkBhe8,27776
+opengeodeweb_back/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
 opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
-opengeodeweb_back/utils_functions.py,sha256=PclYunLMDVQn5s3V54v5jQ2zjtTFtH0C1m4niPOc2-0,8440
+opengeodeweb_back/utils_functions.py,sha256=hqLDghUARAZSGPR8shXTOFXPauq_Z17HKBlIXUgJ1PI,8694
 opengeodeweb_back/routes/blueprint_routes.py,sha256=h_yfFC3ljH0KqFr5Ab_-IQYNB7VVRENwAMQk4NDsh18,11042
 opengeodeweb_back/routes/models/blueprint_models.py,sha256=Jo9pUDeu1nO3_IbBiuHGk57cc4_fhwxjM0EKNyv1FT0,1874
 opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=JmQUvpy7HpGS6FlThZLx1YjHqiInRTqUZ_Ft5MfOzEE,239
@@ -24,8 +23,8 @@ opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl
 opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=2uQueIl1jOmxFG_gIi_vJETR4IurrwuSf8GAnzphk9g,237
 opengeodeweb_back/routes/schemas/upload_file.json,sha256=LJ3U3L5ApKuQDVFIpVT_y2alq4HW_suTvZ3HUucNbhg,219
 opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=ECIflohiqPZNsflAdkfEzksL4we0JvZhIxUd84Ubctg,240
-opengeodeweb_back-5.10.0rc9.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.10.0rc9.dist-info/METADATA,sha256=ysyzH6RWFijRX2M1Q35hRv3CNs--V02IuGbqOLeQRr0,2821
-opengeodeweb_back-5.10.0rc9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.10.0rc9.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.10.0rc9.dist-info/RECORD,,
+opengeodeweb_back-5.10.0rc11.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.10.0rc11.dist-info/METADATA,sha256=MaDdsw8VJ2hUXb2pFafAe9MaT59uGnFi-U1CZRhKpeE,2822
+opengeodeweb_back-5.10.0rc11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.10.0rc11.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.10.0rc11.dist-info/RECORD,,

opengeodeweb_back/data.py

@@ -1,45 +0,0 @@
-from sqlalchemy import String, JSON
-from sqlalchemy.orm import Mapped, mapped_column
-from .database import database, Base
-import uuid
-
-
-class Data(Base):
-    __tablename__ = "datas"
-
-    id: Mapped[str] = mapped_column(
-        String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
-    )
-    native_file_name: Mapped[str] = mapped_column(String, nullable=False)
-    viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
-    geode_object: Mapped[str] = mapped_column(String, nullable=False)
-
-    light_viewable: Mapped[str | None] = mapped_column(String, nullable=True)
-    input_file: Mapped[str | None] = mapped_column(String, nullable=True)
-    additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
-
-    @staticmethod
-    def create(
-        geode_object: str,
-        input_file: str | None = None,
-        additional_files: list[str] | None = None,
-    ) -> "Data":
-        input_file = input_file if input_file is not None else ""
-        additional_files = additional_files if additional_files is not None else []
-
-        data_entry = Data(
-            geode_object=geode_object,
-            input_file=input_file,
-            additional_files=additional_files,
-            native_file_name="",
-            viewable_file_name="",
-            light_viewable=None,
-        )
-
-        database.session.add(data_entry)
-        database.session.flush()
-        return data_entry
-
-    @staticmethod
-    def get(data_id: str) -> "Data | None":
-        return database.session.get(Data, data_id)

opengeodeweb_back/database.py

@@ -1,19 +0,0 @@
-from flask import Flask
-from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy.orm import DeclarativeBase
-
-DATABASE_FILENAME = "project.db"
-
-
-class Base(DeclarativeBase):
-    pass
-
-
-database = SQLAlchemy(model_class=Base)
-
-
-def initialize_database(app: Flask) -> SQLAlchemy:
-    database.init_app(app)
-    with app.app_context():
-        database.create_all()
-    return database