From 8e63c4b64baf0ae871a0e427e59c252a8355e756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Sat, 10 Jan 2026 16:56:47 +0100 Subject: [PATCH 1/2] fix(docworker): Fix fetching submissions for document generation --- packages/dsw-document-worker/dsw/document_worker/worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dsw-document-worker/dsw/document_worker/worker.py b/packages/dsw-document-worker/dsw/document_worker/worker.py index 19b88089..2c934495 100644 --- a/packages/dsw-document-worker/dsw/document_worker/worker.py +++ b/packages/dsw-document-worker/dsw/document_worker/worker.py @@ -178,7 +178,7 @@ def _enrich_context_config(self): def _enrich_context(self): extras: dict[str, typing.Any] = {} if self.safe_format.requires_via_extras('submissions'): - if self.safe_doc.questionnaire_uuid is None: + if self.safe_doc.project_uuid is None: submissions = [] else: submissions = self.ctx.app.db.fetch_project_submissions( From 66c83c5a46a54e63e6dcba8e3ef0bc438d45bc2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Sat, 10 Jan 2026 18:05:07 +0100 Subject: [PATCH 2/2] Hotfix 4.26.1 --- packages/dsw-command-queue/CHANGELOG.md | 5 +++++ packages/dsw-command-queue/pyproject.toml | 4 ++-- packages/dsw-config/CHANGELOG.md | 5 +++++ packages/dsw-config/pyproject.toml | 2 +- packages/dsw-data-seeder/CHANGELOG.md | 5 +++++ .../dsw-data-seeder/dsw/data_seeder/consts.py | 2 +- packages/dsw-data-seeder/pyproject.toml | 10 +++++----- packages/dsw-database/CHANGELOG.md | 13 ++++++++++++- packages/dsw-database/pyproject.toml | 4 ++-- packages/dsw-document-worker/CHANGELOG.md | 17 ++++++++++++++++- .../dsw/document_worker/consts.py | 2 +- packages/dsw-document-worker/pyproject.toml | 10 +++++----- packages/dsw-mailer/CHANGELOG.md | 9 ++++++++- packages/dsw-mailer/Makefile | 2 +- packages/dsw-mailer/dsw/mailer/consts.py | 2 +- packages/dsw-mailer/pyproject.toml | 10 +++++----- packages/dsw-models/CHANGELOG.md | 9 ++++++++- packages/dsw-models/pyproject.toml | 2 +- packages/dsw-storage/CHANGELOG.md | 5 +++++ packages/dsw-storage/pyproject.toml | 4 ++-- packages/dsw-tdk/CHANGELOG.md | 5 +++++ packages/dsw-tdk/dsw/tdk/consts.py | 2 +- packages/dsw-tdk/pyproject.toml | 2 +- 23 files changed, 98 insertions(+), 33 deletions(-) diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index e6d1fe95..76bdd2db 100644 --- a/packages/dsw-command-queue/CHANGELOG.md +++ b/packages/dsw-command-queue/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.26.1] + +Released for version consistency with other DSW tools. + ## [4.26.0] Released for version consistency with other DSW tools. @@ -411,3 +415,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index 95c6429c..f08f3ee8 100644 --- a/packages/dsw-command-queue/pyproject.toml +++ b/packages/dsw-command-queue/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-command-queue' -version = "4.26.0" +version = "4.26.1" description = 'Library for working with command queue and persistent commands' readme = 'README.md' keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing'] @@ -26,7 +26,7 @@ requires-python = '>=3.12, <4' dependencies = [ 'func-timeout', # DSW - "dsw-database==4.26.0", + "dsw-database==4.26.1", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index 9bfbca8f..ba4dddbe 100644 --- a/packages/dsw-config/CHANGELOG.md +++ b/packages/dsw-config/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.26.1] + +Released for version consistency with other DSW tools. + ## [4.26.0] Released for version consistency with other DSW tools. @@ -418,3 +422,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index b6d9552b..836e1a2f 100644 --- a/packages/dsw-config/pyproject.toml +++ b/packages/dsw-config/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-config' -version = "4.26.0" +version = "4.26.1" description = 'Library for DSW config manipulation' readme = 'README.md' keywords = ['dsw', 'config', 'yaml', 'parser'] diff --git a/packages/dsw-data-seeder/CHANGELOG.md b/packages/dsw-data-seeder/CHANGELOG.md index 6183372f..60eb4dc3 100644 --- a/packages/dsw-data-seeder/CHANGELOG.md +++ b/packages/dsw-data-seeder/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.26.1] + +Released for version consistency with other DSW tools. + ## [4.26.0] Released for version consistency with other DSW tools. @@ -487,3 +491,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index 18300f90..5f26d702 100644 --- a/packages/dsw-data-seeder/dsw/data_seeder/consts.py +++ b/packages/dsw-data-seeder/dsw/data_seeder/consts.py @@ -6,7 +6,7 @@ DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>' NULL_UUID = '00000000-0000-0000-0000-000000000000' PROG_NAME = 'dsw-data-seeder' -VERSION = '4.26.0' +VERSION = '4.26.1' VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH' VAR_WORKDIR_PATH = 'WORKDIR_PATH' diff --git a/packages/dsw-data-seeder/pyproject.toml b/packages/dsw-data-seeder/pyproject.toml index de1d267b..e78568d3 100644 --- a/packages/dsw-data-seeder/pyproject.toml +++ b/packages/dsw-data-seeder/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-data-seeder' -version = "4.26.0" +version = "4.26.1" description = 'Worker for seeding DSW data' readme = 'README.md' keywords = ['data', 'database', 'seed', 'storage'] @@ -29,10 +29,10 @@ dependencies = [ 'sentry-sdk', 'tenacity', # DSW - "dsw-command-queue==4.26.0", - "dsw-config==4.26.0", - "dsw-database==4.26.0", - "dsw-storage==4.26.0", + "dsw-command-queue==4.26.1", + "dsw-config==4.26.1", + "dsw-database==4.26.1", + "dsw-storage==4.26.1", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index dfbe3213..57f3011b 100644 --- a/packages/dsw-database/CHANGELOG.md +++ b/packages/dsw-database/CHANGELOG.md @@ -8,10 +8,20 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -## [4.26.0] +## [4.26.1] Released for version consistency with other DSW tools. +## [4.26.0] + +### Fixed + +- RemoveD old prints for debugging + +### Changed + +- Renamed questionnaire to project + ## [4.25.1] - Fixed document.questionnaire_uuid as NULLABLE @@ -433,3 +443,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index 63d61e3c..907a2876 100644 --- a/packages/dsw-database/pyproject.toml +++ b/packages/dsw-database/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-database' -version = "4.26.0" +version = "4.26.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.26.0", + "dsw-config==4.26.1", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index 17b57d95..3485a99e 100644 --- a/packages/dsw-document-worker/CHANGELOG.md +++ b/packages/dsw-document-worker/CHANGELOG.md @@ -8,12 +8,26 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.26.1] + +### Fixed + +- Fixed fetching submissions for document generation + ## [4.26.0] -Released for version consistency with other DSW tools. +### Added + +- Added instance config to document context + +### Changed + +- Renamed questionnaire to project ## [4.25.1] +### Fixed + - Fixed document preview for KM editor ## [4.25.0] @@ -540,3 +554,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index 8893e892..79bacbab 100644 --- a/packages/dsw-document-worker/dsw/document_worker/consts.py +++ b/packages/dsw-document-worker/dsw/document_worker/consts.py @@ -10,7 +10,7 @@ PACKAGE_NAME = 'dsw-document-worker' PLUGINS_ENTRYPOINT = 'dsw_document_worker_plugins' PROG_NAME = 'docworker' -VERSION = '4.26.0' +VERSION = '4.26.1' VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH' VAR_WORKDIR_PATH = 'WORKDIR_PATH' diff --git a/packages/dsw-document-worker/pyproject.toml b/packages/dsw-document-worker/pyproject.toml index b8495669..271680a2 100644 --- a/packages/dsw-document-worker/pyproject.toml +++ b/packages/dsw-document-worker/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-document-worker' -version = "4.26.0" +version = "4.26.1" description = 'Worker for assembling and transforming documents' readme = 'README.md' keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker'] @@ -39,10 +39,10 @@ dependencies = [ 'weasyprint==67.0', 'XlsxWriter', # DSW - "dsw-command-queue==4.26.0", - "dsw-config==4.26.0", - "dsw-database==4.26.0", - "dsw-storage==4.26.0", + "dsw-command-queue==4.26.1", + "dsw-config==4.26.1", + "dsw-database==4.26.1", + "dsw-storage==4.26.1", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index 658a8218..a897a816 100644 --- a/packages/dsw-mailer/CHANGELOG.md +++ b/packages/dsw-mailer/CHANGELOG.md @@ -8,10 +8,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -## [4.26.0] +## [4.26.1] Released for version consistency with other DSW tools. +## [4.26.0] + +### Changed + +- Renamed questionnaire to project + ## [4.25.1] Released for version consistency with other DSW tools. @@ -463,3 +469,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-mailer/Makefile b/packages/dsw-mailer/Makefile index ce270f85..eb853fe2 100644 --- a/packages/dsw-mailer/Makefile +++ b/packages/dsw-mailer/Makefile @@ -1,5 +1,5 @@ PIP = pip -VERSION = 4.26.0 +VERSION = 4.26.1 .PHONY: verify verify: diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index db4d908b..46032d9e 100644 --- a/packages/dsw-mailer/dsw/mailer/consts.py +++ b/packages/dsw-mailer/dsw/mailer/consts.py @@ -5,7 +5,7 @@ DEFAULT_ENCODING = 'utf-8' NULL_UUID = '00000000-0000-0000-0000-000000000000' PROG_NAME = 'dsw-mailer' -VERSION = '4.26.0' +VERSION = '4.26.1' VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH' VAR_WORKDIR_PATH = 'WORKDIR_PATH' diff --git a/packages/dsw-mailer/pyproject.toml b/packages/dsw-mailer/pyproject.toml index a133a9c1..bd39ea88 100644 --- a/packages/dsw-mailer/pyproject.toml +++ b/packages/dsw-mailer/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-mailer' -version = "4.26.0" +version = "4.26.1" description = 'Worker for sending email notifications' readme = 'README.md' keywords = ['email', 'jinja2', 'notification', 'template'] @@ -34,10 +34,10 @@ dependencies = [ 'sentry-sdk', 'tenacity', # DSW - "dsw-command-queue==4.26.0", - "dsw-config==4.26.0", - "dsw-database==4.26.0", - "dsw-storage==4.26.0", + "dsw-command-queue==4.26.1", + "dsw-config==4.26.1", + "dsw-database==4.26.1", + "dsw-storage==4.26.1", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index 97465f9c..6719e6f1 100644 --- a/packages/dsw-models/CHANGELOG.md +++ b/packages/dsw-models/CHANGELOG.md @@ -8,10 +8,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] -## [4.26.0] +## [4.26.1] Released for version consistency with other DSW tools. +## [4.26.0] + +### Changed + +- Introduced KM events, flat, and tree models + ## [4.25.1] Released for version consistency with other DSW tools. @@ -335,3 +341,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index 544a69ca..afae9e6f 100644 --- a/packages/dsw-models/pyproject.toml +++ b/packages/dsw-models/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-models' -version = "4.26.0" +version = "4.26.1" description = 'Library with DSW models and basic IO operations' readme = 'README.md' keywords = ['dsw', 'config', 'yaml', 'parser'] diff --git a/packages/dsw-storage/CHANGELOG.md b/packages/dsw-storage/CHANGELOG.md index b8158bd8..e649fd34 100644 --- a/packages/dsw-storage/CHANGELOG.md +++ b/packages/dsw-storage/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.26.1] + +Released for version consistency with other DSW tools. + ## [4.26.0] Released for version consistency with other DSW tools. @@ -402,3 +406,4 @@ Released for version consistency with other DSW tools. [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index cec5dae6..554b1b00 100644 --- a/packages/dsw-storage/pyproject.toml +++ b/packages/dsw-storage/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-storage' -version = "4.26.0" +version = "4.26.1" description = 'Library for managing DSW S3 storage' readme = 'README.md' keywords = ['dsw', 's3', 'bucket', 'storage'] @@ -26,7 +26,7 @@ dependencies = [ 'minio', 'tenacity', # DSW - "dsw-config==4.26.0", + "dsw-config==4.26.1", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index 8e24a612..6cc69293 100644 --- a/packages/dsw-tdk/CHANGELOG.md +++ b/packages/dsw-tdk/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.26.1] + +Released for version consistency with other DSW tools. + ## [4.26.0] Released for version consistency with other DSW tools. @@ -659,3 +663,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.25.0]: /../../tree/v4.25.0 [4.25.1]: /../../tree/v4.25.1 [4.26.0]: /../../tree/v4.26.0 +[4.26.1]: /../../tree/v4.26.1 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index 9e37ac5d..d356ffe6 100644 --- a/packages/dsw-tdk/dsw/tdk/consts.py +++ b/packages/dsw-tdk/dsw/tdk/consts.py @@ -4,7 +4,7 @@ import pathspec APP = 'dsw-tdk' -VERSION = '4.26.0' +VERSION = '4.26.1' METAMODEL_VERSION_MAJOR = 17 METAMODEL_VERSION_MINOR = 1 METAMODEL_VERSION = f'{METAMODEL_VERSION_MAJOR}.{METAMODEL_VERSION_MINOR}' diff --git a/packages/dsw-tdk/pyproject.toml b/packages/dsw-tdk/pyproject.toml index 2ef9e7a3..f76e97bc 100644 --- a/packages/dsw-tdk/pyproject.toml +++ b/packages/dsw-tdk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta' [project] name = 'dsw-tdk' -version = "4.26.0" +version = "4.26.1" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']