prefect 3.0.5.dev3__tar.gz → 3.0.5.dev4__tar.gz

{prefect-3.0.5.dev3/src/prefect.egg-info → prefect-3.0.5.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect
-Version: 3.0.5.dev3
+Version: 3.0.5.dev4
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/src/prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-04T16:36:47-0500",
+ "date": "2024-10-07T20:38:23-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "f8bcb64b01875e71c6ddaf67f48ded4ae8ae5b5c",
- "version": "3.0.5.dev3"
+ "full-revisionid": "6d084cce302aacb738354e5f27c6088dcc38c899",
+ "version": "3.0.5.dev4"
 }
 '''  # END VERSION_JSON
 

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/src/prefect/results.py

@@ -1155,7 +1155,7 @@ class BaseResult(BaseModel, abc.ABC, Generic[R]):
             try:
                 subcls = lookup_type(cls, dispatch_key=kwargs["type"])
             except KeyError as exc:
-                raise ValidationError(errors=[exc], model=cls)
+                raise ValueError(f"Invalid type: {kwargs['type']}") from exc
             return super().__new__(subcls)
         else:
             return super().__new__(cls)

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/src/prefect/settings.py

@@ -370,7 +370,16 @@ class ProfileSettingsTomlLoader(PydanticBaseSettingsSource):
     def _load_profile_settings(self) -> Dict[str, Any]:
         """Helper method to load the profile settings from the profiles.toml file"""
 
-        all_profile_data = toml.load(self.profiles_path)
+        if not self.profiles_path.exists():
+            return {}
+
+        try:
+            all_profile_data = toml.load(self.profiles_path)
+        except toml.TomlDecodeError:
+            warnings.warn(
+                f"Failed to load profiles from {self.profiles_path}. Please ensure the file is valid TOML."
+            )
+            return {}
 
         if (
             sys.argv[0].endswith("/prefect")

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/src/prefect/transactions.py

@@ -284,11 +284,14 @@ class Transaction(ContextModel):
         self.children.append(transaction)
 
     def get_parent(self) -> Optional["Transaction"]:
-        prev_var = getattr(self._token, "old_value")
-        if prev_var != Token.MISSING:
-            parent = prev_var
+        parent = None
+        if self._token:
+            prev_var = getattr(self._token, "old_value")
+            if prev_var != Token.MISSING:
+                parent = prev_var
         else:
-            parent = None
+            # `_token` has been reset so we need to get the active transaction from the context var
+            parent = self.get_active()
         return parent
 
     def commit(self) -> bool:

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4/src/prefect.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect
-Version: 3.0.5.dev3
+Version: 3.0.5.dev4
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/tests/test_settings.py

@@ -254,6 +254,23 @@ class TestSettingsClass:
             == "test"
         )
 
+    def test_loads_when_profile_path_does_not_exist(self, monkeypatch):
+        monkeypatch.setenv("PREFECT_PROFILES_PATH", str(Path.home() / "nonexistent"))
+        monkeypatch.delenv("PREFECT_TEST_MODE", raising=False)
+        monkeypatch.delenv("PREFECT_UNIT_TEST_MODE", raising=False)
+        assert Settings().test_setting == "FOO"
+
+    def test_loads_when_profile_path_is_not_a_toml_file(self, monkeypatch, tmp_path):
+        monkeypatch.setenv("PREFECT_PROFILES_PATH", str(tmp_path / "profiles.toml"))
+        monkeypatch.delenv("PREFECT_TEST_MODE", raising=False)
+        monkeypatch.delenv("PREFECT_UNIT_TEST_MODE", raising=False)
+
+        with open(tmp_path / "profiles.toml", "w") as f:
+            f.write("Ceci n'est pas un fichier toml")
+
+        with pytest.warns(UserWarning, match="Failed to load profiles from"):
+            assert Settings().test_setting == "FOO"
+
 
 class TestSettingAccess:
     def test_get_value_root_setting(self):

{prefect-3.0.5.dev3 → prefect-3.0.5.dev4}/tests/test_transactions.py

@@ -1,5 +1,6 @@
 import threading
 import uuid
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -85,6 +86,26 @@ class TestGetParent:
                 assert inner.get_parent() == outer
             assert outer.get_parent() is None
 
+    def test_get_parent_works_in_rollback_hook_after_success(self):
+        """
+        This is a regression test for https://github.com/PrefectHQ/prefect/issues/15593
+        """
+        spy = MagicMock()
+
+        def hook(txn):
+            spy(txn.get_parent())
+
+        try:
+            with Transaction() as outer:
+                with Transaction(key="inner_with_rollback") as inner_with_rollback:
+                    inner_with_rollback.stage("foo", on_rollback_hooks=[hook])
+                with Transaction(key="inner_trouble_maker"):
+                    raise ValueError("I'm acting out because I'm misunderstood.")
+        except ValueError:
+            pass
+
+        spy.assert_called_once_with(outer)
+
 
 class TestCommitMode:
     def test_txns_dont_auto_commit(self):