python-general-be-lib 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

general/interface/metadata/crud_metadata.py

@@ -5,8 +5,9 @@ from typing import Optional, Any, Type, Iterable, Sequence
 
 from pydantic import BaseModel
 from sqlalchemy import MetaData, Engine, Column, Table, inspect, Connection, select, RowMapping, CursorResult, not_
+from sqlalchemy.exc import NoSuchTableError
 
-from ...exception.crud_exceptions import HasNoAttributeException
+from ...exception.crud_exceptions import HasNoAttributeException, InternalServerException
 
 
 class CrudMetadata:
@@ -158,7 +159,10 @@ class CrudMetadata:
     def get_table(self, name: str) -> Optional[Table]:
         table = self._get_table(name=name)
         if table is None:
-            table = Table(name, self.metadata, schema=self.schema, autoload_with=self.engine)
+            try:
+                table = Table(name, self.metadata, schema=self.schema, autoload_with=self.engine)
+            except NoSuchTableError:
+                raise InternalServerException(f"No such table {name}")
         return table
 
     def has_table(self, name: str):

general/interface/repository/crud_repository.py

@@ -217,12 +217,13 @@ class CrudRepository[Entity: Base | Type[Base]]:
         else:
             pass
 
-    def find(self, session: Session = None, where: dict[str, Any] = None, columns: list[str] = None, exclude_columns: list[str] = None, limit: int = 0, parsing_model: Type[BaseModel] = None, **kwhere) -> list[Entity]:
+    def find(self, session: Session = None, where: dict[str, Any] = None, columns: list[str] = None, exclude_columns: list[str] = None, limit: int = 0, parsing_model: Type[BaseModel] = None, order_by: str = None,
+             asc: bool = None, **kwhere) -> list[Entity]:
         """Cerca i record che corrispondono ai criteri specificati.
 
         I filtri possono essere passati come dizionario ``where`` o come
         keyword arguments. Supporta caricamento parziale delle colonne,
-        limit e modelli di parsing alternativi.
+        limit, ordinamento e modelli di parsing alternativi.
 
         Args:
             session (Session, optional): Sessione esterna. Se ``None``, ne viene
@@ -234,6 +235,10 @@ class CrudRepository[Entity: Base | Type[Base]]:
             limit (int): Numero massimo di risultati. 0 = nessun limite. Default: 0.
             parsing_model (Type[BaseModel], optional): Modello Pydantic alternativo
                 per la serializzazione del risultato.
+            order_by (str, optional): Nome della colonna per l'ordinamento dei risultati.
+                Se ``None``, non viene applicato nessun ordinamento.
+            asc (bool, optional): Direzione dell'ordinamento. ``True`` per ASC,
+                ``False`` per DESC. Se ``None``, l'ordinamento di default è DESC.
             **kwhere: Filtri aggiuntivi come keyword arguments.
 
         Returns:
@@ -243,17 +248,21 @@ class CrudRepository[Entity: Base | Type[Base]]:
         Example:
             >>> repo.find(active=True, limit=10)
             >>> repo.find(where={"role": ["admin", "editor"]})
+            >>> repo.find(active=True, order_by="name", asc=True)
         """
+
         keep_open = False if session is None else True
         session = self.open_session if session is None else session
-        entities = self._find(session=session, where=where, columns=columns, exclude_columns=exclude_columns, limit=limit, **kwhere)
+        entities = self._find(session=session, where=where, columns=columns, exclude_columns=exclude_columns, limit=limit, order_by=order_by, asc=asc, **kwhere)
         return self._return(session=session, entities=entities, keep_open=keep_open, commit=False, parsing_model=parsing_model)
 
-    def _find(self, session: Session, where: dict[str, Any] = None, columns: list[str] = None, exclude_columns: list[str] = None, limit: int = 0, **kwhere):
+    def _find(self, session: Session, where: dict[str, Any] = None, columns: list[str] = None, exclude_columns: list[str] = None, limit: int = 0, order_by: str = None,
+              asc: bool = None, **kwhere):
         if where is None:
             where = kwhere if kwhere else {}
         stmt = self._select(entity=self.entity, columns=columns, exclude_columns=exclude_columns)
         stmt = self.stmt_manager.prepare_statement(stmt=stmt, **where)
+        stmt = self.stmt_manager.order_by_condition(stmt=stmt, order_by=order_by, asc=asc)
         stmt = self.stmt_manager.limit_offset_condition(stmt=stmt, limit=limit)
         return self.execute(session, stmt)
 
@@ -500,7 +509,8 @@ class CrudRepository[Entity: Base | Type[Base]]:
         """
         pk = self.entity.primary_key()[0]
         stmt = select(count(pk))
-        stmt = stmt.where(where)
+        if where is not None:
+            stmt = stmt.where(where)
         result = session.execute(stmt).all()[0]
         return result[0]
 

general/interface/repository/handler/statement_manager.py

@@ -74,10 +74,11 @@ class StatementManager:
         Raises:
             HasNoAttributeException: Se la colonna ``order_by`` non esiste sull'entità.
         """
