Merge pull request #13 from Muster-Suchen-und-Erkennen/update-dependencies

Author: pilotfritz98

muse_for_anything/api/v1_api/ontology_objects.py

@@ -355,6 +355,14 @@ def post(self, data, namespace: str, **kwargs):
                     "Object type is marked as deleted. No new Objects of this type can be created!"
                 ),
             )
+        if found_object_type.current_version is None:
+            # can only create objects of a type which has a current version
+            abort(
+                HTTPStatus.BAD_REQUEST,
+                message=gettext(
+                    "Object type has no current version. No Object can be created!"
+                ),
+            )
         if not found_object_type.is_toplevel_type:
             # can only create objects for non abstract top level object type!
             abort(

muse_for_anything/db/models/ontology_objects.py

@@ -37,14 +37,13 @@ class OntologyObjectType(MODEL, IdMixin, NameDescriptionMixin, ChangesMixin):
         lazy="joined",
         primaryjoin="OntologyObjectType.current_version_id == OntologyObjectTypeVersion.id",
     )
-    versions = relationship(
-        "OntologyObjectTypeVersion",
+    versions: Mapped[List["OntologyObjectTypeVersion"]] = relationship(
         lazy="select",
         order_by="OntologyObjectTypeVersion.version",
         back_populates="ontology_type",
         primaryjoin="OntologyObjectType.id == OntologyObjectTypeVersion.object_type_id",
     )
-    ontology_objects: Mapped["OntologyObject"] = relationship(
+    ontology_objects: Mapped[List["OntologyObject"]] = relationship(
         lazy="select",
         back_populates="ontology_type",
     )
@@ -137,7 +136,7 @@ def __table_args__(cls):
         back_populates="versions",
         primaryjoin=OntologyObjectType.id == object_type_id,
     )
-    ontology_object_versions: Mapped["OntologyObjectVersion"] = relationship(
+    ontology_object_versions: Mapped[List["OntologyObjectVersion"]] = relationship(
         lazy="select",
         back_populates="ontology_type_version",
     )
@@ -240,8 +239,7 @@ class OntologyObject(MODEL, IdMixin, NameDescriptionMixin, ChangesMixin):
         lazy="joined",
         primaryjoin="OntologyObject.current_version_id == OntologyObjectVersion.id",
     )
-    versions = relationship(
-        "OntologyObjectVersion",
+    versions: Mapped[List["OntologyObjectVersion"]] = relationship(
         lazy="select",
         order_by="OntologyObjectVersion.version",
         back_populates="ontology_object",

muse_for_anything/db/pagination.py

@@ -2,7 +2,7 @@
 from typing import Any, Dict, List, Optional, Sequence, Tuple, Type, TypeVar, Union
 
 from sqlalchemy.orm.query import Query
-from sqlalchemy.sql import column, func
+from sqlalchemy.sql import column, func, select
 from sqlalchemy.sql.expression import and_, asc, desc, or_
 from sqlalchemy.sql.schema import Column
 from sqlalchemy.sql.selectable import CTE
@@ -110,13 +110,17 @@ def get_page_info(
         # always include cursor row
         query_filter = or_(cursor_column == cursor, and_(*filter_criteria))
         item_query = model.query.filter(query_filter).order_by(order_by)
-        cursor_row_cte: CTE = (
+        cursor_row_subq = (
             DB.session.query(
                 row_numbers.label("row"),
                 cursor_column,
             )
             .filter(query_filter)
-            .from_self(column("row"))
+            .subquery()
+        )
+
+        cursor_row_cte: CTE = (
+            select(cursor_row_subq.c.row)
             .filter(cursor_column == cursor)
             .cte("cursor_row")
         )