iris-pgwire 1.2.30__tar.gz → 1.2.32__tar.gz

{iris_pgwire-1.2.30 → iris_pgwire-1.2.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris-pgwire
-Version: 1.2.30
+Version: 1.2.32
 Summary: PostgreSQL Wire Protocol Server for InterSystems IRIS - Connect BI tools, Python frameworks, and PostgreSQL clients to IRIS databases
 Project-URL: Homepage, https://github.com/intersystems-community/iris-pgwire
 Project-URL: Documentation, https://github.com/intersystems-community/iris-pgwire#readme

{iris_pgwire-1.2.30 → iris_pgwire-1.2.32}/src/iris_pgwire/__init__.py

@@ -6,7 +6,7 @@ Based on the specification from docs/iris_pgwire_plan.md and proven patterns fro
 caretdev/sqlalchemy-iris.
 """
 
-__version__ = "1.2.30"
+__version__ = "1.2.32"
 __author__ = "Thomas Dyar <thomas.dyar@intersystems.com>"
 
 # Don't import server/protocol in __init__ to avoid sys.modules conflicts

{iris_pgwire-1.2.30 → iris_pgwire-1.2.32}/src/iris_pgwire/dbapi_connection_pool.py

@@ -115,11 +115,11 @@ class IRISConnectionPool:
 
                         # Check if connection needs recycling
                         if conn_wrapper.should_recycle():
-                logger.info(
-                    "Recycling old connection",
-                    connection_id=conn_wrapper.connection_id,
-                    age_seconds=round(conn_wrapper.age_seconds, 1),
-                )
+                            logger.info(
+                                "Recycling old connection",
+                                connection_id=conn_wrapper.connection_id,
+                                age_seconds=round(conn_wrapper.age_seconds, 1),
+                            )
 
                             await self._recycle_connection(conn_wrapper)
                             # Continue loop to get another connection
@@ -134,12 +134,11 @@ class IRISConnectionPool:
                             ).total_seconds()
 
                         if idle_seconds > 10.0:
-                        logger.debug(
-                            "Acquired connection from pool",
-                            connection_id=conn_wrapper.connection_id,
-                            wait_ms=round(wait_ms, 2),
-                        )
-
+                            logger.debug(
+                                "Checking health of idle connection",
+                                connection_id=conn_wrapper.connection_id,
+                                idle_seconds=round(idle_seconds, 1),
+                            )
 
                             is_healthy = await self._check_connection_health(conn_wrapper)
                             if not is_healthy:
@@ -340,12 +339,11 @@ class IRISConnectionPool:
             self._total_created += 1
 
             logger.info(
-                "Removing idle overflow connection",
+                "Created new IRIS connection",
                 connection_id=conn_wrapper.connection_id,
-                idle_seconds=round(conn_wrapper.idle_seconds, 1),
+                idle_seconds=round(getattr(conn_wrapper, "idle_seconds", 0.0), 1),
             )
 
-
             return conn_wrapper
 
         except Exception as e:
@@ -365,12 +363,11 @@ class IRISConnectionPool:
         del self._connections[conn_wrapper.connection_id]
         self._total_recycled += 1
 
-            logger.info(
-                "Removed connection from pool",
-                connection_id=conn_wrapper.connection_id,
-                is_overflow=conn_wrapper.is_overflow,
-            )
-
+        logger.info(
+            "Removed connection from pool",
+            connection_id=conn_wrapper.connection_id,
+            is_overflow=conn_wrapper.is_overflow,
+        )
 
     async def _check_connection_health(self, conn_wrapper: DBAPIConnection) -> bool:
         """

{iris_pgwire-1.2.30 → iris_pgwire-1.2.32}/src/iris_pgwire/models/dbapi_connection.py

@@ -79,6 +79,7 @@ class DBAPIConnection(BaseModel):
     pool_recycle_seconds: int = Field(
         ge=60, description="Maximum connection lifetime before recycling"
     )
+    is_overflow: bool = Field(default=False, description="Whether this is an overflow connection")
 
     # Pydantic v2 configuration
     model_config = ConfigDict(
@@ -101,10 +102,28 @@ class DBAPIConnection(BaseModel):
                 "iris_port": 1972,
                 "iris_namespace": "USER",
                 "pool_recycle_seconds": 3600,
+                "is_overflow": False,
             }
         },
     )
 
+    @property
+    def idle_seconds(self) -> float:
+        """
+        Calculate connection idle time in seconds.
+
+        Returns:
+            Seconds since last usage, or since creation if never used.
+        """
+        reference_time = self.last_used_at or self.created_at
+        now = datetime.now(UTC)
+
+        if now < reference_time:
+            # Handle potential clock skew
+            return 0.0
+
+        return (now - reference_time).total_seconds()
+
     def age_seconds(self) -> float:
         """
         Calculate connection age in seconds.