Fix more type errors (#977)

* Fix type errors

* Do not make drive-by check for other type errors

Author: dandavison

pyproject.toml

@@ -165,6 +165,7 @@ reportAny = "none"
 reportCallInDefaultInitializer = "none"
 reportExplicitAny = "none"
 reportIgnoreCommentWithoutRule = "none"
+reportImplicitAbstractClass = "none"
 reportImplicitOverride = "none"
 reportImplicitStringConcatenation = "none"
 reportImportCycles = "none"
@@ -184,11 +185,6 @@ exclude = [
   "temporalio/bridge/proto",
   "tests/worker/workflow_sandbox/testmodules/proto",
   "temporalio/bridge/worker.py",
-  "temporalio/contrib/opentelemetry.py",
-  "temporalio/contrib/pydantic.py",
-  "temporalio/converter.py",
-  "temporalio/testing/_workflow.py",
-  "temporalio/worker/_activity.py",
   "temporalio/worker/_replayer.py",
   "temporalio/worker/_worker.py",
   "temporalio/worker/workflow_sandbox/_importer.py",
@@ -203,9 +199,7 @@ exclude = [
   "tests/contrib/pydantic/workflows.py",
   "tests/test_converter.py",
   "tests/test_service.py",
-  "tests/test_workflow.py",
   "tests/worker/test_activity.py",
-  "tests/worker/test_workflow.py",
   "tests/worker/workflow_sandbox/test_importer.py",
   "tests/worker/workflow_sandbox/test_restrictions.py",
   # TODO: these pass locally but fail in CI with

temporalio/client.py

@@ -2889,7 +2889,7 @@ def _from_raw_info(
         cls,
         info: temporalio.api.workflow.v1.WorkflowExecutionInfo,
         converter: temporalio.converter.DataConverter,
-        **additional_fields,
+        **additional_fields: Any,
     ) -> WorkflowExecution:
         return cls(
             close_time=info.close_time.ToDatetime().replace(tzinfo=timezone.utc)

temporalio/contrib/openai_agents/_heartbeat_decorator.py

@@ -10,7 +10,7 @@
 def _auto_heartbeater(fn: F) -> F:
     # Propagate type hints from the original callable.
     @wraps(fn)
-    async def wrapper(*args, **kwargs):
+    async def wrapper(*args: Any, **kwargs: Any) -> Any:
         heartbeat_timeout = activity.info().heartbeat_timeout
         heartbeat_task = None
         if heartbeat_timeout:

temporalio/contrib/openai_agents/_openai_runner.py

@@ -1,11 +1,9 @@
 from dataclasses import replace
-from datetime import timedelta
-from typing import Optional, Union
+from typing import Any, Union
 
 from agents import (
     Agent,
     RunConfig,
-    RunHooks,
     RunResult,
     RunResultStreaming,
     TContext,
@@ -14,10 +12,8 @@
 from agents.run import DEFAULT_AGENT_RUNNER, DEFAULT_MAX_TURNS, AgentRunner
 
 from temporalio import workflow
-from temporalio.common import Priority, RetryPolicy
 from temporalio.contrib.openai_agents._model_parameters import ModelActivityParameters
 from temporalio.contrib.openai_agents._temporal_model_stub import _TemporalModelStub
-from temporalio.workflow import ActivityCancellationType, VersioningIntent
 
 
 class TemporalOpenAIRunner(AgentRunner):
@@ -36,7 +32,7 @@ async def run(
         self,
         starting_agent: Agent[TContext],
         input: Union[str, list[TResponseInputItem]],
-        **kwargs,
+        **kwargs: Any,
     ) -> RunResult:
         """Run the agent in a Temporal workflow."""
         if not workflow.in_workflow():
@@ -82,7 +78,7 @@ def run_sync(
         self,
         starting_agent: Agent[TContext],
         input: Union[str, list[TResponseInputItem]],
-        **kwargs,
+        **kwargs: Any,
     ) -> RunResult:
         """Run the agent synchronously (not supported in Temporal workflows)."""
         if not workflow.in_workflow():
@@ -97,7 +93,7 @@ def run_streamed(
         self,
         starting_agent: Agent[TContext],
         input: Union[str, list[TResponseInputItem]],
-        **kwargs,
+        **kwargs: Any,
     ) -> RunResultStreaming:
         """Run the agent with streaming responses (not supported in Temporal workflows)."""
         if not workflow.in_workflow():

temporalio/contrib/openai_agents/_temporal_trace_provider.py

@@ -1,7 +1,8 @@
 """Provides support for integration with OpenAI Agents SDK tracing across workflows"""
 
 import uuid
-from typing import Any, Optional, Union, cast
+from types import TracebackType
+from typing import Any, Optional, cast
 
 from agents import SpanData, Trace, TracingProcessor
 from agents.tracing import (
@@ -184,6 +185,11 @@ def __enter__(self):
         """Enter the context of the Temporal trace provider."""
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(
+        self,
+        exc_type: type[BaseException],
+        exc_val: BaseException,
+        exc_tb: TracebackType,
+    ):
         """Exit the context of the Temporal trace provider."""
         self._multi_processor.shutdown()

temporalio/contrib/opentelemetry.py

@@ -71,7 +71,7 @@ class should return the workflow interceptor subclass from
     custom attributes desired.
     """
 
-    def __init__(
+    def __init__(  # type: ignore[reportMissingSuperCall]
         self,
         tracer: Optional[opentelemetry.trace.Tracer] = None,
         *,
@@ -125,11 +125,10 @@ def workflow_interceptor_class(
         :py:meth:`temporalio.worker.Interceptor.workflow_interceptor_class`.
         """
         # Set the externs needed
-        # TODO(cretz): MyPy works w/ spread kwargs instead of direct passing
         input.unsafe_extern_functions.update(
-            **_WorkflowExternFunctions(
-                __temporal_opentelemetry_completed_span=self._completed_workflow_span,
-            )
+            {
+                "__temporal_opentelemetry_completed_span": self._completed_workflow_span,
+            }
         )
         return TracingWorkflowInboundInterceptor
 

temporalio/converter.py

@@ -508,7 +508,7 @@ def default(self, o: Any) -> Any:
         if isinstance(o, datetime):
             return o.isoformat()
         # Dataclass support
-        if dataclasses.is_dataclass(o):
+        if dataclasses.is_dataclass(o) and not isinstance(o, type):
             return dataclasses.asdict(o)
         # Support for Pydantic v1's dict method
         dict_fn = getattr(o, "dict", None)
@@ -1701,7 +1701,7 @@ def value_to_type(
                     arg_type = type_args[i]
                 elif type_args[-1] is Ellipsis:
                     # Ellipsis means use the second to last one
-                    arg_type = type_args[-2]
+                    arg_type = type_args[-2]  # type: ignore
                 else:
                     raise TypeError(
                         f"Type {hint} only expecting {len(type_args)} values, got at least {i + 1}"

temporalio/nexus/_operation_context.py

@@ -178,7 +178,7 @@ class WorkflowRunOperationContext(StartOperationContext):
         This API is experimental and unstable.
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Initialize the workflow run operation context."""
         super().__init__(*args, **kwargs)
         self._temporal_context = _TemporalStartOperationContext.get()

temporalio/testing/_workflow.py

@@ -534,7 +534,7 @@ def assert_error_as_app_error(self) -> Iterator[None]:
 
 
 class _TimeSkippingClientInterceptor(temporalio.client.Interceptor):
-    def __init__(self, env: _EphemeralServerWorkflowEnvironment) -> None:
+    def __init__(self, env: _EphemeralServerWorkflowEnvironment) -> None:  # type: ignore[reportMissingSuperCall]
         self.env = env
 
     def intercept_client(
@@ -563,7 +563,7 @@ async def start_workflow(
 
 
 class _TimeSkippingWorkflowHandle(temporalio.client.WorkflowHandle):
-    env: _EphemeralServerWorkflowEnvironment
+    env: _EphemeralServerWorkflowEnvironment  # type: ignore[reportUninitializedInstanceAttribute]
 
     async def result(
         self,

temporalio/worker/_activity.py

@@ -14,32 +14,22 @@
 import threading
 import warnings
 from abc import ABC, abstractmethod
+from collections.abc import Iterator, Sequence
 from contextlib import contextmanager
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta, timezone
 from typing import (
     Any,
     Callable,
-    Dict,
-    Iterator,
     NoReturn,
     Optional,
-    Sequence,
-    Tuple,
-    Type,
     Union,
 )
 
 import google.protobuf.duration_pb2
 import google.protobuf.timestamp_pb2
 
 import temporalio.activity
-import temporalio.api.common.v1
-import temporalio.bridge.client
-import temporalio.bridge.proto
-import temporalio.bridge.proto.activity_result
-import temporalio.bridge.proto.activity_task
-import temporalio.bridge.proto.common
 import temporalio.bridge.runtime
 import temporalio.bridge.worker
 import temporalio.client
@@ -76,7 +66,7 @@ def __init__(
         self._task_queue = task_queue
         self._activity_executor = activity_executor
         self._shared_state_manager = shared_state_manager
-        self._running_activities: Dict[bytes, _RunningActivity] = {}
+        self._running_activities: dict[bytes, _RunningActivity] = {}
         self._data_converter = data_converter
         self._interceptors = interceptors
         self._metric_meter = metric_meter
@@ -90,7 +80,7 @@ def __init__(
         self._client = client
 
         # Validate and build activity dict
-        self._activities: Dict[str, temporalio.activity._Definition] = {}
+        self._activities: dict[str, temporalio.activity._Definition] = {}
         self._dynamic_activity: Optional[temporalio.activity._Definition] = None
         for activity in activities:
             # Get definition
@@ -180,7 +170,7 @@ async def raise_from_exception_queue() -> NoReturn:
                     self._handle_cancel_activity_task(task.task_token, task.cancel)
                 else:
                     raise RuntimeError(f"Unrecognized activity task: {task}")
-            except temporalio.bridge.worker.PollShutdownError:
+            except temporalio.bridge.worker.PollShutdownError:  # type: ignore[reportPrivateLocalImportUsage]
                 exception_task.cancel()
                 return
             except Exception as err:
@@ -197,12 +187,12 @@ async def drain_poll_queue(self) -> None:
             try:
                 # Just take all tasks and say we can't handle them
                 task = await self._bridge_worker().poll_activity_task()
-                completion = temporalio.bridge.proto.ActivityTaskCompletion(
+                completion = temporalio.bridge.proto.ActivityTaskCompletion(  # type: ignore[reportAttributeAccessIssue]
                     task_token=task.task_token
                 )
                 completion.result.failed.failure.message = "Worker shutting down"
                 await self._bridge_worker().complete_activity_task(completion)
-            except temporalio.bridge.worker.PollShutdownError:
+            except temporalio.bridge.worker.PollShutdownError:  # type: ignore[reportPrivateLocalImportUsage]
                 return
 
     # Only call this after run()/drain_poll_queue() have returned. This will not
@@ -216,7 +206,9 @@ async def wait_all_completed(self) -> None:
             await asyncio.gather(*running_tasks, return_exceptions=False)
 
     def _handle_cancel_activity_task(
-        self, task_token: bytes, cancel: temporalio.bridge.proto.activity_task.Cancel
+        self,
+        task_token: bytes,
+        cancel: temporalio.bridge.proto.activity_task.Cancel,  # type: ignore[reportAttributeAccessIssue]
     ) -> None:
         """Request cancellation of a running activity task."""
         activity = self._running_activities.get(task_token)
@@ -264,7 +256,9 @@ async def _heartbeat_async(
 
         # Perform the heartbeat
         try:
-            heartbeat = temporalio.bridge.proto.ActivityHeartbeat(task_token=task_token)
+            heartbeat = temporalio.bridge.proto.ActivityHeartbeat(  # type: ignore[reportAttributeAccessIssue]
+                task_token=task_token
+            )
             if details:
                 # Convert to core payloads
                 heartbeat.details.extend(await self._data_converter.encode(details))
@@ -286,7 +280,7 @@ async def _heartbeat_async(
     async def _handle_start_activity_task(
         self,
         task_token: bytes,
-        start: temporalio.bridge.proto.activity_task.Start,
+        start: temporalio.bridge.proto.activity_task.Start,  # type: ignore[reportAttributeAccessIssue]
         running_activity: _RunningActivity,
     ) -> None:
         """Handle a start activity task.
@@ -298,7 +292,7 @@ async def _handle_start_activity_task(
         # We choose to surround interceptor creation and activity invocation in
         # a try block so we can mark the workflow as failed on any error instead
         # of having error handling in the interceptor
-        completion = temporalio.bridge.proto.ActivityTaskCompletion(
+        completion = temporalio.bridge.proto.ActivityTaskCompletion(  # type: ignore[reportAttributeAccessIssue]
             task_token=task_token
         )
         try:
@@ -415,7 +409,7 @@ async def _handle_start_activity_task(
 
     async def _execute_activity(
         self,
-        start: temporalio.bridge.proto.activity_task.Start,
+        start: temporalio.bridge.proto.activity_task.Start,  # type: ignore[reportAttributeAccessIssue]
         running_activity: _RunningActivity,
         task_token: bytes,
     ) -> Any:
@@ -651,14 +645,14 @@ class _ThreadExceptionRaiser:
     def __init__(self) -> None:
         self._lock = threading.Lock()
         self._thread_id: Optional[int] = None
-        self._pending_exception: Optional[Type[Exception]] = None
+        self._pending_exception: Optional[type[Exception]] = None
         self._shield_depth = 0
 
     def set_thread_id(self, thread_id: int) -> None:
         with self._lock:
             self._thread_id = thread_id
 
-    def raise_in_thread(self, exc_type: Type[Exception]) -> None:
+    def raise_in_thread(self, exc_type: type[Exception]) -> None:
         with self._lock:
             self._pending_exception = exc_type
             self._raise_in_thread_if_pending_unlocked()
@@ -814,7 +808,7 @@ def _execute_sync_activity(
     cancelled_event: threading.Event,
     worker_shutdown_event: threading.Event,
     payload_converter_class_or_instance: Union[
-        Type[temporalio.converter.PayloadConverter],
+        type[temporalio.converter.PayloadConverter],
         temporalio.converter.PayloadConverter,
     ],
     runtime_metric_meter: Optional[temporalio.common.MetricMeter],
@@ -826,13 +820,10 @@ def _execute_sync_activity(
         thread_id = threading.current_thread().ident
         if thread_id is not None:
             cancel_thread_raiser.set_thread_id(thread_id)
-    heartbeat_fn: Callable[..., None]
     if isinstance(heartbeat, SharedHeartbeatSender):
-        # To make mypy happy
-        heartbeat_sender = heartbeat
-        heartbeat_fn = lambda *details: heartbeat_sender.send_heartbeat(
-            info.task_token, *details
-        )
+
+        def heartbeat_fn(*details: Any) -> None:
+            heartbeat.send_heartbeat(info.task_token, *details)
     else:
         heartbeat_fn = heartbeat
     temporalio.activity._Context.set(
@@ -942,11 +933,11 @@ def __init__(
         self._mgr = mgr
         self._queue_poller_executor = queue_poller_executor
         # 1000 in-flight heartbeats should be plenty
-        self._heartbeat_queue: queue.Queue[Tuple[bytes, Sequence[Any]]] = mgr.Queue(
+        self._heartbeat_queue: queue.Queue[tuple[bytes, Sequence[Any]]] = mgr.Queue(
             1000
         )
-        self._heartbeats: Dict[bytes, Callable[..., None]] = {}
-        self._heartbeat_completions: Dict[bytes, Callable] = {}
+        self._heartbeats: dict[bytes, Callable[..., None]] = {}
+        self._heartbeat_completions: dict[bytes, Callable] = {}
 
     def new_event(self) -> threading.Event:
         return self._mgr.Event()
@@ -1004,7 +995,7 @@ def _heartbeat_processor(self) -> None:
 
 class _MultiprocessingSharedHeartbeatSender(SharedHeartbeatSender):
     def __init__(
-        self, heartbeat_queue: queue.Queue[Tuple[bytes, Sequence[Any]]]
+        self, heartbeat_queue: queue.Queue[tuple[bytes, Sequence[Any]]]
     ) -> None:
         super().__init__()
         self._heartbeat_queue = heartbeat_queue