-        try:
-            stmt = stmt.order_by(self._base_handler.columns[order_by].asc()) if asc else stmt.order_by(self._base_handler.columns[order_by].desc())
-        except KeyError:
-            raise HasNoAttributeException(order_by)
+        if order_by:
+            try:
+                stmt = stmt.order_by(self._base_handler.columns[order_by].asc()) if asc else stmt.order_by(self._base_handler.columns[order_by].desc())
+            except KeyError:
+                raise HasNoAttributeException(order_by)
         return stmt
 
     def limit_offset_condition(self, stmt: Select, limit: int, page: int = None):

{python_general_be_lib-0.5.3.dist-info → python_general_be_lib-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-general-be-lib
-Version: 0.5.3
+Version: 0.5.5
 Summary: General purpose backend library — SQLAlchemy CRUD/Geometry repositories, FastAPI exceptions, Pydantic base models, logger utilities.
 Author-email: Andrea Di Placido <a.diplacido@arpes.it>, "Arpes S.r.l." <it.admin@arpes.it>
 License: MIT

{python_general_be_lib-0.5.3.dist-info → python_general_be_lib-0.5.5.dist-info}/RECORD

@@ -10,10 +10,10 @@ general/interface/base/__init__.py,sha256=SDlTi28M8rzJ9yiKefo5l7V3K109LnnBHW-SuZ
 general/interface/base/base_model.py,sha256=SVrYl1kSAj37yCScfO3Qe6ELyLxou65njpvbYmjTG00,2215
 general/interface/base/declarative_base.py,sha256=5hw2VpJHHebjixuI3d4wpkyAentGBGN54QXcniaoJ-A,5236
 general/interface/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-general/interface/metadata/crud_metadata.py,sha256=z1fTh77K7fkhDgNus5Xrv4EYerbdlPVl4F1NLbSxqcM,8478
+general/interface/metadata/crud_metadata.py,sha256=qZLYakASWkA9120HA4n4-9EOb8ZbkIpNip96jwdmjNU,8676
 general/interface/metadata/geom_metadata.py,sha256=CZPzlqos5XuDWn_FeKLxxYqOuGx1Bg9C0xH5-ZR0vXw,5326
 general/interface/repository/__init__.py,sha256=EcRukwf61Ua-9-JfM_ingVv1wXNRV8HBrrWwjj8m23w,136
-general/interface/repository/crud_repository.py,sha256=j70VKjcVmkFVTZTYA9KQBKSnZpk6P9FkLQDfFeDg8HM,28582
+general/interface/repository/crud_repository.py,sha256=HFWFDaHqcCbI1Ks4gTRDrbG4ih43id4lDIrxWuvx01E,29244
 general/interface/repository/geometry_repository.py,sha256=bJVPhsr-fGhVTywdHwx9Qt_inWPHk5wqq9EFWFLfuGU,11181
 general/interface/repository/many_to_many_repository.py,sha256=iEhWyD8nPZSAPL8Z2wXrK-aRBnoh3evaSN-voaf0EP0,8662
 general/interface/repository/view_repository.py,sha256=Sm591FUP0iBYlI-ULNWszD5fOvTGwXX0iYoeDbUqo34,5397
@@ -23,9 +23,9 @@ general/interface/repository/handler/ilike_handler.py,sha256=_HHTvj6Tm1L-WvUy1S9
 general/interface/repository/handler/interval_handler.py,sha256=XxMQr6UuWnoCtbOOO7l80_Yja_aPKYtHhDfhFCRMaKg,4135
 general/interface/repository/handler/json_handler.py,sha256=7bS59seB-It5KHsWXTbHGsEvbQZ6lYyvX-d29BcRLVE,2956
 general/interface/repository/handler/json_ilike_handler.py,sha256=yDuKER3yqtnHpVWndF8PVEaqDThcq1EhZzLaqxbQ0bU,4491
-general/interface/repository/handler/statement_manager.py,sha256=2_AjORmDnKtRaHxZc8RLKe68soNVv2YBRCB5jihgvcY,4392
-python_general_be_lib-0.5.3.dist-info/licenses/LICENSE,sha256=iUaO1XZyB9P3Tmog0OILuTisP6vXGe3QKz-4yRTxOFk,1069
-python_general_be_lib-0.5.3.dist-info/METADATA,sha256=ppE7Y1Ij9o6lkL9QY0Kn8NLBPfvaFRHFMmmtEnK8tKU,1384
-python_general_be_lib-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_general_be_lib-0.5.3.dist-info/top_level.txt,sha256=tTZePW8_CNUqSgKFd2SEH72ZbnhS0OYjRsgcv0ikSFY,8
-python_general_be_lib-0.5.3.dist-info/RECORD,,
+general/interface/repository/handler/statement_manager.py,sha256=sGDMU4fPkF0_9-SbDmAw8Vpel1Z7eImBs8fHO-5Lr_0,4429
+python_general_be_lib-0.5.5.dist-info/licenses/LICENSE,sha256=iUaO1XZyB9P3Tmog0OILuTisP6vXGe3QKz-4yRTxOFk,1069
+python_general_be_lib-0.5.5.dist-info/METADATA,sha256=tlgM7YpM6ii5vsqSp59qp3Bx3VqTkNxSBb0iqgBnoPI,1384
+python_general_be_lib-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_general_be_lib-0.5.5.dist-info/top_level.txt,sha256=tTZePW8_CNUqSgKFd2SEH72ZbnhS0OYjRsgcv0ikSFY,8
+python_general_be_lib-0.5.5.dist-info/RECORD,,