dbos 1.8.0a1__py3-none-any.whl → 1.8.0a5__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of dbos might be problematic. Click here for more details.
- dbos/_client.py +15 -4
- dbos/_context.py +37 -12
- dbos/_dbos.py +106 -2
- dbos/_dbos_config.py +24 -1
- dbos/_error.py +1 -1
- dbos/_sys_db.py +11 -11
- dbos/cli/cli.py +2 -2
- {dbos-1.8.0a1.dist-info → dbos-1.8.0a5.dist-info}/METADATA +1 -1
- {dbos-1.8.0a1.dist-info → dbos-1.8.0a5.dist-info}/RECORD +12 -12
- {dbos-1.8.0a1.dist-info → dbos-1.8.0a5.dist-info}/WHEEL +1 -1
- {dbos-1.8.0a1.dist-info → dbos-1.8.0a5.dist-info}/entry_points.txt +0 -0
- {dbos-1.8.0a1.dist-info → dbos-1.8.0a5.dist-info}/licenses/LICENSE +0 -0
dbos/_client.py
CHANGED
|
@@ -13,7 +13,7 @@ else:
|
|
|
13
13
|
|
|
14
14
|
from dbos import _serialization
|
|
15
15
|
from dbos._dbos import WorkflowHandle, WorkflowHandleAsync
|
|
16
|
-
from dbos._dbos_config import is_valid_database_url
|
|
16
|
+
from dbos._dbos_config import get_system_database_url, is_valid_database_url
|
|
17
17
|
from dbos._error import DBOSException, DBOSNonExistentWorkflowError
|
|
18
18
|
from dbos._registrations import DEFAULT_MAX_RECOVERY_ATTEMPTS
|
|
19
19
|
from dbos._serialization import WorkflowInputs
|
|
@@ -97,17 +97,28 @@ class WorkflowHandleClientAsyncPolling(Generic[R]):
|
|
|
97
97
|
|
|
98
98
|
|
|
99
99
|
class DBOSClient:
|
|
100
|
-
def __init__(
|
|
100
|
+
def __init__(
|
|
101
|
+
self,
|
|
102
|
+
database_url: str,
|
|
103
|
+
*,
|
|
104
|
+
system_database_url: Optional[str] = None,
|
|
105
|
+
system_database: Optional[str] = None,
|
|
106
|
+
):
|
|
101
107
|
assert is_valid_database_url(database_url)
|
|
102
108
|
# We only create database connections but do not run migrations
|
|
103
109
|
self._sys_db = SystemDatabase(
|
|
104
|
-
|
|
110
|
+
system_database_url=get_system_database_url(
|
|
111
|
+
{
|
|
112
|
+
"system_database_url": system_database_url,
|
|
113
|
+
"database_url": database_url,
|
|
114
|
+
"database": {"sys_db_name": system_database},
|
|
115
|
+
}
|
|
116
|
+
),
|
|
105
117
|
engine_kwargs={
|
|
106
118
|
"pool_timeout": 30,
|
|
107
119
|
"max_overflow": 0,
|
|
108
120
|
"pool_size": 2,
|
|
109
121
|
},
|
|
110
|
-
sys_db_name=system_database,
|
|
111
122
|
)
|
|
112
123
|
self._sys_db.check_connection()
|
|
113
124
|
self._app_db = ApplicationDatabase(
|
dbos/_context.py
CHANGED
|
@@ -10,7 +10,7 @@ from enum import Enum
|
|
|
10
10
|
from types import TracebackType
|
|
11
11
|
from typing import List, Literal, Optional, Type, TypedDict
|
|
12
12
|
|
|
13
|
-
from opentelemetry.trace import Span, Status, StatusCode
|
|
13
|
+
from opentelemetry.trace import Span, Status, StatusCode, use_span
|
|
14
14
|
from sqlalchemy.orm import Session
|
|
15
15
|
|
|
16
16
|
from dbos._utils import GlobalParams
|
|
@@ -68,6 +68,20 @@ class StepStatus:
|
|
|
68
68
|
max_attempts: Optional[int]
|
|
69
69
|
|
|
70
70
|
|
|
71
|
+
@dataclass
|
|
72
|
+
class ContextSpan:
|
|
73
|
+
"""
|
|
74
|
+
A span that is used to track the context of a workflow or step execution.
|
|
75
|
+
|
|
76
|
+
Attributes:
|
|
77
|
+
span: The OpenTelemetry span object.
|
|
78
|
+
context_manager: The context manager that is used to manage the span's lifecycle.
|
|
79
|
+
"""
|
|
80
|
+
|
|
81
|
+
span: Span
|
|
82
|
+
context_manager: AbstractContextManager[Span]
|
|
83
|
+
|
|
84
|
+
|
|
71
85
|
class DBOSContext:
|
|
72
86
|
def __init__(self) -> None:
|
|
73
87
|
self.executor_id = GlobalParams.executor_id
|
|
@@ -86,7 +100,7 @@ class DBOSContext:
|
|
|
86
100
|
self.curr_step_function_id: int = -1
|
|
87
101
|
self.curr_tx_function_id: int = -1
|
|
88
102
|
self.sql_session: Optional[Session] = None
|
|
89
|
-
self.
|
|
103
|
+
self.context_spans: list[ContextSpan] = []
|
|
90
104
|
|
|
91
105
|
self.authenticated_user: Optional[str] = None
|
|
92
106
|
self.authenticated_roles: Optional[List[str]] = None
|
|
@@ -202,8 +216,8 @@ class DBOSContext:
|
|
|
202
216
|
self._end_span(exc_value)
|
|
203
217
|
|
|
204
218
|
def get_current_span(self) -> Optional[Span]:
|
|
205
|
-
if len(self.
|
|
206
|
-
return self.
|
|
219
|
+
if len(self.context_spans) > 0:
|
|
220
|
+
return self.context_spans[-1].span
|
|
207
221
|
return None
|
|
208
222
|
|
|
209
223
|
def _start_span(self, attributes: TracedAttributes) -> None:
|
|
@@ -218,27 +232,38 @@ class DBOSContext:
|
|
|
218
232
|
)
|
|
219
233
|
attributes["authenticatedUserAssumedRole"] = self.assumed_role
|
|
220
234
|
span = dbos_tracer.start_span(
|
|
221
|
-
attributes,
|
|
235
|
+
attributes,
|
|
236
|
+
parent=self.context_spans[-1].span if len(self.context_spans) > 0 else None,
|
|
237
|
+
)
|
|
238
|
+
# Activate the current span
|
|
239
|
+
cm = use_span(
|
|
240
|
+
span,
|
|
241
|
+
end_on_exit=False,
|
|
242
|
+
record_exception=False,
|
|
243
|
+
set_status_on_exception=False,
|
|
222
244
|
)
|
|
223
|
-
self.
|
|
245
|
+
self.context_spans.append(ContextSpan(span, cm))
|
|
246
|
+
cm.__enter__()
|
|
224
247
|
|
|
225
248
|
def _end_span(self, exc_value: Optional[BaseException]) -> None:
|
|
249
|
+
context_span = self.context_spans.pop()
|
|
226
250
|
if exc_value is None:
|
|
227
|
-
|
|
251
|
+
context_span.span.set_status(Status(StatusCode.OK))
|
|
228
252
|
else:
|
|
229
|
-
|
|
253
|
+
context_span.span.set_status(
|
|
230
254
|
Status(StatusCode.ERROR, description=str(exc_value))
|
|
231
255
|
)
|
|
232
|
-
dbos_tracer.end_span(
|
|
256
|
+
dbos_tracer.end_span(context_span.span)
|
|
257
|
+
context_span.context_manager.__exit__(None, None, None)
|
|
233
258
|
|
|
234
259
|
def set_authentication(
|
|
235
260
|
self, user: Optional[str], roles: Optional[List[str]]
|
|
236
261
|
) -> None:
|
|
237
262
|
self.authenticated_user = user
|
|
238
263
|
self.authenticated_roles = roles
|
|
239
|
-
if user is not None and len(self.
|
|
240
|
-
self.
|
|
241
|
-
self.
|
|
264
|
+
if user is not None and len(self.context_spans) > 0:
|
|
265
|
+
self.context_spans[-1].span.set_attribute("authenticatedUser", user)
|
|
266
|
+
self.context_spans[-1].span.set_attribute(
|
|
242
267
|
"authenticatedUserRoles", json.dumps(roles) if roles is not None else ""
|
|
243
268
|
)
|
|
244
269
|
|
dbos/_dbos.py
CHANGED
|
@@ -91,6 +91,7 @@ from ._context import (
|
|
|
91
91
|
from ._dbos_config import (
|
|
92
92
|
ConfigFile,
|
|
93
93
|
DBOSConfig,
|
|
94
|
+
get_system_database_url,
|
|
94
95
|
overwrite_config,
|
|
95
96
|
process_config,
|
|
96
97
|
translate_dbos_config_to_config_file,
|
|
@@ -424,9 +425,8 @@ class DBOS:
|
|
|
424
425
|
assert self._config["database_url"] is not None
|
|
425
426
|
assert self._config["database"]["sys_db_engine_kwargs"] is not None
|
|
426
427
|
self._sys_db_field = SystemDatabase(
|
|
427
|
-
|
|
428
|
+
system_database_url=get_system_database_url(self._config),
|
|
428
429
|
engine_kwargs=self._config["database"]["sys_db_engine_kwargs"],
|
|
429
|
-
sys_db_name=self._config["database"]["sys_db_name"],
|
|
430
430
|
debug_mode=debug_mode,
|
|
431
431
|
)
|
|
432
432
|
assert self._config["database"]["db_engine_kwargs"] is not None
|
|
@@ -966,6 +966,12 @@ class DBOS:
|
|
|
966
966
|
fn, "DBOS.cancelWorkflow"
|
|
967
967
|
)
|
|
968
968
|
|
|
969
|
+
@classmethod
|
|
970
|
+
async def cancel_workflow_async(cls, workflow_id: str) -> None:
|
|
971
|
+
"""Cancel a workflow by ID."""
|
|
972
|
+
await cls._configure_asyncio_thread_pool()
|
|
973
|
+
await asyncio.to_thread(cls.cancel_workflow, workflow_id)
|
|
974
|
+
|
|
969
975
|
@classmethod
|
|
970
976
|
async def _configure_asyncio_thread_pool(cls) -> None:
|
|
971
977
|
"""
|
|
@@ -987,11 +993,23 @@ class DBOS:
|
|
|
987
993
|
_get_dbos_instance()._sys_db.call_function_as_step(fn, "DBOS.resumeWorkflow")
|
|
988
994
|
return cls.retrieve_workflow(workflow_id)
|
|
989
995
|
|
|
996
|
+
@classmethod
|
|
997
|
+
async def resume_workflow_async(cls, workflow_id: str) -> WorkflowHandleAsync[Any]:
|
|
998
|
+
"""Resume a workflow by ID."""
|
|
999
|
+
await cls._configure_asyncio_thread_pool()
|
|
1000
|
+
await asyncio.to_thread(cls.resume_workflow, workflow_id)
|
|
1001
|
+
return await cls.retrieve_workflow_async(workflow_id)
|
|
1002
|
+
|
|
990
1003
|
@classmethod
|
|
991
1004
|
def restart_workflow(cls, workflow_id: str) -> WorkflowHandle[Any]:
|
|
992
1005
|
"""Restart a workflow with a new workflow ID"""
|
|
993
1006
|
return cls.fork_workflow(workflow_id, 1)
|
|
994
1007
|
|
|
1008
|
+
@classmethod
|
|
1009
|
+
async def restart_workflow_async(cls, workflow_id: str) -> WorkflowHandleAsync[Any]:
|
|
1010
|
+
"""Restart a workflow with a new workflow ID"""
|
|
1011
|
+
return await cls.fork_workflow_async(workflow_id, 1)
|
|
1012
|
+
|
|
995
1013
|
@classmethod
|
|
996
1014
|
def fork_workflow(
|
|
997
1015
|
cls,
|
|
@@ -1017,6 +1035,23 @@ class DBOS:
|
|
|
1017
1035
|
)
|
|
1018
1036
|
return cls.retrieve_workflow(new_id)
|
|
1019
1037
|
|
|
1038
|
+
@classmethod
|
|
1039
|
+
async def fork_workflow_async(
|
|
1040
|
+
cls,
|
|
1041
|
+
workflow_id: str,
|
|
1042
|
+
start_step: int,
|
|
1043
|
+
*,
|
|
1044
|
+
application_version: Optional[str] = None,
|
|
1045
|
+
) -> WorkflowHandleAsync[Any]:
|
|
1046
|
+
"""Restart a workflow with a new workflow ID from a specific step"""
|
|
1047
|
+
await cls._configure_asyncio_thread_pool()
|
|
1048
|
+
new_id = await asyncio.to_thread(
|
|
1049
|
+
lambda: cls.fork_workflow(
|
|
1050
|
+
workflow_id, start_step, application_version=application_version
|
|
1051
|
+
).get_workflow_id()
|
|
1052
|
+
)
|
|
1053
|
+
return await cls.retrieve_workflow_async(new_id)
|
|
1054
|
+
|
|
1020
1055
|
@classmethod
|
|
1021
1056
|
def list_workflows(
|
|
1022
1057
|
cls,
|
|
@@ -1057,6 +1092,42 @@ class DBOS:
|
|
|
1057
1092
|
fn, "DBOS.listWorkflows"
|
|
1058
1093
|
)
|
|
1059
1094
|
|
|
1095
|
+
@classmethod
|
|
1096
|
+
async def list_workflows_async(
|
|
1097
|
+
cls,
|
|
1098
|
+
*,
|
|
1099
|
+
workflow_ids: Optional[List[str]] = None,
|
|
1100
|
+
status: Optional[Union[str, List[str]]] = None,
|
|
1101
|
+
start_time: Optional[str] = None,
|
|
1102
|
+
end_time: Optional[str] = None,
|
|
1103
|
+
name: Optional[str] = None,
|
|
1104
|
+
app_version: Optional[str] = None,
|
|
1105
|
+
user: Optional[str] = None,
|
|
1106
|
+
limit: Optional[int] = None,
|
|
1107
|
+
offset: Optional[int] = None,
|
|
1108
|
+
sort_desc: bool = False,
|
|
1109
|
+
workflow_id_prefix: Optional[str] = None,
|
|
1110
|
+
load_input: bool = True,
|
|
1111
|
+
load_output: bool = True,
|
|
1112
|
+
) -> List[WorkflowStatus]:
|
|
1113
|
+
await cls._configure_asyncio_thread_pool()
|
|
1114
|
+
return await asyncio.to_thread(
|
|
1115
|
+
cls.list_workflows,
|
|
1116
|
+
workflow_ids=workflow_ids,
|
|
1117
|
+
status=status,
|
|
1118
|
+
start_time=start_time,
|
|
1119
|
+
end_time=end_time,
|
|
1120
|
+
name=name,
|
|
1121
|
+
app_version=app_version,
|
|
1122
|
+
user=user,
|
|
1123
|
+
limit=limit,
|
|
1124
|
+
offset=offset,
|
|
1125
|
+
sort_desc=sort_desc,
|
|
1126
|
+
workflow_id_prefix=workflow_id_prefix,
|
|
1127
|
+
load_input=load_input,
|
|
1128
|
+
load_output=load_output,
|
|
1129
|
+
)
|
|
1130
|
+
|
|
1060
1131
|
@classmethod
|
|
1061
1132
|
def list_queued_workflows(
|
|
1062
1133
|
cls,
|
|
@@ -1089,6 +1160,34 @@ class DBOS:
|
|
|
1089
1160
|
fn, "DBOS.listQueuedWorkflows"
|
|
1090
1161
|
)
|
|
1091
1162
|
|
|
1163
|
+
@classmethod
|
|
1164
|
+
async def list_queued_workflows_async(
|
|
1165
|
+
cls,
|
|
1166
|
+
*,
|
|
1167
|
+
queue_name: Optional[str] = None,
|
|
1168
|
+
status: Optional[Union[str, List[str]]] = None,
|
|
1169
|
+
start_time: Optional[str] = None,
|
|
1170
|
+
end_time: Optional[str] = None,
|
|
1171
|
+
name: Optional[str] = None,
|
|
1172
|
+
limit: Optional[int] = None,
|
|
1173
|
+
offset: Optional[int] = None,
|
|
1174
|
+
sort_desc: bool = False,
|
|
1175
|
+
load_input: bool = True,
|
|
1176
|
+
) -> List[WorkflowStatus]:
|
|
1177
|
+
await cls._configure_asyncio_thread_pool()
|
|
1178
|
+
return await asyncio.to_thread(
|
|
1179
|
+
cls.list_queued_workflows,
|
|
1180
|
+
queue_name=queue_name,
|
|
1181
|
+
status=status,
|
|
1182
|
+
start_time=start_time,
|
|
1183
|
+
end_time=end_time,
|
|
1184
|
+
name=name,
|
|
1185
|
+
limit=limit,
|
|
1186
|
+
offset=offset,
|
|
1187
|
+
sort_desc=sort_desc,
|
|
1188
|
+
load_input=load_input,
|
|
1189
|
+
)
|
|
1190
|
+
|
|
1092
1191
|
@classmethod
|
|
1093
1192
|
def list_workflow_steps(cls, workflow_id: str) -> List[StepInfo]:
|
|
1094
1193
|
def fn() -> List[StepInfo]:
|
|
@@ -1100,6 +1199,11 @@ class DBOS:
|
|
|
1100
1199
|
fn, "DBOS.listWorkflowSteps"
|
|
1101
1200
|
)
|
|
1102
1201
|
|
|
1202
|
+
@classmethod
|
|
1203
|
+
async def list_workflow_steps_async(cls, workflow_id: str) -> List[StepInfo]:
|
|
1204
|
+
await cls._configure_asyncio_thread_pool()
|
|
1205
|
+
return await asyncio.to_thread(cls.list_workflow_steps, workflow_id)
|
|
1206
|
+
|
|
1103
1207
|
@classproperty
|
|
1104
1208
|
def logger(cls) -> Logger:
|
|
1105
1209
|
"""Return the DBOS `Logger` for the current context."""
|
dbos/_dbos_config.py
CHANGED
|
@@ -23,7 +23,8 @@ class DBOSConfig(TypedDict, total=False):
|
|
|
23
23
|
Attributes:
|
|
24
24
|
name (str): Application name
|
|
25
25
|
database_url (str): Database connection string
|
|
26
|
-
|
|
26
|
+
system_database_url (str): Connection string for the system database (if different from the application database)
|
|
27
|
+
sys_db_name (str): System database name (deprecated)
|
|
27
28
|
sys_db_pool_size (int): System database pool size
|
|
28
29
|
db_engine_kwargs (Dict[str, Any]): SQLAlchemy engine kwargs (See https://docs.sqlalchemy.org/en/20/core/engines.html#sqlalchemy.create_engine)
|
|
29
30
|
log_level (str): Log level
|
|
@@ -36,6 +37,7 @@ class DBOSConfig(TypedDict, total=False):
|
|
|
36
37
|
|
|
37
38
|
name: str
|
|
38
39
|
database_url: Optional[str]
|
|
40
|
+
system_database_url: Optional[str]
|
|
39
41
|
sys_db_name: Optional[str]
|
|
40
42
|
sys_db_pool_size: Optional[int]
|
|
41
43
|
db_engine_kwargs: Optional[Dict[str, Any]]
|
|
@@ -111,6 +113,7 @@ class ConfigFile(TypedDict, total=False):
|
|
|
111
113
|
runtimeConfig: RuntimeConfig
|
|
112
114
|
database: DatabaseConfig
|
|
113
115
|
database_url: Optional[str]
|
|
116
|
+
system_database_url: Optional[str]
|
|
114
117
|
telemetry: Optional[TelemetryConfig]
|
|
115
118
|
env: Dict[str, str]
|
|
116
119
|
|
|
@@ -136,6 +139,8 @@ def translate_dbos_config_to_config_file(config: DBOSConfig) -> ConfigFile:
|
|
|
136
139
|
|
|
137
140
|
if "database_url" in config:
|
|
138
141
|
translated_config["database_url"] = config.get("database_url")
|
|
142
|
+
if "system_database_url" in config:
|
|
143
|
+
translated_config["system_database_url"] = config.get("system_database_url")
|
|
139
144
|
|
|
140
145
|
# Runtime config
|
|
141
146
|
translated_config["runtimeConfig"] = {"run_admin_server": True}
|
|
@@ -488,6 +493,8 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
|
|
|
488
493
|
"DBOS_DATABASE_URL environment variable is not set. This is required to connect to the database."
|
|
489
494
|
)
|
|
490
495
|
provided_config["database_url"] = db_url
|
|
496
|
+
if "system_database_url" in provided_config:
|
|
497
|
+
del provided_config["system_database_url"]
|
|
491
498
|
|
|
492
499
|
# Telemetry config
|
|
493
500
|
if "telemetry" not in provided_config or provided_config["telemetry"] is None:
|
|
@@ -537,3 +544,19 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
|
|
|
537
544
|
del provided_config["env"]
|
|
538
545
|
|
|
539
546
|
return provided_config
|
|
547
|
+
|
|
548
|
+
|
|
549
|
+
def get_system_database_url(config: ConfigFile) -> str:
|
|
550
|
+
if "system_database_url" in config and config["system_database_url"] is not None:
|
|
551
|
+
return config["system_database_url"]
|
|
552
|
+
else:
|
|
553
|
+
assert config["database_url"] is not None
|
|
554
|
+
app_db_url = make_url(config["database_url"])
|
|
555
|
+
if config["database"].get("sys_db_name") is not None:
|
|
556
|
+
sys_db_name = config["database"]["sys_db_name"]
|
|
557
|
+
else:
|
|
558
|
+
assert app_db_url.database is not None
|
|
559
|
+
sys_db_name = app_db_url.database + SystemSchema.sysdb_suffix
|
|
560
|
+
return app_db_url.set(database=sys_db_name).render_as_string(
|
|
561
|
+
hide_password=False
|
|
562
|
+
)
|
dbos/_error.py
CHANGED
|
@@ -126,7 +126,7 @@ class DBOSDeadLetterQueueError(DBOSException):
|
|
|
126
126
|
|
|
127
127
|
def __init__(self, wf_id: str, max_retries: int):
|
|
128
128
|
super().__init__(
|
|
129
|
-
f"Workflow {wf_id} has been moved to the dead-letter queue after exceeding the maximum of
|
|
129
|
+
f"Workflow {wf_id} has been moved to the dead-letter queue after exceeding the maximum of {max_retries} retries",
|
|
130
130
|
dbos_error_code=DBOSErrorCode.DeadLetterQueueError.value,
|
|
131
131
|
)
|
|
132
132
|
|
dbos/_sys_db.py
CHANGED
|
@@ -331,22 +331,15 @@ class SystemDatabase:
|
|
|
331
331
|
def __init__(
|
|
332
332
|
self,
|
|
333
333
|
*,
|
|
334
|
-
|
|
334
|
+
system_database_url: str,
|
|
335
335
|
engine_kwargs: Dict[str, Any],
|
|
336
|
-
sys_db_name: Optional[str] = None,
|
|
337
336
|
debug_mode: bool = False,
|
|
338
337
|
):
|
|
339
338
|
# Set driver
|
|
340
|
-
|
|
341
|
-
# Resolve system database name
|
|
342
|
-
sysdb_name = sys_db_name
|
|
343
|
-
if not sysdb_name:
|
|
344
|
-
assert system_db_url.database is not None
|
|
345
|
-
sysdb_name = system_db_url.database + SystemSchema.sysdb_suffix
|
|
346
|
-
system_db_url = system_db_url.set(database=sysdb_name)
|
|
339
|
+
url = sa.make_url(system_database_url).set(drivername="postgresql+psycopg")
|
|
347
340
|
|
|
348
341
|
self.engine = sa.create_engine(
|
|
349
|
-
|
|
342
|
+
url,
|
|
350
343
|
**engine_kwargs,
|
|
351
344
|
)
|
|
352
345
|
self._engine_kwargs = engine_kwargs
|
|
@@ -437,7 +430,14 @@ class SystemDatabase:
|
|
|
437
430
|
|
|
438
431
|
# Values to update when a row already exists for this workflow
|
|
439
432
|
update_values: dict[str, Any] = {
|
|
440
|
-
"recovery_attempts":
|
|
433
|
+
"recovery_attempts": sa.case(
|
|
434
|
+
(
|
|
435
|
+
SystemSchema.workflow_status.c.status
|
|
436
|
+
!= WorkflowStatusString.ENQUEUED.value,
|
|
437
|
+
SystemSchema.workflow_status.c.recovery_attempts + 1,
|
|
438
|
+
),
|
|
439
|
+
else_=SystemSchema.workflow_status.c.recovery_attempts,
|
|
440
|
+
),
|
|
441
441
|
"updated_at": func.extract("epoch", func.now()) * 1000,
|
|
442
442
|
}
|
|
443
443
|
# Don't update an existing executor ID when enqueueing a workflow.
|
dbos/cli/cli.py
CHANGED
|
@@ -21,6 +21,7 @@ from .._client import DBOSClient
|
|
|
21
21
|
from .._dbos_config import (
|
|
22
22
|
_app_name_to_db_name,
|
|
23
23
|
_is_valid_app_name,
|
|
24
|
+
get_system_database_url,
|
|
24
25
|
is_valid_database_url,
|
|
25
26
|
load_config,
|
|
26
27
|
)
|
|
@@ -294,13 +295,12 @@ def migrate(
|
|
|
294
295
|
sys_db = None
|
|
295
296
|
try:
|
|
296
297
|
sys_db = SystemDatabase(
|
|
297
|
-
|
|
298
|
+
system_database_url=get_system_database_url(config),
|
|
298
299
|
engine_kwargs={
|
|
299
300
|
"pool_timeout": 30,
|
|
300
301
|
"max_overflow": 0,
|
|
301
302
|
"pool_size": 2,
|
|
302
303
|
},
|
|
303
|
-
sys_db_name=sys_db_name,
|
|
304
304
|
)
|
|
305
305
|
app_db = ApplicationDatabase(
|
|
306
306
|
database_url=connection_string,
|
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
dbos-1.8.
|
|
2
|
-
dbos-1.8.
|
|
3
|
-
dbos-1.8.
|
|
4
|
-
dbos-1.8.
|
|
1
|
+
dbos-1.8.0a5.dist-info/METADATA,sha256=4VFTFK4ah0MNauAMusSRH9aW0CnLjveeNNLwsC5cxgs,13267
|
|
2
|
+
dbos-1.8.0a5.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
|
|
3
|
+
dbos-1.8.0a5.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
|
|
4
|
+
dbos-1.8.0a5.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
|
|
5
5
|
dbos/__init__.py,sha256=NssPCubaBxdiKarOWa-wViz1hdJSkmBGcpLX_gQ4NeA,891
|
|
6
6
|
dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
|
|
7
7
|
dbos/_admin_server.py,sha256=e8ELhcDWqR3_PNobnNgUvLGh5lzZq0yFSF6dvtzoQRI,16267
|
|
8
8
|
dbos/_app_db.py,sha256=htblDPfqrpb_uZoFcvaud7cgQ-PDyn6Bn-cBidxdCTA,10603
|
|
9
9
|
dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
|
|
10
|
-
dbos/_client.py,sha256=
|
|
10
|
+
dbos/_client.py,sha256=6ReC_VF1JhscxtMjmjwJH_X7HV0L9Zoj_OiYhs4el40,15517
|
|
11
11
|
dbos/_conductor/conductor.py,sha256=3E_hL3c9g9yWqKZkvI6KA0-ZzPMPRo06TOzT1esMiek,24114
|
|
12
12
|
dbos/_conductor/protocol.py,sha256=q3rgLxINFtWFigdOONc-4gX4vn66UmMlJQD6Kj8LnL4,7420
|
|
13
|
-
dbos/_context.py,sha256=
|
|
13
|
+
dbos/_context.py,sha256=0vFtLAk3WF5BQYIYNFImDRBppKO2CTKOSy51zQC-Cu8,25723
|
|
14
14
|
dbos/_core.py,sha256=kRY2PXVryfpwjbOCmgzPA_-qNsFmRMLi-CxYCnyp1V8,49495
|
|
15
15
|
dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
|
|
16
|
-
dbos/_dbos.py,sha256=
|
|
17
|
-
dbos/_dbos_config.py,sha256=
|
|
16
|
+
dbos/_dbos.py,sha256=bVKff1pUa8LeUEi53FFWMIC008qxM_RLLtfdMmz4vFA,52035
|
|
17
|
+
dbos/_dbos_config.py,sha256=TWIbGCWl_8o3l0Y2IzrL1q9mTYl_vVeZDjYJMDXCPVU,21676
|
|
18
18
|
dbos/_debug.py,sha256=99j2SChWmCPAlZoDmjsJGe77tpU2LEa8E2TtLAnnh7o,1831
|
|
19
19
|
dbos/_docker_pg_helper.py,sha256=tLJXWqZ4S-ExcaPnxg_i6cVxL6ZxrYlZjaGsklY-s2I,6115
|
|
20
|
-
dbos/_error.py,sha256=
|
|
20
|
+
dbos/_error.py,sha256=MAHBjo2MLoaHBtRL1pOPNKqAM3IdNPPV11n7-meSF54,8580
|
|
21
21
|
dbos/_event_loop.py,sha256=cvaFN9-II3MsHEOq8QoICc_8qSKrjikMlLfuhC3Y8Dk,2923
|
|
22
22
|
dbos/_fastapi.py,sha256=T7YlVY77ASqyTqq0aAPclZ9YzlXdGTT0lEYSwSgt1EE,3151
|
|
23
23
|
dbos/_flask.py,sha256=Npnakt-a3W5OykONFRkDRnumaDhTQmA0NPdUCGRYKXE,1652
|
|
@@ -49,7 +49,7 @@ dbos/_schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
49
49
|
dbos/_schemas/application_database.py,sha256=SypAS9l9EsaBHFn9FR8jmnqt01M74d9AF1AMa4m2hhI,1040
|
|
50
50
|
dbos/_schemas/system_database.py,sha256=rbFKggONdvvbb45InvGz0TM6a7c-Ux9dcaL-h_7Z7pU,4438
|
|
51
51
|
dbos/_serialization.py,sha256=bWuwhXSQcGmiazvhJHA5gwhrRWxtmFmcCFQSDJnqqkU,3666
|
|
52
|
-
dbos/_sys_db.py,sha256=
|
|
52
|
+
dbos/_sys_db.py,sha256=XcDXqr9kQo_EcprawANLxUkn1MLXNV8iPpTOsA5Wgx0,81200
|
|
53
53
|
dbos/_templates/dbos-db-starter/README.md,sha256=GhxhBj42wjTt1fWEtwNriHbJuKb66Vzu89G4pxNHw2g,930
|
|
54
54
|
dbos/_templates/dbos-db-starter/__package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
55
55
|
dbos/_templates/dbos-db-starter/__package/main.py.dbos,sha256=aQnBPSSQpkB8ERfhf7gB7P9tsU6OPKhZscfeh0yiaD8,2702
|
|
@@ -65,8 +65,8 @@ dbos/_utils.py,sha256=uywq1QrjMwy17btjxW4bES49povlQwYwYbvKwMT6C2U,1575
|
|
|
65
65
|
dbos/_workflow_commands.py,sha256=EmmAaQfRWeOZm_WPTznuU-O3he3jiSzzT9VpYrhxugE,4835
|
|
66
66
|
dbos/cli/_github_init.py,sha256=Y_bDF9gfO2jB1id4FV5h1oIxEJRWyqVjhb7bNEa5nQ0,3224
|
|
67
67
|
dbos/cli/_template_init.py,sha256=7JBcpMqP1r2mfCnvWatu33z8ctEGHJarlZYKgB83cXE,2972
|
|
68
|
-
dbos/cli/cli.py,sha256=
|
|
68
|
+
dbos/cli/cli.py,sha256=Nez2c5Z61jBUcvgglSiy7FZoXhxR_EaVfQWDyLLi7IQ,22094
|
|
69
69
|
dbos/dbos-config.schema.json,sha256=CjaspeYmOkx6Ip_pcxtmfXJTn_YGdSx_0pcPBF7KZmo,6060
|
|
70
70
|
dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
|
|
71
71
|
version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
|
|
72
|
-
dbos-1.8.
|
|
72
|
+
dbos-1.8.0a5.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|