stbkit 0.1.0a9.dev1__py3-none-any.whl

stbkit/tools/upgrade/_internal/common.py

@@ -0,0 +1,205 @@
+# Copyright 2025-2026 TAISEI CORPORATION
+# SPDX-License-Identifier: MPL-2.0
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from collections.abc import Mapping
+from types import ModuleType
+from typing import Any, Protocol
+
+from stbkit.core._internal.name_converter import (
+    xml_element_name_to_key,
+    xml_element_name_to_python_class_name,
+)
+from stbkit.core.data_model.common import (
+    StBridgeElement,
+    StBridgeRoot,
+    _StBridgeExtensionElement,
+)
+from stbkit.core.stb_reporting import Code, Phase, Reporter
+
+
+class ElementHook(Protocol):
+    """変換が終わった後に呼ばれる後処理"""
+
+    def __call__(
+        self, before: StBridgeElement, after: StBridgeElement, *, reporter: Reporter
+    ) -> None: ...
+
+
+def _clone_extension_element(element: StBridgeElement) -> _StBridgeExtensionElement:
+    clone = _StBridgeExtensionElement(element._xml_name())
+    _copy_extension(element, clone)
+    return clone
+
+
+def _copy_extension(source: StBridgeElement, new_element: StBridgeElement) -> None:
+    extension = source._extension
+    if extension is None:
+        return
+    if extension._attributes:
+        for name, value in extension._attributes.items():
+            new_element._ensure_extension._set_attribute(name, value)
+    if extension._children:
+        for child in extension._children:
+            new_element._ensure_extension._set_child(_clone_extension_element(child))
+
+
+def _resolve_renamed_child_attr_name(
+    element: StBridgeElement,
+    attr_name: str,
+    class_name_table: dict[str, str],
+) -> str | None:
+    if not element._is_child(attr_name):
+        return None
+    source_child_xml_name: str = element._xml_name(attr_name)
+    target_child_xml_name: str | None = class_name_table.get(source_child_xml_name)
+    if target_child_xml_name is None:
+        return None
+
+    source_child_key: str = xml_element_name_to_key(source_child_xml_name)
+    if attr_name == source_child_key:
+        return xml_element_name_to_key(target_child_xml_name)
+    return None
+
+
+def convert_element(
+    element: StBridgeElement,
+    module_to: ModuleType,
+    *,
+    ignore_field: dict[str, list[str]] | None = None,
+    class_name_table: dict[str, str] | None = None,
+    attr_name_table: dict[str, dict[str, str]] | None = None,
+    hooks: Mapping[str, ElementHook] | None = None,
+    post: ElementHook | None = None,
+    reporter: Reporter,
+) -> StBridgeElement | None:
+    """要素を変換後バージョンのモジュールの同等クラスへ複製する。
+
+    変換後のバージョンに対応するクラスが無い場合はNoneを返す。
+    """
+    if ignore_field is None:
+        ignore_field = {}
+    old_class_name: str = element.__class__.__name__
+    old_element_name: str = element._xml_name()
+    new_class_name: str = old_class_name
+    if class_name_table and old_element_name in class_name_table:
+        new_class_name = xml_element_name_to_python_class_name(
+            class_name_table[old_element_name]
+        )
+    NewClass: type[StBridgeElement] | None = getattr(module_to, new_class_name, None)
+    if NewClass is None:
+        reporter.warning(
+            message=(
+                f"変換後のバージョンにクラス[{new_class_name}]がないためスキップします"
+            ),
+            code=Code.NOT_IMPLEMENTED,
+            phase=Phase.UPGRADE,
+            stb_element=element,
+        )
+        return None
+    new_element: StBridgeElement = NewClass()
+    for key in element._fields:
+        attr_name: str = key
+        if attr_name.startswith("_"):
+            continue
+        new_attr_name: str = attr_name
+        if attr_name in ignore_field.get(old_element_name, []):
+            continue
+        if (
+            attr_name_table
+            and old_element_name in attr_name_table
+            and attr_name in attr_name_table[old_element_name]
+        ):
+            new_attr_name = attr_name_table[old_element_name][attr_name]
+        elif class_name_table:
+            auto_renamed_attr_name = _resolve_renamed_child_attr_name(
+                element,
+                attr_name,
+                class_name_table,
+            )
+            if auto_renamed_attr_name is not None:
+                new_attr_name = auto_renamed_attr_name
+        value: Any = getattr(element, f"_{attr_name}")
+        if not hasattr(new_element, f"_{new_attr_name}"):
+            if value is not None:
+                reporter.warning(
+                    message=(f"変換後のバージョンに属性[{new_attr_name}]がありません"),
+                    code=Code.NOT_IMPLEMENTED,
+                    phase=Phase.UPGRADE,
+                    stb_element=element,
+                    attr_name=attr_name,
+                )
+                continue
+            else:
+                continue
+        elif element._is_child(attr_name) and new_element._is_child(new_attr_name):
+            source_is_children: bool = element._is_children(attr_name)
+            target_is_children: bool = new_element._is_children(new_attr_name)
+            if source_is_children and target_is_children:
+                new_items: list[StBridgeElement] = []
+                for item in getattr(element, attr_name):
+                    new_item: StBridgeElement | None = convert_element(
+                        item,
+                        module_to,
+                        ignore_field=ignore_field,
+                        class_name_table=class_name_table,
+                        attr_name_table=attr_name_table,
+                        hooks=hooks,
+                        reporter=reporter,
+                    )
+                    if new_item is not None:
+                        new_items.append(new_item)
+                setattr(new_element, new_attr_name, new_items)
+            elif not source_is_children and not target_is_children:
+                if value:
+                    new_child: StBridgeElement | None = convert_element(
+                        value,
+                        module_to,
+                        ignore_field=ignore_field,
+                        class_name_table=class_name_table,
+                        attr_name_table=attr_name_table,
+                        hooks=hooks,
+                        reporter=reporter,
+                    )
+                    if new_child is not None:
+                        setattr(new_element, new_attr_name, new_child)
+            elif not source_is_children and target_is_children:
+                if value:
+                    new_child = convert_element(
+                        value,
+                        module_to,
+                        ignore_field=ignore_field,
+                        class_name_table=class_name_table,
+                        attr_name_table=attr_name_table,
+                        hooks=hooks,
+                        reporter=reporter,
+                    )
+                    if new_child is not None:
+                        setattr(new_element, new_attr_name, [new_child])
+            else:
+                reporter.warning(
+                    message=("子要素の最大回数が異なります"),
+                    code=Code.SCHEMA_VERSION_MISMATCH,
+                    phase=Phase.UPGRADE,
+                    stb_element=element,
+                    attr_name=attr_name,
+                )
+        else:
+            if value is not None:
+                new_element._set_attribute_by_any(new_attr_name, value)
+    _copy_extension(element, new_element)
+    if hooks is not None:
+        hook: ElementHook | None = hooks.get(old_element_name)
+        if hook is not None:
+            hook(element, new_element, reporter=reporter)
+    if post is not None:
+        post(
+            element,
+            new_element,
+            reporter=reporter,
+        )
+    if isinstance(new_element, StBridgeRoot):
+        new_element._set_version(reporter=reporter, phase=Phase.UPGRADE)
+    return new_element

