fix: rename

Author: giancarloromeo

packages/celery-library/src/celery_library/backends/_redis.py

@@ -5,7 +5,7 @@
 
 from models_library.progress_bar import ProgressReport
 from pydantic import ValidationError
-from servicelib.queued_tasks.models import (
+from servicelib.celery.models import (
     Task,
     TaskContext,
     TaskID,

packages/celery-library/src/celery_library/signals.py

@@ -4,8 +4,8 @@
 
 from celery import Celery  # type: ignore[import-untyped]
 from celery.worker.worker import WorkController  # type: ignore[import-untyped]
+from servicelib.celery.app_server import STARTUP_TIMEOUT, BaseAppServer
 from servicelib.logging_utils import log_context
-from servicelib.queued_tasks.app_server import STARTUP_TIMEOUT, BaseAppServer
 from settings_library.celery import CelerySettings
 
 from .common import create_task_manager

packages/celery-library/src/celery_library/task.py

@@ -14,7 +14,7 @@
 from celery.exceptions import Ignore  # type: ignore[import-untyped]
 from pydantic import NonNegativeInt
 from servicelib.async_utils import cancel_wait_task
-from servicelib.queued_tasks.models import TaskID
+from servicelib.celery.models import TaskID
 
 from .errors import encode_celery_transferrable_error
 from .utils import get_app_server

packages/celery-library/src/celery_library/task_manager.py

@@ -9,8 +9,7 @@
 )
 from common_library.async_tools import make_async
 from models_library.progress_bar import ProgressReport
-from servicelib.logging_utils import log_context
-from servicelib.queued_tasks.models import (
+from servicelib.celery.models import (
     Task,
     TaskContext,
     TaskID,
@@ -20,6 +19,7 @@
     TaskStatus,
     TaskUUID,
 )
+from servicelib.logging_utils import log_context
 from settings_library.celery import CelerySettings
 
 from .utils import build_task_id

packages/celery-library/src/celery_library/utils.py

@@ -1,8 +1,8 @@
 from typing import Final
 
 from celery import Celery  # type: ignore[import-untyped]
-from servicelib.queued_tasks.app_server import BaseAppServer
-from servicelib.queued_tasks.models import TaskContext, TaskID, TaskUUID
+from servicelib.celery.app_server import BaseAppServer
+from servicelib.celery.models import TaskContext, TaskID, TaskUUID
 
 _APP_SERVER_KEY = "app_server"
 

packages/celery-library/tests/conftest.py

@@ -16,7 +16,7 @@
 from celery_library.task_manager import CeleryTaskManager
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from servicelib.queued_tasks.app_server import BaseAppServer
+from servicelib.celery.app_server import BaseAppServer
 from settings_library.celery import CelerySettings
 from settings_library.redis import RedisSettings
 

packages/celery-library/tests/unit/test_tasks.py

@@ -19,13 +19,13 @@
 from celery_library.utils import get_app_server
 from common_library.errors_classes import OsparcErrorMixin
 from models_library.progress_bar import ProgressReport
-from servicelib.logging_utils import log_context
-from servicelib.queued_tasks.models import (
+from servicelib.celery.models import (
     TaskContext,
     TaskID,
     TaskMetadata,
     TaskState,
 )
+from servicelib.logging_utils import log_context
 from tenacity import Retrying, retry_if_exception_type, stop_after_delay, wait_fixed
 
 _logger = logging.getLogger(__name__)

packages/service-library/src/servicelib/fastapi/queued_tasks/__init__.py renamed to packages/service-library/src/servicelib/celery/__init__.py

@@ -5,7 +5,7 @@
 from asyncio import AbstractEventLoop
 from typing import Final, Generic, TypeVar
 
-from servicelib.queued_tasks.task_manager import TaskManager
+from servicelib.celery.task_manager import TaskManager
 
 STARTUP_TIMEOUT: Final[float] = datetime.timedelta(minutes=1).total_seconds()