Skip to content

Commit 46b808d

Browse files
committed
linter fixups after worker settings fixing
1 parent 477439f commit 46b808d

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

dispatcher/config.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ def __init__(self, config: dict) -> None:
1616
# self.options: dict = config.get('options', {})
1717

1818
def serialize(self):
19-
return dict(
20-
brokers=self.brokers,
21-
producers=self.producers,
22-
service=self.service,
23-
publish=self.publish
24-
)
19+
return dict(brokers=self.brokers, producers=self.producers, service=self.service, publish=self.publish)
2520

2621

2722
def settings_from_file(path: str) -> DispatcherSettings:

dispatcher/main.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
from types import SimpleNamespace
66
from typing import Iterable, Optional
77

8+
from dispatcher.config import LazySettings
9+
from dispatcher.config import settings as global_settings
810
from dispatcher.pool import WorkerPool
911
from dispatcher.producers import BaseProducer
10-
from dispatcher.config import settings as global_settings, LazySettings
1112

1213
logger = logging.getLogger(__name__)
1314

dispatcher/pool.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
from asyncio import Task
55
from typing import Iterator, Optional
66

7+
from dispatcher.config import LazySettings
8+
from dispatcher.config import settings as global_settings
79
from dispatcher.process import ProcessManager, ProcessProxy
810
from dispatcher.utils import DuplicateBehavior, MessageAction
9-
from dispatcher.config import settings as global_settings, LazySettings
1011

1112
logger = logging.getLogger(__name__)
1213

@@ -188,7 +189,12 @@ async def manage_timeout(self) -> None:
188189
self.events.timeout_event.clear()
189190

190191
async def up(self) -> None:
191-
process = self.process_manager.create_process((self.settings_stash, self.next_worker_id,))
192+
process = self.process_manager.create_process(
193+
(
194+
self.settings_stash,
195+
self.next_worker_id,
196+
)
197+
)
192198
worker = PoolWorker(self.next_worker_id, process)
193199
self.workers[self.next_worker_id] = worker
194200
self.next_worker_id += 1

dispatcher/process.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_event_loop(self):
4646
self._loop = asyncio.get_event_loop()
4747
return self._loop
4848

49-
def create_process(self, args: Iterable[int | str], **kwargs) -> ProcessProxy:
49+
def create_process(self, args: Iterable[int | str | dict], **kwargs) -> ProcessProxy:
5050
return ProcessProxy(args, self.finished_queue, **kwargs)
5151

5252
async def read_finished(self) -> dict[str, Union[str, int]]:

dispatcher/registry.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
from typing import Callable, Optional, Set, Tuple
77
from uuid import uuid4
88

9+
from dispatcher.config import LazySettings
10+
from dispatcher.config import settings as global_settings
911
from dispatcher.utils import MODULE_METHOD_DELIMITER, DispatcherCallable, resolve_callable
10-
from dispatcher.config import settings as global_settings, DispatcherSettings
1112

1213
logger = logging.getLogger(__name__)
1314

@@ -80,7 +81,7 @@ def get_async_body(
8081

8182
return body
8283

83-
def apply_async(self, args=None, kwargs=None, queue=None, uuid=None, settings: DispatcherSettings = global_settings, **kw) -> Tuple[dict, str]:
84+
def apply_async(self, args=None, kwargs=None, queue=None, uuid=None, settings: LazySettings = global_settings, **kw) -> Tuple[dict, str]:
8485
queue = queue or self.submission_defaults.get('queue')
8586

8687
if callable(queue):

dispatcher/worker/task.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import traceback
99
from queue import Empty as QueueEmpty
1010

11-
from dispatcher.registry import registry
1211
from dispatcher.config import setup
12+
from dispatcher.registry import registry
1313

1414
logger = logging.getLogger(__name__)
1515

0 commit comments

Comments
 (0)