Merge pull request #209 from ds-wizard/release/4.8.0

Release 4.8.0
ds-wizard · Jul 2, 2024 · 5b6fa3e · 5b6fa3e
2 parents 56c5312 + fb43d0b
commit 5b6fa3e
Show file tree

Hide file tree

Showing 42 changed files with 144 additions and 237 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -129,7 +129,7 @@ jobs:
           type=sha
 
     - name: Docker build [test]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}
         file: ${{ env.DOCKER_META_FILE }}
@@ -158,7 +158,7 @@ jobs:
           type=ref,event=branch
 
     - name: Docker build+push [dev]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != ''
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}
@@ -183,7 +183,7 @@ jobs:
           type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
 
     - name: Docker build+push [public]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != ''
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}

diff --git a/.github/workflows/lambda.yml b/.github/workflows/lambda.yml
@@ -101,7 +101,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
 
     - name: Docker build [test]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}
         file: ${{ env.DOCKER_META_FILE }}
@@ -132,7 +132,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
 
     - name: Docker build+push [dev]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != ''
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}
@@ -159,7 +159,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
 
     - name: Docker build+push [public]
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != ''
       with:
         context: ${{ env.DOCKER_META_CONTEXT }}

diff --git 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.8.0]
+
+Released for version consistency with other DSW tools.
+
 ## [4.7.0]
 
 Released for version consistency with other DSW tools.
@@ -211,3 +215,4 @@ Released for version consistency with other DSW tools.
 [4.5.0]: /../../tree/v4.5.0
 [4.6.0]: /../../tree/v4.6.0
 [4.7.0]: /../../tree/v4.7.0
+[4.8.0]: /../../tree/v4.8.0
diff --git 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.7.0"
+version = "4.8.0"
 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.7.0",
+    "dsw-database==4.8.0",
 ]
 
 [project.urls]

diff --git a/packages/dsw-command-queue/requirements.txt b/packages/dsw-command-queue/requirements.txt
@@ -1,6 +1,6 @@
-psycopg==3.1.18
-psycopg-binary==3.1.18
+psycopg==3.1.19
+psycopg-binary==3.1.19
 PyYAML==6.0.1
-tenacity==8.2.3
-typing_extensions==4.11.0
+tenacity==8.4.1
+typing_extensions==4.12.2
 tzdata==2024.1
diff --git 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.8.0]
+
+Released for version consistency with other DSW tools.
+
 ## [4.7.0]
 
 Released for version consistency with other DSW tools.
@@ -217,3 +221,4 @@ Released for version consistency with other DSW tools.
 [4.5.0]: /../../tree/v4.5.0
 [4.6.0]: /../../tree/v4.6.0
 [4.7.0]: /../../tree/v4.7.0
+[4.8.0]: /../../tree/v4.8.0
diff --git 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.7.0"
+version = "4.8.0"
 description = 'Library for DSW config manipulation'
 readme = 'README.md'
 keywords = ['dsw', 'config', 'yaml', 'parser']

diff --git a/packages/dsw-config/requirements.txt b/packages/dsw-config/requirements.txt
@@ -1,4 +1,4 @@
-certifi==2024.2.2
+certifi==2024.6.2
 PyYAML==6.0.1
-sentry-sdk==1.45.0
-urllib3==2.2.1
+sentry-sdk==2.6.0
+urllib3==2.2.2
diff --git 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.8.0]
+
+Released for version consistency with other DSW tools.
+
 ## [4.7.0]
 
 Released for version consistency with other DSW tools.
@@ -267,3 +271,4 @@ Released for version consistency with other DSW tools.
 [4.5.0]: /../../tree/v4.5.0
 [4.6.0]: /../../tree/v4.6.0
 [4.7.0]: /../../tree/v4.7.0
+[4.8.0]: /../../tree/v4.8.0
diff --git 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.7.0'
+VERSION = '4.8.0'
 
 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
