dbos 1.15.0a3__py3-none-any.whl → 1.15.0a5__py3-none-any.whl

dbos/_admin_server.py

@@ -244,7 +244,7 @@ class AdminRequestHandler(BaseHTTPRequestHandler):
     def _handle_restart(self, workflow_id: str) -> None:
         try:
             print(f"Restarting workflow {workflow_id}")
-            handle = self.dbos.restart_workflow(workflow_id)
+            handle = self.dbos.fork_workflow(workflow_id, 1)
             response_body = json.dumps(
                 {
                     "workflow_id": handle.workflow_id,

dbos/_client.py

@@ -124,7 +124,6 @@ class DBOSClient:
         system_database_url: Optional[str] = None,
         application_database_url: Optional[str] = None,
         dbos_system_schema: Optional[str] = "dbos",
-        system_database: Optional[str] = None,  # DEPRECATED
     ):
         application_database_url = (
             database_url if database_url else application_database_url
@@ -133,7 +132,6 @@ class DBOSClient:
             {
                 "system_database_url": system_database_url,
                 "database_url": application_database_url,
-                "database": {"sys_db_name": system_database},
             }
         )
         assert is_valid_database_url(system_database_url)

dbos/_dbos.py

@@ -1029,16 +1029,6 @@ class DBOS:
         await asyncio.to_thread(cls.resume_workflow, workflow_id)
         return await cls.retrieve_workflow_async(workflow_id)
 
-    @classmethod
-    def restart_workflow(cls, workflow_id: str) -> WorkflowHandle[Any]:
-        """Restart a workflow with a new workflow ID"""
-        return cls.fork_workflow(workflow_id, 1)
-
-    @classmethod
-    async def restart_workflow_async(cls, workflow_id: str) -> WorkflowHandleAsync[Any]:
-        """Restart a workflow with a new workflow ID"""
-        return await cls.fork_workflow_async(workflow_id, 1)
-
     @classmethod
     def fork_workflow(
         cls,
@@ -1232,6 +1222,10 @@ class DBOS:
     async def list_workflow_steps_async(cls, workflow_id: str) -> List[StepInfo]:
         await cls._configure_asyncio_thread_pool()
         return await asyncio.to_thread(cls.list_workflow_steps, workflow_id)
+    
+    @classproperty
+    def application_version(cls) -> str:
+        return GlobalParams.app_version
 
     @classproperty
     def logger(cls) -> Logger:
@@ -1274,20 +1268,6 @@ class DBOS:
         else:
             return None
 
-    @classproperty
-    def parent_workflow_id(cls) -> str:
-        """
-        This method is deprecated and should not be used.
-        """
-        dbos_logger.warning(
-            "DBOS.parent_workflow_id is deprecated and should not be used"
-        )
-        ctx = assert_current_dbos_context()
-        assert (
-            ctx.is_within_workflow()
-        ), "parent_workflow_id is only available within a workflow."
-        return ctx.parent_workflow_id
-
     @classproperty
     def span(cls) -> "Span":
         """Return the tracing `Span` associated with the current context."""

dbos/_dbos_config.py

@@ -22,7 +22,6 @@ class DBOSConfig(TypedDict, total=False):
         system_database_url (str): Connection string for the DBOS system database. Defaults to sqlite:///{name} if not provided.
         application_database_url (str): Connection string for the DBOS application database, in which DBOS @Transaction functions run. Optional. Should be the same type of database (SQLite or Postgres) as the system database.
         database_url (str): (DEPRECATED) Database connection string
-        sys_db_name (str): (DEPRECATED) System database name
         sys_db_pool_size (int): System database pool size
         db_engine_kwargs (Dict[str, Any]): SQLAlchemy engine kwargs (See https://docs.sqlalchemy.org/en/20/core/engines.html#sqlalchemy.create_engine)
         log_level (str): Log level
@@ -41,7 +40,6 @@ class DBOSConfig(TypedDict, total=False):
     system_database_url: Optional[str]
     application_database_url: Optional[str]
     database_url: Optional[str]
-    sys_db_name: Optional[str]
     sys_db_pool_size: Optional[int]
     db_engine_kwargs: Optional[Dict[str, Any]]
     log_level: Optional[str]
@@ -74,14 +72,10 @@ class DatabaseConfig(TypedDict, total=False):
         dbos_system_schema (str): Schema name for DBOS system tables. Defaults to "dbos".
     """
 
-    sys_db_name: Optional[str]
-    sys_db_pool_size: Optional[
-        int
-    ]  # For internal use, will be removed in a future version
+    sys_db_pool_size: Optional[int]
     db_engine_kwargs: Optional[Dict[str, Any]]
     sys_db_engine_kwargs: Optional[Dict[str, Any]]
     migrate: Optional[List[str]]
-    rollback: Optional[List[str]]  # Will be removed in a future version
 
 
 class OTLPExporterConfig(TypedDict, total=False):
@@ -139,8 +133,6 @@ def translate_dbos_config_to_config_file(config: DBOSConfig) -> ConfigFile:
 
     # Database config
     db_config: DatabaseConfig = {}
-    if "sys_db_name" in config:
-        db_config["sys_db_name"] = config.get("sys_db_name")
     if "sys_db_pool_size" in config:
         db_config["sys_db_pool_size"] = config.get("sys_db_pool_size")
     if "db_engine_kwargs" in config:
@@ -409,10 +401,7 @@ def process_config(
         else:
             url = make_url(data["database_url"])
             assert url.database
-            if data["database"].get("sys_db_name"):
-                url = url.set(database=data["database"]["sys_db_name"])
-            else:
-                url = url.set(database=f"{url.database}{SystemSchema.sysdb_suffix}")
+            url = url.set(database=f"{url.database}{SystemSchema.sysdb_suffix}")
             data["system_database_url"] = url.render_as_string(hide_password=False)
 
     # If a system database URL is provided but not an application database URL,
@@ -617,11 +606,8 @@ def get_system_database_url(config: ConfigFile) -> str:
         if config["database_url"].startswith("sqlite"):
             return config["database_url"]
         app_db_url = make_url(config["database_url"])
-        if config.get("database") and config["database"].get("sys_db_name") is not None:
-            sys_db_name = config["database"]["sys_db_name"]
-        else:
-            assert app_db_url.database is not None
-            sys_db_name = app_db_url.database + SystemSchema.sysdb_suffix
+        assert app_db_url.database is not None
+        sys_db_name = app_db_url.database + SystemSchema.sysdb_suffix
         return app_db_url.set(database=sys_db_name).render_as_string(
             hide_password=False
         )

dbos/_debouncer.py

@@ -89,11 +89,13 @@ def debouncer_workflow(
     # Every time the debounced workflow is called, a message is sent to this workflow.
     # It waits until debounce_period_sec have passed since the last message or until
     # debounce_timeout_sec has elapsed.
-    debounce_deadline_epoch_sec = (
-        time.time() + options["debounce_timeout_sec"]
-        if options["debounce_timeout_sec"]
-        else math.inf
-    )
+    def get_debounce_deadline_epoch_sec() -> float:
+        return (
+            time.time() + options["debounce_timeout_sec"]
+            if options["debounce_timeout_sec"]
+            else math.inf
+        )
+    debounce_deadline_epoch_sec = dbos._sys_db.call_function_as_step(get_debounce_deadline_epoch_sec, "get_debounce_deadline_epoch_sec")
     debounce_period_sec = initial_debounce_period_sec
     while time.time() < debounce_deadline_epoch_sec:
         time_until_deadline = max(debounce_deadline_epoch_sec - time.time(), 0)

dbos/_queue.py

@@ -61,7 +61,7 @@ class Queue:
 
         registry = _get_or_create_dbos_registry()
         if self.name in registry.queue_info_map and self.name != INTERNAL_QUEUE_NAME:
-            dbos_logger.warning(f"Queue {name} has already been declared")
+            raise Exception(f"Queue {name} has already been declared")
         registry.queue_info_map[self.name] = self
 
     def enqueue(
@@ -75,7 +75,7 @@ class Queue:
             and context.priority is not None
             and not self.priority_enabled
         ):
-            dbos_logger.warning(
+            raise Exception(
                 f"Priority is not enabled for queue {self.name}. Setting priority will not have any effect."
             )
 

dbos/cli/cli.py

@@ -681,48 +681,6 @@ def resume(
     client.resume_workflow(workflow_id=workflow_id)
 
 
-@workflow.command(
-    help="[DEPRECATED - Use fork instead] Restart a workflow from the beginning with a new id"
-)
-def restart(
-    workflow_id: Annotated[str, typer.Argument()],
-    application_database_url: Annotated[
-        typing.Optional[str],
-        typer.Option(
-            "--db-url",
-            "-D",
-            help="Your DBOS application database URL",
-        ),
-    ] = None,
-    system_database_url: Annotated[
-        typing.Optional[str],
-        typer.Option(
-            "--sys-db-url",
-            "-s",
-            help="Your DBOS system database URL",
-        ),
-    ] = None,
-    schema: Annotated[
-        typing.Optional[str],
-        typer.Option(
-            "--schema",
-            help='Schema name for DBOS system tables. Defaults to "dbos".',
-        ),
-    ] = "dbos",
-) -> None:
-    system_database_url, application_database_url = _get_db_url(
-        system_database_url=system_database_url,
-        application_database_url=application_database_url,
-    )
-    client = DBOSClient(
-        application_database_url=application_database_url,
-        system_database_url=system_database_url,
-        dbos_system_schema=schema,
-    )
-    status = client.fork_workflow(workflow_id=workflow_id, start_step=1).get_status()
-    print(json.dumps(status.__dict__, cls=DefaultEncoder))
-
-
 @workflow.command(
     help="fork a workflow from the beginning with a new id and from a step"
 )

dbos/dbos-config.schema.json

@@ -27,99 +27,14 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "hostname": {
-            "type": ["string", "null"],
-            "description": "The hostname or IP address of the application database. DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
-          "port": {
-            "type": ["number", "null"],
-            "description": "The port number of the application database. DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
-          "username": {
-            "type": ["string", "null"],
-            "description": "The username to use when connecting to the application database. DEPRECATED: Use database_url instead",
-            "not": {
-              "enum": ["dbos"]
-            },
-            "deprecated": true
-          },
-          "password": {
-            "type": ["string", "null"],
-            "description": "The password to use when connecting to the application database. Developers are strongly encouraged to use environment variable substitution (${VAR_NAME}) or Docker secrets (${DOCKER_SECRET:SECRET_NAME}) to avoid storing secrets in source. DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
-          "connectionTimeoutMillis": {
-            "type": ["number", "null"],
-            "description": "The number of milliseconds the system waits before timing out when connecting to the application database. DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
           "app_db_name": {
             "type": ["string", "null"],
-            "description": "The name of the application database. DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
-          "sys_db_name": {
-            "type": "string",
-            "description": "The name of the system database"
-          },
-          "ssl": {
-            "type": ["boolean", "null"],
-            "description": "Use SSL/TLS to securely connect to the database (default: true). DEPRECATED: Use database_url instead",
-            "deprecated": true
-          },
-          "ssl_ca": {
-            "type": ["string", "null"],
-            "description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file. DEPRECATED: Use database_url instead",
+            "description": "The name of the application database in DBOS Cloud",
             "deprecated": true
           },
           "migrate": {
             "type": "array",
-            "description": "Specify a list of user DB migration commands to run"
-          },
-          "rollback": {
-            "type": "array",
-            "description": "Specify a list of user DB rollback commands to run. DEPRECATED",
-            "deprecated": true
-          }
-        }
-      },
-      "telemetry": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "logs": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "addContextMetadata": {
-                "type": "boolean",
-                "description": "Adds contextual information, such as workflow UUID, to each log entry"
-              },
-              "logLevel": {
-                "type": "string",
-                "description": "A filter on what logs should be printed to the standard output"
-              },
-              "silent": {
-                "type": "boolean",
-                "description": "Silences the logger such that nothing is printed to the standard output"
-              }
-            }
-          },
-          "OTLPExporter": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "logsEndpoint": {
-                "type": "string",
-                "description": "The URL of an OTLP collector to which to export logs"
-              },
-              "tracesEndpoint": {
-                "type": "string",
-                "description": "The URL of an OTLP collector to which to export traces"
-              }
-            }
+            "description": "Specify a list of user database migration commands to run in DBOS Cloud"
           }
         }
       },
@@ -127,56 +42,20 @@
         "type": "object",
         "additionalProperties": false,
         "properties": {
-          "entrypoints": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "port": {
-            "type": "number"
-          },
           "start": {
             "type": "array",
-            "description": "Specify commands to run to start your application (Python only)"
+            "description": "Specify commands to run to start your application in DBOS Cloud"
           },
           "setup": {
             "type": "array",
             "items": {
               "type": "string"
             },
-            "description": "Commands to setup the application execution environment"
-          },
-          "admin_port": {
-            "type": "number",
-            "description": "The port number of the admin server (Default: 3001)"
+            "description": "Commands to setup the application execution environment in DBOS Cloud"
           }
         }
       },
-      "http": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "cors_middleware": {
-            "type": "boolean"
-          },
-          "credentials": {
-            "type": "boolean"
-          },
-          "allowed_origins": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        }
-      },
-      "application": {},
-      "env": {},
-      "version": {
-        "type": "string",
-        "deprecated": true
-      }
+      "env": {}
     }
   }
   

{dbos-1.15.0a3.dist-info → dbos-1.15.0a5.dist-info}/METADATA

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

{dbos-1.15.0a3.dist-info → dbos-1.15.0a5.dist-info}/RECORD

@@ -1,21 +1,21 @@
-dbos-1.15.0a3.dist-info/METADATA,sha256=Ft-tggTIl0dxVo3Byd4BKytIRVdvegchZIKPnrcnq0w,13021
-dbos-1.15.0a3.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-dbos-1.15.0a3.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-1.15.0a3.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-1.15.0a5.dist-info/METADATA,sha256=ySISelF_uzHOl3jJk5bLWR6-58WI00Ys5TdK9cEhiFk,13021
+dbos-1.15.0a5.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+dbos-1.15.0a5.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-1.15.0a5.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=pT4BuNLDCrIQX27vQG8NlfxX6PZRU7r9miq4thJTszU,982
 dbos/__main__.py,sha256=G7Exn-MhGrVJVDbgNlpzhfh8WMX_72t3_oJaFT9Lmt8,653
-dbos/_admin_server.py,sha256=e8ELhcDWqR3_PNobnNgUvLGh5lzZq0yFSF6dvtzoQRI,16267
+dbos/_admin_server.py,sha256=hubQJw5T8zGKCPNS6FQTXy8jQ8GTJxoYQaDTMlICl9k,16267
 dbos/_app_db.py,sha256=WJwUdKsTpSZPCIWVeSF5FQNf5y1PF_lJ96tiaCjvck8,16385
 dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
-dbos/_client.py,sha256=Rp1OiT5523QosHB8Qy0xe9eWNx9osZGhfQknO122hj8,18928
+dbos/_client.py,sha256=1M2PhMNodw7Cnfrs3D0_NbwY0VnDoA1OnAOkBnLzTGg,18805
 dbos/_conductor/conductor.py,sha256=3E_hL3c9g9yWqKZkvI6KA0-ZzPMPRo06TOzT1esMiek,24114
 dbos/_conductor/protocol.py,sha256=q3rgLxINFtWFigdOONc-4gX4vn66UmMlJQD6Kj8LnL4,7420
 dbos/_context.py,sha256=cJDxVbswTLXKE5MV4Hmg6gpIX3Dd5mBTG-4lmofWP9E,27668
 dbos/_core.py,sha256=13DNN_fpSIs42NquV80XsHV7yKwY_adKP03h_xhXok4,50493
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
-dbos/_dbos.py,sha256=ReujpyRseUNL_9FQN-uIhSFh6HJnAA2IAcVy6qDdEco,58036
-dbos/_dbos_config.py,sha256=pnFeWZFDsk_94DWDCqm3e-ppTrqBFKQQdD5TvQGZ8-Y,25963
-dbos/_debouncer.py,sha256=VmGq1_ZIQ79fnH14LEhdoqxKWp6rlEwzsUwumwAMgTQ,15095
+dbos/_dbos.py,sha256=wT4POKmTKwPYrapMiV7EhfWicFdT9qVOiw3bujcE0Lg,57261
+dbos/_dbos_config.py,sha256=ha0Qo4kRCCi1dQZZzm1e24iMqR2Zty9LejcLxUbzlUg,25286
+dbos/_debouncer.py,sha256=9-9dlXKLRHSUSylprCw18r-7MAdFwD8-w0KkY-bEG_I,15281
 dbos/_debug.py,sha256=0MfgNqutCUhI4PEmmra9x7f3DiFE_0nscfUCHdLimEY,1415
 dbos/_docker_pg_helper.py,sha256=xySum4hTA8TVMBODoG19u4cXQAB1vCock-jwM2pnmSI,7791
 dbos/_error.py,sha256=GwO0Ng4d4iB52brY09-Ss6Cz_V28Xc0D0cRCzZ6XmNM,8688
@@ -27,7 +27,7 @@ dbos/_kafka_message.py,sha256=NYvOXNG3Qn7bghn1pv3fg4Pbs86ILZGcK4IB-MLUNu0,409
 dbos/_logger.py,sha256=djnCp147QoQ1iG9Bt3Uz8RyGaXGmi6gebccXsrA6Cps,4660
 dbos/_migration.py,sha256=VAQxZXWQISifW0JpIG78lowV1MTBJ5ZC4P0YIwqxQhM,10013
 dbos/_outcome.py,sha256=7HvosMfEHTh1U5P6xok7kFTGLwa2lPaul0YApb3UnN4,8191
-dbos/_queue.py,sha256=0kJTPwXy3nZ4Epzt-lHky9M9S4L31645drPGFR8fIJY,4854
+dbos/_queue.py,sha256=cgFFwVPUeQtrTgk7ivoTZb0v9ya8rZK4m7-G-h5gIb4,4846
 dbos/_recovery.py,sha256=K-wlFhdf4yGRm6cUzyhcTjQUS0xp2T5rdNMLiiBErYg,2882
 dbos/_registrations.py,sha256=bEOntObnWaBylnebr5ZpcX2hk7OVLDd1z4BvW4_y3zA,7380
 dbos/_roles.py,sha256=kCuhhg8XLtrHCgKgm44I0abIRTGHltf88OwjEKAUggk,2317
@@ -51,9 +51,9 @@ dbos/_utils.py,sha256=ZdoM1MDbHnlJrh31zfhp3iX62bAxK1kyvMwXnltC_84,1779
 dbos/_workflow_commands.py,sha256=k-i1bCfNrux43BHLT8wQ-l-MVZX3D6LGZLH7-uuiDRo,4951
 dbos/cli/_github_init.py,sha256=R_94Fnn40CAmPy-zM00lwHi0ndyfv57TmIooADjmag4,3378
 dbos/cli/_template_init.py,sha256=AltKk256VocgvxLpuTxpjJyACrdHFjbGoqYhHzeLae4,2649
-dbos/cli/cli.py,sha256=K8Fz05qach61EMuv5reUMRgT-UltysGZ4XerOTR4KEg,29003
+dbos/cli/cli.py,sha256=s-gGQvHvVPeQp68raQElGnbBlSCv69JZ3HNFj5Qt2bs,27686
 dbos/cli/migration.py,sha256=1Y52EMc2rX7PJgJa3_KXV7oiQEO569k7aHXRofwYipo,3608
-dbos/dbos-config.schema.json,sha256=LyUT1DOTaAwOP6suxQGS5KemVIqXGPyu_q7Hbo0neA8,6192
+dbos/dbos-config.schema.json,sha256=47wofTZ5jlFynec7bG0L369tAXbRQQ2euBxBXvg4m9c,1730
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-1.15.0a3.dist-info/RECORD,,
+dbos-1.15.0a5.dist-info/RECORD,,