Refactor imports to respect the convention we introduced

jbbarth · jbbarth · commit f7ba658424f4 · 2023-08-25T22:53:19.000+02:00
diff --git a/simpleflow/canvas.py b/simpleflow/canvas.py
@@ -130,7 +130,7 @@ def __init__(self, *activities, **options):
         self.extend(activities)
 
     def append(self, submittable, *args, **kwargs):
-        from simpleflow import Workflow
+        from simpleflow.workflow import Workflow
 
         if isinstance(submittable, (Submittable, SubmittableContainer)):
             if args or kwargs:
diff --git a/simpleflow/command.py b/simpleflow/command.py
@@ -16,7 +16,8 @@
 import simpleflow.swf.mapper.exceptions
 import simpleflow.swf.mapper.models
 import simpleflow.swf.mapper.querysets
-from simpleflow import Workflow, __version__, format, log, logger
+from simpleflow.workflow import Workflow
+from simpleflow import __version__, format, log, logger
 from simpleflow.download import download_binaries
 from simpleflow.history import History
 from simpleflow.settings import print_settings
@@ -30,7 +31,7 @@
 if TYPE_CHECKING:
     from typing import Any
 
-    from simpleflow.swf.mapper.models import WorkflowType
+    from simpleflow.swf.mapper.models.workflow import WorkflowType
 
 
 def disable_boto_connection_pooling():
@@ -124,7 +125,7 @@ def transform_input(wf_input):
 
 
 def run_workflow_locally(workflow_class, wf_input, middlewares):
-    from .local import Executor
+    from .local.executor import Executor
 
     Executor(workflow_class, middlewares=middlewares).run(wf_input)
 
diff --git a/simpleflow/exceptions.py b/simpleflow/exceptions.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from simpleflow import Workflow
+    from simpleflow.workflow import Workflow
     from simpleflow.task import Task
 
 
diff --git a/simpleflow/executor.py b/simpleflow/executor.py
@@ -6,7 +6,7 @@
 from ._decorators import deprecated
 
 if TYPE_CHECKING:
-    from simpleflow import Workflow
+    from simpleflow.workflow import Workflow
     from simpleflow.history import History
 
 __all__ = ["Executor"]
diff --git a/simpleflow/history.py b/simpleflow/history.py
@@ -11,14 +11,11 @@
 if TYPE_CHECKING:
     from typing import Any
 
-    from simpleflow.swf.mapper.models.event import (
-        ActivityTaskEvent,
-        ChildWorkflowExecutionEvent,
-        Event,
-        MarkerEvent,
-        TimerEvent,
-        WorkflowExecutionEvent,
-    )
+    from simpleflow.swf.mapper.models.event.base import Event
+    from simpleflow.swf.mapper.models.event.marker import MarkerEvent
+    from simpleflow.swf.mapper.models.event.task import ActivityTaskEvent
+    from simpleflow.swf.mapper.models.event.timer import TimerEvent
+    from simpleflow.swf.mapper.models.event.workflow import ChildWorkflowExecutionEvent, WorkflowExecutionEvent
 
 
 class History:
diff --git a/simpleflow/process/__init__.py b/simpleflow/process/__init__.py
@@ -1,2 +1,2 @@
-from .named_mixin import NamedMixin, with_state  # NOQA
-from .supervisor import Supervisor, reset_signal_handlers  # NOQA
+from ._named_mixin import NamedMixin, with_state  # NOQA
+from ._supervisor import Supervisor, reset_signal_handlers  # NOQA
diff --git a/simpleflow/process/_named_mixin.py b/simpleflow/process/_named_mixin.py
diff --git a/simpleflow/process/_supervisor.py b/simpleflow/process/_supervisor.py
@@ -11,7 +11,7 @@
 
 from simpleflow import logger
 
-from .named_mixin import NamedMixin, with_state
+from ._named_mixin import NamedMixin, with_state
 
 
 def reset_signal_handlers(func):
