dsw-database 4.20.0__tar.gz → 4.21.0__tar.gz

{dsw_database-4.20.0/dsw_database.egg-info → dsw_database-4.21.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.20.0
+Version: 4.21.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.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.11
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.20.0
+Requires-Dist: dsw-config==4.21.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

{dsw_database-4.20.0 → dsw_database-4.21.0}/dsw/database/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.20.0~25af8c2',
-    built_at='2025-07-01 08:19:14Z',
-    sha='25af8c29d1d7d5e767dca72ce71d183b7434d751',
+    version='v4.21.0~12713f1',
+    built_at='2025-08-05 09:21:07Z',
+    sha='12713f1988c2a33d5c40dd2cb899cdac7be35668',
     branch='HEAD',
-    tag='v4.20.0',
+    tag='v4.21.0',
 )

{dsw_database-4.20.0 → dsw_database-4.21.0}/dsw/database/database.py

@@ -13,7 +13,7 @@ from dsw.config.model import DatabaseConfig
 
 from .model import DBDocumentTemplate, DBDocumentTemplateFile, \
     DBDocumentTemplateAsset, DBDocument, DBComponent, \
-    DocumentState, DBTenantConfig, DBTenantLimits, DBSubmission, \
+    DocumentState, DBTenantLimits, DBSubmission, \
     DBInstanceConfigMail, DBQuestionnaireSimple, \
     DBUserEntity, DBLocale
 
@@ -44,8 +44,6 @@ class Database:
                               '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;'
@@ -152,16 +150,6 @@ class Database:
                 return None
             return DBDocument.from_dict_row(result[0])
 
-    @tenacity.retry(
-        reraise=True,
-        wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
-        stop=tenacity.stop_after_attempt(RETRY_QUERY_TRIES),
-        before=tenacity.before_log(LOG, logging.DEBUG),
-        after=tenacity.after_log(LOG, logging.DEBUG),
-    )
-    def fetch_tenant_config(self, tenant_uuid: str) -> DBTenantConfig | None:
-        return self.get_tenant_config(tenant_uuid)
-
     @tenacity.retry(
         reraise=True,
         wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
@@ -375,29 +363,6 @@ class Database:
             row = cursor.fetchone()
             return row[0]
 
-    @tenacity.retry(
-        reraise=True,
-        wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),
-        stop=tenacity.stop_after_attempt(RETRY_QUERY_TRIES),
-        before=tenacity.before_log(LOG, logging.DEBUG),
-        after=tenacity.after_log(LOG, logging.DEBUG),
-    )
-    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:
-            try:
-                cursor.execute(
-                    query=self.SELECT_TENANT_CONFIG,
-                    params={'tenant_uuid': tenant_uuid},
-                )
-                result = cursor.fetchone()
-                return DBTenantConfig.from_dict_row(data=result)
-            except Exception as e:
-                LOG.warning('Could not retrieve tenant_config for tenant "%s": %s',
-                            tenant_uuid, str(e))
-                return None
-
     @tenacity.retry(
         reraise=True,
         wait=tenacity.wait_exponential(multiplier=RETRY_QUERY_MULTIPLIER),

{dsw_database-4.20.0 → dsw_database-4.21.0}/dsw/database/model.py

@@ -216,55 +216,6 @@ class PersistentCommand:
         )
 
 
-@dataclasses.dataclass
-class DBTenantConfig:
-    uuid: 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) -> str | None:
-        if self.look_and_feel is None:
-            return None
-        return self.look_and_feel.get('appTitle', None)
-
-    @property
-    def support_email(self) -> str | None:
-        if self.privacy_and_support is None:
-            return None
-        return self.privacy_and_support.get('supportEmail', None)
-
-    @staticmethod
-    def from_dict_row(data: dict):
-        return DBTenantConfig(
-            uuid=str(data['uuid']),
-            organization=data.get('organization', None),
-            authentication=data.get('authentication', None),
-            privacy_and_support=data.get('privacy_and_support', None),
-            dashboard=data.get('dashboard_and_login_screen', None),
-            look_and_feel=data.get('look_and_feel', None),
-            registry=data.get('registry', None),
-            knowledge_model=data.get('knowledge_model', None),
-            questionnaire=data.get('questionnaire', None),
-            submission=data.get('submission', None),
-            owl=data.get('owl', None),
-            mail_config_uuid=data.get('mail_config_uuid', None),
-            created_at=data['created_at'],
-            updated_at=data['updated_at'],
-        )
-
-
 @dataclasses.dataclass
 class DBTenantLimits:
     tenant_uuid: str

{dsw_database-4.20.0 → dsw_database-4.21.0/dsw_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.20.0
+Version: 4.21.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.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: Utilities
-Requires-Python: <4,>=3.11
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.20.0
+Requires-Dist: dsw-config==4.21.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

{dsw_database-4.20.0 → dsw_database-4.21.0}/dsw_database.egg-info/requires.txt

@@ -1,3 +1,3 @@
 psycopg[binary]
 tenacity
-dsw-config==4.20.0
+dsw-config==4.21.0

{dsw_database-4.20.0 → dsw_database-4.21.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "4.20.0"
+version = "4.21.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.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Topic :: Database',
     'Topic :: Utilities',
 ]
-requires-python = '>=3.11, <4'
+requires-python = '>=3.12, <4'
 dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==4.20.0",
+    "dsw-config==4.21.0",
 ]
 
 [project.urls]