dbos 1.3.0a4__py3-none-any.whl → 1.3.0a7__py3-none-any.whl

dbos/_client.py

@@ -141,6 +141,11 @@ class DBOSClient:
             "priority": options.get("priority"),
         }
 
+        inputs: WorkflowInputs = {
+            "args": args,
+            "kwargs": kwargs,
+        }
+
         status: WorkflowStatusInternal = {
             "workflow_uuid": workflow_id,
             "status": WorkflowStatusString.ENQUEUED.value,
@@ -169,16 +174,11 @@ class DBOSClient:
                 if enqueue_options_internal["priority"] is not None
                 else 0
             ),
-        }
-
-        inputs: WorkflowInputs = {
-            "args": args,
-            "kwargs": kwargs,
+            "inputs": _serialization.serialize_args(inputs),
         }
 
         self._sys_db.init_workflow(
             status,
-            _serialization.serialize_args(inputs),
             max_recovery_attempts=None,
         )
         return workflow_id
@@ -237,6 +237,7 @@ class DBOSClient:
             "workflow_deadline_epoch_ms": None,
             "deduplication_id": None,
             "priority": 0,
+            "inputs": _serialization.serialize_args({"args": (), "kwargs": {}}),
         }
         with self._sys_db.engine.begin() as conn:
             self._sys_db._insert_workflow_status(

dbos/_core.py

@@ -252,6 +252,10 @@ def _init_workflow(
             raise DBOSNonExistentWorkflowError(wfid)
         return get_status_result
 
+    # If we have a class name, the first arg is the instance and do not serialize
+    if class_name is not None:
+        inputs = {"args": inputs["args"][1:], "kwargs": inputs["kwargs"]}
+
     # Initialize a workflow status object from the context
     status: WorkflowStatusInternal = {
         "workflow_uuid": wfid,
@@ -291,16 +295,12 @@ def _init_workflow(
             if enqueue_options is not None
             else 0
         ),
+        "inputs": _serialization.serialize_args(inputs),
     }
 
-    # If we have a class name, the first arg is the instance and do not serialize
-    if class_name is not None:
-        inputs = {"args": inputs["args"][1:], "kwargs": inputs["kwargs"]}
-
     # Synchronously record the status and inputs for workflows
     wf_status, workflow_deadline_epoch_ms = dbos._sys_db.init_workflow(
         status,
-        _serialization.serialize_args(inputs),
         max_recovery_attempts=max_recovery_attempts,
     )
 
@@ -441,16 +441,13 @@ def execute_workflow_by_id(dbos: "DBOS", workflow_id: str) -> "WorkflowHandle[An
     status = dbos._sys_db.get_workflow_status(workflow_id)
     if not status:
         raise DBOSRecoveryError(workflow_id, "Workflow status not found")
-    inputs = dbos._sys_db.get_workflow_inputs(workflow_id)
-    if not inputs:
-        raise DBOSRecoveryError(workflow_id, "Workflow inputs not found")
+    inputs = _serialization.deserialize_args(status["inputs"])
     wf_func = dbos._registry.workflow_info_map.get(status["name"], None)
     if not wf_func:
         raise DBOSWorkflowFunctionNotFoundError(
             workflow_id, "Workflow function not found"
         )
     with DBOSContextEnsure():
-        ctx = assert_current_dbos_context()
         # If this function belongs to a configured class, add that class instance as its first argument
         if status["config_name"] is not None:
             config_name = status["config_name"]

dbos/_dbos_config.py

@@ -91,7 +91,7 @@ class ConfigFile(TypedDict, total=False):
     Data structure containing the DBOS Configuration.
 
     This configuration data is typically loaded from `dbos-config.yaml`.
-    See `https://docs.dbos.dev/api-reference/configuration`_
+    See `https://docs.dbos.dev/python/reference/configuration#dbos-configuration-file`
 
     Attributes:
         name (str): Application name

dbos/_migrations/versions/d994145b47b6_consolidate_inputs.py

@@ -0,0 +1,30 @@
+"""consolidate_inputs
+
+Revision ID: d994145b47b6
+Revises: 66478e1b95e5
+Create Date: 2025-05-23 08:09:15.515009
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "d994145b47b6"
+down_revision: Union[str, None] = "66478e1b95e5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "workflow_status",
+        sa.Column("inputs", sa.Text(), nullable=True),
+        schema="dbos",
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("workflow_status", "inputs", schema="dbos")

dbos/_schemas/system_database.py

@@ -58,6 +58,7 @@ class SystemSchema:
         Column("workflow_deadline_epoch_ms", BigInteger, nullable=True),
         Column("started_at_epoch_ms", BigInteger(), nullable=True),
         Column("deduplication_id", Text(), nullable=True),
+        Column("inputs", Text()),
         Column("priority", Integer(), nullable=False, server_default=text("'0'::int")),
         Index("workflow_status_created_at_index", "created_at"),
         Index("workflow_status_executor_id_index", "executor_id"),
@@ -88,21 +89,6 @@ class SystemSchema:
         PrimaryKeyConstraint("workflow_uuid", "function_id"),
     )
 
-    workflow_inputs = Table(
-        "workflow_inputs",
-        metadata_obj,
-        Column(
-            "workflow_uuid",
-            Text,
-            ForeignKey(
-                "workflow_status.workflow_uuid", onupdate="CASCADE", ondelete="CASCADE"
-            ),
-            primary_key=True,
-            nullable=False,
-        ),
-        Column("inputs", Text, nullable=False),
-    )
-
     notifications = Table(
         "notifications",
         metadata_obj,

dbos/_sys_db.py

@@ -140,6 +140,8 @@ class WorkflowStatusInternal(TypedDict):
     deduplication_id: Optional[str]
     # Priority of the workflow on the queue, starting from 1 ~ 2,147,483,647. Default 0 (highest priority).
     priority: int
+    # Serialized workflow inputs
+    inputs: str
 
 
 class EnqueueOptionsInternal(TypedDict):
@@ -462,6 +464,7 @@ class SystemDatabase:
                 workflow_deadline_epoch_ms=status["workflow_deadline_epoch_ms"],
                 deduplication_id=status["deduplication_id"],
                 priority=status["priority"],
+                inputs=status["inputs"],
             )
             .on_conflict_do_update(
                 index_elements=["workflow_uuid"],
@@ -483,6 +486,8 @@ class SystemDatabase:
                     status["queue_name"],
                     status["deduplication_id"],
                 )
+            else:
+                raise
         row = results.fetchone()
         if row is not None:
             # Check the started workflow matches the expected name, class_name, config_name, and queue_name
@@ -640,9 +645,6 @@ class SystemDatabase:
         status = self.get_workflow_status(original_workflow_id)
         if status is None:
             raise Exception(f"Workflow {original_workflow_id} not found")
-        inputs = self.get_workflow_inputs(original_workflow_id)
-        if inputs is None:
-            raise Exception(f"Workflow {original_workflow_id} not found")
 
         with self.engine.begin() as c:
             # Create an entry for the forked workflow with the same
@@ -664,13 +666,7 @@ class SystemDatabase:
                     authenticated_roles=status["authenticated_roles"],
                     assumed_role=status["assumed_role"],
                     queue_name=INTERNAL_QUEUE_NAME,
-                )
-            )
-            # Copy the original workflow's inputs into the forked workflow
-            c.execute(
-                pg.insert(SystemSchema.workflow_inputs).values(
-                    workflow_uuid=forked_workflow_id,
-                    inputs=_serialization.serialize_args(inputs),
+                    inputs=status["inputs"],
                 )
             )
 
@@ -730,6 +726,7 @@ class SystemDatabase:
                     SystemSchema.workflow_status.c.workflow_timeout_ms,
                     SystemSchema.workflow_status.c.deduplication_id,
                     SystemSchema.workflow_status.c.priority,
+                    SystemSchema.workflow_status.c.inputs,
                 ).where(SystemSchema.workflow_status.c.workflow_uuid == workflow_uuid)
             ).fetchone()
             if row is None:
@@ -756,6 +753,7 @@ class SystemDatabase:
                 "workflow_timeout_ms": row[15],
                 "deduplication_id": row[16],
                 "priority": row[17],
+                "inputs": row[18],
             }
             return status
 
@@ -786,53 +784,6 @@ class SystemDatabase:
                     pass  # CB: I guess we're assuming the WF will show up eventually.
             time.sleep(1)
 
-    def _update_workflow_inputs(
-        self, workflow_uuid: str, inputs: str, conn: sa.Connection
-    ) -> None:
-        if self._debug_mode:
-            raise Exception("called update_workflow_inputs in debug mode")
-
-        cmd = (
-            pg.insert(SystemSchema.workflow_inputs)
-            .values(
-                workflow_uuid=workflow_uuid,
-                inputs=inputs,
-            )
-            .on_conflict_do_update(
-                index_elements=["workflow_uuid"],
-                set_=dict(workflow_uuid=SystemSchema.workflow_inputs.c.workflow_uuid),
-            )
-            .returning(SystemSchema.workflow_inputs.c.inputs)
-        )
-
-        row = conn.execute(cmd).fetchone()
-        if row is not None and row[0] != inputs:
-            # In a distributed environment, scheduled workflows are enqueued multiple times with slightly different timestamps
-            if not workflow_uuid.startswith("sched-"):
-                dbos_logger.warning(
-                    f"Workflow {workflow_uuid} has been called multiple times with different inputs"
-                )
-            # TODO: actually changing the input
-
-        return
-
-    @db_retry()
-    def get_workflow_inputs(
-        self, workflow_uuid: str
-    ) -> Optional[_serialization.WorkflowInputs]:
-        with self.engine.begin() as c:
-            row = c.execute(
-                sa.select(SystemSchema.workflow_inputs.c.inputs).where(
-                    SystemSchema.workflow_inputs.c.workflow_uuid == workflow_uuid
-                )
-            ).fetchone()
-            if row is None:
-                return None
-            inputs: _serialization.WorkflowInputs = _serialization.deserialize_args(
-                row[0]
-            )
-            return inputs
-
     def get_workflows(self, input: GetWorkflowsInput) -> List[WorkflowStatus]:
         """
         Retrieve a list of workflows result and inputs based on the input criteria. The result is a list of external-facing workflow status objects.
@@ -853,15 +804,11 @@ class SystemDatabase:
             SystemSchema.workflow_status.c.updated_at,
             SystemSchema.workflow_status.c.application_version,
             SystemSchema.workflow_status.c.application_id,
-            SystemSchema.workflow_inputs.c.inputs,
+            SystemSchema.workflow_status.c.inputs,
             SystemSchema.workflow_status.c.output,
             SystemSchema.workflow_status.c.error,
             SystemSchema.workflow_status.c.workflow_deadline_epoch_ms,
             SystemSchema.workflow_status.c.workflow_timeout_ms,
-        ).join(
-            SystemSchema.workflow_inputs,
-            SystemSchema.workflow_status.c.workflow_uuid
-            == SystemSchema.workflow_inputs.c.workflow_uuid,
         )
         if input.sort_desc:
             query = query.order_by(SystemSchema.workflow_status.c.created_at.desc())
@@ -951,39 +898,31 @@ class SystemDatabase:
         """
         Retrieve a list of queued workflows result and inputs based on the input criteria. The result is a list of external-facing workflow status objects.
         """
-        query = (
-            sa.select(
-                SystemSchema.workflow_status.c.workflow_uuid,
-                SystemSchema.workflow_status.c.status,
-                SystemSchema.workflow_status.c.name,
-                SystemSchema.workflow_status.c.recovery_attempts,
-                SystemSchema.workflow_status.c.config_name,
-                SystemSchema.workflow_status.c.class_name,
-                SystemSchema.workflow_status.c.authenticated_user,
-                SystemSchema.workflow_status.c.authenticated_roles,
-                SystemSchema.workflow_status.c.assumed_role,
-                SystemSchema.workflow_status.c.queue_name,
-                SystemSchema.workflow_status.c.executor_id,
-                SystemSchema.workflow_status.c.created_at,
-                SystemSchema.workflow_status.c.updated_at,
-                SystemSchema.workflow_status.c.application_version,
-                SystemSchema.workflow_status.c.application_id,
-                SystemSchema.workflow_inputs.c.inputs,
-                SystemSchema.workflow_status.c.output,
-                SystemSchema.workflow_status.c.error,
-                SystemSchema.workflow_status.c.workflow_deadline_epoch_ms,
-                SystemSchema.workflow_status.c.workflow_timeout_ms,
-            )
-            .join(
-                SystemSchema.workflow_inputs,
-                SystemSchema.workflow_status.c.workflow_uuid
-                == SystemSchema.workflow_inputs.c.workflow_uuid,
-            )
-            .where(
-                sa.and_(
-                    SystemSchema.workflow_status.c.queue_name.isnot(None),
-                    SystemSchema.workflow_status.c.status.in_(["ENQUEUED", "PENDING"]),
-                )
+        query = sa.select(
+            SystemSchema.workflow_status.c.workflow_uuid,
+            SystemSchema.workflow_status.c.status,
+            SystemSchema.workflow_status.c.name,
+            SystemSchema.workflow_status.c.recovery_attempts,
+            SystemSchema.workflow_status.c.config_name,
+            SystemSchema.workflow_status.c.class_name,
+            SystemSchema.workflow_status.c.authenticated_user,
+            SystemSchema.workflow_status.c.authenticated_roles,
+            SystemSchema.workflow_status.c.assumed_role,
+            SystemSchema.workflow_status.c.queue_name,
+            SystemSchema.workflow_status.c.executor_id,
+            SystemSchema.workflow_status.c.created_at,
+            SystemSchema.workflow_status.c.updated_at,
+            SystemSchema.workflow_status.c.application_version,
+            SystemSchema.workflow_status.c.application_id,
+            SystemSchema.workflow_status.c.inputs,
+            SystemSchema.workflow_status.c.output,
+            SystemSchema.workflow_status.c.error,
+            SystemSchema.workflow_status.c.workflow_deadline_epoch_ms,
+            SystemSchema.workflow_status.c.workflow_timeout_ms,
+        ).where(
+            sa.and_(
+                SystemSchema.workflow_status.c.queue_name.isnot(None),
+                SystemSchema.workflow_status.c.status.in_(["ENQUEUED", "PENDING"]),
             )
         )
         if input["sort_desc"]:
@@ -1893,7 +1832,6 @@ class SystemDatabase:
     def init_workflow(
         self,
         status: WorkflowStatusInternal,
-        inputs: str,
         *,
         max_recovery_attempts: Optional[int],
     ) -> tuple[WorkflowStatuses, Optional[int]]:
@@ -1904,7 +1842,6 @@ class SystemDatabase:
             wf_status, workflow_deadline_epoch_ms = self._insert_workflow_status(
                 status, conn, max_recovery_attempts=max_recovery_attempts
             )
-            self._update_workflow_inputs(status["workflow_uuid"], inputs, conn)
         return wf_status, workflow_deadline_epoch_ms
 
     def check_connection(self) -> None:

{dbos-1.3.0a4.dist-info → dbos-1.3.0a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 1.3.0a4
+Version: 1.3.0a7
 Summary: Ultra-lightweight durable execution in Python
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-1.3.0a4.dist-info → dbos-1.3.0a7.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dbos-1.3.0a4.dist-info/METADATA,sha256=SxzfQt29v1tlpqECaOISk3fOPzN9vCsagpgQ5n3TqwM,13267
-dbos-1.3.0a4.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dbos-1.3.0a4.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-1.3.0a4.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-1.3.0a7.dist-info/METADATA,sha256=niVru1hNRSgrq4e_MBCmWXBVzq0j3S80W_GClfpA6RE,13267
+dbos-1.3.0a7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dbos-1.3.0a7.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-1.3.0a7.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=NssPCubaBxdiKarOWa-wViz1hdJSkmBGcpLX_gQ4NeA,891
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
 dbos/_admin_server.py,sha256=TWXi4drrzKFpKkUmEJpJkQBZxAtOalnhtYicEn2nDK0,10618
 dbos/_app_db.py,sha256=0PKqpxJ3EbIaak3Wl0lNl3hXvhBfz4EEHaCw1bUOvIM,9937
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=jrvbv33KMkoACD4-wE72a6-Mp2fx0tagh_MnHY93Apk,14576
+dbos/_client.py,sha256=cQxw1Nbh_vKZ03lONt0EmUhwXBk3B3NczZrmfXXeefY,14667
 dbos/_conductor/conductor.py,sha256=o0IaZjwnZ2TOyHeP2H4iSX6UnXLXQ4uODvWAKD9hHMs,21703
 dbos/_conductor/protocol.py,sha256=wgOFZxmS81bv0WCB9dAyg0s6QzldpzVKQDoSPeaX0Ws,6967
 dbos/_context.py,sha256=5ajoWAmToAfzzmMLylnJZoL4Ny9rBwZWuG05sXadMIA,24798
-dbos/_core.py,sha256=-yhsWn5TqDEDsIE_fY1O5qxu295kYFnz8IJnS9luhTE,48656
+dbos/_core.py,sha256=hvHKi31-3LG5yfWa-KhsnoFrXsV_eT-GeKIZFT4chx8,48533
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
 dbos/_dbos.py,sha256=Y---ozwd9OXzA1o-oWEbnafQkUibblE6o1kUuVZa_90,47163
-dbos/_dbos_config.py,sha256=JWVuPE_Ifyr-pYHFxclFalB_HZ8ETFCGNJzBHGpClXw,20347
+dbos/_dbos_config.py,sha256=2CC1YR8lP9W-_NsMUMnTnW-v-70KN4XkbJEeNJ78RlQ,20373
 dbos/_debug.py,sha256=MNlQVZ6TscGCRQeEEL0VE8Uignvr6dPeDDDefS3xgIE,1823
 dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
 dbos/_error.py,sha256=q0OQJZTbR8FFHV9hEpAGpz9oWBT5L509zUhmyff7FJw,8500
@@ -36,6 +36,7 @@ dbos/_migrations/versions/933e86bdac6a_add_queue_priority.py,sha256=yZX2kGF33skp
 dbos/_migrations/versions/a3b18ad34abe_added_triggers.py,sha256=Rv0ZsZYZ_WdgGEULYsPfnp4YzaO5L198gDTgYY39AVA,2022
 dbos/_migrations/versions/d76646551a6b_job_queue_limiter.py,sha256=8PyFi8rd6CN-mUro43wGhsg5wcQWKZPRHD6jw8R5pVc,986
 dbos/_migrations/versions/d76646551a6c_workflow_queue.py,sha256=G942nophZ2uC2vc4hGBC02Ptng1715roTjY3xiyzZU4,729
+dbos/_migrations/versions/d994145b47b6_consolidate_inputs.py,sha256=_J0jP247fuo66fzOmLlKFO9FJ_CRBXlqa2lnLrcXugQ,672
 dbos/_migrations/versions/eab0cc1d9a14_job_queue.py,sha256=uvhFOtqbBreCePhAxZfIT0qCAI7BiZTou9wt6QnbY7c,1412
 dbos/_migrations/versions/f4b9b32ba814_functionname_childid_op_outputs.py,sha256=m90Lc5YH0ZISSq1MyxND6oq3RZrZKrIqEsZtwJ1jWxA,1049
 dbos/_outcome.py,sha256=EXxBg4jXCVJsByDQ1VOCIedmbeq_03S6d-p1vqQrLFU,6810
@@ -46,9 +47,9 @@ dbos/_roles.py,sha256=iOsgmIAf1XVzxs3gYWdGRe1B880YfOw5fpU7Jwx8_A8,2271
 dbos/_scheduler.py,sha256=SR1oRZRcVzYsj-JauV2LA8JtwTkt8mru7qf6H1AzQ1U,2027
 dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_schemas/application_database.py,sha256=SypAS9l9EsaBHFn9FR8jmnqt01M74d9AF1AMa4m2hhI,1040
-dbos/_schemas/system_database.py,sha256=5ebwz_h-Yz11u_eYbs8Cy8YinDpxvyiw8mEc0qjR5bo,4796
+dbos/_schemas/system_database.py,sha256=rbFKggONdvvbb45InvGz0TM6a7c-Ux9dcaL-h_7Z7pU,4438
 dbos/_serialization.py,sha256=bWuwhXSQcGmiazvhJHA5gwhrRWxtmFmcCFQSDJnqqkU,3666
-dbos/_sys_db.py,sha256=wAmqy4oznS3BkG-Q0K0PnpodrecuUSP9UyXGQbTYkk4,80429
+dbos/_sys_db.py,sha256=67z_K0aKH8M_oRs9c13zhp6skpT-sLAw8nYRBa3JM5w,77844
 dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
 dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbos/_templates/dbos-db-starter/__package/main.py.dbos,sha256=aQnBPSSQpkB8ERfhf7gB7P9tsU6OPKhZscfeh0yiaD8,2702
@@ -68,4 +69,4 @@ dbos/cli/cli.py,sha256=EemOMqNpzSU2BQhAxV_e59pBRITDLwt49HF6W3uWBZg,20775
 dbos/dbos-config.schema.json,sha256=CjaspeYmOkx6Ip_pcxtmfXJTn_YGdSx_0pcPBF7KZmo,6060
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-1.3.0a4.dist-info/RECORD,,
+dbos-1.3.0a7.dist-info/RECORD,,