Move around files and use relative imports (#86)

* File move comment, and start adoption of relative imports

* Use relative imports

Author: AlanCoding

dispatcher/cli.py

@@ -3,8 +3,8 @@
 import os
 import sys
 
-from dispatcher import run_service
-from dispatcher.config import setup
+from . import run_service
+from .config import setup
 
 logger = logging.getLogger(__name__)
 

dispatcher/control.py

@@ -5,8 +5,8 @@
 import uuid
 from typing import Optional
 
-from dispatcher.factories import get_broker
-from dispatcher.producers import BrokeredProducer
+from .factories import get_broker
+from .producers import BrokeredProducer
 
 logger = logging.getLogger('awx.main.dispatch.control')
 

dispatcher/factories.py

@@ -2,15 +2,15 @@
 from copy import deepcopy
 from typing import Iterable, Optional, Type, get_args, get_origin
 
-from dispatcher import producers
-from dispatcher.brokers import get_broker
-from dispatcher.brokers.base import BaseBroker
-from dispatcher.config import LazySettings
-from dispatcher.config import settings as global_settings
-from dispatcher.control import Control
-from dispatcher.main import DispatcherMain
-from dispatcher.pool import WorkerPool
-from dispatcher.process import ProcessManager
+from . import producers
+from .brokers import get_broker
+from .brokers.base import BaseBroker
+from .config import LazySettings
+from .config import settings as global_settings
+from .control import Control
+from .service.main import DispatcherMain
+from .service.pool import WorkerPool
+from .service.process import ProcessManager
 
 """
 Creates objects from settings,

dispatcher/producers/brokered.py

@@ -2,8 +2,8 @@
 import logging
 from typing import Optional
 
-from dispatcher.brokers.base import BaseBroker
-from dispatcher.producers.base import BaseProducer
+from ..brokers.base import BaseBroker
+from .base import BaseProducer
 
 logger = logging.getLogger(__name__)
 

dispatcher/producers/scheduled.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 
-from dispatcher.producers.base import BaseProducer
+from .base import BaseProducer
 
 logger = logging.getLogger(__name__)
 

dispatcher/publish.py

@@ -1,9 +1,9 @@
 import logging
 from typing import Optional
 
-from dispatcher.registry import DispatcherMethodRegistry
-from dispatcher.registry import registry as default_registry
-from dispatcher.utils import DispatcherCallable
+from .registry import DispatcherMethodRegistry
+from .registry import registry as default_registry
+from .utils import DispatcherCallable
 
 logger = logging.getLogger('awx.main.dispatch')
 

dispatcher/registry.py

@@ -6,9 +6,9 @@
 from typing import Callable, Optional, Set, Tuple
 from uuid import uuid4
 
-from dispatcher.config import LazySettings
-from dispatcher.config import settings as global_settings
-from dispatcher.utils import MODULE_METHOD_DELIMITER, DispatcherCallable, resolve_callable
+from .config import LazySettings
+from .config import settings as global_settings
+from .utils import MODULE_METHOD_DELIMITER, DispatcherCallable, resolve_callable
 
 logger = logging.getLogger(__name__)
 

dispatcher/main.py dispatcher/service/main.py

@@ -5,8 +5,8 @@
 from types import SimpleNamespace
 from typing import Iterable, Optional
 
-from dispatcher.pool import WorkerPool
-from dispatcher.producers import BaseProducer
+from ..producers import BaseProducer
+from .pool import WorkerPool
 
 logger = logging.getLogger(__name__)
 
@@ -207,7 +207,7 @@ async def process_message_internal(self, message: dict, producer=None) -> None:
                 self.control_count += 1
                 await self.pool.dispatch_task(
                     {
-                        'task': 'dispatcher.tasks.reply_to_control',
+                        'task': 'dispatcher.service.tasks.reply_to_control',
                         'args': [message['reply_to'], json.dumps(returned)],
                         'uuid': f'control-{self.control_count}',
                         'control': 'reply',  # for record keeping

dispatcher/pool.py dispatcher/service/pool.py

@@ -4,10 +4,10 @@
 from asyncio import Task
 from typing import Iterator, Optional
 
-from dispatcher.config import LazySettings
-from dispatcher.config import settings as global_settings
-from dispatcher.process import ProcessManager, ProcessProxy
-from dispatcher.utils import DuplicateBehavior, MessageAction
+from ..config import LazySettings
+from ..config import settings as global_settings
+from ..utils import DuplicateBehavior, MessageAction
+from .process import ProcessManager, ProcessProxy
 
 logger = logging.getLogger(__name__)
 

dispatcher/process.py dispatcher/service/process.py

@@ -2,7 +2,7 @@
 import multiprocessing
 from typing import Callable, Iterable, Optional, Union
 
-from dispatcher.worker.task import work_loop
+from ..worker.task import work_loop
 
 
 class ProcessProxy:

dispatcher/tasks.py dispatcher/service/tasks.py

@@ -1,5 +1,5 @@
-from dispatcher.factories import get_publisher_from_settings
-from dispatcher.publish import task
+from ..factories import get_publisher_from_settings
+from ..publish import task
 
 
 @task()

dispatcher/worker/task.py

@@ -8,8 +8,8 @@
 import traceback
 from queue import Empty as QueueEmpty
 
-from dispatcher.config import setup
-from dispatcher.registry import registry
+from ..config import setup
+from ..registry import registry
 
 logger = logging.getLogger(__name__)
 

tests/conftest.py

@@ -6,7 +6,7 @@
 
 import pytest_asyncio
 
-from dispatcher.main import DispatcherMain
+from dispatcher.service.main import DispatcherMain
 from dispatcher.control import Control
 
 from dispatcher.brokers.pg_notify import Broker, create_connection, acreate_connection

tests/unit/service/test_process.py

@@ -1,6 +1,6 @@
 from multiprocessing import Queue
 
-from dispatcher.process import ProcessManager, ProcessProxy
+from dispatcher.service.process import ProcessManager, ProcessProxy
 
 
 def test_pass_messages_to_worker():