dsw-database 4.12.0__tar.gz → 4.14.0__tar.gz

{dsw_database-4.12.0/dsw_database.egg-info → dsw_database-4.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-database
-Version: 4.12.0
+Version: 4.14.0
 Summary: Library for managing DSW database
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -11,16 +11,16 @@ Keywords: dsw,database
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.12.0
+Requires-Dist: dsw-config==4.14.0
 
 # Data Stewardship Wizard: Database
 

{dsw_database-4.12.0 → dsw_database-4.14.0}/dsw/database/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.12.0~f6f9756',
-    built_at='2024-11-07 09:41:07Z',
-    sha='f6f975677676e5749b1e9cc97a0fb9238f18097a',
+    version='v4.14.0~213910f',
+    built_at='2025-01-07 08:17:38Z',
+    sha='213910ffb32a7cea98942ccd0f6c52cb6cf79128',
     branch='HEAD',
-    tag='v4.12.0',
+    tag='v4.14.0',
 )

{dsw_database-4.12.0 → dsw_database-4.14.0}/dsw/database/database.py

@@ -1,13 +1,13 @@
 import datetime
 import logging
+import typing
+
 import psycopg
 import psycopg.conninfo
 import psycopg.rows
 import psycopg.types.json
 import tenacity
 
-from typing import List, Iterable, Optional
-
 from dsw.config.model import DatabaseConfig
 
 from .model import DBDocumentTemplate, DBDocumentTemplateFile, \
@@ -28,44 +28,56 @@ def wrap_json_data(data: dict):
     return psycopg.types.json.Json(data)
 
 
+# pylint: disable-next=too-many-public-methods
 class Database:
 
-    # TODO: refactor queries and models
-    SELECT_DOCUMENT = 'SELECT * FROM document WHERE uuid = %s AND tenant_uuid = %s LIMIT 1;'
-    SELECT_QTN_DOCUMENTS = 'SELECT * FROM document WHERE questionnaire_uuid = %s AND tenant_uuid = %s;'
-    SELECT_DOCUMENT_SUBMISSIONS = 'SELECT * FROM submission WHERE document_uuid = %s AND tenant_uuid = %s;'
-    SELECT_QTN_SUBMISSIONS = 'SELECT s.* FROM document d JOIN submission s ON d.uuid = s.document_uuid ' \
-                             'WHERE d.questionnaire_uuid = %s AND d.tenant_uuid = %s;'
-    SELECT_QTN_SIMPLE = 'SELECT qtn.* FROM questionnaire qtn ' \
-                        'WHERE qtn.uuid = %s AND qtn.tenant_uuid = %s;'
-    SELECT_TENANT_CONFIG = 'SELECT * FROM tenant_config WHERE uuid = %(tenant_uuid)s LIMIT 1;'
-    SELECT_TENANT_LIMIT = 'SELECT uuid, storage FROM tenant_limit_bundle WHERE uuid = %(tenant_uuid)s LIMIT 1;'
+    SELECT_DOCUMENT = ('SELECT * FROM document '
+                       'WHERE uuid = %s AND tenant_uuid = %s LIMIT 1;')
+    SELECT_QTN_DOCUMENTS = ('SELECT * FROM document '
+                            'WHERE questionnaire_uuid = %s AND tenant_uuid = %s;')
+    SELECT_DOCUMENT_SUBMISSIONS = ('SELECT * FROM submission '
+                                   'WHERE document_uuid = %s AND tenant_uuid = %s;')
+    SELECT_QTN_SUBMISSIONS = ('SELECT s.* '
+                              'FROM document d JOIN submission s ON d.uuid = s.document_uuid '
+                              'WHERE d.questionnaire_uuid = %s AND d.tenant_uuid = %s;')
+    SELECT_QTN_SIMPLE = ('SELECT qtn.* FROM questionnaire qtn '
+                         'WHERE qtn.uuid = %s AND qtn.tenant_uuid = %s;')
+    SELECT_TENANT_CONFIG = ('SELECT * FROM tenant_config '
+                            'WHERE uuid = %(tenant_uuid)s LIMIT 1;')
+    SELECT_TENANT_LIMIT = ('SELECT uuid, storage FROM tenant_limit_bundle '
+                           'WHERE uuid = %(tenant_uuid)s LIMIT 1;')
     UPDATE_DOCUMENT_STATE = 'UPDATE document SET state = %s, worker_log = %s WHERE uuid = %s;'
     UPDATE_DOCUMENT_RETRIEVED = 'UPDATE document SET retrieved_at = %s, state = %s WHERE uuid = %s;'
