Merge pull request #422 from jbbarth/fix-circular-dependencies

Author: ybastide

pyproject.toml

@@ -84,7 +84,7 @@ simpleflow = "simpleflow.command:cli"
 
 [tool.setuptools]
 zip-safe = false
-packages=["simpleflow", "swf"]
+packages=["simpleflow"]
 
 [tool.setuptools.dynamic]
 version = { attr = "simpleflow.__version__" }

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:

simpleflow/command.py

@@ -13,10 +13,11 @@
 import click
 import multiprocess
 
-import swf.exceptions
-import swf.models
-import swf.querysets
-from simpleflow import Workflow, __version__, format, log, logger
+import simpleflow.swf.mapper.exceptions
+import simpleflow.swf.mapper.models
+import simpleflow.swf.mapper.querysets
+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 swf.models import WorkflowType
+    from simpleflow.swf.mapper.models.workflow import WorkflowType
 
 
 def disable_boto_connection_pooling():
@@ -81,8 +82,8 @@ def get_workflow_type(domain_name: str, workflow_class: type[Workflow]) -> Workf
     :param workflow_class:
     :return:
     """
-    domain = swf.models.Domain(domain_name)
-    query = swf.querysets.WorkflowTypeQuerySet(domain)
+    domain = simpleflow.swf.mapper.models.Domain(domain_name)
+    query = simpleflow.swf.mapper.querysets.WorkflowTypeQuerySet(domain)
     return query.get_or_create(workflow_class.name, workflow_class.version)
 
 
@@ -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)
 
@@ -381,7 +382,7 @@ def filter_workflows(
 ):
     status = status.upper()
     kwargs = {}
-    if status == swf.models.workflow.WorkflowExecution.STATUS_OPEN:
+    if status == simpleflow.swf.mapper.models.workflow.WorkflowExecution.STATUS_OPEN:
         kwargs["oldest_date"] = started_since
     else:
         kwargs["start_oldest_date"] = started_since
@@ -724,7 +725,7 @@ def activity_rerun(domain, workflow_id, run_id, input, scheduled_id, activity_id
     # find workflow execution
     try:
         wfe = helpers.get_workflow_execution(domain, workflow_id, run_id)
-    except (swf.exceptions.DoesNotExistError, IndexError):
+    except (simpleflow.swf.mapper.exceptions.DoesNotExistError, IndexError):
         logger.error("Couldn't find execution, exiting.")
         sys.exit(1)
     logger.info(f"Found execution: workflowId={wfe.workflow_id} runId={wfe.run_id}")

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
 
 

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"]

simpleflow/history.py

@@ -3,30 +3,27 @@
 import collections
 from typing import TYPE_CHECKING, Callable
 
-import swf.models.history
+import simpleflow.swf.mapper.models.history
 from simpleflow import logger
-from swf.models.event.task import ActivityTaskEventDict
-from swf.models.event.workflow import ExternalWorkflowExecutionEvent
+from simpleflow.swf.mapper.models.event.task import ActivityTaskEventDict
+from simpleflow.swf.mapper.models.event.workflow import ExternalWorkflowExecutionEvent
 
 if TYPE_CHECKING:
     from typing import Any
 
-    from swf.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:
     """
     History data.
     """
 
-    def __init__(self, history: swf.models.history.History) -> None:
+    def __init__(self, history: simpleflow.swf.mapper.models.history.History) -> None:
         self._history = history
         self._activities: dict[str, ActivityTaskEventDict] = {}
         self._child_workflows: dict[str, dict[str, Any]] = {}
@@ -44,7 +41,7 @@ def __init__(self, history: swf.models.history.History) -> None:
         self.last_event_id: int | None = None
 
     @property
-    def swf_history(self) -> swf.models.history.History:
+    def swf_history(self) -> simpleflow.swf.mapper.models.history.History:
         return self._history
 
     @property

simpleflow/local/executor.py

@@ -14,7 +14,7 @@
 from simpleflow.task import ActivityTask, MarkerTask, SignalTask, TaskFailureContext, WorkflowTask
 from simpleflow.utils import format_exc, format_exc_type, issubclass_, json_dumps
 from simpleflow.workflow import Workflow
-from swf.models.history import builder
+from simpleflow.swf.mapper.models.history import builder
 
 
 class Executor(executor.Executor):
@@ -47,7 +47,7 @@ def history(self) -> History | None:
     def update_workflow_class(self):
         """
         Returns the workflow class with all the needed attributes for
-        swf.models.history.builder.History()
+        simpleflow.swf.mapper.models.history.builder.History()
         This allows to get a SWF-compatible history in local executions so that
         the metrology feature works correctly.
         """
@@ -164,7 +164,7 @@ def run(self, input=None):
         result = self.run_workflow(*args, **kwargs)
 
         # Hack: self._history must be available to the callback as a
-        # simpleflow.history.History, not a swf.models.history.builder.History
+        # simpleflow.history.History, not a simpleflow.swf.mapper.models.history.builder.History
         self._history = History(self._history)
         self._history.parse()
         self.after_replay()

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

simpleflow/process/named_mixin.py renamed to simpleflow/process/_named_mixin.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):