Merge pull request #15 from GSA-TTS/tts-changes-to-keep

TTS changes to keep

Author: btylerburton

.github/workflows/build_docker_images.yml

@@ -31,6 +31,7 @@ on:
   push:
     branches:
       - main
+      - pic-stable
     tags: [v*]
 
 jobs:
@@ -40,13 +41,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - image_name: sartography/spiffworkflow-frontend
+          - image_name: gsa-tts/spiffworkflow-frontend
             context: spiffworkflow-frontend
             description: "Frontend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams"
-          - image_name: sartography/spiffworkflow-backend
+          - image_name: gsa-tts/spiffworkflow-backend
             context: spiffworkflow-backend
             description: "Backend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams"
-          - image_name: sartography/connector-proxy-demo
+          - image_name: gsa-tts/connector-proxy-demo
             context: connector-proxy-demo
             description: "Connector proxy component of SpiffWorkflow, providing integration capabilities for external services"
 

spiffworkflow-backend/bin/boot_server_in_docker

@@ -102,6 +102,9 @@ if [[ "${SPIFFWORKFLOW_BACKEND_RUN_DATA_SETUP:-}" != "false" ]]; then
   uv run python bin/refresh_all_caches.py
 fi
 
+# uv run python bin/bootstrap.py
+## TODO: turn back on
+
 log_info "Starting gunicorn server"
 export IS_GUNICORN="true"
 # THIS MUST BE THE LAST COMMAND!

spiffworkflow-backend/bin/wait_for_db_schema_migrations

@@ -16,8 +16,8 @@ while true; do
     break
   else
     echo "Waiting for db migrations to finish"
-    echo "current revision: ${current_db_migration_head}"
-    echo "head revision: ${current_db_migration_revision}"
+    echo "current revision: ${current_db_migration_revision}"
+    echo "head revision: ${current_db_migration_head}"
     sleep 2
   fi
 done

spiffworkflow-backend/migrations/versions/8b258f77eafe_.py

