dbos 0.6.0a3__tar.gz → 0.6.0a4__tar.gz

{dbos-0.6.0a3 → dbos-0.6.0a4}/PKG-INFO

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

{dbos-0.6.0a3 → dbos-0.6.0a4}/dbos/dbos.py

@@ -714,6 +714,12 @@ class DBOS:
         ctx = assert_current_dbos_context()
         return ctx.authenticated_roles
 
+    @classproperty
+    def assumed_role(cls) -> Optional[str]:
+        """Return the role currently assumed by the authenticated user, if any, associated with the current context."""
+        ctx = assert_current_dbos_context()
+        return ctx.assumed_role
+
     @classmethod
     def set_authentication(
         cls, authenticated_user: Optional[str], authenticated_roles: Optional[List[str]]
@@ -800,13 +806,9 @@ class DBOSConfiguredInstance:
 
     """
 
-    def __init__(self, config_name: str, dbos: Optional[DBOS] = None) -> None:
+    def __init__(self, config_name: str) -> None:
         self.config_name = config_name
-        if dbos is not None:
-            assert isinstance(dbos, DBOS)
-            dbos._registry.register_instance(self)
-        else:
-            DBOS.register_instance(self)
+        DBOS.register_instance(self)
 
 
 # Apps that import DBOS probably don't exit.  If they do, let's see if

{dbos-0.6.0a3 → dbos-0.6.0a4}/dbos/dbos_config.py

@@ -2,7 +2,7 @@ import json
 import os
 import re
 from importlib import resources
-from typing import Dict, List, Optional, TypedDict
+from typing import Any, Dict, List, Optional, TypedDict
 
 import yaml
 from jsonschema import ValidationError, validate
@@ -69,6 +69,7 @@ class ConfigFile(TypedDict, total=False):
     database: DatabaseConfig
     telemetry: Optional[TelemetryConfig]
     env: Dict[str, str]
+    application: Dict[str, Any]
 
 
 def substitute_env_vars(content: str) -> str:

{dbos-0.6.0a3 → dbos-0.6.0a4}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.6.0a3"
+version = "0.6.0a4"
 
 [project.license]
 text = "MIT"

{dbos-0.6.0a3 → dbos-0.6.0a4}/tests/classdefs.py

@@ -61,7 +61,7 @@ class DBOSTestClass(DBOSConfiguredInstance):
     @DBOS.workflow()
     @DBOS.required_roles(["admin"])
     def test_func_admin(self, var: str) -> str:
-        assert assert_current_dbos_context().assumed_role == "admin"
+        assert DBOS.assumed_role == "admin"
         return self.config_name + ":" + var
 
 

{dbos-0.6.0a3 → dbos-0.6.0a4}/tests/test_classdecorators.py

@@ -49,7 +49,7 @@ def test_required_roles_class(dbos: DBOS) -> None:
     @DBOS.default_required_roles(["user"])
     class DBOSTestClassRR(DBOSConfiguredInstance):
         def __init__(self) -> None:
-            super().__init__("myconfig", dbos)
+            super().__init__("myconfig")
 
         @DBOS.workflow()
         def test_func_user(self, var: str) -> str:
@@ -279,7 +279,7 @@ def test_simple_workflow_inst(dbos: DBOS) -> None:
     @DBOS.dbos_class()
     class DBOSTestClassInst(DBOSConfiguredInstance):
         def __init__(self) -> None:
-            super().__init__("bob", dbos)
+            super().__init__("bob")
             self.txn_counter: int = 0
             self.wf_counter: int = 0
             self.step_counter: int = 0
@@ -327,7 +327,7 @@ def test_simple_workflow_inst(dbos: DBOS) -> None:
 def test_forgotten_decorator(dbos: DBOS) -> None:
     class DBOSTestRegErr(DBOSConfiguredInstance):
         def __init__(self) -> None:
-            super().__init__("bob", dbos)
+            super().__init__("bob")
             self.txn_counter: int = 0
             self.wf_counter: int = 0
             self.step_counter: int = 0
@@ -362,7 +362,7 @@ def test_duplicate_reg(dbos: DBOS) -> None:
     @DBOS.dbos_class()
     class DBOSTestRegDup(DBOSConfiguredInstance):
         def __init__(self) -> None:
-            super().__init__("bob", dbos)
+            super().__init__("bob")
 
     # Duplicate class registration
     with pytest.raises(Exception) as exc_info:
@@ -370,7 +370,7 @@ def test_duplicate_reg(dbos: DBOS) -> None:
         @DBOS.dbos_class()
         class DBOSTestRegDup(DBOSConfiguredInstance):  # type: ignore
             def __init__(self) -> None:
-                super().__init__("bob", dbos)
+                super().__init__("bob")
 
     assert "Duplicate type registration for class 'DBOSTestRegDup'" == str(
         exc_info.value
@@ -419,7 +419,7 @@ def test_inst_recovery(dbos: DBOS) -> None:
     @DBOS.dbos_class()
     class DBOSTestInstRec(DBOSConfiguredInstance):
         def __init__(self) -> None:
-            super().__init__("bob", dbos)
+            super().__init__("bob")
 
         @DBOS.workflow()
         def check_inst(self, arg1: str) -> str:

{dbos-0.6.0a3 → dbos-0.6.0a4}/tests/test_singleton.py

@@ -146,6 +146,12 @@ database:
 runtimeConfig:
   start:
     - python3 main.py
+application:
+  service_url: 'https://service.org'
+  service_config:
+    port: 80
+    user: "user"
+    password: "password"
 """
 
 
@@ -164,6 +170,12 @@ def test_config_before_singleton(cleanup_test_databases: None) -> None:
 
         x = DBOS.config.get("language")
         assert x == "python"
+        y = DBOS.config["language"]
+        assert y == "python"
+        url = DBOS.config["application"]["service_url"]
+        assert url == "https://service.org"
+        port = DBOS.config["application"]["service_config"]["port"]
+        assert port == 80
 
         # This is OK, it meant load_config anyway
         dbos: DBOS = DBOS()