Move agreements_pool.py, ctx.py and utils.py from yapapi/executor/ to…

… yapapi/

tests/executor/test_agreements_pool.py → tests/test_agreements_pool.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from yapapi.executor import agreements_pool
+from yapapi import agreements_pool
 
 
 def mock_agreement(**properties):

tests/executor/test_async_wrapper.py → tests/test_async_wrapper.py

@@ -2,7 +2,7 @@
 import pytest
 import time
 
-from yapapi.executor.utils import AsyncWrapper
+from yapapi.utils import AsyncWrapper
 
 
 def test_async_wrapper_ordering():

tests/executor/test_ctx.py → tests/test_ctx.py

@@ -5,7 +5,7 @@
 import sys
 from unittest import mock
 
-from yapapi.executor.ctx import CommandContainer, WorkContext
+from yapapi.ctx import CommandContainer, WorkContext
 
 from tests.factories.props import NodeInfoFactory
 

yapapi/__init__.py

@@ -6,15 +6,9 @@
 from pathlib import Path
 from pkg_resources import get_distribution
 
-from .executor import (
-    CaptureContext,
-    ExecOptions,
-    Executor,
-    Task,
-    WorkContext,
-)
-
+from yapapi.ctx import CaptureContext, ExecOptions, WorkContext
 from yapapi.engine import NoPaymentAccountError, WorkItem
+from yapapi.executor import Executor, Task
 from yapapi.golem import Golem
 
 

yapapi/executor/ctx.py → yapapi/ctx.py

@@ -9,8 +9,8 @@
 from typing import Callable, Iterable, Optional, Dict, List, Tuple, Union, Any, Awaitable
 
 from yapapi.events import DownloadStarted, DownloadFinished
-from ..props import NodeInfo
-from ..storage import StorageProvider, Source, Destination, DOWNLOAD_BYTES_LIMIT_DEFAULT
+from yapapi.props import NodeInfo
+from yapapi.storage import StorageProvider, Source, Destination, DOWNLOAD_BYTES_LIMIT_DEFAULT
 
 
 class CommandContainer:

yapapi/engine.py

@@ -30,9 +30,8 @@
 
 
 from yapapi import rest, events
-from yapapi.executor import AgreementsPool
-from yapapi.executor.ctx import CommandContainer, ExecOptions, Work
-from yapapi.executor.utils import AsyncWrapper
+from yapapi.agreements_pool import AgreementsPool
+from yapapi.ctx import CommandContainer, ExecOptions, Work
 from yapapi.payload import Payload
 from yapapi.props import com, Activity, NodeInfo, NodeInfoKeys
 from yapapi.props.builder import DemandBuilder, DemandDecorator
@@ -45,6 +44,7 @@
     MarketStrategy,
     SCORE_NEUTRAL,
 )
+from yapapi.utils import AsyncWrapper
 
 
 DEBIT_NOTE_MIN_TIMEOUT: Final[int] = 30  # in seconds

yapapi/executor/__init__.py

@@ -22,15 +22,14 @@
 from typing_extensions import Final, AsyncGenerator
 import warnings
 
+from yapapi import rest, events
+from yapapi.ctx import WorkContext
 from yapapi.events import Event
-from yapapi.executor.agreements_pool import AgreementsPool
+from yapapi.payload import Payload
+from yapapi.props import NodeInfo
 from yapapi.strategy import MarketStrategy
 
-from .ctx import CaptureContext, CommandContainer, ExecOptions, Work, WorkContext
 from .task import Task, TaskStatus
-from ..payload import Payload
-from ..props import NodeInfo
-from .. import rest, events
 from ._smartq import SmartQueue
 
 
@@ -54,8 +53,6 @@
 
 
 from yapapi.engine import _Engine, Job, WorkItem
-from yapapi.executor.ctx import Work
-
 
 D = TypeVar("D")  # Type var for task data
 R = TypeVar("R")  # Type var for task result

yapapi/golem.py

@@ -16,9 +16,9 @@
 from typing_extensions import AsyncGenerator
 
 from yapapi import events
+from yapapi.ctx import WorkContext
 from yapapi.engine import _Engine, WorkItem
 from yapapi.executor import Executor
-from yapapi.executor.ctx import WorkContext
 from yapapi.executor.task import Task
 from yapapi.payload import Payload
 from yapapi.services import Cluster, Service

yapapi/services.py

@@ -20,8 +20,8 @@
     from typing_extensions import Final
 
 from yapapi import rest, events
+from yapapi.ctx import WorkContext
 from yapapi.engine import _Engine, Job
-from yapapi.executor.ctx import WorkContext
 from yapapi.payload import Payload
 from yapapi.props import NodeInfo