vsjetengine 1.2.0__tar.gz → 1.4.0__tar.gz

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vsjetengine
-Version: 1.2.0
+Version: 1.4.0
 Summary: An engine for vapoursynth previewers, renderers and script analyis tools.
 Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/vs-jet-engine
 Project-URL: Contact, https://discord.gg/XTpc6Fa9eB

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/tests/test_futures.py

@@ -7,14 +7,14 @@
 
 import contextlib
 import threading
-from collections.abc import AsyncIterator, Iterator
+from collections.abc import AsyncGenerator, Generator, Iterator
 from concurrent.futures import Future
 from typing import Any
 
 import pytest
 
-from vsengine._futures import UnifiedFuture, UnifiedIterator, unified
 from vsengine.adapters.asyncio import AsyncIOLoop
+from vsengine.futures import UnifiedFuture, UnifiedIterator, unified
 from vsengine.loops import NO_LOOP, set_loop
 
 
@@ -32,7 +32,7 @@ def reject(err: BaseException) -> Future[Any]:
 
 def contextmanager_helper() -> Future[Any]:
     @contextlib.contextmanager
-    def noop() -> Iterator[int]:
+    def noop() -> Generator[int]:
         yield 1
 
     return resolve(noop())
@@ -40,7 +40,7 @@ def contextmanager_helper() -> Future[Any]:
 
 def asynccontextmanager_helper() -> Future[Any]:
     @contextlib.asynccontextmanager
-    async def noop() -> AsyncIterator[int]:
+    async def noop() -> AsyncGenerator[int]:
         yield 2
 
     return resolve(noop())
@@ -141,9 +141,6 @@ def test_unified_future_catch() -> None:
 
 @pytest.mark.asyncio
 async def test_unified_future_add_loop_callback() -> None:
-    from vsengine.adapters.asyncio import AsyncIOLoop
-    from vsengine.loops import set_loop
-
     set_loop(AsyncIOLoop())
 
     def _init_thread(fut: Future[threading.Thread]) -> None:
@@ -170,6 +167,122 @@ async def test_unified_future_add_loop_callback() -> None:
     assert cb_thread != loop_thread
 
 
+@pytest.mark.asyncio
+async def test_unified_future_add_loop_callback_chaining() -> None:
+    set_loop(AsyncIOLoop())
+
+    fut = Future[int]()
+    unified_fut = UnifiedFuture.from_future(fut)
+
+    recorded_value: int | None = None
+
+    def _side_effect(f: Future[int]) -> None:
+        nonlocal recorded_value
+        recorded_value = f.result() * 2
+
+    chained_fut = unified_fut.add_loop_callback(_side_effect)
+
+    results = list[int]()
+    chained_fut.then(lambda val: results.append(val))
+
+    fut.set_result(21)
+
+    res = await chained_fut
+    assert res == 21
+    assert results == [21]
+    assert recorded_value == 42
+
+
+@pytest.mark.asyncio
+async def test_unified_future_then_on_loop() -> None:
+    set_loop(AsyncIOLoop())
+
+    fut = Future[int]()
+    unified_fut = UnifiedFuture.from_future(fut)
+
+    loop_thread: threading.Thread | None = None
+    callback_thread: threading.Thread | None = None
+
+    def _init_thread() -> None:
+        fut.set_result(42)
+
+    def _on_success(v: int) -> int:
+        nonlocal callback_thread
+        callback_thread = threading.current_thread()
+        return v * 2
+
+    chained = unified_fut.then(_on_success, on_loop=True)
+
+    thr = threading.Thread(target=_init_thread)
+    thr.start()
+
+    res = await chained
+    loop_thread = threading.current_thread()
+
+    assert callback_thread == loop_thread
+    assert res == 84
+
+
+@pytest.mark.asyncio
+async def test_unified_future_map_on_loop() -> None:
+    set_loop(AsyncIOLoop())
+
+    fut = Future[int]()
+    unified_fut = UnifiedFuture.from_future(fut)
+
+    loop_thread: threading.Thread | None = None
+    callback_thread: threading.Thread | None = None
+
+    def _init_thread() -> None:
+        fut.set_result(10)
+
+    def _map_fn(v: int) -> str:
+        nonlocal callback_thread
+        callback_thread = threading.current_thread()
+        return f"value: {v}"
+
+    chained = unified_fut.map(_map_fn, on_loop=True)
+
+    thr = threading.Thread(target=_init_thread)
+    thr.start()
+
+    res = await chained
+    loop_thread = threading.current_thread()
+
+    assert callback_thread == loop_thread
+    assert res == "value: 10"
+
+
+@pytest.mark.asyncio
+async def test_unified_future_catch_on_loop() -> None:
+    set_loop(AsyncIOLoop())
+
+    fut = Future[int]()
+    unified_fut = UnifiedFuture.from_future(fut)
+
+    loop_thread: threading.Thread | None = None
+    callback_thread: threading.Thread | None = None
+
+    def _init_thread() -> None:
+        fut.set_exception(ValueError("error!"))
+
+    def _catch_fn(e: BaseException) -> str:
+        nonlocal callback_thread
+        callback_thread = threading.current_thread()
+        return str(e)
+
+    chained = unified_fut.catch(_catch_fn, on_loop=True)
+
+    thr = threading.Thread(target=_init_thread)
+    thr.start()
+
+    res = await chained
+    loop_thread = threading.current_thread()
+
+    assert callback_thread == loop_thread
+    assert res == "error!"
+
+
 # UnifiedIterator tests
 
 

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/tests/test_hospice.py

