libresvip 2.6.2__tar.gz → 2.7.0__tar.gz

{libresvip-2.6.2 → libresvip-2.7.0}/.gitignore

@@ -168,6 +168,7 @@ cython_debug/
 .opencode/
 .trae/
 openspec/
+.slim/deepwork/
 
 assets/
 node_modules/

{libresvip-2.6.2 → libresvip-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libresvip
-Version: 2.6.2
+Version: 2.7.0
 Summary: Universal Converter for Singing Voice Projects
 Project-URL: documentation, https://soulmelody.github.io/LibreSVIP
 Project-URL: repository, https://github.com/SoulMelody/LibreSVIP
@@ -30,8 +30,7 @@ Classifier: Topic :: File Formats
 Classifier: Topic :: Multimedia :: Sound/Audio :: Sound Synthesis
 Classifier: Typing :: Typed
 Requires-Python: <3.15,>=3.10
-Requires-Dist: aristaproto<0.2.0,>=0.1.4
-Requires-Dist: backports-zstd<1.5.1,>=1.5.0; (sys_platform == 'win32' or sys_platform == 'darwin' or sys_platform == 'linux') and (platform_python_implementation == 'CPython' or platform_python_implementation == 'PyPy') and python_version < '3.14'
+Requires-Dist: backports-zstd<1.6.1,>=1.6.0; (sys_platform == 'win32' or sys_platform == 'darwin' or sys_platform == 'linux') and (platform_python_implementation == 'CPython' or platform_python_implementation == 'PyPy') and python_version < '3.14'
 Requires-Dist: bidict<0.23.2,>=0.23.1
 Requires-Dist: cbor2<6.1.3,>=6.1.2
 Requires-Dist: charset-normalizer<4.0.0,>=3.4.7
@@ -44,9 +43,10 @@ Requires-Dist: loguru<1.0.0,>=0.7.3
 Requires-Dist: more-itertools<11.1.1,>=11.1.0
 Requires-Dist: packaging<26.3,>=26.2
 Requires-Dist: platformdirs<5.0.0,>=4.10.0
-Requires-Dist: portion<3.0.0,>=2.6.1
+Requires-Dist: portion<3.0.0,>=2.6.2
+Requires-Dist: protobuf-py>=0.1.1
 Requires-Dist: pydantic-extra-types<3.0.0,>=2.11.1
-Requires-Dist: pydantic-settings<3.0.0,>=2.14.1
+Requires-Dist: pydantic-settings<3.0.0,>=2.14.2
 Requires-Dist: pydantic<3.0.0,>=2.13.4
 Requires-Dist: pymediainfo<=7.0.1; sys_platform != 'emscripten'
 Requires-Dist: pypinyin<1.0.0,>=0.55.0
@@ -58,13 +58,14 @@ Requires-Dist: ruamel-yaml<=0.20.0,>=0.19.1
 Requires-Dist: soundfile; sys_platform == 'emscripten'
 Requires-Dist: svg-py<2.0.0,>=1.10.0
 Requires-Dist: tatsu-lts<6.0.0,>=5.16.0
-Requires-Dist: that-depends>=3.9.2
+Requires-Dist: that-depends>=4.0.0
 Requires-Dist: universal-pathlib<1.0.0,>=0.3.10
 Requires-Dist: wanakana-python
 Requires-Dist: xsdata-pydantic<24.6,>=24.5
 Requires-Dist: zhon<3.0.0,>=2.1.1
 Requires-Dist: zstandard<0.25.1,>=0.25.0; (sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'linux') and platform_python_implementation == 'CPython' and python_version < '3.14'
 Provides-Extra: cli
+Requires-Dist: grpclib>=0.4.9; extra == 'cli'
 Requires-Dist: typer<1.0.0,>=0.26.7; extra == 'cli'
 Requires-Dist: winloop>=0.6.3; (sys_platform == 'win32') and extra == 'cli'
 Provides-Extra: crypto
@@ -79,20 +80,20 @@ Requires-Dist: ttkbootstrap-icons-mat>=1.0.0; extra == 'desktop'
 Provides-Extra: lxml
 Requires-Dist: lxml>=6.1.1; extra == 'lxml'
 Provides-Extra: minijinja
-Requires-Dist: minijinja>=2.20.0; extra == 'minijinja'
+Requires-Dist: minijinja>=2.21.0; extra == 'minijinja'
 Provides-Extra: mobile
-Requires-Dist: flet-permission-handler<0.90.0,>=0.85.2; extra == 'mobile'
-Requires-Dist: flet[desktop]<0.90.0,>=0.85.2; extra == 'mobile'
+Requires-Dist: flet-permission-handler<0.90.0,>=0.85.3; extra == 'mobile'
+Requires-Dist: flet[desktop]<0.90.0,>=0.85.3; extra == 'mobile'
 Requires-Dist: fontconfig-py>=1.0.1; (sys_platform == 'darwin' or sys_platform == 'linux') and extra == 'mobile'
 Provides-Extra: tui
 Requires-Dist: textual-fspicker>=1.0.1; extra == 'tui'
 Provides-Extra: ujson
-Requires-Dist: ujson>=5.12.1; extra == 'ujson'
+Requires-Dist: ujson>=5.13.0; extra == 'ujson'
 Provides-Extra: webui
-Requires-Dist: nicegui>=3.12.1; extra == 'webui'
+Requires-Dist: nicegui>=3.13.0; extra == 'webui'
 Provides-Extra: yaml12
 Requires-Dist: ruamel-yaml-clib<0.3.0,>=0.2.15; (sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'linux' and sys_platform != 'emscripten') and extra == 'yaml12'
-Requires-Dist: yaml-rs<0.2.0,>=0.1.3; (sys_platform == 'win32' or sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'emscripten') and extra == 'yaml12'
+Requires-Dist: yaml-rs<0.2.0,>=0.1.4; (sys_platform == 'win32' or sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'emscripten') and extra == 'yaml12'
 Description-Content-Type: text/markdown
 
 # LibreSVIP

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/__init__.py

@@ -1,4 +1,4 @@
 import os
 
-__version__ = "2.6.2"
+__version__ = "2.7.0"
 os.environ.setdefault("LOGURU_AUTOINIT", "false")

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/cli/rpc/conversion_grpc.py

@@ -1,24 +1,74 @@
-import aristaproto
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+import grpclib.client
+import grpclib.const
 import grpclib.server
-from aristaproto.grpc.grpclib_client import MetadataLike
-from aristaproto.grpc.grpclib_server import ServiceBase
-from grpclib.metadata import Deadline
 
-from .messages import ConversionRequest, ConversionResponse, PluginInfosRequest, PluginInfosResponse
+if TYPE_CHECKING:
+    from grpclib.metadata import Deadline
+
+from .libresvip_pb import (
+    ConversionRequest,
+    ConversionResponse,
+    PluginInfosRequest,
+    PluginInfosResponse,
+)
 
 
-class ConversionStub(aristaproto.ServiceStub):
+class ConversionStub:
+    def __init__(self, channel: grpclib.client.Channel) -> None:
+        self._channel = channel
+
+    async def _unary_unary(
+        self,
+        method_name: str,
+        request_message: Any,
+        request_type: type[Any],
+        reply_type: type[Any],
+        *,
+        timeout: float | None = None,
+        deadline: Deadline | None = None,
+        metadata: Any | None = None,
+    ) -> Any:
+        request_factory = getattr(self._channel, "request", None)
+        if request_factory is None:
+            request_factory = getattr(self._channel, "unary_unary")
+            async with request_factory(
+                method_name,
+                request_type,
+                reply_type,
+                timeout=timeout,
+                deadline=deadline,
+                metadata=metadata,
+            ) as stream:
+                await stream.send_message(request_message, end=True)
+                return await stream.recv_message()
+        async with request_factory(
+            method_name,
+            grpclib.const.Cardinality.UNARY_UNARY,
+            request_type,
+            reply_type,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        ) as stream:
+            await stream.send_message(request_message, end=True)
+            return await stream.recv_message()
+
     async def plugin_infos(
         self,
         plugin_infos_request: PluginInfosRequest,
         *,
         timeout: float | None = None,
         deadline: Deadline | None = None,
-        metadata: MetadataLike | None = None,
+        metadata: Any | None = None,
     ) -> PluginInfosResponse:
         return await self._unary_unary(
             "/LibreSVIP.Conversion/PluginInfos",
             plugin_infos_request,
+            PluginInfosRequest,
             PluginInfosResponse,
             timeout=timeout,
             deadline=deadline,
@@ -31,11 +81,12 @@ class ConversionStub(aristaproto.ServiceStub):
         *,
         timeout: float | None = None,
         deadline: Deadline | None = None,
-        metadata: MetadataLike | None = None,
+        metadata: Any | None = None,
     ) -> ConversionResponse:
         return await self._unary_unary(
             "/LibreSVIP.Conversion/Convert",
             conversion_request,
+            ConversionRequest,
             ConversionResponse,
             timeout=timeout,
             deadline=deadline,
@@ -43,7 +94,7 @@ class ConversionStub(aristaproto.ServiceStub):
         )
 
 
-class ConversionBase(ServiceBase):
+class ConversionBase:
     async def plugin_infos(self, plugin_infos_request: PluginInfosRequest) -> PluginInfosResponse:
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
@@ -51,14 +102,14 @@ class ConversionBase(ServiceBase):
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
     async def __rpc_plugin_infos(
-        self, stream: "grpclib.server.Stream[PluginInfosRequest, PluginInfosResponse]"
+        self, stream: grpclib.server.Stream[PluginInfosRequest, PluginInfosResponse]
     ) -> None:
         request = await stream.recv_message()
         response = await self.plugin_infos(request)
         await stream.send_message(response)
 
     async def __rpc_convert(
-        self, stream: "grpclib.server.Stream[ConversionRequest, ConversionResponse]"
+        self, stream: grpclib.server.Stream[ConversionRequest, ConversionResponse]
     ) -> None:
         request = await stream.recv_message()
         response = await self.convert(request)

libresvip-2.7.0/libresvip/cli/rpc/libresvip_pb.py

@@ -0,0 +1,185 @@
+# Generated from libresvip/res/protos/libresvip.proto. DO NOT EDIT.
+# Generated by protoc-gen-py v0.1.1 with parameter "".
+# ruff: noqa: PGH004
+# ruff: noqa
+# fmt: off
+
+from __future__ import annotations
+
+from typing import Literal, TYPE_CHECKING, TypeAlias
+
+from protobuf import Enum, Message
+
+
+_PluginInfoFields: TypeAlias = Literal["identifier", "name", "version", "description", "author", "website", "json_schema", "file_format", "suffixes", "icon_base64"]
+
+class PluginInfo(Message[_PluginInfoFields]):
+
+    __slots__ = ("identifier", "name", "version", "description", "author", "website", "json_schema", "file_format", "suffixes", "icon_base64")
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            identifier: str = "",
+            name: str = "",
+            version: str = "",
+            description: str = "",
+            author: str = "",
+            website: str = "",
+            json_schema: str = "",
+            file_format: str = "",
+            suffixes: list[str] | None = None,
+            icon_base64: str = "",
+        ) -> None:
+            pass
+
+        identifier: str
+        name: str
+        version: str
+        description: str
+        author: str
+        website: str
+        json_schema: str
+        file_format: str
+        suffixes: list[str]
+        icon_base64: str
+
+_PluginInfosRequestFields: TypeAlias = Literal["category", "language"]
+
+class PluginInfosRequest(Message[_PluginInfosRequestFields]):
+
+    __slots__ = ("category", "language")
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            category: PluginCategory | None = None,
+            language: str = "",
+        ) -> None:
+            pass
+
+        category: PluginCategory
+        language: str
+
+_PluginInfosResponseFields: TypeAlias = Literal["values"]
+
+class PluginInfosResponse(Message[_PluginInfosResponseFields]):
+
+    __slots__ = ("values",)
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            values: list[PluginInfo] | None = None,
+        ) -> None:
+            pass
+
+        values: list[PluginInfo]
+
+_ConversionGroupFields: TypeAlias = Literal["group_id", "file_contents"]
+
+class ConversionGroup(Message[_ConversionGroupFields]):
+
+    __slots__ = ("group_id", "file_contents")
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            group_id: str = "",
+            file_contents: list[bytes] | None = None,
+        ) -> None:
+            pass
+
+        group_id: str
+        file_contents: list[bytes]
+
+_ConversionRequestFields: TypeAlias = Literal["input_format", "output_format", "mode", "max_track_count", "groups", "input_options", "output_options", "middleware_options"]
+
+class ConversionRequest(Message[_ConversionRequestFields]):
+
+    __slots__ = ("input_format", "output_format", "mode", "max_track_count", "groups", "input_options", "output_options", "middleware_options")
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            input_format: str = "",
+            output_format: str = "",
+            mode: ConversionMode | None = None,
+            max_track_count: int = 0,
+            groups: list[ConversionGroup] | None = None,
+            input_options: str = "",
+            output_options: str = "",
+            middleware_options: dict[str, str] | None = None,
+        ) -> None:
+            pass
+
+        input_format: str
+        output_format: str
+        mode: ConversionMode
+        max_track_count: int
+        groups: list[ConversionGroup]
+        input_options: str
+        output_options: str
+        middleware_options: dict[str, str]
+
+_SingleConversionResultFields: TypeAlias = Literal["success", "file_contents", "error_message", "warning_messages"]
+
+class SingleConversionResult(Message[_SingleConversionResultFields]):
+
+    __slots__ = ("success", "file_contents", "error_message", "warning_messages")
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            success: bool = False,
+            file_contents: list[bytes] | None = None,
+            error_message: str = "",
+            warning_messages: list[str] | None = None,
+        ) -> None:
+            pass
+
+        success: bool
+        file_contents: list[bytes]
+        error_message: str
+        warning_messages: list[str]
+
+_ConversionResponseFields: TypeAlias = Literal["group_results"]
+
+class ConversionResponse(Message[_ConversionResponseFields]):
+
+    __slots__ = ("group_results",)
+
+    if TYPE_CHECKING:
+
+        def __init__(
+            self,
+            *,
+            group_results: dict[str, SingleConversionResult] | None = None,
+        ) -> None:
+            pass
+
+        group_results: dict[str, SingleConversionResult]
+
+class PluginCategory(Enum):
+
+    INPUT = 0
+    OUTPUT = 1
+    MIDDLEWARE = 2
+
+class ConversionMode(Enum):
+
+    DIRECT = 0
+    SPLIT = 1
+    MERGE = 2

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/cli/rpc/server.py

