dagster-postgres 0.23.10__tar.gz → 0.23.12__tar.gz

{dagster-postgres-0.23.10/dagster_postgres.egg-info → dagster-postgres-0.23.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-postgres
-Version: 0.23.10
+Version: 0.23.12
 Summary: A Dagster integration for postgres
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-postgres
 Author: Dagster Labs

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/dagster_postgres/event_log/event_log.py

@@ -30,15 +30,16 @@ from dagster._core.storage.sql import (
 )
 from dagster._core.storage.sqlalchemy_compat import db_select
 from dagster._serdes import ConfigurableClass, ConfigurableClassData, deserialize_value
+from sqlalchemy import event
 from sqlalchemy.engine import Connection
 
 from ..utils import (
     create_pg_connection,
     pg_alembic_config,
-    pg_statement_timeout,
     pg_url_from_config,
     retry_pg_connection_fn,
     retry_pg_creation_fn,
+    set_pg_statement_timeout,
 )
 
 CHANNEL_NAME = "run_events"
@@ -112,18 +113,19 @@ class PostgresEventLogStorage(SqlEventLogStorage, ConfigurableClass):
 
     def optimize_for_webserver(self, statement_timeout: int, pool_recycle: int) -> None:
         # When running in dagster-webserver, hold an open connection and set statement_timeout
+        kwargs = {
+            "isolation_level": "AUTOCOMMIT",
+            "pool_size": 1,
+            "pool_recycle": pool_recycle,
+        }
         existing_options = self._engine.url.query.get("options")
-        timeout_option = pg_statement_timeout(statement_timeout)
         if existing_options:
-            options = f"{timeout_option} {existing_options}"
-        else:
-            options = timeout_option
-        self._engine = create_engine(
-            self.postgres_url,
-            isolation_level="AUTOCOMMIT",
-            pool_size=1,
-            connect_args={"options": options},
-            pool_recycle=pool_recycle,
+            kwargs["connect_args"] = {"options": existing_options}
+        self._engine = create_engine(self.postgres_url, **kwargs)
+        event.listen(
+            self._engine,
+            "connect",
+            lambda connection, _: set_pg_statement_timeout(connection, statement_timeout),
         )
 
     def upgrade(self) -> None:

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/dagster_postgres/run_storage/run_storage.py

@@ -25,15 +25,16 @@ from dagster._core.storage.sql import (
 from dagster._daemon.types import DaemonHeartbeat
 from dagster._serdes import ConfigurableClass, ConfigurableClassData, serialize_value
 from dagster._utils import utc_datetime_from_timestamp
+from sqlalchemy import event
 from sqlalchemy.engine import Connection
 
 from ..utils import (
     create_pg_connection,
     pg_alembic_config,
-    pg_statement_timeout,
     pg_url_from_config,
     retry_pg_connection_fn,
     retry_pg_creation_fn,
+    set_pg_statement_timeout,
 )
 
 
@@ -107,19 +108,20 @@ class PostgresRunStorage(SqlRunStorage, ConfigurableClass):
                 stamp_alembic_rev(pg_alembic_config(__file__), conn)
 
     def optimize_for_webserver(self, statement_timeout: int, pool_recycle: int) -> None:
-        # When running in dagster-webserver, hold 1 open connection and set statement_timeout
+        # When running in dagster-webserver, hold an open connection and set statement_timeout
+        kwargs = {
+            "isolation_level": "AUTOCOMMIT",
+            "pool_size": 1,
+            "pool_recycle": pool_recycle,
+        }
         existing_options = self._engine.url.query.get("options")
-        timeout_option = pg_statement_timeout(statement_timeout)
         if existing_options:
-            options = f"{timeout_option} {existing_options}"
-        else:
-            options = timeout_option
-        self._engine = create_engine(
-            self.postgres_url,
-            isolation_level="AUTOCOMMIT",
-            pool_size=1,
-            connect_args={"options": options},
-            pool_recycle=pool_recycle,
+            kwargs["connect_args"] = {"options": existing_options}
+        self._engine = create_engine(self.postgres_url, **kwargs)
+        event.listen(
+            self._engine,
+            "connect",
+            lambda connection, _: set_pg_statement_timeout(connection, statement_timeout),
         )
 
     @property

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/dagster_postgres/schedule_storage/schedule_storage.py

@@ -24,15 +24,16 @@ from dagster._core.storage.sql import (
     stamp_alembic_rev,
 )
 from dagster._serdes import ConfigurableClass, ConfigurableClassData, serialize_value
+from sqlalchemy import event
 from sqlalchemy.engine import Connection
 
 from ..utils import (
     create_pg_connection,
     pg_alembic_config,
-    pg_statement_timeout,
     pg_url_from_config,
     retry_pg_connection_fn,
     retry_pg_creation_fn,
+    set_pg_statement_timeout,
 )
 
 
@@ -103,18 +104,19 @@ class PostgresScheduleStorage(SqlScheduleStorage, ConfigurableClass):
 
     def optimize_for_webserver(self, statement_timeout: int, pool_recycle: int) -> None:
         # When running in dagster-webserver, hold an open connection and set statement_timeout
+        kwargs = {
+            "isolation_level": "AUTOCOMMIT",
+            "pool_size": 1,
+            "pool_recycle": pool_recycle,
+        }
         existing_options = self._engine.url.query.get("options")
-        timeout_option = pg_statement_timeout(statement_timeout)
         if existing_options:
-            options = f"{timeout_option} {existing_options}"
-        else:
-            options = timeout_option
-        self._engine = create_engine(
-            self.postgres_url,
-            isolation_level="AUTOCOMMIT",
-            pool_size=1,
-            connect_args={"options": options},
-            pool_recycle=pool_recycle,
+            kwargs["connect_args"] = {"options": existing_options}
+        self._engine = create_engine(self.postgres_url, **kwargs)
+        event.listen(
+            self._engine,
+            "connect",
+            lambda connection, _: set_pg_statement_timeout(connection, statement_timeout),
         )
 
     @property

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/dagster_postgres/utils.py

@@ -169,6 +169,8 @@ def create_pg_connection(
             conn.close()
 
 
-def pg_statement_timeout(millis: int) -> str:
+def set_pg_statement_timeout(conn: psycopg2.extensions.connection, millis: int):
     check.int_param(millis, "millis")
-    return f"-c statement_timeout={millis}"
+    with conn:
+        with conn.cursor() as curs:
+            curs.execute(f"SET statement_timeout = {millis};")

dagster-postgres-0.23.12/dagster_postgres/version.py

@@ -0,0 +1 @@
+__version__ = "0.23.12"

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12/dagster_postgres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-postgres
-Version: 0.23.10
+Version: 0.23.12
 Summary: A Dagster integration for postgres
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-postgres
 Author: Dagster Labs

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/dagster_postgres.egg-info/requires.txt

@@ -1,2 +1,2 @@
-dagster==1.7.10
+dagster==1.7.12
 psycopg2-binary

{dagster-postgres-0.23.10 → dagster-postgres-0.23.12}/setup.py

@@ -40,6 +40,6 @@ setup(
     },
     include_package_data=True,
     python_requires=">=3.8,<3.13",
-    install_requires=["dagster==1.7.10", "psycopg2-binary"],
+    install_requires=["dagster==1.7.12", "psycopg2-binary"],
     zip_safe=False,
 )

dagster-postgres-0.23.10/dagster_postgres/version.py

@@ -1 +0,0 @@
-__version__ = "0.23.10"