dsw-database 4.20.1__py2.py3-none-any.whl → 4.22.0__py2.py3-none-any.whl

dsw/database/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.20.1~0e2ea82',
-    built_at='2025-07-23 08:04:38Z',
-    sha='0e2ea82aa69b9aae205f7715cf9606bbf75f9f20',
+    version='v4.22.0~dffe6c1',
+    built_at='2025-09-02 13:01:38Z',
+    sha='dffe6c10e47b8795a0d27d495d1c0c0a5d4a76fb',
     branch='HEAD',
-    tag='v4.20.1',
+    tag='v4.22.0',
 )

dsw/database/database.py

@@ -13,9 +13,10 @@ 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
+    DBUserEntity, DBLocale, DBDocumentTemplateFormat, \
+    DBDocumentTemplateStep
 
 LOG = logging.getLogger(__name__)
 
@@ -44,8 +45,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;'
@@ -55,6 +54,10 @@ class Database:
                                 'file_size = %s WHERE uuid = %s;')
     SELECT_TEMPLATE = ('SELECT * FROM document_template '
                        'WHERE id = %s AND tenant_uuid = %s LIMIT 1;')
+    SELECT_TEMPLATE_FORMATS = ('SELECT * FROM document_template_format '
+                               'WHERE document_template_id = %s AND tenant_uuid = %s;')
+    SELECT_TEMPLATE_STEPS = ('SELECT * FROM document_template_format_step '
+                             'WHERE document_template_id = %s AND tenant_uuid = %s;')
     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 '
@@ -152,16 +155,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),
@@ -195,10 +188,47 @@ class Database:
                 query=self.SELECT_TEMPLATE,
                 params=(template_id, tenant_uuid),
             )
-            result = cursor.fetchall()
-            if len(result) != 1:
+            dt_result = cursor.fetchall()
+            if len(dt_result) != 1:
                 return None
-            return DBDocumentTemplate.from_dict_row(result[0])
+            template = DBDocumentTemplate.from_dict_row(dt_result[0])
+
+            cursor.execute(
+                query=self.SELECT_TEMPLATE_FORMATS,
+                params=(template_id, tenant_uuid),
+            )
+            formats_result = cursor.fetchall()
+            formats = sorted([
+                DBDocumentTemplateFormat.from_dict_row(x) for x in formats_result
+            ], key=lambda x: x.name)
+            cursor.execute(
+                query=self.SELECT_TEMPLATE_STEPS,
+                params=(template_id, tenant_uuid),
+            )
+            print(f'Format results: {formats_result}')
+            print(f'Formats: {formats}')
+            steps_result = cursor.fetchall()
+            steps = sorted([
+                DBDocumentTemplateStep.from_dict_row(x) for x in steps_result
+            ], key=lambda x: x.position)
+            print(f'Steps results: {formats_result}')
+            print(f'Steps: {steps}')
+            steps_dict: dict[str, list[dict]] = {}
+            for step in steps:
+                if step.format_uuid not in steps_dict:
+                    steps_dict[step.format_uuid] = []
+                steps_dict[step.format_uuid].append({
+                    'name': step.name,
+                    'options': step.options,
+                })
+            for format_obj in formats:
+                template.formats.append({
+                    'uuid': format_obj.uuid,
+                    'name': format_obj.name,
+                    'steps': steps_dict.get(format_obj.uuid, []),
+                })
+            print(template.formats)
+        return template
 
     @tenacity.retry(
         reraise=True,
@@ -375,29 +405,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/model.py

@@ -96,7 +96,7 @@ class DBDocumentTemplate:
     readme: str
     license: str
     allowed_packages: dict
-    formats: dict
+    formats: list
     phase: str
     created_at: datetime.datetime
     updated_at: datetime.datetime
@@ -127,7 +127,7 @@ class DBDocumentTemplate:
             readme=data['readme'],
             license=data['license'],
             allowed_packages=data['allowed_packages'],
-            formats=data['formats'],
+            formats=[],
             phase=data['phase'],
             created_at=data['created_at'],
             updated_at=data['updated_at'],
@@ -135,6 +135,54 @@ class DBDocumentTemplate:
         )
 
 
