dsw-tdk 4.25.1__py2.py3-none-any.whl → 4.26.0rc1__py2.py3-none-any.whl

dsw/tdk/api_client.py

@@ -361,9 +361,19 @@ class WizardAPIClient:
         return await self._delete(f'/document-template-drafts/{remote_id}/assets/{asset_id}')
 
     @handle_client_errors
-    async def get_api_version(self) -> str:
+    async def get_api_version(self) -> tuple[str, str | None]:
         body = await self._get_json('/')
-        return body['version']
+        version = body.get('version', None)
+        metamodel_version = None
+        for item in body.get('metamodelVersions', []):
+            if item.get('name', '') == 'Document Template':
+                metamodel_version = item.get('version', None)
+        if version is None:
+            raise WizardCommunicationError(
+                reason='Invalid response',
+                message='Server did not return valid API version information (incompatible TDK?)'
+            )
+        return version, metamodel_version
 
     @handle_client_errors
     async def get_organization_id(self) -> str:

dsw/tdk/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.25.1~31a01b8',
-    built_at='2025-12-19 12:48:15Z',
-    sha='31a01b81b38254d1f771f4b109b60550a1debfa2',
+    version='v4.26.0~919c0b6',
+    built_at='2026-01-06 08:15:13Z',
+    sha='919c0b6cbc66f7fc93f03d3bd2f14e345a438367',
     branch='HEAD',
-    tag='v4.25.1',
+    tag='v4.26.0',
 )

dsw/tdk/consts.py

@@ -4,9 +4,9 @@ import re
 import pathspec
 
 APP = 'dsw-tdk'
-VERSION = '4.25.1'
+VERSION = '4.26.0rc1'
 METAMODEL_VERSION_MAJOR = 17
-METAMODEL_VERSION_MINOR = 0
+METAMODEL_VERSION_MINOR = 1
 METAMODEL_VERSION = f'{METAMODEL_VERSION_MAJOR}.{METAMODEL_VERSION_MINOR}'
 
 REGEX_SEMVER = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+$')

dsw/tdk/core.py

@@ -4,7 +4,6 @@ import io
 import json
 import logging
 import pathlib
-import re
 import shutil
 import tempfile
 import zipfile
@@ -12,7 +11,7 @@ import zipfile
 import watchfiles
 
 from .api_client import WizardAPIClient, WizardCommunicationError
-from .consts import DEFAULT_ENCODING, REGEX_SEMVER
+from .consts import DEFAULT_ENCODING
 from .model import TemplateProject, Template, TemplateFile, TemplateFileType
 from .utils import UUIDGen
 from .validation import ValidationError, TemplateValidator
@@ -32,33 +31,16 @@ class TDKProcessingError(RuntimeError):
         self.hint = hint
 
 
-METAMODEL_VERSION_SUPPORT = {
-    '1.0': (2, 5, 0),
-    '2.0': (2, 6, 0),
-    '3.0': (2, 12, 0),
-    '4.0': (3, 2, 0),
-    '5.0': (3, 5, 0),
-    '6.0': (3, 6, 0),
-    '7.0': (3, 7, 0),
-    '8.0': (3, 8, 0),
-    '9.0': (3, 10, 0),
-    '10.0': (3, 12, 0),
-    '11.0': (3, 20, 0),
-    '12.0': (4, 1, 0),
-    '13.0': (4, 3, 0),
-    '14.0': (4, 10, 0),
-    '15.0': (4, 12, 0),
-    '16.0': (4, 13, 0),
-    '17.0': (4, 22, 0),
-}
-
-
 # pylint: disable-next=too-many-public-methods
 class TDKCore:
 
     # pylint: disable-next=too-many-locals
     def _check_metamodel_version(self):
         hint = 'Fix your metamodelVersion in template.json and/or visit docs'
+        if self.remote_metamodel_version is None:
+            self.logger.warning('Remote metamodel version is unknown, you should use '
+                                'a matching version of TDK to avoid issues')
+            return
         mm_ver = str(self.safe_template.metamodel_version)
         try:
             if '.' not in mm_ver:
