From 5978c7d09e71d2712e762f8afc062d2eefb53116 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Sun, 19 Jun 2022 00:53:53 +0200 Subject: [PATCH] renaming --- pyinfra/visitor/dispatch/dispatch.py | 1 + .../strategies/{parsing => blob_parsing}/__init__.py | 0 .../{parsing/parsing.py => blob_parsing/blob_parsing.py} | 2 +- .../visitor/strategies/{parsing => blob_parsing}/dynamic.py | 4 ++-- pyinfra/visitor/visitor.py | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) rename pyinfra/visitor/strategies/{parsing => blob_parsing}/__init__.py (100%) rename pyinfra/visitor/strategies/{parsing/parsing.py => blob_parsing/blob_parsing.py} (87%) rename pyinfra/visitor/strategies/{parsing => blob_parsing}/dynamic.py (84%) diff --git a/pyinfra/visitor/dispatch/dispatch.py b/pyinfra/visitor/dispatch/dispatch.py index 55ce1b9..a2e25d5 100644 --- a/pyinfra/visitor/dispatch/dispatch.py +++ b/pyinfra/visitor/dispatch/dispatch.py @@ -1,6 +1,7 @@ import abc +# TODO: rename class DispatchCallback(abc.ABC): @abc.abstractmethod def __call__(self, payload): diff --git a/pyinfra/visitor/strategies/parsing/__init__.py b/pyinfra/visitor/strategies/blob_parsing/__init__.py similarity index 100% rename from pyinfra/visitor/strategies/parsing/__init__.py rename to pyinfra/visitor/strategies/blob_parsing/__init__.py diff --git a/pyinfra/visitor/strategies/parsing/parsing.py b/pyinfra/visitor/strategies/blob_parsing/blob_parsing.py similarity index 87% rename from pyinfra/visitor/strategies/parsing/parsing.py rename to pyinfra/visitor/strategies/blob_parsing/blob_parsing.py index 836c402..baed5dc 100644 --- a/pyinfra/visitor/strategies/parsing/parsing.py +++ b/pyinfra/visitor/strategies/blob_parsing/blob_parsing.py @@ -1,7 +1,7 @@ import abc -class ParsingStrategy(abc.ABC): +class BlobParsingStrategy(abc.ABC): @abc.abstractmethod def parse(self, data: bytes): pass diff --git a/pyinfra/visitor/strategies/parsing/dynamic.py b/pyinfra/visitor/strategies/blob_parsing/dynamic.py similarity index 84% rename from pyinfra/visitor/strategies/parsing/dynamic.py rename to pyinfra/visitor/strategies/blob_parsing/dynamic.py index e2a2167..850ee87 100644 --- a/pyinfra/visitor/strategies/parsing/dynamic.py +++ b/pyinfra/visitor/strategies/blob_parsing/dynamic.py @@ -4,12 +4,12 @@ from pyinfra.parser.parser_composer import EitherParserComposer from pyinfra.parser.parsers.identity import IdentityBlobParser from pyinfra.parser.parsers.json import JsonBlobParser from pyinfra.parser.parsers.string import StringBlobParser -from pyinfra.visitor.strategies.parsing.parsing import ParsingStrategy +from pyinfra.visitor.strategies.blob_parsing.blob_parsing import BlobParsingStrategy # TODO: Each analysis service should specify a custom parsing strategy for the type of data it expects to be found # on the storage. This class is only a temporary trial-and-error->fallback type of solution. -class DynamicParsingStrategy(ParsingStrategy): +class DynamicParsingStrategy(BlobParsingStrategy): def __init__(self): self.parser = EitherParserComposer(JsonBlobParser(), StringBlobParser(), IdentityBlobParser()) diff --git a/pyinfra/visitor/visitor.py b/pyinfra/visitor/visitor.py index 9164346..d14a904 100644 --- a/pyinfra/visitor/visitor.py +++ b/pyinfra/visitor/visitor.py @@ -5,8 +5,8 @@ from funcy import lflatten, compose from pyinfra.storage.storage import Storage from pyinfra.utils.func import lift from pyinfra.visitor.strategies.download.download import DownloadStrategy -from pyinfra.visitor.strategies.parsing.dynamic import DynamicParsingStrategy -from pyinfra.visitor.strategies.parsing.parsing import ParsingStrategy +from pyinfra.visitor.strategies.blob_parsing.dynamic import DynamicParsingStrategy +from pyinfra.visitor.strategies.blob_parsing.blob_parsing import BlobParsingStrategy from pyinfra.visitor.strategies.response.response import ResponseStrategy from pyinfra.visitor.strategies.response.storage import StorageStrategy from pyinfra.visitor.utils import standardize, get_download_strategy @@ -18,7 +18,7 @@ class QueueVisitor: storage: Storage, callback: Callable, download_strategy: DownloadStrategy = None, - parsing_strategy: ParsingStrategy = None, + parsing_strategy: BlobParsingStrategy = None, response_strategy: ResponseStrategy = None, ): """Processes queue messages that specify items on a storage to process with a given callback.