fixes after merge, lint

Signed-off-by: Filinto Duran <[email protected]>

Author: filintod

durabletask/aio/driver.py

@@ -160,6 +160,9 @@ def driver_gen() -> Generator[task.Task[Any], Any, Any]:
             except StopIteration as stop:
                 return stop.value
             except Exception as e:
+                # Re-raise NonRetryableError directly to preserve its type for the runtime
+                if isinstance(e, task.NonRetryableError):
+                    raise
                 raise AsyncWorkflowError(
                     f"Workflow failed during initialization: {e}",
                     workflow_name=self._workflow_name,
@@ -199,6 +202,15 @@ def _one_shot() -> Generator[task.Task[Any], Any, Any]:
                     except StopIteration as stop:
                         return stop.value
                     except Exception as e:
+                        # Check if this is a TaskFailedError wrapping a NonRetryableError
+                        if isinstance(e, task.TaskFailedError):
+                            details = e.details
+                            if details.error_type == "NonRetryableError":
+                                # Reconstruct NonRetryableError to preserve its type for the runtime
+                                raise task.NonRetryableError(details.message) from e
+                        # Re-raise NonRetryableError directly to preserve its type for the runtime
+                        if isinstance(e, task.NonRetryableError):
+                            raise
                         raise AsyncWorkflowError(
                             f"Workflow failed: {e}",
                             workflow_name=self._workflow_name,
@@ -231,6 +243,15 @@ def _one_shot() -> Generator[task.Task[Any], Any, Any]:
                         except StopIteration as stop:
                             return stop.value
                         except Exception as workflow_exc:
+                            # Check if this is a TaskFailedError wrapping a NonRetryableError
+                            if isinstance(workflow_exc, task.TaskFailedError):
+                                details = workflow_exc.details
+                                if details.error_type == "NonRetryableError":
+                                    # Reconstruct NonRetryableError to preserve its type for the runtime
+                                    raise task.NonRetryableError(details.message) from workflow_exc
+                            # Re-raise NonRetryableError directly to preserve its type for the runtime
+                            if isinstance(workflow_exc, task.NonRetryableError):
+                                raise
                             raise AsyncWorkflowError(
                                 f"Workflow failed: {workflow_exc}",
                                 workflow_name=self._workflow_name,
@@ -247,6 +268,15 @@ def _one_shot() -> Generator[task.Task[Any], Any, Any]:
                         except StopIteration as stop:
                             return stop.value
                         except Exception as workflow_exc:
+                            # Check if this is a TaskFailedError wrapping a NonRetryableError
+                            if isinstance(workflow_exc, task.TaskFailedError):
+                                details = workflow_exc.details
+                                if details.error_type == "NonRetryableError":
+                                    # Reconstruct NonRetryableError to preserve its type for the runtime
+                                    raise task.NonRetryableError(details.message) from workflow_exc
+                            # Re-raise NonRetryableError directly to preserve its type for the runtime
+                            if isinstance(workflow_exc, task.NonRetryableError):
+                                raise
                             raise AsyncWorkflowError(
                                 f"Workflow failed: {workflow_exc}",
                                 workflow_name=self._workflow_name,
@@ -277,6 +307,15 @@ def _one_shot() -> Generator[task.Task[Any], Any, Any]:
                     except StopIteration as stop:
                         return stop.value
                     except Exception as e:
+                        # Check if this is a TaskFailedError wrapping a NonRetryableError
+                        if isinstance(e, task.TaskFailedError):
+                            details = e.details
+                            if details.error_type == "NonRetryableError":
+                                # Reconstruct NonRetryableError to preserve its type for the runtime
+                                raise task.NonRetryableError(details.message) from e
+                        # Re-raise NonRetryableError directly to preserve its type for the runtime
+                        if isinstance(e, task.NonRetryableError):
+                            raise
                         raise AsyncWorkflowError(
                             f"Workflow failed: {e}",
                             workflow_name=self._workflow_name,

durabletask/aio/sandbox.py

@@ -406,7 +406,7 @@ def __await__(self) -> Any:
                 base = getattr(self.async_ctx, "_base_ctx", None)
                 now_dt = getattr(base, "current_utc_datetime", None) if base is not None else None
         if now_dt is None:
-            now_dt = _datetime.datetime.utcfromtimestamp(0)
+            now_dt = _datetime.datetime.fromtimestamp(0, _datetime.timezone.utc)
         rng = deterministic_random(iid or "", now_dt)
         # Mark as deterministic so the detector can whitelist bound method calls
         try:

tests/README.md

@@ -59,16 +59,16 @@ dapr init
 # Start Dapr sidecar for testing
 dapr run \
   --app-id durabletask-test \
-  --dapr-grpc-port 50001 \
+  --dapr-grpc-port 4001 \
   --dapr-http-port 3500 \
   --log-level debug \
-  --components-path ./dapr-components \
+  --resources-path ./examples/components \
   -- sleep 3600
 
 # Alternative: Minimal setup without components
 dapr run \
   --app-id durabletask-test \
-  --dapr-grpc-port 50001 \
+  --dapr-grpc-port 4001 \
   --log-level debug \
   -- sleep 3600
 ```
@@ -105,7 +105,7 @@ docker run --rm -d \
   daprio/daprd:latest \
   ./daprd \
   --app-id durabletask-test \
-  --dapr-grpc-port 50001 \
+  --dapr-grpc-port 4001 \
   --dapr-http-port 3500 \
   --log-level debug
 ```

tests/aio/test_sandbox.py

@@ -1622,7 +1622,7 @@ async def test_workflow_calls_datetime_functions(self):
 
         async def workflow_with_datetime(ctx):
             now = datetime.datetime.now()
-            utcnow = datetime.datetime.utcnow()
+            utcnow = datetime.datetime.now(datetime.timezone.utc)
             now_tz = datetime.datetime.now(datetime.timezone.utc)
             return [now, utcnow, now_tz]
 
@@ -1666,7 +1666,7 @@ async def workflow_comprehensive(ctx):
 
             # Test datetime
             results["now"] = datetime.datetime.now()
-            results["utcnow"] = datetime.datetime.utcnow()
+            results["utcnow"] = datetime.datetime.now(datetime.timezone.utc)
             results["now_tz"] = datetime.datetime.now(datetime.timezone.utc)
 
             return results