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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.21.0
+Version: 4.22.1
 Summary: Library for managing DSW database
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.21.0
+Requires-Dist: dsw-config==4.22.1
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

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

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.21.0~12713f1',
-    built_at='2025-08-05 09:21:07Z',
-    sha='12713f1988c2a33d5c40dd2cb899cdac7be35668',
+    version='v4.22.1~13699ca',
+    built_at='2025-09-04 06:55:38Z',
+    sha='13699ca0f74ff51a24bd76e242a89ef434b74658',
     branch='HEAD',
-    tag='v4.21.0',
+    tag='v4.22.1',
 )

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

@@ -15,7 +15,8 @@ from .model import DBDocumentTemplate, DBDocumentTemplateFile, \
     DBDocumentTemplateAsset, DBDocument, DBComponent, \
     DocumentState, DBTenantLimits, DBSubmission, \
     DBInstanceConfigMail, DBQuestionnaireSimple, \
-    DBUserEntity, DBLocale
+    DBUserEntity, DBLocale, DBDocumentTemplateFormat, \
+    DBDocumentTemplateStep
 
 LOG = logging.getLogger(__name__)
 
@@ -53,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 '
@@ -183,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,

{dsw_database-4.21.0 → dsw_database-4.22.1}/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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-database
-Version: 4.21.0
+Version: 4.22.1
 Summary: Library for managing DSW database
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: psycopg[binary]
 Requires-Dist: tenacity
-Requires-Dist: dsw-config==4.21.0
+Requires-Dist: dsw-config==4.22.1
 Dynamic: license-file
 
 # Data Stewardship Wizard: Database

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

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

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

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "4.21.0"
+version = "4.22.1"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==4.21.0",
+    "dsw-config==4.22.1",
 ]
 
 [project.urls]