@@ -9,7 +9,7 @@ import contextlib
 import gc
 import logging
 import weakref
-from collections.abc import Iterator
+from collections.abc import Generator, Iterator
 from typing import Any
 
 import pytest
@@ -53,7 +53,7 @@ class MockEnv:
 
 
 @contextlib.contextmanager
-def hide_logs() -> Iterator[None]:
+def hide_logs() -> Generator[None]:
     logging.disable(logging.CRITICAL)
     try:
         yield

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/tests/test_loop_adapters.py

@@ -42,7 +42,7 @@ class AdapterTest:
     """Base class for event loop adapter tests."""
 
     @contextlib.contextmanager
-    def with_loop(self) -> Iterator[EventLoop]:
+    def with_loop(self) -> Generator[EventLoop]:
         loop = self.make_loop()
         set_loop(loop)
         try:
@@ -60,7 +60,7 @@ class AdapterTest:
         raise NotImplementedError
 
     @contextlib.contextmanager
-    def assert_cancelled(self) -> Iterator[None]:
+    def assert_cancelled(self) -> Generator[None]:
         raise NotImplementedError
 
     @make_async
@@ -216,7 +216,7 @@ class TestNoLoop(AdapterTest):
                 pass
 
     @contextlib.contextmanager
-    def assert_cancelled(self) -> Iterator[None]:
+    def assert_cancelled(self) -> Generator[None]:
         with pytest.raises(CancelledError):
             yield
 
@@ -244,7 +244,7 @@ class TestAsyncIO(AsyncAdapterTest):
         return await asyncio.wait_for(coro, timeout)
 
     @contextlib.contextmanager
-    def assert_cancelled(self) -> Iterator[None]:
+    def assert_cancelled(self) -> Generator[None]:
         with pytest.raises(asyncio.CancelledError):
             yield
 
@@ -309,6 +309,6 @@ else:
                 return await coro
 
         @contextlib.contextmanager
-        def assert_cancelled(self) -> Iterator[None]:
+        def assert_cancelled(self) -> Generator[None]:
             with pytest.raises(trio.Cancelled):
                 yield

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/tests/test_vpy.py

@@ -15,7 +15,7 @@ import textwrap
 import threading
 import types
 import weakref
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Generator
 from pathlib import Path
 from typing import Any
 
@@ -44,7 +44,7 @@ PATH: str = os.path.join(DIR, "fixtures", "test.vpy")
 
 
 @contextlib.contextmanager
-def noop() -> Iterator[None]:
+def noop() -> Generator[None]:
     yield
 
 

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/vsengine/__init__.py

@@ -13,6 +13,7 @@ Parts:
 - vpy:     Run .vpy-scripts in your application.
 """
 
+from vsengine.futures import *
 from vsengine.loops import *
 from vsengine.policy import *
 from vsengine.video import *

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/vsengine/_helpers.py

@@ -4,7 +4,7 @@
 # This project is licensed under the EUPL-1.2
 # SPDX-License-Identifier: EUPL-1.2
 import contextlib
-from collections.abc import Iterator
+from collections.abc import Generator
 
 import vapoursynth as vs
 
@@ -13,7 +13,7 @@ from vsengine.policy import ManagedEnvironment
 
 # Automatically set the environment within that block.
 @contextlib.contextmanager
-def use_inline(function_name: str, env: vs.Environment | ManagedEnvironment | None) -> Iterator[None]:
+def use_inline(function_name: str, env: vs.Environment | ManagedEnvironment | None) -> Generator[None]:
     if env is None:
         # Ensure there is actually an environment set in this block.
         try:

vsjetengine-1.4.0/vsengine/_version.py

@@ -0,0 +1,2 @@
+__version__ = "1.4.0"
+__version_tuple__ = (1, 4, 0)

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/vsengine/adapters/asyncio.py

@@ -7,7 +7,7 @@
 import asyncio
 import contextlib
 import contextvars
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Generator
 from concurrent.futures import Future
 
 from vsengine.loops import Cancelled, EventLoop
@@ -78,7 +78,7 @@ class AsyncIOLoop(EventLoop):
             return await asyncio.wrap_future(future, loop=self.loop)
 
     @contextlib.contextmanager
-    def wrap_cancelled(self) -> Iterator[None]:
+    def wrap_cancelled(self) -> Generator[None]:
         try:
             yield
         except Cancelled:

{vsjetengine-1.2.0 → vsjetengine-1.4.0}/vsengine/adapters/trio.py

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: EUPL-1.2
 
 import contextlib
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Generator
 from concurrent.futures import Future
 
 import trio
@@ -100,7 +100,7 @@ class TrioEventLoop(EventLoop):
                 raise exc
 
     @contextlib.contextmanager
-    def wrap_cancelled(self) -> Iterator[None]:
+    def wrap_cancelled(self) -> Generator[None]:
         try:
             yield
         except Cancelled: