minor refactoring

This commit is contained in:
Matthias Bisping 2022-06-28 19:32:38 +02:00
parent 0937b63dc0
commit 70df7911b9
3 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
from itertools import chain, takewhile from itertools import chain, takewhile
from typing import Iterable from typing import Iterable
from funcy import first, repeatedly, flatten from funcy import first, repeatedly, mapcat
from pyinfra.server.buffering.bufferize import bufferize from pyinfra.server.buffering.bufferize import bufferize
from pyinfra.server.dispatcher.dispatcher import Nothing, is_not_nothing from pyinfra.server.dispatcher.dispatcher import Nothing, is_not_nothing
@ -16,7 +16,7 @@ class FlatStreamBuffer:
def __call__(self, items): def __call__(self, items):
items = chain(items, [Nothing]) items = chain(items, [Nothing])
yield from flatten(map(self.stream_buffer, items)) yield from mapcat(self.stream_buffer, items)
class StreamBuffer: class StreamBuffer:

View File

@ -1,5 +1,5 @@
import pytest import pytest
from funcy import rcompose, compose, project, second, merge, lpluck from funcy import rcompose, compose, project, merge
from pyinfra.server.buffering.stream import FlatStreamBuffer from pyinfra.server.buffering.stream import FlatStreamBuffer
from pyinfra.server.client_pipeline import ClientPipeline from pyinfra.server.client_pipeline import ClientPipeline
@ -40,9 +40,9 @@ def test_pipeline(
for storage_mdt, queue_mdt in zip(metadata, queue_message_metadata) for storage_mdt, queue_mdt in zip(metadata, queue_message_metadata)
] ]
output = compose(llift(unpack), client_pipeline)(input_data_items, metadata) outputs = compose(llift(unpack), client_pipeline)(input_data_items, metadata)
assert n_items == 0 or len(output) > 0 assert n_items == 0 or len(outputs) > 0
assert output == targets assert outputs == targets
@pytest.mark.parametrize("item_type", ["string"]) @pytest.mark.parametrize("item_type", ["string"])