stbkit/tools/upgrade/_internal/upgrade.py

@@ -0,0 +1,228 @@
+# Copyright 2025-2026 TAISEI CORPORATION
+# SPDX-License-Identifier: MPL-2.0
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from logging import Logger
+from typing import TYPE_CHECKING, Literal, overload
+
+from stbkit.core.data_model import (
+    stb_v2_0_0,
+    stb_v2_0_1,
+    stb_v2_0_2,
+    stb_v2_1_0,
+    stb_v2_1_1,
+)
+from stbkit.core.data_model.common import StBridgeRoot
+from stbkit.core.stb_exceptions import UnsupportedStbVersionError
+from stbkit.core.stb_reporting import Code, Phase, Reporter, get_reporter
+from stbkit.core.validation._internal.validator import _validate
+
+from .common import convert_element
+from .v2_0_2_to_v2_1_0 import upgrade_v2_0_2_to_v2_1_0
+from .v2_1_0_to_v2_1_1 import upgrade_v2_1_0_to_v2_1_1
+
+if TYPE_CHECKING:
+    from stbkit.api import stb_latest
+
+__all__ = ["upgrade_v2_0_2_to_v2_1_0", "upgrade_v2_1_0_to_v2_1_1"]
+
+
+def upgrade_v2_0_0_to_v2_0_1(
+    stb: stb_v2_0_0.StBridge,
+    *,
+    reporter: Reporter,
+) -> stb_v2_0_1.StBridge:
+    reporter.info(
+        "---v2.0.0->v2.0.1変換処理開始---",
+        code=Code.PROGRESS_INFO,
+        phase=Phase.UPGRADE,
+    )
+    new_stb = convert_element(
+        stb,
+        stb_v2_0_1,
+        reporter=reporter,
+    )
+    if isinstance(new_stb, stb_v2_0_1.StBridge):
+        new_stb.version = stb_v2_0_1.VERSION
+        reporter.info(
+            "---v2.0.0->v2.0.1変換処理完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        reporter.info(
+            "---v2.0.1バリデーション開始---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        _validate(reporter=reporter, stb=new_stb)
+        reporter.info(
+            "---v2.0.1バリデーション完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        return new_stb
+    else:
+        raise TypeError("ST-Bridgeのバージョン変換に失敗しました")
+
+
+def upgrade_v2_0_1_to_v2_0_2(
+    stb: stb_v2_0_1.StBridge,
+    *,
+    reporter: Reporter,
+) -> stb_v2_0_2.StBridge:
+    reporter.info(
+        "---v2.0.1->v2.0.2変換処理開始---",
+        code=Code.PROGRESS_INFO,
+        phase=Phase.UPGRADE,
+    )
+    new_stb = convert_element(
+        stb,
+        stb_v2_0_2,
+        reporter=reporter,
+    )
+    if isinstance(new_stb, stb_v2_0_2.StBridge):
+        new_stb.version = stb_v2_0_2.VERSION
+        reporter.info(
+            "---v2.0.1->v2.0.2変換処理完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        reporter.info(
+            "---v2.0.2バリデーション開始---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        _validate(reporter=reporter, stb=new_stb)
+        reporter.info(
+            "---v2.0.2バリデーション完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        return new_stb
+    else:
+        raise TypeError("ST-Bridgeのバージョン変換に失敗しました")
+
+
+def upgrade_to_v2_0_1(stb: StBridgeRoot, *, reporter: Reporter) -> stb_v2_0_1.StBridge:
+    if isinstance(stb, stb_v2_0_1.StBridge):
+        return stb
+    elif isinstance(stb, stb_v2_0_0.StBridge):
+        return upgrade_v2_0_0_to_v2_0_1(stb, reporter=reporter)
+    else:
+        raise NotImplementedError()
+
+
+def upgrade_to_v2_0_2(stb: StBridgeRoot, *, reporter: Reporter) -> stb_v2_0_2.StBridge:
+    if isinstance(stb, stb_v2_0_2.StBridge):
+        return stb
+    elif isinstance(stb, stb_v2_0_1.StBridge):
+        return upgrade_v2_0_1_to_v2_0_2(stb, reporter=reporter)
+    else:
+        raise NotImplementedError()
+
+
+def upgrade_to_v2_1_0(stb: StBridgeRoot, *, reporter: Reporter) -> stb_v2_1_0.StBridge:
+    if isinstance(stb, stb_v2_1_0.StBridge):
+        return stb
+    elif not isinstance(stb, stb_v2_0_2.StBridge):
+        stb = upgrade_to_v2_0_2(stb, reporter=reporter)
+    return upgrade_v2_0_2_to_v2_1_0(stb, reporter=reporter)
+
+
+def upgrade_to_v2_1_1(stb: StBridgeRoot, *, reporter: Reporter) -> stb_v2_1_1.StBridge:
+    if isinstance(stb, stb_v2_1_1.StBridge):
+        return stb
+    elif not isinstance(stb, stb_v2_1_0.StBridge):
+        stb = upgrade_to_v2_1_0(stb, reporter=reporter)
+    return upgrade_v2_1_0_to_v2_1_1(stb, reporter=reporter)
+
+
+@overload
+def upgrade_to(
+    stb: StBridgeRoot,
+    to_version: Literal["2.0.1"],
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> stb_v2_0_1.StBridge: ...
+@overload
+def upgrade_to(
+    stb: StBridgeRoot,
+    to_version: Literal["2.0.2"],
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> stb_v2_0_2.StBridge: ...
+@overload
+def upgrade_to(
+    stb: StBridgeRoot,
+    to_version: Literal["2.1.0"],
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> stb_v2_1_0.StBridge: ...
+@overload
+def upgrade_to(
+    stb: StBridgeRoot,
+    to_version: Literal["2.1.1", "latest"],
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> stb_v2_1_1.StBridge: ...
+def upgrade_to(
+    stb: StBridgeRoot,
+    to_version: Literal["2.0.1", "2.0.2", "2.1.0", "2.1.1", "latest"] = "latest",
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> StBridgeRoot:
+    """指定したバージョンにST-Bridgeを変換する"""
+    reporter = get_reporter(logger=logger, reporter=reporter)
+    if to_version == "latest":
+        return upgrade_to_latest(stb, reporter=reporter)
+    match to_version:
+        case "2.0.1":
+            return upgrade_to_v2_0_1(stb, reporter=reporter)
+        case "2.0.2":
+            return upgrade_to_v2_0_2(stb, reporter=reporter)
+        case "2.1.0":
+            return upgrade_to_v2_1_0(stb, reporter=reporter)
+        case "2.1.1":
+            return upgrade_to_v2_1_1(stb, reporter=reporter)
+        case _:
+            raise UnsupportedStbVersionError(version=to_version)
+
+
+def upgrade_to_latest(
+    stb: StBridgeRoot,
+    *,
+    logger: Logger | None = None,
+    reporter: Reporter | None = None,
+) -> "stb_latest.StBridge":
+    """ST-Bridgeモデルをstbkitが対応する最新版へ変換します。
+
+    既に最新版の場合は、変換せず同じインスタンスをそのまま返します。
+    変換後のモデルはバリデーションを行い、結果をreporterへ記録します。
+
+    変換が実装されていない要素や属性があっても例外にせず、reporterへ記録して変換を続けます。
+
+    Args:
+        stb: 変換元のST-Bridgeのルート要素。
+        logger: 出力先Logger
+        reporter: 出力先Reporter。
+
+    Returns:
+        stb_latest.StBridge: 最新版のST-Bridgeのルート要素。
+
+    Raises:
+        UnsupportedStbVersionError: 対応していないバージョンのモデルを渡した場合。
+        TypeError: バージョン変換に失敗した場合。
+
+    Examples:
+        >>> import stbkit.api
+        >>> stb = stbkit.api.upgrade_stb(stbkit.api.load("model_v2_0_1.stb"))
+    """
+    reporter = get_reporter(logger, reporter)
+    return upgrade_to_v2_1_1(stb, reporter=reporter)

stbkit/tools/upgrade/_internal/v2_0_2_to_v2_1_0/__init__.py

@@ -0,0 +1,60 @@
+# Copyright 2025-2026 TAISEI CORPORATION
+# SPDX-License-Identifier: MPL-2.0
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from stbkit.core.data_model import (
+    stb_v2_0_2,
+    stb_v2_1_0,
+)
+from stbkit.core.stb_reporting import Code, Phase, Reporter
+from stbkit.core.validation._internal.validator import _validate
+
+from .. import common
+from . import tables
+from .hooks import HOOKS
+from .post import post_conversion
+
+
+def upgrade_v2_0_2_to_v2_1_0(
+    stb: stb_v2_0_2.StBridge,
+    *,
+    reporter: Reporter,
+) -> stb_v2_1_0.StBridge:
+    reporter.info(
+        "---v2.0.2->v2.1.0変換処理開始---",
+        code=Code.PROGRESS_INFO,
+        phase=Phase.UPGRADE,
+    )
+    new_stb = common.convert_element(
+        stb,
+        stb_v2_1_0,
+        ignore_field=tables.ignore_field,
+        class_name_table=tables.class_name_table,
+        attr_name_table=tables.attr_name_table,
+        hooks=HOOKS,
+        post=post_conversion,
+        reporter=reporter,
+    )
+
+    if isinstance(new_stb, stb_v2_1_0.StBridge):
+        reporter.info(
+            "---v2.0.2->v2.1.0変換処理完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        reporter.info(
+            "---v2.1.0バリデーション開始---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        _validate(reporter=reporter, stb=new_stb)
+        reporter.info(
+            "---v2.1.0バリデーション完了---",
+            code=Code.PROGRESS_INFO,
+            phase=Phase.UPGRADE,
+        )
+        return new_stb
+    else:
+        raise TypeError("ST-Bridgeのバージョン変換に失敗しました")

stbkit/tools/upgrade/_internal/v2_0_2_to_v2_1_0/hook_funcs/hook_common.py

@@ -0,0 +1,62 @@
+# Copyright 2025-2026 TAISEI CORPORATION
+# SPDX-License-Identifier: MPL-2.0
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from stbkit.core.data_model import stb_v2_0_2, stb_v2_1_0
+from stbkit.core.data_model.common import StBridgeElement
+from stbkit.core.stb_exceptions import NoneAccessError
+from stbkit.core.stb_reporting import Reporter
+
+
+def column_rc_rebar_position_apply_to_stb_apply_column(
+    v202: stb_v2_0_2.StbColumnRcRebarPositionApply,
+) -> stb_v2_1_0.StbApplyRcColumn:
+    v210: stb_v2_1_0.StbApplyRcColumn = stb_v2_1_0.StbApplyRcColumn()
+    v210.depth_cover_start_x_or_none = v202.depth_cover_or_none
+    v210.depth_cover_start_y_or_none = v202.depth_cover_or_none
+    v210.depth_cover_end_x_or_none = v202.depth_cover_or_none
+    v210.depth_cover_end_y_or_none = v202.depth_cover_or_none
+    v210.interval_or_none = v202.interval_or_none
+    v210.center_start_x_or_none = v202.center_or_none
+    v210.center_start_y_or_none = v202.center_or_none
+    v210.center_end_x_or_none = v202.center_or_none
+    v210.center_end_y_or_none = v202.center_or_none
+    v210.center_interval_or_none = v202.length_to_center_or_none
+    # set_defaultは無視
+    return v210
+
+
+def post_common(v202: stb_v2_0_2.StBridge, v210: stb_v2_1_0.StBridge) -> None:
+    """TODO:作成中。要対応"""
+    try:
+        v202_c_r_r_p_a = (
+            v202.stb_common.stb_apply_conditions_list.stb_column_rc_rebar_position_apply
+        )
+    except NoneAccessError:
+        return
+    v210_a_c_l_r: stb_v2_1_0.StbApplyConditionListRc = (
+        v210.ensure.stb_common()
+        .ensure.stb_apply_conditions_list()
+        .ensure.stb_apply_condition_list_rc()
+    )
+    v210_a_c_l_r.stb_apply_rc_column = (
+        column_rc_rebar_position_apply_to_stb_apply_column(v202_c_r_r_p_a)
+    )
+
+
+def hook_apply_conditions_list(
+    before: StBridgeElement, after: StBridgeElement, *, reporter: Reporter
+) -> None:
+    if not isinstance(before, stb_v2_0_2.StbApplyConditionsList) or not isinstance(
+        after, stb_v2_1_0.StbApplyConditionsList
+    ):
+        return
+    try:
+        v202_apply = before.stb_column_rc_rebar_position_apply
+    except NoneAccessError:
+        return
+    after.ensure.stb_apply_condition_list_rc().stb_apply_rc_column = (
+        column_rc_rebar_position_apply_to_stb_apply_column(v202_apply)
+    )

stbkit/tools/upgrade/_internal/v2_0_2_to_v2_1_0/hook_funcs/hook_joint_beam_shape_h.py

@@ -0,0 +1,44 @@
+# Copyright 2026 TAISEI CORPORATION
+# SPDX-License-Identifier: MPL-2.0
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from stbkit.core.data_model import stb_v2_0_2, stb_v2_1_0
+from stbkit.core.data_model.common import StBridgeElement
+from stbkit.core.stb_reporting import Reporter
+
+
+def joint_beam_shape_h(
+    before: StBridgeElement, after: StBridgeElement, *, reporter: Reporter
+) -> None:
+    if not isinstance(before, stb_v2_0_2.StbJointBeamShapeH) or not isinstance(
+        after, stb_v2_1_0.StbJointBeamShapeH
+    ):
+        return
+    frange_202: stb_v2_0_2.StbJointShapeHFlange | None = (
+        before.stb_joint_shape_h_flange_or_none
+    )
+    if frange_202:
+        nf: int | None = frange_202.nf_or_none
+        mf: int | None = frange_202.mf_or_none
+        frange_210: stb_v2_1_0.StbJointShapeHFlange = (
+            after.ensure.stb_joint_shape_h_flange()
+        )
+        if nf is not None and mf is not None:
+            for i in range(1, nf + 1):
+                frange_bolt: stb_v2_1_0.StbJointShapeHFlangeBolt = (
+                    stb_v2_1_0.StbJointShapeHFlangeBolt(id_order=i, mf=mf)
+                )
+                frange_210.stb_joint_shape_h_flange_bolt.append(frange_bolt)
+    web_202: stb_v2_0_2.StbJointShapeHWeb | None = before.stb_joint_shape_h_web_or_none
+    if web_202:
+        nw: int | None = web_202.nw_or_none
+        mw: int | None = web_202.mw_or_none
+        web_210: stb_v2_1_0.StbJointShapeHWeb = after.ensure.stb_joint_shape_h_web()
+        if nw is not None and mw is not None:
+            for i in range(1, nw + 1):
+                web_bolt: stb_v2_1_0.StbJointShapeHWebBolt = (
+                    stb_v2_1_0.StbJointShapeHWebBolt(id_order=i, mw=mw)
+                )
+                web_210.stb_joint_shape_h_web_bolt.append(web_bolt)