From 7a1db32c3b451f6fb197a909d7c85f8be8a754a2 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Thu, 5 May 2022 11:22:17 +0200 Subject: [PATCH] refactoring: rename --- pyinfra/server/{sender => dispatcher}/__init__.py | 0 pyinfra/server/{sender/sender.py => dispatcher/dispatcher.py} | 2 +- pyinfra/server/{sender => dispatcher}/senders/__init__.py | 0 pyinfra/server/{sender => dispatcher}/senders/rest.py | 4 ++-- pyinfra/server/rest.py | 4 ++-- test/unit_tests/rest/receiver_test.py | 4 ++-- test/unit_tests/rest/sender_test.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename pyinfra/server/{sender => dispatcher}/__init__.py (100%) rename pyinfra/server/{sender/sender.py => dispatcher/dispatcher.py} (97%) rename pyinfra/server/{sender => dispatcher}/senders/__init__.py (100%) rename pyinfra/server/{sender => dispatcher}/senders/rest.py (73%) diff --git a/pyinfra/server/sender/__init__.py b/pyinfra/server/dispatcher/__init__.py similarity index 100% rename from pyinfra/server/sender/__init__.py rename to pyinfra/server/dispatcher/__init__.py diff --git a/pyinfra/server/sender/sender.py b/pyinfra/server/dispatcher/dispatcher.py similarity index 97% rename from pyinfra/server/sender/sender.py rename to pyinfra/server/dispatcher/dispatcher.py index 975d9b0..8d60ce8 100644 --- a/pyinfra/server/sender/sender.py +++ b/pyinfra/server/dispatcher/dispatcher.py @@ -12,7 +12,7 @@ def has_next(peekable_iter): return peekable_iter.peek(Nothing) != Nothing -class Sender: +class Dispatcher: def __call__(self, packages: Iterable[dict]): packages = peekable(packages) diff --git a/pyinfra/server/sender/senders/__init__.py b/pyinfra/server/dispatcher/senders/__init__.py similarity index 100% rename from pyinfra/server/sender/senders/__init__.py rename to pyinfra/server/dispatcher/senders/__init__.py diff --git a/pyinfra/server/sender/senders/rest.py b/pyinfra/server/dispatcher/senders/rest.py similarity index 73% rename from pyinfra/server/sender/senders/rest.py rename to pyinfra/server/dispatcher/senders/rest.py index 6baed62..8f3d66c 100644 --- a/pyinfra/server/sender/senders/rest.py +++ b/pyinfra/server/dispatcher/senders/rest.py @@ -1,9 +1,9 @@ import requests -from pyinfra.server.sender.sender import Sender +from pyinfra.server.dispatcher.dispatcher import Dispatcher -class RestSender(Sender): +class RestDispatcher(Dispatcher): def __init__(self, endpoint): self.endpoint = endpoint diff --git a/pyinfra/server/rest.py b/pyinfra/server/rest.py index 52f8bdc..0aa5e53 100644 --- a/pyinfra/server/rest.py +++ b/pyinfra/server/rest.py @@ -6,7 +6,7 @@ from funcy import identity, rcompose, flatten from pyinfra.server.packer.packers.rest import RestPacker from pyinfra.server.receiver.receivers.rest import RestReceiver -from pyinfra.server.sender.senders.rest import RestSender +from pyinfra.server.dispatcher.senders.rest import RestDispatcher from pyinfra.server.utils import stream_response_payloads from pyinfra.utils.func import lift @@ -55,7 +55,7 @@ def head(endpoint): """Sends packages of data and metadata to endpoint and returns response.""" return rcompose( RestPacker(), - RestSender(endpoint), + RestDispatcher(endpoint), RestReceiver() )(data, metadata) diff --git a/test/unit_tests/rest/receiver_test.py b/test/unit_tests/rest/receiver_test.py index c228a73..b71eefa 100644 --- a/test/unit_tests/rest/receiver_test.py +++ b/test/unit_tests/rest/receiver_test.py @@ -1,12 +1,12 @@ import pytest from pyinfra.server.receiver.receivers.rest import RestReceiver -from pyinfra.server.sender.senders.rest import RestSender +from pyinfra.server.dispatcher.senders.rest import RestDispatcher @pytest.mark.parametrize("batched", [True, False]) @pytest.mark.parametrize("item_type", ["string", "image", "pdf"]) def test_rest_receiver(url, packages, server_process): - sender = RestSender(f"{url}/process") + sender = RestDispatcher(f"{url}/process") receiver = RestReceiver() assert all((isinstance(r, list) for r in receiver(sender(packages)))) diff --git a/test/unit_tests/rest/sender_test.py b/test/unit_tests/rest/sender_test.py index be37524..c894671 100644 --- a/test/unit_tests/rest/sender_test.py +++ b/test/unit_tests/rest/sender_test.py @@ -1,10 +1,10 @@ import pytest -from pyinfra.server.sender.senders.rest import RestSender +from pyinfra.server.dispatcher.senders.rest import RestDispatcher @pytest.mark.parametrize("batched", [True, False]) @pytest.mark.parametrize("item_type", ["string", "image", "pdf"]) def test_rest_sender(url, packages, server_process): - sender = RestSender(f"{url}/process") + sender = RestDispatcher(f"{url}/process") assert all((r.status_code == 200 for r in sender(packages)))