@@ -29,7 +29,7 @@ from libresvip.utils.translation import gettext_lazy as _
 from libresvip.utils.translation import lazy_translation
 
 from .conversion_grpc import ConversionBase
-from .messages import (
+from .libresvip_pb import (
     ConversionGroup,
     ConversionMode,
     ConversionRequest,
@@ -217,7 +217,7 @@ class Conversion(ConversionBase):
                     )
                     for identifier, plugin in plugins.items()
                 )
-        return PluginInfosResponse(plugin_infos)
+        return PluginInfosResponse(values=plugin_infos)
 
     async def convert(self, conversion_request: ConversionRequest) -> ConversionResponse:
         group_id2results = {}
@@ -260,7 +260,7 @@ class Conversion(ConversionBase):
         for future in asyncio.as_completed(futures):
             group_id, result = await future
             group_id2results[group_id] = result
-        return ConversionResponse(group_id2results)
+        return ConversionResponse(group_results=group_id2results)
 
 
 async def run_grpc_server(*, host: str = "127.0.0.1", port: int = 15150) -> None:

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/gui/__main__.py

@@ -116,6 +116,7 @@ def run() -> None:
     app.set_attribute(Qt.ApplicationAttribute.AA_DontUseNativeMenuBar, True)
     if not config_path.exists():
         settings.language = Language.auto()