@@ -0,0 +1,66 @@
+"""empty message
+
+Revision ID: 8b258f77eafe
+Revises: 4efc3d8655be
+Create Date: 2026-01-12 16:59:26.261161
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = "8b258f77eafe"
+down_revision = "4efc3d8655be"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task_draft_data", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("task_guid", sa.String(length=36), nullable=False))
+        batch_op.drop_constraint("process_instance_task_definition_pk", type_="primary")
+        batch_op.drop_constraint("process_instance_task_definition_unique", type_="unique")
+
+
+        batch_op.create_unique_constraint(
+            "process_instance_task_unique", ["process_instance_id", "task_guid"]
+        )
+        batch_op.create_primary_key(
+            "process_instance_task_pk", ["process_instance_id", "task_guid"]
+        )
+
+        batch_op.drop_index("ix_task_draft_data_task_definition_id_path")
+        batch_op.create_index("ix_task_draft_data_task_guid", ["task_guid"], unique=False)
+
+        batch_op.create_foreign_key("task_draft_data_task_guid_fk", "task", ["task_guid"], ["guid"])
+        batch_op.drop_column("task_definition_id_path")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("task_draft_data", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "task_definition_id_path", mysql.VARCHAR(length=255), nullable=False
+            )
+        )
+        batch_op.drop_constraint(None, type_="foreignkey")
+        batch_op.drop_constraint("process_instance_task_unique", type_="unique")
+        batch_op.drop_index(batch_op.f("ix_task_draft_data_task_guid"))
+        batch_op.create_unique_constraint(
+            batch_op.f("process_instance_task_definition_unique"),
+            ["process_instance_id", "task_definition_id_path"],
+        )
+        batch_op.create_index(
+            batch_op.f("ix_task_draft_data_task_definition_id_path"),
+            ["task_definition_id_path"],
+            unique=False,
+        )
+        batch_op.drop_column("task_guid")
+
+    # ### end Alembic commands ###

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

@@ -15,11 +15,12 @@
 from spiffworkflow_backend.models.db import db
 from spiffworkflow_backend.models.json_data import JsonDataModel  # noqa: F401
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
+from spiffworkflow_backend.models.task import TaskModel
 
 
 class TaskDraftDataDict(TypedDict):
     process_instance_id: int
-    task_definition_id_path: str
+    task_guid: str
     saved_form_data_hash: str | None
 
 
@@ -29,20 +30,19 @@ class TaskDraftDataModel(SpiffworkflowBaseDBModel):
     __table_args__ = (
         UniqueConstraint(
             "process_instance_id",
-            "task_definition_id_path",
-            name="process_instance_task_definition_unique",
+            "task_guid",
+            name="process_instance_task_unique",
         ),
         PrimaryKeyConstraint(
             "process_instance_id",
-            "task_definition_id_path",
-            name="process_instance_task_definition_pk",
+            "task_guid",
+            name="process_instance_task_pk",
         ),
     )
 
     process_instance_id: int = db.Column(ForeignKey(ProcessInstanceModel.id), nullable=False, index=True)  # type: ignore
 
-    # a colon delimited path of bpmn_process_definition_ids for a given task
-    task_definition_id_path: str = db.Column(db.String(255), nullable=False, index=True)
+    task_guid: str = db.Column(ForeignKey(TaskModel.guid), nullable=False, index=True)
 
     saved_form_data_hash: str | None = db.Column(db.String(255), nullable=True, index=True)
 
@@ -66,7 +66,7 @@ def insert_or_update_task_draft_data_dict(cls, task_draft_data_dict: TaskDraftDa
             else:
                 insert_stmt = postgres_insert(TaskDraftDataModel).values([task_draft_data_dict])
             on_duplicate_key_stmt = insert_stmt.on_conflict_do_update(
-                index_elements=["process_instance_id", "task_definition_id_path"],
+                index_elements=["process_instance_id", "task_guid"],
                 set_={"saved_form_data_hash": task_draft_data_dict["saved_form_data_hash"]},
             )
         db.session.execute(on_duplicate_key_stmt)

spiffworkflow-backend/src/spiffworkflow_backend/routes/openid_blueprint/openid_blueprint.py

@@ -131,6 +131,7 @@ def token() -> Response:
         {
             "iss": f"{host_url}{url_for('openid.index')}",
             "aud": client_id,
+            "azp": client_id[0],
             "iat": math.floor(time.time()),
             "exp": round(time.time()) + two_days,
             "sub": user_name,
@@ -145,6 +146,7 @@ def token() -> Response:
         "access_token": id_token,
         "id_token": id_token,
         "refresh_token": id_token,
+        "token_type": "Bearer",
     }
     return make_response(jsonify(response), 200)
 

spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py

@@ -755,11 +755,9 @@ def task_save_draft(
         return make_response(jsonify({"ok": True}), 200)
 
     task_model = _get_task_model_from_guid_or_raise(task_guid, process_instance_id)
-    full_bpmn_process_id_path = TaskService.full_bpmn_process_path(task_model.bpmn_process, "id")
-    task_definition_id_path = f"{':'.join(map(str, full_bpmn_process_id_path))}:{task_model.task_definition_id}"
     task_draft_data_dict: TaskDraftDataDict = {
         "process_instance_id": process_instance.id,
-        "task_definition_id_path": task_definition_id_path,
+        "task_guid": task_guid,
         "saved_form_data_hash": None,
     }
 

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

@@ -656,15 +656,11 @@ def full_bpmn_process_path(cls, bpmn_process: BpmnProcessModel, definition_colum
     def task_draft_data_from_task_model(
         cls, task_model: TaskModel, create_if_not_exists: bool = False
     ) -> TaskDraftDataModel | None:
-        full_bpmn_process_id_path = cls.full_bpmn_process_path(task_model.bpmn_process, "id")
-        task_definition_id_path = f"{':'.join(map(str, full_bpmn_process_id_path))}:{task_model.task_definition_id}"
         task_draft_data: TaskDraftDataModel | None = TaskDraftDataModel.query.filter_by(
-            process_instance_id=task_model.process_instance_id, task_definition_id_path=task_definition_id_path
+            process_instance_id=task_model.process_instance_id, task_guid=task_model.guid
         ).first()
         if task_draft_data is None and create_if_not_exists:
-            task_draft_data = TaskDraftDataModel(
-                process_instance_id=task_model.process_instance_id, task_definition_id_path=task_definition_id_path
-            )
+            task_draft_data = TaskDraftDataModel(process_instance_id=task_model.process_instance_id, task_guid=task_model.guid)
         return task_draft_data
 
     @classmethod