deev 1.2.2__tar.gz → 1.2.4__tar.gz

{deev-1.2.2/src/deev.egg-info → deev-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 1.2.2
+Version: 1.2.4
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT

{deev-1.2.2 → deev-1.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deev"
-version = "1.2.2"
+version = "1.2.4"
 description = "..an entity framework for Python."
 keywords = ["DB", "database", "entity framework", "mapper"]
 authors = [

{deev-1.2.2 → deev-1.2.4}/src/deev/__init__.py

@@ -11,8 +11,8 @@ from .utils import connect
 from . import common, entities, mongodb, mysql, translation, utils, validation
 
 
-__version__ = '1.2.2'
-__commit__ = '96178a5'
+__version__ = '1.2.4'
+__commit__ = '3f52ea0'
 __all__ = [
     '__version__', '__commit__',
     'ConnectionString',

{deev-1.2.2 → deev-1.2.4}/src/deev/common/ConnectionString.py

@@ -16,6 +16,8 @@ class ConnectionString:
     __user: Optional[str]
     __password: Optional[str]
     __provider: Optional[str]
+    __connect_timeout: Optional[int]
+    __command_timeout: Optional[int]
 
     def __init__(
         self,
@@ -26,6 +28,8 @@ class ConnectionString:
         self.__user = None
         self.__password = None
         self.__provider = None
+        self.__connect_timeout = None
+        self.__command_timeout = None
         if connection_str is not None:
             self.parse(connection_str)
 
@@ -41,6 +45,10 @@ class ConnectionString:
             parts.append(f'PWD={self.password}')
         if self.provider is not None:
             parts.append(f'Provider={self.provider}')
+        if self.connect_timeout is not None:
+            parts.append(f'Connection Timeout={self.connect_timeout}')
+        if self.command_timeout is not None:
+            parts.append(f'Command Timeout={self.command_timeout}')
         return ';'.join(parts)
 
     @property
@@ -83,6 +91,22 @@ class ConnectionString:
     def provider(self, value: Optional[str]):
         self.__provider = value
 
+    @property
+    def connect_timeout(self) -> Optional[int]:
+        return self.__connect_timeout
+
+    @connect_timeout.setter
+    def connect_timeout(self, value: Optional[int]):
+        self.__connect_timeout = value
+
+    @property
+    def command_timeout(self) -> Optional[int]:
+        return self.__command_timeout
+
+    @command_timeout.setter
+    def command_timeout(self, value: Optional[int]):
+        self.__command_timeout = value
+
     def parse(self, connectionstring: Optional[str]) -> ConnectionString:
         parts = (
             []
@@ -102,6 +126,10 @@ class ConnectionString:
                     self.password = value
                 case 'provider':
                     self.provider = value
+                case 'connection timeout':
+                    self.connect_timeout = int(value)
+                case 'command timeout':
+                    self.command_timeout = int(value)
         return self
 
 

{deev-1.2.2 → deev-1.2.4}/src/deev/mongodb/MongoProxyConnection.py

@@ -28,6 +28,11 @@ class MongoProxyConnection(DbConnection):
         # NOTE: this is a non-conformant property that we require for internal functionality, and it must be retained.
         return self.__connection
 
+    @property
+    def mongo_database(self) -> pymongo.database.Database[Any]:
+        # NOTE: this is a non-conformant property that we require for migration scripts (QOL), and must be retained.
+        return self.__connection[self.__database_name]
+
     @property
     def mongo_database_name(self) -> str:
         # NOTE: this is a non-conformant property that we require for internal functionality, and it must be retained.

{deev-1.2.2 → deev-1.2.4}/src/deev/mongodb/MongoTableAdapter.py

@@ -61,6 +61,15 @@ class MongoTableAdapter(Generic[TEntity]):
     def primary_key(self) -> tuple[str, ...]:
         return self.__entity_spec.primary_key
 
+    @property
+    def mongo_collection(self) -> pymongo.collection.Collection[Any]:
+        # NOTE: this is a non-conformant property that we require for migration scripts (QOL), and must be retained.
+        return self.__context.mongo_database[  # type: ignore
+            self.__table_name
+            if self.__table_name is not None
+            else self.__entity_spec.table_name
+        ]
+
     def __get_pyobject(self, key: str, value: Any) -> Any:
         return to_pyobject(
             value,

{deev-1.2.2 → deev-1.2.4}/src/deev/mongodb/MongoTransactionContext.py

@@ -80,6 +80,11 @@ class MongoTransactionContext(DbTransactionContext):
         # NOTE: keep this as-is unless you see a problem, then we should discuss first.
         return cast(MongoProxyCursor, self.__cursor).mongo_session  # type: ignore[attr-defined, valid-type]
 
+    @property
+    def mongo_database(self) -> pymongo.database.Database[Any]:
+        # NOTE: this is a non-conformant property that we require for migration scripts (QOL), and must be retained.
+        return self.connection[self.__database_name].mongo_database  # type: ignore
+
     @property
     def mongo_database_name(self) -> str:
         # NOTE: this is a non-conformant property that we require for internal functionality, and it must be retained.

{deev-1.2.2 → deev-1.2.4}/src/deev/utils.py

@@ -14,12 +14,28 @@ from .common.DbTableAdapter import DbTableAdapter
 from .common.DbTransactionContext import DbTransactionContext
 
 
-def connect(connectionstring: ConnectionString | str) -> DbConnection:
+def connect(
+    connectionstring: ConnectionString | str,
+    *,
+    connect_timeout: int = 3,
+    command_timeout: int = 9,
+) -> DbConnection:
     """
     Create a PEP 249 Connection to a database, given *connectionstring*.
+
+    Args:
+        connectionstring: A DSN string or :class:`ConnectionString` object.
+        connect_timeout: Connection timeout in seconds (if the provider supports it).
+                            Only used when *connectionstring* does not specify
+                            ``Connection Timeout``.
+        command_timeout: Command/operation timeout in seconds (if the provider supports it).
+                         Only used when *connectionstring* does not specify
+                         ``Command Timeout``.
     """
     if isinstance(connectionstring, str):
         connectionstring = ConnectionString(connectionstring)
+    effective_connect_timeout = connectionstring.connect_timeout if connectionstring.connect_timeout is not None else connect_timeout
+    effective_command_timeout = connectionstring.command_timeout if connectionstring.command_timeout is not None else command_timeout
     match connectionstring.provider:
         case 'mongodb':
             from deev.mongodb.MongoProxyConnection import MongoProxyConnection
@@ -28,7 +44,11 @@ def connect(connectionstring: ConnectionString | str) -> DbConnection:
                 raise DbError(f'ConnectionString is missing `database` component: {connectionstring}')
             mongo_uri = f'mongodb://{connectionstring.user}:{connectionstring.password}@{connectionstring.server}/{connectionstring.database}'
             return MongoProxyConnection(
-                pymongo.MongoClient(mongo_uri),
+                pymongo.MongoClient(
+                    mongo_uri,
+                    serverSelectionTimeoutMS=effective_connect_timeout * 1000,
+                    socketTimeoutMS=effective_command_timeout * 1000,
+                ),
                 database_name=connectionstring.database
             )
         case 'mysql.connector' | 'mysql':
@@ -38,14 +58,23 @@ def connect(connectionstring: ConnectionString | str) -> DbConnection:
                 raise DbError(f'ConnectionString is missing `server` component: {connectionstring}')
             parts = connectionstring.server.split(':')
             host_name, port_number = (parts[0], int(parts[1])) if len(parts) == 2 else (parts[0], 3306)
-            return MysqlProxyConnection(mysql.connector.connect(
+            conn = mysql.connector.connect(
                 host=host_name,
                 port=port_number,
                 user=connectionstring.user,
                 password=connectionstring.password,
                 database=connectionstring.database,
-                use_pure=True
-            ))
+                use_pure=True,
+                connection_timeout=effective_connect_timeout,
+                read_timeout=effective_command_timeout,
+                write_timeout=effective_command_timeout
+            )
+            if effective_command_timeout is not None:
+                cur = conn.cursor()
+                cur.execute(f'SET SESSION wait_timeout={effective_command_timeout}')
+                cur.close()
+                conn.commit()
+            return MysqlProxyConnection(conn)
         case 'sqlite3' | 'sqlite':
             from deev.sqlite.SqliteProxyConnection import SqliteProxyConnection
             import sqlite3

{deev-1.2.2 → deev-1.2.4/src/deev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 1.2.2
+Version: 1.2.4
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT