made modules flat

Author: Andrei Neagu

…long_running_tasks/_rabbit/lrt_client.py …icelib/long_running_tasks/_lrt_client.pypackages/service-library/src/servicelib/long_running_tasks/_rabbit/lrt_client.py renamed to packages/service-library/src/servicelib/long_running_tasks/_lrt_client.py packages/service-library/src/servicelib/long_running_tasks/_rabbit/lrt_client.py renamed to packages/service-library/src/servicelib/long_running_tasks/_lrt_client.py

@@ -5,14 +5,14 @@
 from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import PositiveInt, TypeAdapter
 
-from ...logging_errors import create_troubleshootting_log_kwargs
-from ...logging_utils import log_decorator
-from ...long_running_tasks.task import RegisteredTaskName
-from ...rabbitmq._client_rpc import RabbitMQRPCClient
-from .._serialization import string_to_object
-from ..models import LRTNamespace, TaskBase, TaskContext, TaskId, TaskStatus
+from ..logging_errors import create_troubleshootting_log_kwargs
+from ..logging_utils import log_decorator
+from ..rabbitmq._client_rpc import RabbitMQRPCClient
 from ._models import RPCErrorResponse
-from .namespace import get_rabbit_namespace
+from ._rabbit_namespace import get_rabbit_namespace
+from ._serialization import string_to_object
+from .models import LRTNamespace, TaskBase, TaskContext, TaskId, TaskStatus
+from .task import RegisteredTaskName
 
 _logger = logging.getLogger(__name__)
 

…long_running_tasks/_rabbit/lrt_server.py …icelib/long_running_tasks/_lrt_server.pypackages/service-library/src/servicelib/long_running_tasks/_rabbit/lrt_server.py renamed to packages/service-library/src/servicelib/long_running_tasks/_lrt_server.py packages/service-library/src/servicelib/long_running_tasks/_rabbit/lrt_server.py renamed to packages/service-library/src/servicelib/long_running_tasks/_lrt_server.py

@@ -1,13 +1,13 @@
 import traceback
 from typing import Any
 
-from ...rabbitmq import RPCRouter
-from .._serialization import object_to_string
-from ..base_long_running_manager import BaseLongRunningManager
-from ..errors import BaseLongRunningError, TaskNotCompletedError, TaskNotFoundError
-from ..models import TaskBase, TaskContext, TaskId, TaskStatus
-from ..task import RegisteredTaskName
+from ..rabbitmq import RPCRouter
 from ._models import RPCErrorResponse
+from ._serialization import object_to_string
+from .base_long_running_manager import BaseLongRunningManager
+from .errors import BaseLongRunningError, TaskNotCompletedError, TaskNotFoundError
+from .models import TaskBase, TaskContext, TaskId, TaskStatus
+from .task import RegisteredTaskName
 
 router = RPCRouter()
 

…ib/long_running_tasks/_rabbit/_models.py …servicelib/long_running_tasks/_models.pypackages/service-library/src/servicelib/long_running_tasks/_rabbit/_models.py renamed to packages/service-library/src/servicelib/long_running_tasks/_models.py packages/service-library/src/servicelib/long_running_tasks/_rabbit/_models.py renamed to packages/service-library/src/servicelib/long_running_tasks/_models.py

@@ -1,7 +1,7 @@
 from models_library.rabbitmq_basic_types import RPCNamespace
 from pydantic import TypeAdapter
 
-from ..models import LRTNamespace
+from .models import LRTNamespace
 
 
 def get_rabbit_namespace(namespace: LRTNamespace) -> RPCNamespace:

packages/service-library/src/servicelib/long_running_tasks/_rabbit/__init__.py

@@ -1,12 +1,8 @@
 import base64
-import logging
 import pickle
 from abc import ABC, abstractmethod
 from typing import Any, Final, Generic, TypeVar
 
-_logger = logging.getLogger(__name__)
-
-
 T = TypeVar("T")
 
 

…/long_running_tasks/_rabbit/namespace.py …/long_running_tasks/_rabbit_namespace.pypackages/service-library/src/servicelib/long_running_tasks/_rabbit/namespace.py renamed to packages/service-library/src/servicelib/long_running_tasks/_rabbit_namespace.py packages/service-library/src/servicelib/long_running_tasks/_rabbit/namespace.py renamed to packages/service-library/src/servicelib/long_running_tasks/_rabbit_namespace.py

@@ -4,7 +4,7 @@
 from settings_library.redis import RedisSettings
 
 from ..rabbitmq._client_rpc import RabbitMQRPCClient
-from ._rabbit.namespace import get_rabbit_namespace
+from ._rabbit_namespace import get_rabbit_namespace
 from .models import LRTNamespace
 from .task import TasksManager
 
@@ -61,8 +61,7 @@ async def setup(self) -> None:
             client_name=f"lrt-client-{self.lrt_namespace}",
             settings=self.rabbit_settings,
         )
-
-        from ._rabbit.lrt_server import router
+        from ._lrt_server import router
 
         await self.rpc_server.register_router(
             router,

packages/service-library/src/servicelib/long_running_tasks/_serialization.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 from ..rabbitmq._client_rpc import RabbitMQRPCClient
-from ._rabbit import lrt_client
+from . import _lrt_client
 from .base_long_running_manager import BaseLongRunningManager
 from .models import TaskBase, TaskContext, TaskId, TaskStatus
 from .task import RegisteredTaskName
@@ -43,7 +43,7 @@ async def start_task(
         TaskId: the task unique identifier
     """
 
-    return await lrt_client.start_task(
+    return await _lrt_client.start_task(
         long_running_manager.rpc_client,
         long_running_manager.lrt_namespace,
         registered_task_name=registered_task_name,
@@ -60,7 +60,7 @@ async def list_tasks(
     long_running_manager: BaseLongRunningManager,
     task_context: TaskContext,
 ) -> list[TaskBase]:
-    return await lrt_client.list_tasks(
+    return await _lrt_client.list_tasks(
         rabbitmq_rpc_client,
         long_running_manager.lrt_namespace,
         task_context=task_context,
@@ -74,7 +74,7 @@ async def get_task_status(
     task_id: TaskId,
 ) -> TaskStatus:
     """returns the status of a task"""
-    return await lrt_client.get_task_status(
+    return await _lrt_client.get_task_status(
         rabbitmq_rpc_client,
         long_running_manager.lrt_namespace,
         task_id=task_id,
@@ -88,7 +88,7 @@ async def get_task_result(
     task_context: TaskContext,
     task_id: TaskId,
 ) -> Any:
-    return await lrt_client.get_task_result(
+    return await _lrt_client.get_task_result(
         rabbitmq_rpc_client,
         long_running_manager.lrt_namespace,
         task_context=task_context,
@@ -103,7 +103,7 @@ async def remove_task(
     task_id: TaskId,
 ) -> None:
     """cancels and removes the task"""
-    await lrt_client.remove_task(
+    await _lrt_client.remove_task(
         rabbitmq_rpc_client,
         long_running_manager.lrt_namespace,
         task_id=task_id,