+@dataclasses.dataclass
+class DBDocumentTemplateFormat:
+    document_template_id: str
+    uuid: str
+    name: str
+    icon: str
+    created_at: datetime.datetime
+    updated_at: datetime.datetime
+    tenant_uuid: str
+
+    @staticmethod
+    def from_dict_row(data: dict) -> 'DBDocumentTemplateFormat':
+        return DBDocumentTemplateFormat(
+            document_template_id=data['document_template_id'],
+            uuid=str(data['uuid']),
+            name=data['name'],
+            icon=data['icon'],
+            created_at=data['created_at'],
+            updated_at=data['updated_at'],
+            tenant_uuid=str(data.get('tenant_uuid', NULL_UUID)),
+        )
+
+
+@dataclasses.dataclass
+class DBDocumentTemplateStep:
+    document_template_id: str
+    format_uuid: str
+    position: int
+    name: str
+    options: dict[str, str]
+    created_at: datetime.datetime
+    updated_at: datetime.datetime
+    tenant_uuid: str
+
+    @staticmethod
+    def from_dict_row(data: dict) -> 'DBDocumentTemplateStep':
+        return DBDocumentTemplateStep(
+            document_template_id=data['document_template_id'],
+            format_uuid=str(data['format_uuid']),
+            position=data['position'],
+            name=data['name'],
+            options=data['options'],
+            created_at=data['created_at'],
+            updated_at=data['updated_at'],
+            tenant_uuid=str(data.get('tenant_uuid', NULL_UUID)),
+        )
+
+
 @dataclasses.dataclass
 class DBDocumentTemplateFile:
     document_template_id: str
@@ -216,55 +264,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.1.dist-info → dsw_database-4.22.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.20.1
+Version: 4.22.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.1
+Requires-Dist: dsw-config==4.22.0
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

dsw_database-4.22.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+dsw/database/__init__.py,sha256=58ZXZ8i4xzAvvjUdqt8lvdv28hD0yzY_xxI6n9deynw,55
+dsw/database/build_info.py,sha256=LEKGaMjtEl5mbW--jDiDsVBjM3eCcpa-JHkt1-_6hHk,381
+dsw/database/database.py,sha256=2hXcU-txscH6qtKz1CT_JHIChdH4G_PgSNcIA6s4Tv8,27457
+dsw/database/model.py,sha256=ECUNCxbzRuy8dPjEWY1dAkaY1AmdobH6DPGBQPZaaKY,13552
+dsw_database-4.22.0.dist-info/licenses/LICENSE,sha256=rDtJ4LdsXvf_euOpGD0Q86P78K4JyM5m4yfYz9wZ750,11346
+dsw_database-4.22.0.dist-info/METADATA,sha256=EAp6xHhi-1Y6uhPOK82yailN3cYdzZ-cCmWeYsejzmQ,1843
+dsw_database-4.22.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+dsw_database-4.22.0.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
+dsw_database-4.22.0.dist-info/RECORD,,

dsw_database-4.20.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-dsw/database/__init__.py,sha256=58ZXZ8i4xzAvvjUdqt8lvdv28hD0yzY_xxI6n9deynw,55
-dsw/database/build_info.py,sha256=ZPEl_TE1xRrecv0DidwcjMbWKR5jnVrzoo-ZMOoF_Z0,381
-dsw/database/database.py,sha256=fsj9RoEQcISU7XZQ7YNlMJKVIaHqjjFejeDO0tzAKIA,27116
-dsw/database/model.py,sha256=4Co0j4gLWI6r1wuOxylApOfZfCE9ZGXawA7A8JKUsHk,13828
-dsw_database-4.20.1.dist-info/licenses/LICENSE,sha256=rDtJ4LdsXvf_euOpGD0Q86P78K4JyM5m4yfYz9wZ750,11346
-dsw_database-4.20.1.dist-info/METADATA,sha256=WUo3vLfJmOGsdn9KEmbm5SZNii1isyHsg9Pg5ChQScg,1843
-dsw_database-4.20.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-dsw_database-4.20.1.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
-dsw_database-4.20.1.dist-info/RECORD,,