@@ -66,34 +48,24 @@ class TDKCore:
             mm_major, mm_minor = map(int, mm_ver.split('.'))
         except ValueError as e:
             raise TDKProcessingError(f'Invalid metamodel version format: {mm_ver}', hint) from e
-        api_version = self.remote_version.split('~', maxsplit=1)[0]
-        if '-' in api_version:
-            api_version = api_version.split('-', maxsplit=1)[0]
-        if 'v' == api_version[0]:
-            api_version = api_version[1:]
-        if not re.match(REGEX_SEMVER, api_version):
-            self.logger.warning('Using non-stable release of API: %s',
-                                self.remote_version)
-            return
-        parts = api_version.split('.')
-        ver = (int(parts[0]), int(parts[1]), int(parts[2]))
-        vtag = f'v{ver[0]}.{ver[1]}.{ver[2]}'
-        if mm_ver not in METAMODEL_VERSION_SUPPORT:
-            raise TDKProcessingError(f'Unknown metamodel version: {mm_ver}', hint)
-        map_reverse = {v: k for k, v in METAMODEL_VERSION_SUPPORT.items()}
-        nearest_leq = unknown_version = (0, 0, 0)
-        for known_version in map_reverse.keys():
-            if known_version <= ver:
-                nearest_leq = known_version
-            else:
-                break
-        if nearest_leq == unknown_version:
-            raise TDKProcessingError(f'Unsupported API version: {vtag}', hint)
-        api_mm_major, api_mm_minor = map(int, map_reverse[nearest_leq].split('.'))
-        if mm_major != api_mm_major or mm_minor < api_mm_minor:
+        mmr_ver = self.remote_metamodel_version
+        try:
+            if '.' not in mmr_ver:
+                mmr_ver = f'{mmr_ver}.0'
+            mmr_major, mmr_minor = map(int, mmr_ver.split('.'))
+        except ValueError as e:
+            raise TDKProcessingError(f'Invalid remote metamodel version format: {mmr_ver}',
+                                     'Check if connecting to correct API with matching version '
+                                     'as you have in TDK.') from e
+        if (mm_major, mm_minor) == (mmr_major, mmr_minor):
+            self.logger.debug('Metamodel version %s matches remote version %s',
+                              mmr_ver, mmr_ver)
+        elif mm_major == mmr_major and mm_minor < mmr_minor:
+            self.logger.warning('Local metamodel version %s is older than remote version %s, '
+                                'but still compatible', mm_ver, mmr_ver)
+        else:
             raise TDKProcessingError(
-                f'Unsupported metamodel version {mm_ver} for API version {api_version}',
-                hint,
+                f'Unsupported metamodel version: local {mm_ver}, remote {mmr_ver}', hint
             )
 
     def __init__(self, template: Template | None = None, project: TemplateProject | None = None,
@@ -101,7 +73,8 @@ class TDKCore:
         self.template = template
         self.project = project
         self.client = client
-        self.remote_version = 'unknown~??????'
+        self.remote_version: str = 'unknown~??????'
+        self.remote_metamodel_version: str | None = 'unknown'
         self.logger = logger or logging.getLogger()
         self.loop = asyncio.get_event_loop()
         self.changes_processor = ChangesProcessor(self)
@@ -131,7 +104,7 @@ class TDKCore:
     async def init_client(self, api_url: str, api_key: str):
         self.logger.info('Connecting to %s', api_url)
         self.client = WizardAPIClient(api_url=api_url, api_key=api_key)
-        self.remote_version = await self.client.get_api_version()
+        self.remote_version, self.remote_metamodel_version = await self.client.get_api_version()
         user = await self.client.get_current_user()
         self.logger.info('Successfully authenticated as %s %s (%s)',
                          user['firstName'], user['lastName'], user['email'])

{dsw_tdk-4.25.1.dist-info → dsw_tdk-4.26.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsw-tdk
-Version: 4.25.1
+Version: 4.26.0rc1
 Summary: Data Stewardship Wizard Template Development Toolkit
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0

{dsw_tdk-4.25.1.dist-info → dsw_tdk-4.26.0rc1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 dsw/tdk/__init__.py,sha256=zJeTybb0SqiNdGLkANjRa36hku4axi17mZL2dM3tHto,288
 dsw/tdk/__main__.py,sha256=cCzxo6f7raF50kQE-nM_segNjCNe723ZrxOBB6f3qwc,84
-dsw/tdk/api_client.py,sha256=04obYHBIVO-HYQn2-tBIMMgtvOGb1_p6dxrM-orGMco,14925
-dsw/tdk/build_info.py,sha256=tGprxsqrINBtV_KjxMqofgwmw68_gYoV3GgBY3FUj4Y,381
+dsw/tdk/api_client.py,sha256=YBr_7CV2EMpyXKoGHYTDQSwoeIE1F5Uje_DFEIKEfxE,15436
+dsw/tdk/build_info.py,sha256=ureIUUESM8ZemjCvErMSsn9HZTHGh40c-weckrTKOAE,381
 dsw/tdk/cli.py,sha256=VEpzf1_JIhPqeDcDLfR76oqoYVS9nvbIujBZ-2syL2M,28128
 dsw/tdk/config.py,sha256=ZZlpMqJ5QGsiywwleXtFS2DO1bhnp3ttGOsNq4VoPYc,4888
-dsw/tdk/consts.py,sha256=lBsp_OL7L3fmIJTZ00HW1jiFoiN0jOhBlZXaRyLSHlo,713
-dsw/tdk/core.py,sha256=yVZHsmptEXQBrddAGsKlw6zpgbMeaknqeSYbFA_7HF0,27691
+dsw/tdk/consts.py,sha256=58kIQkOSIOBa5tpuLcBkTtiAARNLEG9pEP0JGslYCVk,716
+dsw/tdk/core.py,sha256=RYV_AQNbcpAHxxq_Tg7LavyNs1JcbPat2Hy5DHbGBlY,27193
 dsw/tdk/model.py,sha256=e7wAraebj66AMRSKc1Lkmvrsj7m9ep2UcAxMdwd_x0c,17340
 dsw/tdk/utils.py,sha256=9XBc_2c9IDw0FqAXZYFRVxYFVPuYULWvs2Y9SjNQJT4,5681
 dsw/tdk/validation.py,sha256=PxgthiZJIk7al64n7Nj7Bp5Vvg_ltxRm3ocp74UO8Y8,10173
@@ -13,9 +13,9 @@ dsw/tdk/templates/LICENSE.j2,sha256=6WzK06169rxZ4V_boYgejcZkw-1Up_WoU18iI3Gbkfs,
 dsw/tdk/templates/README.md.j2,sha256=FzUABeMM8To0oT48Kytoox64uAZ8F7FSAAXgpyKzqdU,247
 dsw/tdk/templates/env.j2,sha256=yUaY7ZLbjdG45-_q6KWi-YnX9bjP7_lfXrowhJF1he0,98
 dsw/tdk/templates/starter.j2,sha256=JKJIkiXsmBO4P6pKXM4IvSz3JgJhqCnaZI1NVfPPnXg,246
-dsw_tdk-4.25.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dsw_tdk-4.25.1.dist-info/METADATA,sha256=GOBZA39xuAvF43sk2NhLVADc6S9CJ3qTB7h2Yp6gH0g,6095
-dsw_tdk-4.25.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-dsw_tdk-4.25.1.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
-dsw_tdk-4.25.1.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
-dsw_tdk-4.25.1.dist-info/RECORD,,
+dsw_tdk-4.26.0rc1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dsw_tdk-4.26.0rc1.dist-info/METADATA,sha256=xJ4SW-FtGDW3UlUw4nxgr-P6nBEugP1futKHZEepD9s,6098
+dsw_tdk-4.26.0rc1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+dsw_tdk-4.26.0rc1.dist-info/entry_points.txt,sha256=lwD5ZzRCbTFSjP1-SkhYsaJe8sEXOWWgMAMUhw0v2Hk,41
+dsw_tdk-4.26.0rc1.dist-info/top_level.txt,sha256=7SfbsHFoJ_vlAgG6C-xzETETwYO71dBrGnod8uMFnjw,4
+dsw_tdk-4.26.0rc1.dist-info/RECORD,,