plexus-python-pulse-common 1.1.84__py3-none-any.whl → 1.1.85__py3-none-any.whl

plexus/pulse/common/utils/apiutils.py

@@ -2,6 +2,7 @@ from contextlib import AbstractContextManager
 
 import sqlalchemy.orm as sa_orm
 from fastapi import HTTPException
+from plexus.common.utils import logger
 
 __all__ = [
     "managed_db_session",
@@ -17,14 +18,29 @@ class DBSessionExceptionManager(AbstractContextManager):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        if isinstance(exc_type, HTTPException):
-            return False  # Propagate HTTPException
-        if exc_type is not None:
-            self.db.rollback()  # Raise a new HTTPException (or any other exception type)
-            raise HTTPException(status_code=500, detail=str(exc_value)) from exc_value
-        if self.commit_on_exit:
-            self.db.commit()
-        return True
+        if exc_type is None:
+            if self.commit_on_exit:
+                try:
+                    self.db.commit()
+                except BaseException as commit_exc_value:
+                    self.handle_exception(commit_exc_value)
+                    raise
+            return False
+
+        self.handle_exception(exc_value)
+        return False
+
+    def handle_exception(self, exc_value: BaseException | None) -> None:
+        try:
+            self.db.rollback()
+        except Exception:
+            logger.exception("Failed to roll back database session")
+
+        if isinstance(exc_value, HTTPException) or not isinstance(exc_value, Exception):
+            return
+
+        logger.error("Database session failed", exc_info=(type(exc_value), exc_value, exc_value.__traceback__))
+        raise HTTPException(status_code=500, detail="Internal server error") from exc_value
 
 
 def managed_db_session(db: sa_orm.Session, commit_on_exit: bool = True) -> DBSessionExceptionManager:

plexus/pulse/common/utils/ormutils.py

@@ -224,24 +224,72 @@ def collect_model_tables[ModelT: SQLModel](*models: ModelT) -> sa.MetaData:
     return metadata
 
 
-def model_copy_from[ModelT: SQLModel, ModelU: SQLModel](dst: ModelT, src: ModelU, **kwargs) -> ModelT:
+def model_copy_from[ModelT: SQLModel, ModelU: SQLModel](
+    dst: ModelT,
+    src: ModelU,
+    *,
+    include: set[str] | frozenset[str] | None = None,
+    exclude: set[str] | frozenset[str] | None = None,
+    exclude_none: bool = False,
+    exclude_unset: bool = False,
+    exclude_defaults: bool = False,
+) -> ModelT:
+    """Copy native field values without invoking serializers.
+
+    ``include`` and ``exclude`` select top-level field names only; nested filter
+    mappings and serialization options are not supported. The exclusion flags
+    also apply when recursively copying nested models.
+    """
     if not isinstance(dst, SQLModel) or not isinstance(src, SQLModel):
         raise TypeError("both 'dst' and 'src' must be instances of SQLModel or its subclasses")
+    if include is not None and (
+        not isinstance(include, (set, frozenset)) or not all(isinstance(item, str) for item in include)):
+        raise TypeError(f"'include' must be a set of field names or None")
+    if exclude is not None and (
+        not isinstance(exclude, (set, frozenset)) or not all(isinstance(item, str) for item in exclude)):
+        raise TypeError(f"'exclude' must be a set of field names or None")
 
-    for field, value in src.model_dump(**kwargs).items():
-        if field not in dst.model_fields:
-            continue
+    src_model = type(src)
+    dst_model = type(dst)
+
+    for field, src_field_info in src_model.model_fields.items():
         # Skip fields that are not present in the destination model
-        if value is None and dst.model_fields[field].required:
-            raise ValueError(f"field '{field}' is required but got None")
+        if field not in dst_model.model_fields:
+            continue
+        if include is not None and field not in include:
+            continue
+        if exclude is not None and field in exclude:
+            continue
+        if exclude_unset and field not in src.model_fields_set:
+            continue
+
+        value = getattr(src, field)
+        if exclude_none and value is None:
+            continue
+        if exclude_defaults and not src_field_info.is_required():
+            default = src_field_info.get_default(call_default_factory=True, validated_data=src.__dict__)
+            if value == default:
+                continue
+
+        field_info = dst_model.model_fields[field]
+        if value is None:
+            pdt.TypeAdapter(field_info.annotation).validate_python(None)
 
         # Only set the field if it exists in the destination model
         if hasattr(dst, field):
             # If the field is a SQLModel, recursively copy it
             if isinstance(value, SQLModel):
-                value = model_copy_from(getattr(dst, field), value, **kwargs)
+                value = model_copy_from(getattr(dst, field),
+                                        value,
+                                        exclude_none=exclude_none,
+                                        exclude_unset=exclude_unset,
+                                        exclude_defaults=exclude_defaults)
             elif isinstance(value, list) and all(isinstance(item, SQLModel) for item in value):
-                value = [model_copy_from(dst_item, src_item, **kwargs)
+                value = [model_copy_from(dst_item,
+                                         src_item,
+                                         exclude_none=exclude_none,
+                                         exclude_unset=exclude_unset,
+                                         exclude_defaults=exclude_defaults)
                          for dst_item, src_item in zip(getattr(dst, field), value)]
 
         setattr(dst, field, value)
@@ -503,6 +551,16 @@ def model_revision_type(dialect: str | None = None) -> sa.types.TypeEngine[int]:
     raise ValueError(f"unsupported database dialect '{dialect}'")
 
 
+def index_condition_kwarg(dialect: str | None = None, clause: sa.TextClause | None = None) -> dict[str, sa.TextClause]:
+    if dialect is None:
+        dialect = dialects.postgresql
+    if dialect == dialects.postgresql:
+        return dict(postgresql_where=clause)
+    if dialect == dialects.sqlite:
+        return dict(sqlite_where=clause)
+    raise ValueError(f"unsupported database dialect '{dialect}'")
+
+
 # At the present time, we cannot express intersection of Protocol and SQLModel directly.
 # Thus, we define union types here for the mixins.
 SequenceModelMixin = SequenceModelMixinProtocol | pdt.BaseModel
@@ -670,7 +728,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
                 index_name,
                 "record_sqn",
                 unique=True,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
         @classmethod
@@ -678,7 +736,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
             return sa.Index(
                 index_name,
                 *fields,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
         @classmethod
@@ -687,7 +745,7 @@ def make_snapshot_model_mixin(dialect: str | None = None) -> type[SnapshotModelM
                 index_name,
                 *fields,
                 unique=True,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
     return ModelMixin
@@ -807,7 +865,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
                 index_name,
                 "record_sqn",
                 unique=True,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
         @classmethod
@@ -815,7 +873,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
             return sa.Index(
                 index_name,
                 *fields,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
         @classmethod
@@ -824,7 +882,7 @@ def make_revision_model_mixin(dialect: str | None = None) -> type[RevisionModelM
                 index_name,
                 *fields,
                 unique=True,
-                postgresql_where=sa.text('"expired_at" IS NULL'),
+                **index_condition_kwarg(dialect, sa.text('"expired_at" IS NULL')),
             )
 
     return ModelMixin

{plexus_python_pulse_common-1.1.84.dist-info → plexus_python_pulse_common-1.1.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plexus-python-pulse-common
-Version: 1.1.84
+Version: 1.1.85
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13

{plexus_python_pulse_common-1.1.84.dist-info → plexus_python_pulse_common-1.1.85.dist-info}/RECORD

@@ -9,7 +9,7 @@ plexus/pulse/common/resources/tags/__init__.py,sha256=1BmOq9aIT2Fr4YTzDwTrYySDhi
 plexus/pulse/common/resources/tags/unittest-1.0.0.tagset.yaml,sha256=8zWjsYp3OxGfBJSiS6-r08q61Jhulol65iV5-pvF1-M,5338
 plexus/pulse/common/resources/tags/universal-1.0.0.tagset.yaml,sha256=PRxyS5xwWcNwUjAbYqN-SafLZVviE-QSzU-DXyXNffw,80736
 plexus/pulse/common/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plexus/pulse/common/utils/apiutils.py,sha256=8H1wuahkPseOjZHQcrT70EUUDTJ-j7c9lw8kx8SoG0Y,1000
+plexus/pulse/common/utils/apiutils.py,sha256=AEGyzteSJrCq13EvQO07xDs3rROMSvG6OaFdj7swFdA,1530
 plexus/pulse/common/utils/bagutils.py,sha256=JcTD-9xJAhV_BYXw-Zfa_85hkyO5wUVqTqw2eMJFgVI,13116
 plexus/pulse/common/utils/config.py,sha256=YPtFK5QHTVsXwcFBGV0rlZad0GFtsgwysQNyKYjdzvk,2409
 plexus/pulse/common/utils/datautils.py,sha256=OWlnyFSa6UaPbSSG3HzCJHxdiHyfHAE-FUVHaLfNZoM,9335
@@ -17,14 +17,14 @@ plexus/pulse/common/utils/dockerutils.py,sha256=7DF9yFGz8uHwpYk115xBWqOjs5etz0UE
 plexus/pulse/common/utils/flowutils.py,sha256=MGu15KL9mw-LyGGLceVmY-c2FGer5PURnMZWFSJN--I,10182
 plexus/pulse/common/utils/gisutils.py,sha256=Cx0ZB9-NA_7VuzbuzRArTJ5UfltG-KmvVC8YxPIgPE4,11600
 plexus/pulse/common/utils/jsonutils.py,sha256=zSbW94klN2jrkMdBECu4RNJX6zzNaSxauQ3FuihuB6E,3342
-plexus/pulse/common/utils/ormutils.py,sha256=JD-hKLEGkFWy7ojc3dC_90qtexe2UnLEvD90tEOHtCg,61897
+plexus/pulse/common/utils/ormutils.py,sha256=FPkkdmiTZ1M0ohLTQakA8shO1MD_2mhM6NolpnD4OWo,64472
 plexus/pulse/common/utils/pathutils.py,sha256=eYfNK48wf1xZGK2IbpKxYOn4skZhWWA8OTyUwDXGMIc,9222
 plexus/pulse/common/utils/s3utils.py,sha256=5q5wSOavt-n5EdrflQX7WPGgDeWQkGO9lG5Nq3QXjCk,35904
 plexus/pulse/common/utils/sqlutils.py,sha256=D6kTBjhO5YlNRt3uFlPt6z3uH61m9ajEzPYmsI6NoFc,231
 plexus/pulse/common/utils/strutils.py,sha256=PkmMHCcHN9vALCy_8fJTf00Dg7I2N4QTCXdBmB3t7rk,16440
 plexus/pulse/common/utils/tagutils.py,sha256=V8eUxtWSijX6nHSCuRX2dTJz3why3TCOzPVK5YXt28s,66944
 plexus/pulse/common/utils/testutils.py,sha256=hKPRvoN4mg8QGQJH121l59a0uo8jN5rntGQAVYplGBw,6166
-plexus_python_pulse_common-1.1.84.dist-info/METADATA,sha256=lrRb4CQVIl31KxYwj9qX1Y0EVJ-eAQh_tV_hxyTjiQ8,1555
-plexus_python_pulse_common-1.1.84.dist-info/WHEEL,sha256=a-udL2m4V_6Yn8b-uKzWb12RjRxwwMo6ohYFM24tpaY,91
-plexus_python_pulse_common-1.1.84.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
-plexus_python_pulse_common-1.1.84.dist-info/RECORD,,
+plexus_python_pulse_common-1.1.85.dist-info/METADATA,sha256=khRqgCk5BE_g8XkuhmSDVTfVKQhEd_hTr6u9CrRb2-Y,1555
+plexus_python_pulse_common-1.1.85.dist-info/WHEEL,sha256=a-udL2m4V_6Yn8b-uKzWb12RjRxwwMo6ohYFM24tpaY,91
+plexus_python_pulse_common-1.1.85.dist-info/top_level.txt,sha256=ug_g7CVwaMQuas5UzAXbHUrQvKGCn8ezc6ZNvvRlJOE,7
+plexus_python_pulse_common-1.1.85.dist-info/RECORD,,