Revert "Feature/event payloads (#393)"

This reverts commit 4cf60ac.

Author: burnettk

bin/run_pyl

@@ -38,7 +38,7 @@ function run_autofixers() {
     asdf reshim python
   fi
 
-  python_dirs="$(get_python_dirs) bin"
+  python_dirs=$(get_python_dirs)
   ruff --fix $python_dirs || echo ''
 }
 

spiffworkflow-backend/bin/boot_server_in_docker

@@ -88,10 +88,6 @@ if [[ -z "${SPIFFWORKFLOW_BACKEND_THREADS_PER_WORKER:-}" ]]; then
   export SPIFFWORKFLOW_BACKEND_THREADS_PER_WORKER
 fi
 
-# DELETE after this runs on all necessary environments
-# TODO: make a system somewhat like schema migrations (storing versions in a db table) to handle data migrations
-poet run python ./bin/data_migrations/version_1_3.py
-
 # --worker-class is not strictly necessary, since setting threads will automatically set the worker class to gthread, but meh
 export IS_GUNICORN="true"
 # THIS MUST BE THE LAST COMMAND!

spiffworkflow-backend/bin/data_migrations/version_1_3.py

@@ -29,11 +29,8 @@ class MessageInstanceCorrelationRuleModel(SpiffworkflowBaseDBModel):
 
     id = db.Column(db.Integer, primary_key=True)
     message_instance_id = db.Column(ForeignKey(MessageInstanceModel.id), nullable=False, index=True)  # type: ignore
-
     name: str = db.Column(db.String(50), nullable=False, index=True)
     retrieval_expression: str = db.Column(db.String(255))
     updated_at_in_seconds: int = db.Column(db.Integer)
     created_at_in_seconds: int = db.Column(db.Integer)
-    correlation_key_names: list = db.Column(db.JSON)
-
     message_instance = relationship("MessageInstanceModel", back_populates="correlation_rules")

spiffworkflow-backend/migrations/versions/214e0c5fb418_.py

@@ -1,6 +1,4 @@
-from SpiffWorkflow.bpmn.event import BpmnEvent  # type: ignore
-from SpiffWorkflow.bpmn.specs.event_definitions.message import CorrelationProperty  # type: ignore
-from SpiffWorkflow.spiff.specs.event_definitions import MessageEventDefinition  # type: ignore
+from SpiffWorkflow.bpmn.workflow import BpmnMessage  # type: ignore
 from spiffworkflow_backend.models.db import db
 from spiffworkflow_backend.models.message_instance import MessageInstanceModel
 from spiffworkflow_backend.models.message_instance import MessageStatuses
@@ -74,7 +72,8 @@ def correlate_send_message(cls, message_instance_send: MessageInstanceModel) ->
             cls.process_message_receive(
                 receiving_process,
                 message_instance_receive,
-                message_instance_send,
+                message_instance_send.name,
+                message_instance_send.payload,
             )
             message_instance_receive.status = "completed"
             message_instance_receive.counterpart_id = message_instance_send.id
@@ -131,7 +130,7 @@ def get_process_instance_for_message_instance(
                 (
                     (
                         "Process instance cannot be found for queued message:"
-                        f" {message_instance_receive.id}. Tried with id"
+                        f" {message_instance_receive.id}.Tried with id"
                         f" {message_instance_receive.process_instance_id}"
                     ),
                 )
@@ -142,28 +141,16 @@ def get_process_instance_for_message_instance(
     def process_message_receive(
         process_instance_receive: ProcessInstanceModel,
         message_instance_receive: MessageInstanceModel,
-        message_instance_send: MessageInstanceModel,
+        message_model_name: str,
+        message_payload: dict,
     ) -> None:
-        correlation_properties = []
-        for cr in message_instance_receive.correlation_rules:
-            correlation_properties.append(
-                CorrelationProperty(
-                    name=cr.name,
-                    retrieval_expression=cr.retrieval_expression,
-                    correlation_keys=cr.correlation_key_names,
-                )
-            )
-        bpmn_message = MessageEventDefinition(
-            name=message_instance_send.name,
-            correlation_properties=correlation_properties,
-        )
-        bpmn_event = BpmnEvent(
-            event_definition=bpmn_message,
-            payload=message_instance_send.payload,
-            correlations=message_instance_send.correlation_keys,
+        bpmn_message = BpmnMessage(
+            None,
+            message_model_name,
+            message_payload,
         )
         processor_receive = ProcessInstanceProcessor(process_instance_receive)
-        processor_receive.bpmn_process_instance.send_event(bpmn_event)
+        processor_receive.bpmn_process_instance.catch_bpmn_message(bpmn_message)
         processor_receive.do_engine_steps(save=True)
         message_instance_receive.status = MessageStatuses.completed.value
         db.session.add(message_instance_receive)

spiffworkflow-backend/poetry.lock

@@ -24,7 +24,6 @@
 from lxml import etree  # type: ignore
 from lxml.etree import XMLSyntaxError  # type: ignore
 from RestrictedPython import safe_globals  # type: ignore
-from SpiffWorkflow.bpmn.event import BpmnEvent  # type: ignore
 from SpiffWorkflow.bpmn.exceptions import WorkflowTaskException  # type: ignore
 from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException  # type: ignore
 from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine  # type: ignore
@@ -1084,12 +1083,10 @@ def send_bpmn_event(self, event_data: dict[str, Any]) -> None:
         """Send an event to the workflow."""
         payload = event_data.pop("payload", None)
         event_definition = self._event_serializer.registry.restore(event_data)
-        bpmn_event = BpmnEvent(
-            event_definition=event_definition,
-            payload=payload,
-        )
+        if payload is not None:
+            event_definition.payload = payload
         try:
-            self.bpmn_process_instance.send_event(bpmn_event)
+            self.bpmn_process_instance.catch(event_definition)
         except Exception as e:
             print(e)
 

spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance_correlation.py

@@ -10,8 +10,8 @@
 import sentry_sdk
 from flask import current_app
 from flask import g
-from SpiffWorkflow.bpmn.specs.control import BoundaryEventSplit  # type: ignore
-from SpiffWorkflow.bpmn.specs.event_definitions.timer import TimerEventDefinition  # type: ignore
+from SpiffWorkflow.bpmn.specs.control import _BoundaryEventParent  # type: ignore
+from SpiffWorkflow.bpmn.specs.event_definitions import TimerEventDefinition  # type: ignore
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 from spiffworkflow_backend import db
 from spiffworkflow_backend.exceptions.api_error import ApiError
@@ -170,7 +170,7 @@ def all_waiting_events_can_be_skipped(cls, waiting_events: list[dict[str, Any]])
     @classmethod
     def ready_user_task_has_associated_timer(cls, processor: ProcessInstanceProcessor) -> bool:
         for ready_user_task in processor.bpmn_process_instance.get_ready_user_tasks():
-            if isinstance(ready_user_task.parent.task_spec, BoundaryEventSplit):
+            if isinstance(ready_user_task.parent.task_spec, _BoundaryEventParent):
                 return True
         return False