+    app.process_events(QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
     splash_translation = _load_splash_translation(settings.language.value)
     splash_screen = QSplashScreen(_build_splash_pixmap(icon_pixmap))
     splash_screen.show()

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/gui/modules/frameless_helper.py

@@ -17,6 +17,7 @@ from PySide6.QtCore import (
 from PySide6.QtGui import QCursor, QMouseEvent
 from PySide6.QtQml import QmlElement, QPyQmlParserStatus
 from PySide6.QtQuick import QQuickItem, QQuickWindow
+from typing_extensions import Self
 
 from __feature__ import snake_case, true_property  # isort:skip # noqa: F401
 
@@ -198,7 +199,7 @@ if sys.platform == "win32":
     class WindowsNativeEventFilter(QAbstractNativeEventFilter):
         _instance = None
 
-        def __new__(cls) -> "WindowsNativeEventFilter":  # noqa: PYI034
+        def __new__(cls) -> Self:
             if cls._instance is None:
                 cls._instance = super().__new__(cls)
             return cls._instance

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/plugins/acep/ace_studio_parser.py

@@ -104,23 +104,36 @@ class AceParser:
             ace_note_list = []
             ace_params = AcepParams()
             for pattern in sorted(ace_track.patterns, key=operator.attrgetter("clip_pos")):
-                ace_notes = [
-                    note
-                    for note in pattern.notes
-                    if note.pos + pattern.pos >= 0
-                    and pattern.clip_pos <= note.pos < pattern.clip_pos + pattern.clip_dur
-                ]
+                pattern_pos = int(pattern.pos)
+                clip_pos = int(pattern.clip_pos)
+                clip_end = int(pattern.clip_pos + pattern.clip_dur)
+                ace_notes = []
+                for note in pattern.notes:
+                    note_start = note.pos
+                    note_end = note.pos + note.dur
+                    clipped_start = max(note_start, clip_pos)
+                    clipped_end = min(note_end, clip_end)
+                    if clipped_start >= clipped_end:
+                        continue
+                    visible_pos = clipped_start - clip_pos + pattern_pos
+                    if visible_pos < 0:
+                        clipped_start -= visible_pos
+                        visible_pos = 0
+                        if clipped_start >= clipped_end:
+                            continue
+                    ace_notes.append(
+                        note.model_copy(
+                            deep=True,
+                            update={
+                                "pos": int(visible_pos),
+                                "dur": int(clipped_end - clipped_start),
+                            },
+                        )
+                    )
                 if not ace_notes:
                     continue
                 prev_ace_note = None
                 for ace_note in ace_notes:
-                    ace_note.dur = int(
-                        min(
-                            ace_note.dur,
-                            pattern.clip_pos + pattern.clip_dur - ace_note.pos,
-                        )
-                    )
-                    ace_note.pos += int(pattern.pos)
                     if (
                         prev_ace_note is not None
                         and prev_ace_note.pos + prev_ace_note.dur > ace_note.pos
@@ -130,19 +143,30 @@ class AceParser:
                 ace_note_list.extend(ace_notes)
 
                 def merge_curves(src: AcepParamCurveList, dst: AcepParamCurveList) -> None:
-                    ace_curves = [
-                        curve
-                        for curve in src.root
-                        if curve.offset + pattern.pos >= -self.first_bar_ticks
-                        and curve.offset + len(curve.values) > pattern.clip_pos
-                        and curve.offset < pattern.clip_pos + pattern.clip_dur
-                    ]
-                    for ace_curve in ace_curves:
-                        max_length = int(pattern.clip_pos + pattern.clip_dur - ace_curve.offset)
-                        if max_length < len(ace_curve.values):
-                            ace_curve.values = ace_curve.values[:max_length]
-                        ace_curve.offset += int(pattern.pos)
-                    dst.root.extend(ace_curves)
+                    for ace_curve in src.root:
+                        curve_start = ace_curve.offset
+                        curve_end = ace_curve.offset + len(ace_curve.values)
+                        clipped_start = max(curve_start, clip_pos)
+                        clipped_end = min(curve_end, clip_end)
+                        if clipped_start >= clipped_end:
+                            continue
+                        dst_offset = clipped_start - clip_pos + pattern_pos
+                        if dst_offset < -self.first_bar_ticks:
+                            clipped_start += -self.first_bar_ticks - dst_offset
+                            dst_offset = -self.first_bar_ticks
+                        if clipped_start >= clipped_end:
+                            continue
+                        start_index = int(clipped_start - curve_start)
+                        end_index = int(clipped_end - curve_start)
+                        dst.root.append(
+                            ace_curve.model_copy(
+                                deep=True,
+                                update={
+                                    "offset": int(dst_offset),
+                                    "values": ace_curve.values[start_index:end_index],
+                                },
+                            )
+                        )
 
                 merge_curves(pattern.parameters.pitch_delta, ace_params.pitch_delta)
                 merge_curves(pattern.parameters.breathiness, ace_params.breathiness)
@@ -388,7 +412,7 @@ class AceParser:
                 for value in ace_curve.values:
                     if ace_curve.curve_type == "anchor":
                         curve.points.append(Point(pos + self.first_bar_ticks, round(value * 100)))
-                    elif not (math.isnan(value) or value is None):
+                    elif value is not None and not math.isnan(value):
                         abs_semitone = (
                             base_pitch.semitone_value_at(
                                 self.synchronizer.get_actual_secs_from_ticks(pos)

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/plugins/mid/midi_parser.py

@@ -250,36 +250,28 @@ class MidiParser:
                         )
                     )
                 elif event.detail.data.type == "control_change":
+                    control = event.detail.data.control
+                    value = event.detail.data.value
                     if self.options.import_pitch:
                         if (
-                            event.detail.data.control == ControlChange.DATA_ENTRY
+                            control == ControlChange.DATA_ENTRY.value
                             and len(pitchbend_range_changed[event.time]) >= 2
                         ):
-                            pitch_bend_sensitivity = event.value
-                        elif (
-                            event.detail.data.control == ControlChange.RPN_MSB
-                            and event.detail.data.value == 0
-                        ) or (
-                            event.detail.data.control == ControlChange.RPN_LSB
-                            and event.detail.data.value == 0
+                            pitch_bend_sensitivity = value
+                        elif (control == ControlChange.RPN_MSB.value and value == 0) or (
+                            control == ControlChange.RPN_LSB.value and value == 0
                         ):
-                            pitchbend_range_changed[event.time].append(event.detail.data.value)
+                            pitchbend_range_changed[event.time].append(value)
                     if self.options.import_volume:
-                        if (
-                            event.detail.data.control == ControlChange.EXPRESSION
-                            and event.detail.data.value
-                        ):
+                        if control == ControlChange.EXPRESSION.value and value:
                             expression.points.append(
                                 Point(
                                     round(event.time * self.tick_rate),
-                                    round(volume_base + cc11_to_db_change(event.detail.data.value)),
+                                    round(volume_base + cc11_to_db_change(value)),
                                 )
                             )
-                        elif (
-                            event.detail.data.control == ControlChange.VOLUME
-                            and event.detail.data.value
-                        ):
-                            volume_base = velocity_to_db_change(event.detail.data.value)
+                        elif control == ControlChange.VOLUME.value and value:
+                            volume_base = velocity_to_db_change(value)
             if (pos := overlapped_pos(notes)) is not None:
                 msg = _("Notes overlapped near bar {}").format(
                     find_bar_index(self.time_signatures, pos)

libresvip-2.7.0/libresvip/plugins/svip3/model.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from .svip3_pb import (
+    Svip3AudioPattern,
+    Svip3AudioTrack,
+    Svip3BeatSize,
+    Svip3LineParamNode,
+    Svip3Note,
+    Svip3NoteLengthValidateTag,
+    Svip3Project,
+    Svip3SingingPattern,
+    Svip3SingingTrack,
+    Svip3SongBeat,
+    Svip3SongTempo,
+)
+
+if TYPE_CHECKING:
+    from .svip3_pb import Svip3SingingPattern as _Svip3SingingPattern
+
+
+def _pattern_pos(self: _Svip3SingingPattern) -> int:
+    return self.real_pos + self.play_pos
+
+
+Svip3SingingPattern.pos = property(_pattern_pos)
+
+
+__all__ = (
+    "Svip3AudioPattern",
+    "Svip3AudioTrack",
+    "Svip3BeatSize",
+    "Svip3LineParamNode",
+    "Svip3Note",
+    "Svip3NoteLengthValidateTag",
+    "Svip3Project",
+    "Svip3SingingPattern",
+    "Svip3SingingTrack",
+    "Svip3SongBeat",
+    "Svip3SongTempo",
+)

{libresvip-2.6.2 → libresvip-2.7.0}/libresvip/plugins/svip3/svip3_converter.py

@@ -22,11 +22,11 @@ class Svip3Converter(plugin_base.SVSConverter):
     @classmethod
     def load(cls, path: pathlib.Path, options: plugin_base.OptionsDict) -> Project:
         options_obj = cls.input_option_cls(**options)
-        svip3_project = Svip3Project().parse(path.read_bytes())
+        svip3_project = Svip3Project.from_binary(path.read_bytes())
         return Svip3Parser(options_obj).parse_project(svip3_project)
 
     @classmethod
     def dump(cls, path: pathlib.Path, project: Project, options: plugin_base.OptionsDict) -> None:
         options_obj = cls.output_option_cls(**options)
         svip3_project = Svip3Generator(options_obj).generate_project(project)
-        path.write_bytes(bytes(svip3_project))
+        path.write_bytes(svip3_project.to_binary())