-    UPDATE_DOCUMENT_FINISHED = 'UPDATE document SET finished_at = %s, state = %s, ' \
-                               'file_name = %s, content_type = %s, worker_log = %s, ' \
-                               'file_size = %s WHERE uuid = %s;'
-    SELECT_TEMPLATE = 'SELECT * FROM document_template WHERE id = %s AND tenant_uuid = %s LIMIT 1;'
-    SELECT_TEMPLATE_FILES = 'SELECT * FROM document_template_file ' \
-                            'WHERE document_template_id = %s AND tenant_uuid = %s;'
-    SELECT_TEMPLATE_ASSETS = 'SELECT * FROM document_template_asset ' \
-                             'WHERE document_template_id = %s AND tenant_uuid = %s;'
-    CHECK_TABLE_EXISTS = 'SELECT EXISTS(SELECT * FROM information_schema.tables' \
-                         '                       WHERE table_name = %(table_name)s)'
-    SELECT_MAIL_CONFIG = 'SELECT icm.* ' \
-                         'FROM tenant_config tc JOIN instance_config_mail icm ' \
-                         'ON tc.mail_config_uuid = icm.uuid ' \
-                         'WHERE tc.uuid = %(tenant_uuid)s;'
-    UPDATE_COMPONENT_INFO = 'INSERT INTO component (name, version, built_at, created_at, updated_at) ' \
-                            'VALUES (%(name)s, %(version)s, %(built_at)s, %(created_at)s, %(updated_at)s)' \
-                            'ON CONFLICT (name) DO ' \
-                            'UPDATE SET version = %(version)s, built_at = %(built_at)s, updated_at = %(updated_at)s;'
+    UPDATE_DOCUMENT_FINISHED = ('UPDATE document SET finished_at = %s, state = %s, '
+                                'file_name = %s, content_type = %s, worker_log = %s, '
+                                'file_size = %s WHERE uuid = %s;')
+    SELECT_TEMPLATE = ('SELECT * FROM document_template '
+                       'WHERE id = %s AND tenant_uuid = %s LIMIT 1;')
+    SELECT_TEMPLATE_FILES = ('SELECT * FROM document_template_file '
+                             'WHERE document_template_id = %s AND tenant_uuid = %s;')
+    SELECT_TEMPLATE_ASSETS = ('SELECT * FROM document_template_asset '
+                              'WHERE document_template_id = %s AND tenant_uuid = %s;')
+    CHECK_TABLE_EXISTS = ('SELECT EXISTS(SELECT * FROM information_schema.tables'
+                          '                       WHERE table_name = %(table_name)s)')
+    SELECT_MAIL_CONFIG = ('SELECT icm.* '
+                          'FROM tenant_config tc JOIN instance_config_mail icm '
+                          'ON tc.mail_config_uuid = icm.uuid '
+                          'WHERE tc.uuid = %(tenant_uuid)s;')
+    UPDATE_COMPONENT_INFO = ('INSERT INTO component '
+                             '(name, version, built_at, created_at, updated_at) '
+                             'VALUES (%(name)s, %(version)s, %(built_at)s, '
+                             '%(created_at)s, %(updated_at)s)'
+                             'ON CONFLICT (name) DO '
+                             'UPDATE SET version = %(version)s, built_at = %(built_at)s, '
+                             'updated_at = %(updated_at)s;')
     SELECT_COMPONENT_INFO = 'SELECT * FROM component WHERE name = %(name)s;'
