From c0ee8f8c2f9b15767f3775e4b15023af7a59a943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Wed, 21 Feb 2024 20:17:35 +0000 Subject: [PATCH 1/2] Fix getting config in mailer for Registry --- packages/dsw-database/dsw/database/database.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/dsw-database/dsw/database/database.py b/packages/dsw-database/dsw/database/database.py index 904f1f3f..d44a86a8 100644 --- a/packages/dsw-database/dsw/database/database.py +++ b/packages/dsw-database/dsw/database/database.py @@ -358,6 +358,8 @@ def get_currently_used_size(self, tenant_uuid: str): after=tenacity.after_log(LOG, logging.DEBUG), ) def get_tenant_config(self, tenant_uuid: str) -> Optional[DBTenantConfig]: + 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( @@ -431,6 +433,8 @@ def update_component_info(self, name: str, version: str, built_at: datetime.date after=tenacity.after_log(LOG, logging.DEBUG), ) def get_component_info(self, name: str) -> Optional[DBComponent]: + if not self._check_table_exists(table_name='component'): + return None with self.conn_query.new_cursor(use_dict=True) as cursor: try: cursor.execute( From d3359bd733e839a93bd43951affe2d3967190f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Wed, 21 Feb 2024 20:40:37 +0000 Subject: [PATCH 2/2] Hotfix 4.3.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 +++++ packages/dsw-data-seeder/dsw/data_seeder/consts.py | 2 +- packages/dsw-data-seeder/pyproject.toml | 10 +++++----- packages/dsw-database/CHANGELOG.md | 7 +++++++ packages/dsw-database/pyproject.toml | 4 ++-- packages/dsw-document-worker/CHANGELOG.md | 5 +++++ .../dsw-document-worker/dsw/document_worker/consts.py | 4 ++-- packages/dsw-document-worker/pyproject.toml | 10 +++++----- packages/dsw-mailer/CHANGELOG.md | 5 +++++ packages/dsw-mailer/dsw/mailer/consts.py | 2 +- packages/dsw-mailer/pyproject.toml | 8 ++++---- packages/dsw-models/CHANGELOG.md | 5 +++++ 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 +- 22 files changed, 75 insertions(+), 28 deletions(-) diff --git a/packages/dsw-command-queue/CHANGELOG.md b/packages/dsw-command-queue/CHANGELOG.md index 9a07eb19..8820bf9e 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.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] Released for version consistency with other DSW tools. @@ -179,3 +183,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml index 4bafa273..7b850240 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.3.0" +version = "4.3.1" description = 'Library for working with command queue and persistent commands' readme = 'README.md' keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing'] @@ -25,7 +25,7 @@ classifiers = [ requires-python = '>=3.10, <4' dependencies = [ # DSW - "dsw-database==4.3.0", + "dsw-database==4.3.1", ] [project.urls] diff --git a/packages/dsw-config/CHANGELOG.md b/packages/dsw-config/CHANGELOG.md index d2c76e39..d6f2d10f 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.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] Released for version consistency with other DSW tools. @@ -187,3 +191,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml index f6b7acb4..03a4431a 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.3.0" +version = "4.3.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 58589b2e..f2c6beea 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.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] ### Added @@ -237,3 +241,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-data-seeder/dsw/data_seeder/consts.py b/packages/dsw-data-seeder/dsw/data_seeder/consts.py index f96aa4c0..a274ad7d 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.3.0' +VERSION = '4.3.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 af84b9b1..0daca2b9 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.3.0" +version = "4.3.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.3.0", - "dsw-config==4.3.0", - "dsw-database==4.3.0", - "dsw-storage==4.3.0", + "dsw-command-queue==4.3.1", + "dsw-config==4.3.1", + "dsw-database==4.3.1", + "dsw-storage==4.3.1", ] [project.urls] diff --git a/packages/dsw-database/CHANGELOG.md b/packages/dsw-database/CHANGELOG.md index 96c6439a..77592998 100644 --- a/packages/dsw-database/CHANGELOG.md +++ b/packages/dsw-database/CHANGELOG.md @@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.3.1] + +### Fixed + +- Fix retrieving configs + ## [4.3.0] Released for version consistency with other DSW tools. @@ -194,3 +200,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml index 880f8c7c..89ada8f1 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.3.0" +version = "4.3.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.3.0", + "dsw-config==4.3.1", ] [project.urls] diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md index 6f9d581c..8b8e06d0 100644 --- a/packages/dsw-document-worker/CHANGELOG.md +++ b/packages/dsw-document-worker/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] ### Added @@ -240,3 +244,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py index 4375c765..c7f421d6 100644 --- a/packages/dsw-document-worker/dsw/document_worker/consts.py +++ b/packages/dsw-document-worker/dsw/document_worker/consts.py @@ -1,12 +1,12 @@ CMD_CHANNEL = 'doc_worker' CMD_COMPONENT = 'doc_worker' COMPONENT_NAME = 'Document Worker' -CURRENT_METAMODEL = 12 +CURRENT_METAMODEL = 13 DEFAULT_ENCODING = 'utf-8' EXIT_SUCCESS = 0 NULL_UUID = '00000000-0000-0000-0000-000000000000' PROG_NAME = 'docworker' -VERSION = '4.3.0' +VERSION = '4.3.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 be7bfe38..bdd18d9e 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.3.0" +version = "4.3.1" description = 'Worker for assembling and transforming documents' readme = 'README.md' keywords = ['documents', 'generation', 'jinja2', 'pandoc', 'worker'] @@ -40,10 +40,10 @@ dependencies = [ 'weasyprint', 'XlsxWriter', # DSW - "dsw-command-queue==4.3.0", - "dsw-config==4.3.0", - "dsw-database==4.3.0", - "dsw-storage==4.3.0", + "dsw-command-queue==4.3.1", + "dsw-config==4.3.1", + "dsw-database==4.3.1", + "dsw-storage==4.3.1", ] [project.urls] diff --git a/packages/dsw-mailer/CHANGELOG.md b/packages/dsw-mailer/CHANGELOG.md index 728ac33a..e6748273 100644 --- a/packages/dsw-mailer/CHANGELOG.md +++ b/packages/dsw-mailer/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] ### Added @@ -207,3 +211,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-mailer/dsw/mailer/consts.py b/packages/dsw-mailer/dsw/mailer/consts.py index d4a6b7e1..491e106f 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.3.0' +VERSION = '4.3.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 74f5641e..e70ea7fb 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.3.0" +version = "4.3.1" description = 'Worker for sending email notifications' readme = 'README.md' keywords = ['email', 'jinja2', 'notification', 'template'] @@ -31,9 +31,9 @@ dependencies = [ 'sentry-sdk', 'tenacity', # DSW - "dsw-command-queue==4.3.0", - "dsw-config==4.3.0", - "dsw-database==4.3.0", + "dsw-command-queue==4.3.1", + "dsw-config==4.3.1", + "dsw-database==4.3.1", ] [project.urls] diff --git a/packages/dsw-models/CHANGELOG.md b/packages/dsw-models/CHANGELOG.md index b472247e..01ff54f7 100644 --- a/packages/dsw-models/CHANGELOG.md +++ b/packages/dsw-models/CHANGELOG.md @@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [4.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] Released for version consistency with other DSW tools. @@ -110,3 +114,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml index e3137a22..9f315a62 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.3.0" +version = "4.3.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 f16cd409..e5283020 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.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] Released for version consistency with other DSW tools. @@ -177,3 +181,4 @@ Released for version consistency with other DSW tools. [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml index ce02fe28..ae9a6537 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.3.0" +version = "4.3.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.3.0", + "dsw-config==4.3.1", ] [project.urls] diff --git a/packages/dsw-tdk/CHANGELOG.md b/packages/dsw-tdk/CHANGELOG.md index b1391074..7c3906e7 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.3.1] + +Released for version consistency with other DSW tools. + ## [4.3.0] ### Fixed @@ -399,3 +403,4 @@ Initial DSW Template Development Kit (versioned as part of the [DSW platform](ht [4.2.0]: /../../tree/v4.2.0 [4.2.1]: /../../tree/v4.2.1 [4.3.0]: /../../tree/v4.3.0 +[4.3.1]: /../../tree/v4.3.1 diff --git a/packages/dsw-tdk/dsw/tdk/consts.py b/packages/dsw-tdk/dsw/tdk/consts.py index 4987b121..28f44043 100644 --- a/packages/dsw-tdk/dsw/tdk/consts.py +++ b/packages/dsw-tdk/dsw/tdk/consts.py @@ -3,7 +3,7 @@ import re APP = 'dsw-tdk' -VERSION = '4.3.0' +VERSION = '4.3.1' METAMODEL_VERSION = 13 REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$') diff --git a/packages/dsw-tdk/pyproject.toml b/packages/dsw-tdk/pyproject.toml index 6132d09e..21ce3821 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.3.0" +version = "4.3.1" description = 'Data Stewardship Wizard Template Development Toolkit' readme = 'README.md' keywords = ['documents', 'dsw', 'jinja2', 'template', 'toolkit']