@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-data-seeder'
-version = "4.7.0"
+version = "4.8.0"
 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.7.0",
-    "dsw-config==4.7.0",
-    "dsw-database==4.7.0",
-    "dsw-storage==4.7.0",
+    "dsw-command-queue==4.8.0",
+    "dsw-config==4.8.0",
+    "dsw-database==4.8.0",
+    "dsw-storage==4.8.0",
 ]
 
 [project.urls]

diff --git a/packages/dsw-data-seeder/requirements.txt b/packages/dsw-data-seeder/requirements.txt
@@ -1,12 +1,12 @@
-certifi==2024.2.2
+certifi==2024.6.2
 click==8.1.7
 minio==7.2.7
-psycopg==3.1.18
-psycopg-binary==3.1.18
+psycopg==3.1.19
+psycopg-binary==3.1.19
 python-dateutil==2.9.0
 PyYAML==6.0.1
-sentry-sdk==1.45.0
+sentry-sdk==2.6.0
 six==1.16.0
-tenacity==8.2.3
-typing_extensions==4.11.0
-urllib3==2.2.1
+tenacity==8.4.1
+typing_extensions==4.12.2
+urllib3==2.2.2
diff --git 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.8.0]
+
+### Removed
+
+- Phased out tenant config features
+
 ## [4.7.0]
 
 Released for version consistency with other DSW tools.
@@ -228,3 +234,4 @@ Released for version consistency with other DSW tools.
 [4.5.0]: /../../tree/v4.5.0
 [4.6.0]: /../../tree/v4.6.0
 [4.7.0]: /../../tree/v4.7.0
+[4.8.0]: /../../tree/v4.8.0
diff --git a/packages/dsw-database/dsw/database/model.py b/packages/dsw-database/dsw/database/model.py
@@ -229,24 +229,11 @@ class DBTenantConfig:
     knowledge_model: Optional[dict]
     questionnaire: Optional[dict]
     submission: Optional[dict]
-    feature: Optional[dict]
     owl: Optional[dict]
     mail_config_uuid: Optional[str]
     created_at: datetime.datetime
     updated_at: datetime.datetime
 
-    @property
-    def feature_pdf_only(self) -> bool:
-        if self.feature is None:
-            return False
-        return self.feature.get('pdfOnlyEnabled', False)
-
-    @property
-    def feature_pdf_watermark(self) -> bool:
-        if self.feature is None:
-            return False
-        return self.feature.get('pdfWatermarkEnabled', False)
-
     @property
     def app_title(self) -> Optional[str]:
         if self.look_and_feel is None:
@@ -272,7 +259,6 @@ def from_dict_row(data: dict):
             knowledge_model=data.get('knowledge_model', None),
             questionnaire=data.get('questionnaire', None),
             submission=data.get('submission', None),
-            feature=data.get('feature', None),
             owl=data.get('owl', None),
             mail_config_uuid=data.get('mail_config_uuid', None),
             created_at=data['created_at'],

diff --git 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.7.0"
+version = "4.8.0"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
     'psycopg[binary]',
     'tenacity',
     # DSW
-    "dsw-config==4.7.0",
+    "dsw-config==4.8.0",
 ]
 
 [project.urls]

diff --git a/packages/dsw-database/requirements.txt b/packages/dsw-database/requirements.txt
@@ -1,6 +1,6 @@
-psycopg==3.1.18
-psycopg-binary==3.1.18
+psycopg==3.1.19
+psycopg-binary==3.1.19
 PyYAML==6.0.1
-tenacity==8.2.3
-typing_extensions==4.11.0
+tenacity==8.4.1
+typing_extensions==4.12.2
 tzdata==2024.1
diff --git a/packages/dsw-document-worker/CHANGELOG.md b/packages/dsw-document-worker/CHANGELOG.md
@@ -8,6 +8,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.8.0]
+
+### Changed
+
+- Simplify PDF generation options
+
 ## [4.7.0]
 
 Released for version consistency with other DSW tools.