diff --git a/simpleflow/swf/executor.py b/simpleflow/swf/executor.py
@@ -38,7 +38,7 @@
 from simpleflow.swf.mapper.core import ConnectedSWFObject
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 __all__ = ["Executor"]
 
diff --git a/simpleflow/swf/helpers.py b/simpleflow/swf/helpers.py
@@ -18,7 +18,7 @@
 from .stats import pretty
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import WorkflowExecution
+    from simpleflow.swf.mapper.models.workflow import WorkflowExecution
 
 
 __all__ = [
diff --git a/simpleflow/swf/mapper/actors/core.py b/simpleflow/swf/mapper/actors/core.py
@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from simpleflow.swf.mapper.core import ConnectedSWFObject
-from simpleflow.swf.mapper.models import Domain
+from simpleflow.swf.mapper.models.domain import Domain
 
 if TYPE_CHECKING:
     from boto.exception import SWFResponseError
diff --git a/simpleflow/swf/mapper/actors/decider.py b/simpleflow/swf/mapper/actors/decider.py
@@ -9,12 +9,12 @@
 from simpleflow.swf.mapper.actors.core import Actor
 from simpleflow.swf.mapper.exceptions import DoesNotExistError, PollTimeout, ResponseError
 from simpleflow.swf.mapper.models.decision.base import Decision
-from simpleflow.swf.mapper.models.history import History
+from simpleflow.swf.mapper.models.history.base import History
 from simpleflow.swf.mapper.models.workflow import WorkflowExecution, WorkflowType
 from simpleflow.swf.mapper.responses import Response
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 
 class Decider(Actor):
diff --git a/simpleflow/swf/mapper/actors/worker.py b/simpleflow/swf/mapper/actors/worker.py
@@ -7,13 +7,13 @@
 from simpleflow import format, logging_context
 from simpleflow.format import JumboTooLargeError
 from simpleflow.utils import format_exc
-from simpleflow.swf.mapper.actors import Actor
+from simpleflow.swf.mapper.actors.core import Actor
 from simpleflow.swf.mapper.exceptions import DoesNotExistError, PollTimeout, RateLimitExceededError, ResponseError
-from simpleflow.swf.mapper.models import ActivityTask
+from simpleflow.swf.mapper.models.activity import ActivityTask
 from simpleflow.swf.mapper.responses import Response
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 
 class ActivityWorker(Actor):
diff --git a/simpleflow/swf/mapper/models/__init__.py b/simpleflow/swf/mapper/models/__init__.py
@@ -6,5 +6,5 @@
 from simpleflow.swf.mapper.models.activity import ActivityTask, ActivityType  # NOQA
 from simpleflow.swf.mapper.models.base import BaseModel  # NOQA
 from simpleflow.swf.mapper.models.domain import Domain  # NOQA
-from simpleflow.swf.mapper.models.history import History  # NOQA
+from simpleflow.swf.mapper.models.history.base import History  # NOQA
 from simpleflow.swf.mapper.models.workflow import WorkflowExecution, WorkflowType  # NOQA
diff --git a/simpleflow/swf/mapper/models/activity.py b/simpleflow/swf/mapper/models/activity.py
@@ -16,7 +16,7 @@
 from simpleflow.swf.mapper.utils import immutable
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
     from simpleflow.swf.mapper.models.workflow import WorkflowExecution
 
 
diff --git a/simpleflow/swf/mapper/models/decision/task.py b/simpleflow/swf/mapper/models/decision/task.py
@@ -11,7 +11,7 @@
 from simpleflow.swf.mapper.models.decision.base import Decision, decision_action
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import ActivityType
+    from simpleflow.swf.mapper.models.activity import ActivityType
 
 
 class ActivityTaskDecision(Decision):
diff --git a/simpleflow/swf/mapper/models/domain.py b/simpleflow/swf/mapper/models/domain.py
@@ -12,12 +12,12 @@
 from simpleflow.swf.mapper import exceptions
 from simpleflow.swf.mapper.constants import REGISTERED
 from simpleflow.swf.mapper.exceptions import AlreadyExistsError, DoesNotExistError, ResponseError, raises
-from simpleflow.swf.mapper.models import BaseModel
-from simpleflow.swf.mapper.models.base import ModelDiff
+from simpleflow.swf.mapper.models.base import BaseModel, ModelDiff
 from simpleflow.swf.mapper.utils import immutable
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import ActivityType, WorkflowType
+    from simpleflow.swf.mapper.models.activity import ActivityType
+    from simpleflow.swf.mapper.models.workflow import WorkflowType
 
 
 class DomainDoesNotExist(DoesNotExistError):
diff --git a/simpleflow/swf/mapper/models/event/compiler.py b/simpleflow/swf/mapper/models/event/compiler.py
@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from simpleflow.swf.mapper.models.event import Event
+from simpleflow.swf.mapper.models.event.base import Event
 
 
 class InconsistentStateError(Exception):
diff --git a/simpleflow/swf/mapper/models/event/factory.py b/simpleflow/swf/mapper/models/event/factory.py
@@ -27,7 +27,8 @@
 from simpleflow.swf.mapper.utils import camel_to_underscore, decapitalize
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models.event import CompiledEvent, Event
+    from simpleflow.swf.mapper.models.event.base import Event
+    from simpleflow.swf.mapper.models.event.compiler import CompiledEvent
 
 EVENTS = collections.OrderedDict(
     [
diff --git a/simpleflow/swf/mapper/models/history/base.py b/simpleflow/swf/mapper/models/history/base.py
@@ -8,7 +8,9 @@
 from itertools import groupby
 from typing import Any, Iterator
 
-from simpleflow.swf.mapper.models.event import CompiledEvent, CompiledEventFactory, Event, EventFactory
+from simpleflow.swf.mapper.models.event.compiler import CompiledEvent
+from simpleflow.swf.mapper.models.event.base import Event
+from simpleflow.swf.mapper.models.event.factory import CompiledEventFactory, EventFactory
 from simpleflow.swf.mapper.models.event.workflow import WorkflowExecutionEvent
 from simpleflow.swf.mapper.utils import cached_property
 
diff --git a/simpleflow/swf/mapper/models/history/builder.py b/simpleflow/swf/mapper/models/history/builder.py
@@ -7,7 +7,7 @@
 from simpleflow.swf.mapper.models.event.factory import EventFactory
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import WorkflowType
+    from simpleflow.swf.mapper.models.workflow import WorkflowType
 
 
 DEFAULT_DECIDER_IDENTITY = "test_decider"
diff --git a/simpleflow/swf/mapper/models/workflow.py b/simpleflow/swf/mapper/models/workflow.py
@@ -15,9 +15,9 @@
 from simpleflow.swf.mapper import exceptions
 from simpleflow.swf.mapper.constants import REGISTERED
 from simpleflow.swf.mapper.exceptions import AlreadyExistsError, DoesNotExistError, ResponseError, raises
-from simpleflow.swf.mapper.models import BaseModel, Domain
-from simpleflow.swf.mapper.models.base import ModelDiff
-from simpleflow.swf.mapper.models.history import History
+from simpleflow.swf.mapper.models.base import BaseModel, ModelDiff
+from simpleflow.swf.mapper.models.domain import Domain
+from simpleflow.swf.mapper.models.history.base import History
 from simpleflow.swf.mapper.utils import immutable
 
 if TYPE_CHECKING:
diff --git a/simpleflow/swf/mapper/querysets/history.py b/simpleflow/swf/mapper/querysets/history.py
@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
-from simpleflow.swf.mapper.models import History
+from simpleflow.swf.mapper.models.history.base import History
 from simpleflow.swf.mapper.querysets.base import BaseQuerySet
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 
 class HistoryQuerySet(BaseQuerySet):
diff --git a/simpleflow/swf/mapper/querysets/workflow.py b/simpleflow/swf/mapper/querysets/workflow.py
@@ -16,7 +16,7 @@
     InvalidKeywordArgumentError,
     ResponseError,
 )
-from simpleflow.swf.mapper.models import Domain
+from simpleflow.swf.mapper.models.domain import Domain
 from simpleflow.swf.mapper.models.workflow import CHILD_POLICIES, WorkflowExecution, WorkflowType
 from simpleflow.swf.mapper.querysets.base import BaseQuerySet
 from simpleflow.swf.mapper.utils import datetime_timestamp, get_subkey, past_day
diff --git a/simpleflow/swf/mapper/responses/__init__.py b/simpleflow/swf/mapper/responses/__init__.py
@@ -1 +1 @@
-from .base import Response  # NOQA
+from ._base import Response  # NOQA
diff --git a/simpleflow/swf/mapper/responses/_base.py b/simpleflow/swf/mapper/responses/_base.py
diff --git a/simpleflow/swf/process/__init__.py b/simpleflow/swf/process/__init__.py
@@ -1,2 +1,2 @@
 from .poller import Poller  # NOQA  # isort:skip
-from .decider import Decider  # NOQA  # isort:skip
+from .decider.base import Decider  # NOQA  # isort:skip
diff --git a/simpleflow/swf/process/decider/base.py b/simpleflow/swf/process/decider/base.py
@@ -10,7 +10,7 @@
 import simpleflow.swf.mapper.models.decision
 from simpleflow import format, logger
 from simpleflow.process import Supervisor, with_state
-from simpleflow.swf.process import Poller
+from simpleflow.swf.process.poller import Poller
 from simpleflow.swf.utils import DecisionsAndContext, get_name_from_event
 
 if TYPE_CHECKING:
diff --git a/simpleflow/swf/process/decider/helpers.py b/simpleflow/swf/process/decider/helpers.py
@@ -5,7 +5,7 @@
 from simpleflow.swf.executor import Executor
 from simpleflow.utils import import_from_module
 
-from . import Decider, DeciderPoller
+from .base import Decider, DeciderPoller
 
 
 def load_workflow_executor(
diff --git a/simpleflow/swf/process/poller.py b/simpleflow/swf/process/poller.py
@@ -12,7 +12,7 @@
 from simpleflow.swf.helpers import swf_identity
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 __all__ = ["Poller"]
 
diff --git a/simpleflow/swf/process/worker/base.py b/simpleflow/swf/process/worker/base.py
@@ -17,16 +17,16 @@
 from simpleflow.download import download_binaries
 from simpleflow.exceptions import ExecutionError
 from simpleflow.process import Supervisor, with_state
-from simpleflow.swf.process import Poller
+from simpleflow.swf.process.poller import Poller
 from simpleflow.swf.task import ActivityTask
 from simpleflow.swf.utils import sanitize_activity_context
 from simpleflow.utils import format_exc, format_exc_type, json_dumps
-from simpleflow.swf.mapper.models import ActivityTask as BaseActivityTask
+from simpleflow.swf.mapper.models.activity import ActivityTask as BaseActivityTask
 from simpleflow.swf.mapper.responses import Response
 
 if TYPE_CHECKING:
     from simpleflow.activity import Activity
-    from simpleflow.swf.mapper.models import Domain
+    from simpleflow.swf.mapper.models.domain import Domain
 
 
 class Worker(Supervisor):
diff --git a/simpleflow/swf/stats/__init__.py b/simpleflow/swf/stats/__init__.py
@@ -1,2 +1,2 @@
-from .base import *  # NOQA  # isort:skip
+from .base import WorkflowStats  # NOQA  # isort:skip
 from . import pretty  # NOQA  # isort:skip
diff --git a/simpleflow/swf/stats/pretty.py b/simpleflow/swf/stats/pretty.py
@@ -12,10 +12,10 @@
 from simpleflow.history import History
 from simpleflow.utils import json_dumps
 
-from . import WorkflowStats
+from .base import WorkflowStats
 
 if TYPE_CHECKING:
-    from simpleflow.swf.mapper.models import WorkflowExecution
+    from simpleflow.swf.mapper.models.workflow import WorkflowExecution
 
 
 TEMPLATE = """
diff --git a/simpleflow/swf/task.py b/simpleflow/swf/task.py
@@ -5,8 +5,9 @@
 
 import simpleflow.swf.mapper.models
 import simpleflow.swf.mapper.models.decision
-from simpleflow import Workflow, logger, settings, task
+from simpleflow import logger, settings, task
 from simpleflow.swf.utils import set_workflow_class_name
+from simpleflow.workflow import Workflow
 
 if typing.TYPE_CHECKING:
     if hasattr(typing, "Self"):
diff --git a/simpleflow/task.py b/simpleflow/task.py
@@ -18,7 +18,7 @@
 if TYPE_CHECKING:
     from typing import Any
 
-    from simpleflow import Workflow
+    from simpleflow.workflow import Workflow
     from simpleflow.exceptions import TaskFailed
     from simpleflow.executor import Executor
 
diff --git a/simpleflow/utils/__init__.py b/simpleflow/utils/__init__.py
@@ -4,7 +4,7 @@
 from zlib import adler32
 
 from . import retry  # NOQA
-from .json_tools import json_dumps, json_loads_or_raw, serialize_complex_object  # NOQA
+from ._json import json_dumps, json_loads_or_raw, serialize_complex_object  # NOQA
 
 if TYPE_CHECKING:
     from typing import Any
diff --git a/simpleflow/utils/_json.py b/simpleflow/utils/_json.py
diff --git a/tests/data/workflows.py b/tests/data/workflows.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from simpleflow import Workflow
+from simpleflow.workflow import Workflow
 from simpleflow.constants import HOUR, MINUTE
 
 
diff --git a/tests/test_simpleflow/base.py b/tests/test_simpleflow/base.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from simpleflow.swf.executor import Executor
-from simpleflow.swf.mapper.models import Domain
+from simpleflow.swf.mapper.models.domain import Domain
 from simpleflow.swf.mapper.models.history import builder
 from simpleflow.swf.mapper.responses import Response
 
diff --git a/tests/test_simpleflow/local/test_executor.py b/tests/test_simpleflow/local/test_executor.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-from simpleflow import Workflow
+from simpleflow.workflow import Workflow
 from simpleflow.activity import with_attributes
 from simpleflow.canvas import Chain, Group
 from simpleflow.constants import HOUR, MINUTE
diff --git a/tests/test_simpleflow/swf/mapper/actors/test_core.py b/tests/test_simpleflow/swf/mapper/actors/test_core.py
diff --git a/tests/test_simpleflow/swf/mapper/actors/test_decider.py b/tests/test_simpleflow/swf/mapper/actors/test_decider.py
diff --git a/tests/test_simpleflow/swf/mapper/models/test_activity.py b/tests/test_simpleflow/swf/mapper/models/test_activity.py
diff --git a/tests/test_simpleflow/swf/mapper/models/test_base.py b/tests/test_simpleflow/swf/mapper/models/test_base.py
diff --git a/tests/test_simpleflow/swf/mapper/models/test_decision.py b/tests/test_simpleflow/swf/mapper/models/test_decision.py
diff --git a/tests/test_simpleflow/swf/mapper/models/test_event.py b/tests/test_simpleflow/swf/mapper/models/test_event.py
diff --git a/tests/test_simpleflow/swf/mapper/models/test_workflow.py b/tests/test_simpleflow/swf/mapper/models/test_workflow.py
diff --git a/tests/test_simpleflow/swf/process/test_poller.py b/tests/test_simpleflow/swf/process/test_poller.py
diff --git a/tests/test_simpleflow/swf/process/test_worker.py b/tests/test_simpleflow/swf/process/test_worker.py
diff --git a/tests/test_simpleflow/swf/stats/test_pretty.py b/tests/test_simpleflow/swf/stats/test_pretty.py
diff --git a/tests/utils/import_from_source.py b/tests/utils/import_from_source.py