-    SUM_FILE_SIZES = 'SELECT (SELECT COALESCE(SUM(file_size)::bigint, 0) ' \
-                     'FROM document WHERE tenant_uuid = %(tenant_uuid)s) ' \
-                     '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) ' \
-                     'FROM document_template_asset WHERE tenant_uuid = %(tenant_uuid)s) ' \
-                     'as result;'
+    SUM_FILE_SIZES = ('SELECT (SELECT COALESCE(SUM(file_size)::bigint, 0) '
+                      'FROM document WHERE tenant_uuid = %(tenant_uuid)s) '
+                      '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) '
+                      'FROM document_template_asset WHERE tenant_uuid = %(tenant_uuid)s) '
+                      '+ (SELECT COALESCE(SUM(file_size)::bigint, 0) '
+                      'FROM questionnaire_file WHERE tenant_uuid = %(tenant_uuid)s) '
+                      'AS result;')
 
     def __init__(self, cfg: DatabaseConfig, connect: bool = True,
                  with_queue: bool = True):
@@ -121,7 +133,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_document(self, document_uuid: str, tenant_uuid: str) -> Optional[DBDocument]:
+    def fetch_document(self, document_uuid: str, tenant_uuid: str) -> DBDocument | None:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_DOCUMENT,
@@ -139,7 +151,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_tenant_config(self, tenant_uuid: str) -> Optional[DBTenantConfig]:
+    def fetch_tenant_config(self, tenant_uuid: str) -> DBTenantConfig | None:
         return self.get_tenant_config(tenant_uuid)
 
     @tenacity.retry(
@@ -149,7 +161,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_tenant_limits(self, tenant_uuid: str) -> Optional[DBTenantLimits]:
+    def fetch_tenant_limits(self, tenant_uuid: str) -> DBTenantLimits | None:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_TENANT_LIMIT,
@@ -169,7 +181,7 @@ class Database:
     )
     def fetch_template(
             self, template_id: str, tenant_uuid: str
-    ) -> Optional[DBDocumentTemplate]:
+    ) -> DBDocumentTemplate | None:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_TEMPLATE,
@@ -189,7 +201,7 @@ class Database:
     )
     def fetch_template_files(
             self, template_id: str, tenant_uuid: str
-    ) -> List[DBDocumentTemplateFile]:
+    ) -> list[DBDocumentTemplateFile]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_TEMPLATE_FILES,
@@ -206,7 +218,7 @@ class Database:
     )
     def fetch_template_assets(
             self, template_id: str, tenant_uuid: str
-    ) -> List[DBDocumentTemplateAsset]:
+    ) -> list[DBDocumentTemplateAsset]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_TEMPLATE_ASSETS,
@@ -221,7 +233,8 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_qtn_documents(self, questionnaire_uuid: str, tenant_uuid: str) -> List[DBDocument]:
+    def fetch_qtn_documents(self, questionnaire_uuid: str,
+                            tenant_uuid: str) -> list[DBDocument]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_QTN_DOCUMENTS,
@@ -236,7 +249,8 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_document_submissions(self, document_uuid: str, tenant_uuid: str) -> List[DBSubmission]:
+    def fetch_document_submissions(self, document_uuid: str,
+                                   tenant_uuid: str) -> list[DBSubmission]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_DOCUMENT_SUBMISSIONS,
@@ -251,7 +265,8 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_questionnaire_submissions(self, questionnaire_uuid: str, tenant_uuid: str) -> List[DBSubmission]:
+    def fetch_questionnaire_submissions(self, questionnaire_uuid: str,
+                                        tenant_uuid: str) -> list[DBSubmission]:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_QTN_SUBMISSIONS,
@@ -266,7 +281,8 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def fetch_questionnaire_simple(self, questionnaire_uuid: str, tenant_uuid: str) -> DBQuestionnaireSimple:
+    def fetch_questionnaire_simple(self, questionnaire_uuid: str,
+                                   tenant_uuid: str) -> DBQuestionnaireSimple:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             cursor.execute(
                 query=self.SELECT_QTN_SIMPLE,
@@ -303,7 +319,7 @@ class Database:
                 query=self.UPDATE_DOCUMENT_RETRIEVED,
                 params=(
                     retrieved_at,
-                    DocumentState.PROCESSING,
+                    DocumentState.PROCESSING.value,
                     document_uuid,
                 ),
             )
