Revert "Fix cyclic import"

This reverts commit 57d7fb7.

Author: Kwaizer

alws/dramatiq/__init__.py

@@ -8,10 +8,12 @@
        and it's important for all tasks which involves user interaction
        to have priority 0.
     4. If you need to use async function in your dramatiq task - ALWAYS use
-       loop from tasks/__init__.py, since creating multiple loops for tasks
+       loop from this __init__.py, since creating multiple loops for tasks
        will break your tasks.
 """
 
+import asyncio
+
 import dramatiq
 from dramatiq.brokers.rabbitmq import RabbitmqBroker
 
@@ -25,10 +27,11 @@
     f"{settings.rabbitmq_default_vhost}",
 )
 dramatiq.set_broker(rabbitmq_broker)
+event_loop = asyncio.get_event_loop()
 
 # Tasks import started from here
-from alws.dramatiq.tasks.build import build_done, start_build
-from alws.dramatiq.tasks.errata import (
+from alws.dramatiq.build import build_done, start_build
+from alws.dramatiq.errata import (
     bulk_errata_release,
     bulk_new_errata_release,
     release_errata,
@@ -37,6 +40,8 @@
 )
 
 # dramatiq.user and dramatiq.products need to go before dramatiq.releases
-from alws.dramatiq.tasks.products import perform_product_modification
-from alws.dramatiq.tasks.sign_task import complete_sign_task
-from alws.dramatiq.tasks.user import perform_user_removal
+from alws.dramatiq.products import perform_product_modification
+from alws.dramatiq.releases import execute_release_plan, revert_release
+from alws.dramatiq.sign_task import complete_sign_task
+from alws.dramatiq.tests import complete_test_task
+from alws.dramatiq.user import perform_user_removal

alws/dramatiq/tasks/build.py renamed to alws/dramatiq/build.py

@@ -21,7 +21,7 @@
 from alws.crud import build_node as build_node_crud
 from alws.crud import test
 from alws.dependencies import get_async_db_key
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.errors import (
     ArtifactConversionError,
     ModuleUpdateError,

alws/dramatiq/tasks/errata.py renamed to alws/dramatiq/errata.py

@@ -10,7 +10,7 @@
     release_new_errata_record,
     reset_matched_erratas_packages_threshold,
 )
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.utils.fastapi_sqla_setup import setup_all
 
 __all__ = ["release_errata"]

alws/dramatiq/tasks/products.py renamed to alws/dramatiq/products.py

@@ -13,7 +13,7 @@
 from alws.config import settings
 from alws.constants import DRAMATIQ_TASK_TIMEOUT, BuildTaskStatus
 from alws.dependencies import get_async_db_key
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.utils.fastapi_sqla_setup import setup_all
 from alws.utils.log_utils import setup_logger
 from alws.utils.pulp_client import PulpClient

alws/dramatiq/tasks/releases.py renamed to alws/dramatiq/releases.py

@@ -1,10 +1,12 @@
+from contextlib import asynccontextmanager
+
 import dramatiq
 from fastapi_sqla import open_async_session
 
 from alws.constants import DRAMATIQ_TASK_TIMEOUT
 from alws.crud import release as r_crud
 from alws.dependencies import get_async_db_key
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.utils.fastapi_sqla_setup import setup_all
 
 __all__ = ["execute_release_plan"]

alws/dramatiq/tasks/sign_task.py renamed to alws/dramatiq/sign_task.py

@@ -4,7 +4,7 @@
 
 from alws.constants import DRAMATIQ_TASK_TIMEOUT
 from alws.crud import sign_task
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.schemas import sign_schema
 from alws.utils.fastapi_sqla_setup import setup_all
 

alws/dramatiq/tasks/__init__.py

@@ -7,7 +7,7 @@
 from alws.constants import DRAMATIQ_TASK_TIMEOUT, TestTaskStatus
 from alws.crud import test as t_crud
 from alws.dependencies import get_async_db_key
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.schemas.test_schema import TestTaskResult
 from alws.utils.fastapi_sqla_setup import setup_all
 

alws/dramatiq/tasks/tests.py renamed to alws/dramatiq/tests.py

@@ -7,7 +7,7 @@
 from alws.constants import DRAMATIQ_TASK_TIMEOUT
 from alws.crud import build as build_crud
 from alws.dependencies import get_async_db_key
-from alws.dramatiq.tasks import event_loop
+from alws.dramatiq import event_loop
 from alws.utils.fastapi_sqla_setup import setup_all
 
 __all__ = ['perform_user_removal']

alws/dramatiq/tasks/user.py renamed to alws/dramatiq/user.py

@@ -2,15 +2,15 @@
 
 from fastapi import APIRouter, Depends
 from fastapi_sqla import AsyncSessionDependency
-from sqlalchemy import update
+from sqlalchemy import select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from alws import dramatiq
 from alws import models
 from alws.auth import get_current_user
 from alws.constants import ReleaseStatus
 from alws.crud import release as r_crud
 from alws.dependencies import get_async_db_key
+from alws.dramatiq import execute_release_plan, revert_release
 from alws.schemas import release_schema
 
 router = APIRouter(
@@ -97,7 +97,7 @@ async def commit_release(
         .values(status=ReleaseStatus.IN_PROGRESS)
     )
     await db.flush()
-    dramatiq.tasks.releases.execute_release_plan.send(release_id, user.id)
+    execute_release_plan.send(release_id, user.id)
     return {"message": "Release plan execution has been started"}
 
 
@@ -119,7 +119,7 @@ async def revert_db_release(
         .values(status=ReleaseStatus.IN_PROGRESS)
     )
     await db.flush()
-    dramatiq.tasks.releases.revert_release.send(release_id, user.id)
+    revert_release.send(release_id, user.id)
     return {"message": "Release plan revert has been started"}
 
 

alws/routers/releases.py

@@ -71,7 +71,7 @@ async def complete_sign_task(
     task = await sign_task.get_sign_task(db, sign_task_id)
     task.ts = datetime.datetime.utcnow() + datetime.timedelta(hours=2)
     await db.flush()
-    dramatiq.tasks.sign_task.complete_sign_task.send(
+    dramatiq.sign_task.complete_sign_task.send(
         sign_task_id, payload.model_dump()
     )
     return {'success': True}

alws/routers/sign_task.py

@@ -27,7 +27,7 @@ async def update_test_task_result(
     test_task_id: int,
     result: test_schema.TestTaskResult,
 ):
-    dramatiq.tasks.tests.complete_test_task.send(test_task_id, result.model_dump())
+    dramatiq.tests.complete_test_task.send(test_task_id, result.model_dump())
     return {'ok': True}
 
 

alws/routers/tests.py

@@ -8,7 +8,7 @@
 from sqlalchemy.orm.session import Session
 
 from alws.crud.build import create_build, get_builds
-from alws.dramatiq.tasks.build import _start_build
+from alws.dramatiq.build import _start_build
 from alws.models import Build, Product
 from alws.schemas.build_schema import BuildCreate
 from tests.constants import ADMIN_USER_ID

tests/fixtures/builds.py

@@ -8,7 +8,7 @@
 from alws.crud import test
 from alws.crud.build import get_builds
 from alws.crud.build_node import safe_build_done
-from alws.dramatiq.tasks.build import _start_build, _build_done
+from alws.dramatiq.build import _start_build, _build_done
 from alws.models import Build
 from alws.schemas.build_node_schema import BuildDone
 from alws.schemas.build_schema import BuildCreate

tests/fixtures/dramatiq.py

@@ -3,7 +3,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
-from alws.dramatiq.tasks.products import _perform_product_modification
+from alws.dramatiq.products import _perform_product_modification
 from alws.models import Build, Product
 from tests.mock_classes import BaseAsyncTestCase
 

tests/test_api/test_products.py

@@ -8,8 +8,8 @@
 
 from alws.constants import BuildTaskStatus
 from alws.crud.build import create_build
-from alws.dramatiq.tasks.build import _start_build
-from alws.dramatiq.tasks.products import (
+from alws.dramatiq.build import _start_build
+from alws.dramatiq.products import (
     get_packages_to_blacklist,
     group_tasks_by_ref_id,
 )