Merge remote-tracking branch 'origin/main' into feature/remove_spif_step_details

spiffworkflow-backend/src/spiffworkflow_backend/__init__.py

@@ -69,6 +69,9 @@ def start_scheduler(app: flask.app.Flask, scheduler_class: BaseScheduler = Backg
 
     # TODO: polling intervals for different jobs
     polling_interval_in_seconds = app.config["SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_POLLING_INTERVAL_IN_SECONDS"]
+    user_input_required_polling_interval_in_seconds = app.config[
+        "SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_USER_INPUT_REQUIRED_POLLING_INTERVAL_IN_SECONDS"
+    ]
     # TODO: add job to release locks to simplify other queries
     # TODO: add job to delete completed entires
     # TODO: add job to run old/low priority instances so they do not get drowned out
@@ -86,7 +89,7 @@ def start_scheduler(app: flask.app.Flask, scheduler_class: BaseScheduler = Backg
     scheduler.add_job(
         BackgroundProcessingService(app).process_user_input_required_process_instances,
         "interval",
-        seconds=120,
+        seconds=user_input_required_polling_interval_in_seconds,
     )
     scheduler.start()
 
@@ -239,12 +242,16 @@ def configure_sentry(app: flask.app.Flask) -> None:
     if sentry_traces_sample_rate is None:
         raise Exception("SPIFFWORKFLOW_BACKEND_SENTRY_TRACES_SAMPLE_RATE is not set somehow")
 
+    sentry_env_identifier = app.config["ENV_IDENTIFIER"]
+    if app.config.get("SPIFFWORKFLOW_BACKEND_SENTRY_ENV_IDENTIFIER"):
+        sentry_env_identifier = app.config.get("SPIFFWORKFLOW_BACKEND_SENTRY_ENV_IDENTIFIER")
+
     sentry_configs = {
         "dsn": app.config.get("SPIFFWORKFLOW_BACKEND_SENTRY_DSN"),
         "integrations": [
             FlaskIntegration(),
         ],
-        "environment": app.config["ENV_IDENTIFIER"],
+        "environment": sentry_env_identifier,
         # sample_rate is the errors sample rate. we usually set it to 1 (100%)
         # so we get all errors in sentry.
         "sample_rate": float(sentry_errors_sample_rate),

spiffworkflow-backend/src/spiffworkflow_backend/config/default.py

@@ -18,12 +18,21 @@ SPIFFWORKFLOW_BACKEND_CORS_ALLOW_ORIGINS = re.split(
 SPIFFWORKFLOW_BACKEND_RUN_BACKGROUND_SCHEDULER = (
     environ.get("SPIFFWORKFLOW_BACKEND_RUN_BACKGROUND_SCHEDULER", default="false") == "true"
 )
+SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_ALLOW_OPTIMISTIC_CHECKS = (
+    environ.get("SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_ALLOW_OPTIMISTIC_CHECKS", default="true") == "true"
+)
 SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_POLLING_INTERVAL_IN_SECONDS = int(
     environ.get(
         "SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_POLLING_INTERVAL_IN_SECONDS",
         default="10",
     )
 )
+SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_USER_INPUT_REQUIRED_POLLING_INTERVAL_IN_SECONDS = int(
+    environ.get(
+        "SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_USER_INPUT_REQUIRED_POLLING_INTERVAL_IN_SECONDS",
+        default="120",
+    )
+)
 SPIFFWORKFLOW_BACKEND_URL_FOR_FRONTEND = environ.get(
     "SPIFFWORKFLOW_BACKEND_URL_FOR_FRONTEND", default="http://localhost:7001"
 )
@@ -79,6 +88,7 @@ SPIFFWORKFLOW_BACKEND_SENTRY_ORGANIZATION_SLUG = environ.get(
     "SPIFFWORKFLOW_BACKEND_SENTRY_ORGANIZATION_SLUG", default=None
 )
 SPIFFWORKFLOW_BACKEND_SENTRY_PROJECT_SLUG = environ.get("SPIFFWORKFLOW_BACKEND_SENTRY_PROJECT_SLUG", default=None)
+SPIFFWORKFLOW_BACKEND_SENTRY_ENV_IDENTIFIER = environ.get("SPIFFWORKFLOW_BACKEND_SENTRY_ENV_IDENTIFIER", default=None)
 SPIFFWORKFLOW_BACKEND_SENTRY_PROFILING_ENABLED = (
     environ.get("SPIFFWORKFLOW_BACKEND_SENTRY_PROFILING_ENABLED", default="false") == "true"
 )

spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py

@@ -11,6 +11,7 @@ from urllib.parse import unquote
 
 import sentry_sdk
 from flask import current_app
+from SpiffWorkflow.bpmn.specs.events.IntermediateEvent import _BoundaryEventParent  # type: ignore
 from SpiffWorkflow.task import Task as SpiffTask  # type: ignore
 
 from spiffworkflow_backend import db
@@ -81,8 +82,25 @@ class ProcessInstanceService:
         process_model = ProcessModelService.get_process_model(process_model_identifier)
         return cls.create_process_instance(process_model, user)
 
-    @staticmethod
+    @classmethod
-    def do_waiting(status_value: str = ProcessInstanceStatus.waiting.value) -> None:
+    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, _BoundaryEventParent):
+                return True
+        return False
+
+    @classmethod
+    def can_optimistically_skip(cls, processor: ProcessInstanceProcessor, status_value: str) -> bool:
+        if not current_app.config["SPIFFWORKFLOW_BACKEND_BACKGROUND_SCHEDULER_ALLOW_OPTIMISTIC_CHECKS"]:
+            return False
+
+        if processor.process_instance_model.status != status_value:
+            return True
+
+        return status_value == "user_input_required" and not cls.ready_user_task_has_associated_timer(processor)
+
+    @classmethod
+    def do_waiting(cls, status_value: str = ProcessInstanceStatus.waiting.value) -> None:
         """Do_waiting."""
         process_instance_ids_to_check = ProcessInstanceQueueService.peek_many(status_value)
         if len(process_instance_ids_to_check) == 0:
@@ -100,6 +118,10 @@ class ProcessInstanceService:
             try:
                 current_app.logger.info(f"Processing process_instance {process_instance.id}")
                 processor = ProcessInstanceProcessor(process_instance)
+                if cls.can_optimistically_skip(processor, status_value):
+                    current_app.logger.info(f"Optimistically skipped process_instance {process_instance.id}")
+                    continue
+
                 processor.lock_process_instance(process_instance_lock_prefix)
                 locked = True
                 db.session.refresh(process_instance)