@@ -317,7 +333,7 @@ class Database:
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
     def update_document_finished(
-            self, finished_at: datetime.datetime, file_name: str, file_size: int,
+            self, *, finished_at: datetime.datetime, file_name: str, file_size: int,
             content_type: str,  worker_log: str, document_uuid: str
     ) -> bool:
         with self.conn_query.new_cursor() as cursor:
@@ -325,7 +341,7 @@ class Database:
                 query=self.UPDATE_DOCUMENT_FINISHED,
                 params=(
                     finished_at,
-                    DocumentState.FINISHED,
+                    DocumentState.FINISHED.value,
                     file_name,
                     content_type,
                     worker_log,
@@ -358,7 +374,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def get_tenant_config(self, tenant_uuid: str) -> Optional[DBTenantConfig]:
+    def get_tenant_config(self, tenant_uuid: str) -> DBTenantConfig | None:
         if not self._check_table_exists(table_name='tenant_config'):
             return None
         with self.conn_query.new_cursor(use_dict=True) as cursor:
@@ -370,8 +386,8 @@ class Database:
                 result = cursor.fetchone()
                 return DBTenantConfig.from_dict_row(data=result)
             except Exception as e:
-                LOG.warning(f'Could not retrieve tenant_config for tenant'
-                            f' "{tenant_uuid}": {str(e)}')
+                LOG.warning('Could not retrieve tenant_config for tenant "%s": %s',
+                            tenant_uuid, str(e))
                 return None
 
     @tenacity.retry(
@@ -381,7 +397,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def get_mail_config(self, tenant_uuid: str) -> Optional[DBInstanceConfigMail]:
+    def get_mail_config(self, tenant_uuid: str) -> DBInstanceConfigMail | None:
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             if not self._check_table_exists(table_name='instance_config_mail'):
                 return None
@@ -395,8 +411,8 @@ class Database:
                     return None
                 return DBInstanceConfigMail.from_dict_row(data=result)
             except Exception as e:
-                LOG.warning(f'Could not retrieve instance_config_mail for tenant'
-                            f' "{tenant_uuid}": {str(e)}')
+                LOG.warning('Could not retrieve instance_config_mail for tenant "%s": %s',
+                            tenant_uuid, str(e))
                 return None
 
     @tenacity.retry(
@@ -409,7 +425,7 @@ class Database:
     def update_component_info(self, name: str, version: str, built_at: datetime.datetime):
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             if not self._check_table_exists(table_name='component'):
-                return None
+                return
             ts_now = datetime.datetime.now(tz=datetime.UTC)
             try:
                 cursor.execute(
@@ -424,7 +440,7 @@ class Database:
                 )
                 self.conn_query.connection.commit()
             except Exception as e:
-                LOG.warning(f'Could not update component info: {str(e)}')
+                LOG.warning('Could not update component info: %s', str(e))
 
     @tenacity.retry(
         reraise=True,
@@ -433,7 +449,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def get_component_info(self, name: str) -> Optional[DBComponent]:
+    def get_component_info(self, name: str) -> DBComponent | None:
         if not self._check_table_exists(table_name='component'):
             return None
         with self.conn_query.new_cursor(use_dict=True) as cursor:
@@ -447,7 +463,7 @@ class Database:
                     return None
                 return DBComponent.from_dict_row(data=result)
             except Exception as e:
-                LOG.warning(f'Could not get component info: {str(e)}')
+                LOG.warning('Could not get component info: %s', str(e))
                 return None
 
     @tenacity.retry(
@@ -457,7 +473,7 @@ class Database:
         before=tenacity.before_log(LOG, logging.DEBUG),
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
-    def execute_queries(self, queries: Iterable[str]):
+    def execute_queries(self, queries: typing.Iterable[str]):
         with self.conn_query.new_cursor(use_dict=True) as cursor:
             for query in queries:
                 cursor.execute(query=query)
@@ -484,7 +500,7 @@ class PostgresConnection:
             connect_timeout=timeout,
         )
         self.autocommit = autocommit
-        self._connection = None  # type: Optional[psycopg.Connection]
+        self._connection: psycopg.Connection | None = None
 
     @tenacity.retry(
         reraise=True,
@@ -494,11 +510,15 @@ class PostgresConnection:
         after=tenacity.after_log(LOG, logging.DEBUG),
     )
     def _connect_db(self):
-        LOG.info(f'Creating connection to PostgreSQL database "{self.name}"')
+        LOG.info('Creating connection to PostgreSQL database "%s"', self.name)
         try:
-            connection = psycopg.connect(conninfo=self.dsn, autocommit=self.autocommit)  # type: psycopg.Connection
+            connection: psycopg.Connection = psycopg.connect(
+                conninfo=self.dsn,
+                autocommit=self.autocommit,
+            )
         except Exception as e:
-            LOG.error(f'Failed to connect to PostgreSQL database "{self.name}": {str(e)}')
+            LOG.error('Failed to connect to PostgreSQL database "%s": %s',
+                      self.name, str(e))
             raise e
         # test connection
         cursor = connection.cursor()
@@ -506,7 +526,7 @@ class PostgresConnection:
         result = cursor.fetchone()
         if result is None:
             raise RuntimeError('Failed to verify DB connection')
-        LOG.debug(f'DB connection verified (result={result[0]})')
+        LOG.debug('DB connection verified (result=%s)', result[0])
         cursor.close()
         connection.commit()
         self._connection = connection
@@ -532,6 +552,6 @@ class PostgresConnection:
 
     def close(self):
         if self._connection:
-            LOG.info(f'Closing connection to PostgreSQL database "{self.name}"')
+            LOG.info('Closing connection to PostgreSQL database "%s"', self.name)
             self._connection.close()
         self._connection = None

{dsw_database-4.12.0 → dsw_database-4.14.0}/dsw/database/model.py

@@ -1,21 +1,20 @@
 import dataclasses
 import datetime
+import enum
 import json
 
-from typing import Optional
-
 
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 
 
-class DocumentState:
+class DocumentState(enum.Enum):
     QUEUED = 'QueuedDocumentState'
     PROCESSING = 'InProgressDocumentState'
     FAILED = 'ErrorDocumentState'
     FINISHED = 'DoneDocumentState'
 
 
-class DocumentTemplatePhase:
+class DocumentTemplatePhase(enum.Enum):
     RELEASED = 'ReleasedTemplatePhase'
     DEPRECATED = 'DeprecatedTemplatePhase'
     DRAFT = 'DraftTemplatePhase'
@@ -55,8 +54,8 @@ class DBDocument:
     content_type: str
     worker_log: str
     created_by: str
-    retrieved_at: Optional[datetime.datetime]
-    finished_at: Optional[datetime.datetime]
+    retrieved_at: datetime.datetime | None
+    finished_at: datetime.datetime | None
     created_at: datetime.datetime
     tenant_uuid: str
     file_size: int
@@ -191,11 +190,11 @@ class PersistentCommand:
     component: str
     function: str
     body: dict
-    last_error_message: Optional[str]
+    last_error_message: str | None
     attempts: int
     max_attempts: int
     tenant_uuid: str
-    created_by: Optional[str]
+    created_by: str | None
     created_at: datetime.datetime
     updated_at: datetime.datetime
 
@@ -220,28 +219,28 @@ class PersistentCommand:
 @dataclasses.dataclass
 class DBTenantConfig:
     uuid: str
-    organization: Optional[dict]
-    authentication: Optional[dict]
-    privacy_and_support: Optional[dict]
-    dashboard: Optional[dict]
-    look_and_feel: Optional[dict]
-    registry: Optional[dict]
-    knowledge_model: Optional[dict]
-    questionnaire: Optional[dict]
-    submission: Optional[dict]
-    owl: Optional[dict]
-    mail_config_uuid: Optional[str]
+    organization: dict | None
+    authentication: dict | None
+    privacy_and_support: dict | None
+    dashboard: dict | None
+    look_and_feel: dict | None
+    registry: dict | None
+    knowledge_model: dict | None
+    questionnaire: dict | None
+    submission: dict | None
+    owl: dict | None
+    mail_config_uuid: str | None
     created_at: datetime.datetime
     updated_at: datetime.datetime
 
     @property
-    def app_title(self) -> Optional[str]:
+    def app_title(self) -> str | None:
         if self.look_and_feel is None:
             return None
         return self.look_and_feel.get('appTitle', None)
 
     @property
-    def support_email(self) -> Optional[str]:
+    def support_email(self) -> str | None:
         if self.privacy_and_support is None:
             return None
         return self.privacy_and_support.get('supportEmail', None)
@@ -269,7 +268,7 @@ class DBTenantConfig:
 @dataclasses.dataclass
 class DBTenantLimits:
     tenant_uuid: str
-    storage: Optional[int]
+    storage: int | None
 
     @staticmethod
     def from_dict_row(data: dict):
@@ -390,19 +389,19 @@ class DBInstanceConfigMail:
     uuid: str
     enabled: bool
     provider: str
-    sender_name: Optional[str]
-    sender_email: Optional[str]
-    smtp_host: Optional[str]
-    smtp_port: Optional[int]
-    smtp_security: Optional[str]
-    smtp_username: Optional[str]
-    smtp_password: Optional[str]
-    aws_access_key_id: Optional[str]
-    aws_secret_access_key: Optional[str]
-    aws_region: Optional[str]
-    rate_limit_window: Optional[int]
-    rate_limit_count: Optional[int]
-    timeout: Optional[int]
+    sender_name: str | None
+    sender_email: str | None
+    smtp_host: str | None
+    smtp_port: int | None
+    smtp_security: str | None
+    smtp_username: str | None
+    smtp_password: str | None
+    aws_access_key_id: str | None
+    aws_secret_access_key: str | None
+    aws_region: str | None
+    rate_limit_window: int | None
+    rate_limit_count: int | None
+    timeout: int | None
 
     @staticmethod
     def from_dict_row(data: dict):

{dsw_database-4.12.0 → dsw_database-4.14.0/dsw_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-database
-Version: 4.12.0
+Version: 4.14.0
 Summary: Library for managing DSW database
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -11,16 +11,16 @@ Keywords: dsw,database
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.12.0
+Requires-Dist: dsw-config==4.14.0
 
 # Data Stewardship Wizard: Database
 

{dsw_database-4.12.0 → dsw_database-4.14.0}/dsw_database.egg-info/requires.txt

@@ -1,3 +1,3 @@
 psycopg[binary]
 tenacity
-dsw-config==4.12.0
+dsw-config==4.14.0

{dsw_database-4.12.0 → dsw_database-4.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "4.12.0"
+version = "4.14.0"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -16,17 +16,17 @@ classifiers = [
     'Development Status :: 5 - Production/Stable',
     'License :: OSI Approved :: Apache Software License',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Topic :: Database',
     'Topic :: Utilities',
 ]
-requires-python = '>=3.10, <4'
+requires-python = '>=3.11, <4'
 dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==4.12.0",
+    "dsw-config==4.14.0",
 ]
 
 [project.urls]