@@ -279,3 +285,4 @@ Released for version consistency with other DSW tools.
 [4.5.0]: /../../tree/v4.5.0
 [4.6.0]: /../../tree/v4.6.0
 [4.7.0]: /../../tree/v4.7.0
+[4.8.0]: /../../tree/v4.8.0
diff --git a/packages/dsw-document-worker/dsw/document_worker/config.py b/packages/dsw-document-worker/dsw/document_worker/config.py
@@ -3,7 +3,7 @@
 
 from dsw.config import DSWConfigParser
 from dsw.config.keys import ConfigKey, ConfigKeys, ConfigKeysContainer,\
-    cast_str, cast_optional_int, cast_bool, cast_optional_str
+    cast_str, cast_optional_int
 from dsw.config.model import GeneralConfig, SentryConfig, DatabaseConfig,\
     S3Config, LoggingConfig, CloudConfig, ConfigModel
 
@@ -20,12 +20,6 @@ class _DocumentsKeys(ConfigKeysContainer):
 
 
 class _ExperimentalKeys(ConfigKeysContainer):
-    pdf_only = ConfigKey(
-        yaml_path=['experimental', 'pdfOnly'],
-        var_names=['EXPERIMENTAL_PDF_ONLY'],
-        default=False,
-        cast=cast_bool,
-    )
     job_timeout = ConfigKey(
         yaml_path=['experimental', 'jobTimeout'],
         var_names=['EXPERIMENTAL_JOB_TIMEOUT'],
@@ -38,18 +32,6 @@ class _ExperimentalKeys(ConfigKeysContainer):
         default=None,
         cast=cast_optional_int,
     )
-    pdf_watermark = ConfigKey(
-        yaml_path=['experimental', 'pdfWatermark'],
-        var_names=['EXPERIMENTAL_PDF_WATERMARK'],
-        default='/home/user/data/watermark.pdf',
-        cast=cast_optional_str,
-    )
-    pdf_watermark_top = ConfigKey(
-        yaml_path=['experimental', 'pdfWatermarkTop'],
-        var_names=['EXPERIMENTAL_PDF_WATERMARK_TOP'],
-        default=True,
-        cast=cast_bool,
-    )
 
 
 class _CommandPandocKeys(ConfigKeysContainer):
@@ -87,14 +69,10 @@ def __init__(self, naming_strategy: str):
 
 class ExperimentalConfig(ConfigModel):
 
-    def __init__(self, pdf_only: bool, job_timeout: Optional[int],
-                 max_doc_size: Optional[float],
-                 pdf_watermark: str, pdf_watermark_top: bool):
-        self.pdf_only = pdf_only
+    def __init__(self, job_timeout: Optional[int],
+                 max_doc_size: Optional[float]):
         self.job_timeout = job_timeout
         self.max_doc_size = max_doc_size
-        self.pdf_watermark = pdf_watermark
-        self.pdf_watermark_top = pdf_watermark_top
 
 
 class CommandConfig:
@@ -225,11 +203,8 @@ def templates(self) -> TemplatesConfig:
     @property
     def experimental(self) -> ExperimentalConfig:
         return ExperimentalConfig(
-            pdf_only=self.get(self.keys.experimental.pdf_only),
             job_timeout=self.get(self.keys.experimental.job_timeout),
             max_doc_size=self.get(self.keys.experimental.max_doc_size),
-            pdf_watermark=self.get(self.keys.experimental.pdf_watermark),
-            pdf_watermark_top=self.get(self.keys.experimental.pdf_watermark_top),
         )
 
     @property

diff --git a/packages/dsw-document-worker/dsw/document_worker/consts.py b/packages/dsw-document-worker/dsw/document_worker/consts.py
@@ -6,7 +6,7 @@
 EXIT_SUCCESS = 0
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'docworker'
-VERSION = '4.7.0'
+VERSION = '4.8.0'
 
 VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
 VAR_WORKDIR_PATH = 'WORKDIR_PATH'