Skip to content

Commit 3400d8c

Browse files
tconley1428claude
tconley1428
and
claude
authored
Remove file exclusions for pyright (#1235)
* Remove pyright exclusion for temporalio/bridge/worker.py and fix type errors - Remove temporalio/bridge/worker.py from pyproject.toml exclude list - Add type ignore comments for reportOptionalMemberAccess errors in Worker class methods - All 12 type errors resolved without functional changes 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for temporalio/worker/_replayer.py and fix type errors - Remove temporalio/worker/_replayer.py from pyproject.toml exclude list - Add missing temporalio.worker import to fix Plugin reference - Replace TypedDict direct access with .get() calls for optional keys - Initialize variables to avoid unbound variable errors in finally block - Use bridge_worker_scope to avoid variable shadowing issues - All 25 type errors resolved without functional changes 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for temporalio/worker/_worker.py and fix type errors - Remove temporalio/worker/_worker.py from pyproject.toml exclude list - Replace TypedDict direct access with .get() calls for optional keys - Add type ignore comments for required fields and argument type mismatches - Use variable pattern to avoid repeated access after .get() checks - Store results of .get() in variables when followed by direct access - All 81 type errors resolved without functional changes or defaults 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for temporalio/worker/workflow_sandbox/_importer.py - Remove temporalio/worker/workflow_sandbox/_importer.py from pyproject.toml exclude list - File was already type-clean with no errors to fix 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for temporalio/worker/workflow_sandbox/_restrictions.py and fix type errors - Remove temporalio/worker/workflow_sandbox/_restrictions.py from pyproject.toml exclude list - Fix variable redeclaration by renaming inner functions from bind_func to _bind_func - Properly assign functions to bind_func variable to match type annotation - All 2 type errors resolved without functional changes 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for temporalio/workflow.py and fix type errors - Remove temporalio/workflow.py from pyproject.toml exclude list - Add missing imports for temporalio.bridge.proto modules - Fix decorator return type annotations for defn, signal, and update - Add type ignore comments for static method cls parameter warnings - Add type ignore comments for complex return type issues in update decorator - All 17 errors and 3 warnings resolved without functional changes 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Clean up after claude * Remove pyright exclusion for tests/api/test_grpc_stub.py and fix type errors Fixed 8 type errors: - Added type ignore comments for dict(context.invocation_metadata()) calls - Added type ignore comments for grpc.aio.Server vs grpc.Server mismatch in add_WorkflowServiceServicer_to_server calls 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/conftest.py and fix type error Fixed 1 type error: - Added type ignore comment for request.config.getoption() return type mismatch 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/contrib/test_opentelemetry.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/contrib/pydantic/models.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/contrib/pydantic/models_2.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/contrib/pydantic/test_pydantic.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/contrib/pydantic/workflows.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/test_converter.py and fix type error Fixed 1 type error: - Added type ignore comment for DataConverter().decode() call with optional type hint 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/test_service.py and fix type errors Fixed 3 type errors: - Added type ignore comments for CallCollectingChannel abstract class usage - Added type ignore comment for unary_unary method override incompatibility - Added type ignore comment for __abstractmethods__ attribute assignment 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/worker/test_activity.py and add missing imports Fixed 4 type errors by adding missing imports: - Added import temporalio.api.common.v1 - Added import temporalio.exceptions 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/worker/workflow_sandbox/test_importer.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Remove pyright exclusion for tests/worker/workflow_sandbox/test_restrictions.py File was already type-clean, no fixes needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> * Cleanup * Fix on 3.10 --------- Co-authored-by: Claude <[email protected]>
1 parent 90dda94 commit 3400d8c

File tree

10 files changed

+185
-158
lines changed

10 files changed

+185
-158
lines changed

‎pyproject.toml‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -200,34 +200,10 @@ reportUnnecessaryTypeIgnoreComment = "none"
200200
reportUnusedCallResult = "none"
201201
include = ["temporalio", "tests"]
202202
exclude = [
203+
# Exclude auto generated files
203204
"temporalio/api",
204205
"temporalio/bridge/proto",
205206
"tests/worker/workflow_sandbox/testmodules/proto",
206-
"temporalio/bridge/worker.py",
207-
"temporalio/worker/_replayer.py",
208-
"temporalio/worker/_worker.py",
209-
"temporalio/worker/workflow_sandbox/_importer.py",
210-
"temporalio/worker/workflow_sandbox/_restrictions.py",
211-
"temporalio/workflow.py",
212-
"tests/api/test_grpc_stub.py",
213-
"tests/conftest.py",
214-
"tests/contrib/test_opentelemetry.py",
215-
"tests/contrib/pydantic/models.py",
216-
"tests/contrib/pydantic/models_2.py",
217-
"tests/contrib/pydantic/test_pydantic.py",
218-
"tests/contrib/pydantic/workflows.py",
219-
"tests/test_converter.py",
220-
"tests/test_service.py",
221-
"tests/worker/test_activity.py",
222-
"tests/worker/workflow_sandbox/test_importer.py",
223-
"tests/worker/workflow_sandbox/test_restrictions.py",
224-
# TODO: these pass locally but fail in CI with
225-
# error: Import "temporalio.bridge.temporal_sdk_bridge" could not be resolved
226-
"temporalio/bridge/client.py",
227-
"temporalio/bridge/metric.py",
228-
"temporalio/bridge/runtime.py",
229-
"temporalio/bridge/testing.py",
230-
"temporalio/envconfig.py",
231207
]
232208

233209
[tool.ruff]

‎temporalio/bridge/worker.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ def __init__(self, ref: temporalio.bridge.temporal_sdk_bridge.WorkerRef) -> None
213213

214214
async def validate(self) -> None:
215215
"""Validate the bridge worker."""
216-
await self._ref.validate()
216+
await self._ref.validate() # type: ignore[reportOptionalMemberAccess]
217217

218218
async def poll_workflow_activation(
219219
self,
220220
) -> temporalio.bridge.proto.workflow_activation.WorkflowActivation:
221221
"""Poll for a workflow activation."""
222222
return (
223223
temporalio.bridge.proto.workflow_activation.WorkflowActivation.FromString(
224-
await self._ref.poll_workflow_activation()
224+
await self._ref.poll_workflow_activation() # type: ignore[reportOptionalMemberAccess]
225225
)
226226
)
227227

@@ -230,53 +230,53 @@ async def poll_activity_task(
230230
) -> temporalio.bridge.proto.activity_task.ActivityTask:
231231
"""Poll for an activity task."""
232232
return temporalio.bridge.proto.activity_task.ActivityTask.FromString(
233-
await self._ref.poll_activity_task()
233+
await self._ref.poll_activity_task() # type: ignore[reportOptionalMemberAccess]
234234
)
235235

236236
async def poll_nexus_task(
237237
self,
238238
) -> temporalio.bridge.proto.nexus.NexusTask:
239239
"""Poll for a nexus task."""
240240
return temporalio.bridge.proto.nexus.NexusTask.FromString(
241-
await self._ref.poll_nexus_task()
241+
await self._ref.poll_nexus_task() # type: ignore[reportOptionalMemberAccess]
242242
)
243243

244244
async def complete_workflow_activation(
245245
self,
246246
comp: temporalio.bridge.proto.workflow_completion.WorkflowActivationCompletion,
247247
) -> None:
248248
"""Complete a workflow activation."""
249-
await self._ref.complete_workflow_activation(comp.SerializeToString())
249+
await self._ref.complete_workflow_activation(comp.SerializeToString()) # type: ignore[reportOptionalMemberAccess]
250250

251251
async def complete_activity_task(
252252
self, comp: temporalio.bridge.proto.ActivityTaskCompletion
253253
) -> None:
254254
"""Complete an activity task."""
255-
await self._ref.complete_activity_task(comp.SerializeToString())
255+
await self._ref.complete_activity_task(comp.SerializeToString()) # type: ignore[reportOptionalMemberAccess]
256256

257257
async def complete_nexus_task(
258258
self, comp: temporalio.bridge.proto.nexus.NexusTaskCompletion
259259
) -> None:
260260
"""Complete a nexus task."""
261-
await self._ref.complete_nexus_task(comp.SerializeToString())
261+
await self._ref.complete_nexus_task(comp.SerializeToString()) # type: ignore[reportOptionalMemberAccess]
262262

263263
def record_activity_heartbeat(
264264
self, comp: temporalio.bridge.proto.ActivityHeartbeat
265265
) -> None:
266266
"""Record an activity heartbeat."""
267-
self._ref.record_activity_heartbeat(comp.SerializeToString())
267+
self._ref.record_activity_heartbeat(comp.SerializeToString()) # type: ignore[reportOptionalMemberAccess]
268268

269269
def request_workflow_eviction(self, run_id: str) -> None:
270270
"""Request a workflow be evicted."""
271-
self._ref.request_workflow_eviction(run_id)
271+
self._ref.request_workflow_eviction(run_id) # type: ignore[reportOptionalMemberAccess]
272272

273273
def replace_client(self, client: temporalio.bridge.client.Client) -> None:
274274
"""Replace the worker client."""
275-
self._ref.replace_client(client._ref)
275+
self._ref.replace_client(client._ref) # type: ignore[reportOptionalMemberAccess]
276276

277277
def initiate_shutdown(self) -> None:
278278
"""Start shutdown of the worker."""
279-
self._ref.initiate_shutdown()
279+
self._ref.initiate_shutdown() # type: ignore[reportOptionalMemberAccess]
280280

281281
async def finalize_shutdown(self) -> None:
282282
"""Finalize the worker.
@@ -286,7 +286,7 @@ async def finalize_shutdown(self) -> None:
286286
"""
287287
ref = self._ref
288288
self._ref = None
289-
await ref.finalize_shutdown()
289+
await ref.finalize_shutdown() # type: ignore[reportOptionalMemberAccess]
290290

291291

292292
class _Visitor(VisitorFunctions):

‎temporalio/worker/_replayer.py‎

Lines changed: 45 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import temporalio.client
1818
import temporalio.converter
1919
import temporalio.runtime
20+
import temporalio.worker
2021
import temporalio.workflow
2122

2223
from ..common import HeaderCodecBehavior
@@ -89,7 +90,7 @@ def __init__(
8990
self._config = plugin.configure_replayer(self._config)
9091

9192
# Validate workflows after plugin configuration
92-
if not self._config["workflows"]:
93+
if not self._config.get("workflows"):
9394
raise ValueError("At least one workflow must be specified")
9495

9596
def config(self, *, active_config: bool = False) -> ReplayerConfig:
@@ -103,7 +104,7 @@ def config(self, *, active_config: bool = False) -> ReplayerConfig:
103104
Configuration, shallow-copied.
104105
"""
105106
config = self._config.copy() if active_config else self._initial_config.copy()
106-
config["workflows"] = list(config["workflows"])
107+
config["workflows"] = list(config.get("workflows", []))
107108
return config
108109

109110
async def replay_workflow(
@@ -191,6 +192,11 @@ def make_lambda(plugin, next):
191192
async def _workflow_replay_iterator(
192193
self, histories: AsyncIterator[temporalio.client.WorkflowHistory]
193194
) -> AsyncIterator[AsyncIterator[WorkflowReplayResult]]:
195+
# Initialize variables to avoid unbound variable errors
196+
pusher = None
197+
workflow_worker_task = None
198+
bridge_worker_scope = None
199+
194200
try:
195201
last_replay_failure: Optional[Exception]
196202
last_replay_complete = asyncio.Event()
@@ -223,39 +229,50 @@ def on_eviction_hook(
223229

224230
# Create worker referencing bridge worker
225231
bridge_worker: temporalio.bridge.worker.Worker
226-
task_queue = f"replay-{self._config['build_id']}"
227-
runtime = self._config["runtime"] or temporalio.runtime.Runtime.default()
232+
task_queue = f"replay-{self._config.get('build_id')}"
233+
runtime = (
234+
self._config.get("runtime") or temporalio.runtime.Runtime.default()
235+
)
228236
workflow_worker = _WorkflowWorker(
229237
bridge_worker=lambda: bridge_worker,
230-
namespace=self._config["namespace"],
238+
namespace=self._config.get("namespace", "ReplayNamespace"),
231239
task_queue=task_queue,
232-
workflows=self._config["workflows"],
233-
workflow_task_executor=self._config["workflow_task_executor"],
240+
workflows=self._config.get("workflows", []),
241+
workflow_task_executor=self._config.get("workflow_task_executor"),
234242
max_concurrent_workflow_tasks=5,
235-
workflow_runner=self._config["workflow_runner"],
236-
unsandboxed_workflow_runner=self._config["unsandboxed_workflow_runner"],
237-
data_converter=self._config["data_converter"],
238-
interceptors=self._config["interceptors"],
239-
workflow_failure_exception_types=self._config[
240-
"workflow_failure_exception_types"
241-
],
242-
debug_mode=self._config["debug_mode"],
243+
workflow_runner=self._config.get("workflow_runner")
244+
or SandboxedWorkflowRunner(),
245+
unsandboxed_workflow_runner=self._config.get(
246+
"unsandboxed_workflow_runner"
247+
)
248+
or UnsandboxedWorkflowRunner(),
249+
data_converter=self._config.get("data_converter")
250+
or temporalio.converter.DataConverter.default,
251+
interceptors=self._config.get("interceptors", []),
252+
workflow_failure_exception_types=self._config.get(
253+
"workflow_failure_exception_types", []
254+
),
255+
debug_mode=self._config.get("debug_mode", False),
243256
metric_meter=runtime.metric_meter,
244257
on_eviction_hook=on_eviction_hook,
245258
disable_eager_activity_execution=False,
246-
disable_safe_eviction=self._config["disable_safe_workflow_eviction"],
259+
disable_safe_eviction=self._config.get(
260+
"disable_safe_workflow_eviction", False
261+
),
247262
should_enforce_versioning_behavior=False,
248263
assert_local_activity_valid=lambda a: None,
249-
encode_headers=self._config["header_codec_behavior"]
264+
encode_headers=self._config.get(
265+
"header_codec_behavior", HeaderCodecBehavior.NO_CODEC
266+
)
250267
!= HeaderCodecBehavior.NO_CODEC,
251268
)
252269
# Create bridge worker
253270
bridge_worker, pusher = temporalio.bridge.worker.Worker.for_replay(
254271
runtime._core_runtime,
255272
temporalio.bridge.worker.WorkerConfig(
256-
namespace=self._config["namespace"],
273+
namespace=self._config.get("namespace", "ReplayNamespace"),
257274
task_queue=task_queue,
258-
identity_override=self._config["identity"],
275+
identity_override=self._config.get("identity"),
259276
# Need to tell core whether we want to consider all
260277
# non-determinism exceptions as workflow fail, and whether we do
261278
# per workflow type
@@ -292,7 +309,7 @@ def on_eviction_hook(
292309
max_task_queue_activities_per_second=None,
293310
graceful_shutdown_period_millis=0,
294311
versioning_strategy=temporalio.bridge.worker.WorkerVersioningStrategyNone(
295-
build_id_no_versioning=self._config["build_id"]
312+
build_id_no_versioning=self._config.get("build_id")
296313
or load_default_build_id(),
297314
),
298315
workflow_task_poller_behavior=temporalio.bridge.worker.PollerBehaviorSimpleMaximum(
@@ -307,6 +324,8 @@ def on_eviction_hook(
307324
plugins=[plugin.name() for plugin in self.plugins],
308325
),
309326
)
327+
bridge_worker_scope = bridge_worker
328+
310329
# Start worker
311330
workflow_worker_task = asyncio.create_task(workflow_worker.run())
312331

@@ -347,18 +366,20 @@ async def replay_iterator() -> AsyncIterator[WorkflowReplayResult]:
347366
yield replay_iterator()
348367
finally:
349368
# Close the pusher
350-
pusher.close()
369+
if pusher is not None:
370+
pusher.close()
351371
# If the workflow worker task is not done, wait for it
352372
try:
353-
if not workflow_worker_task.done():
373+
if workflow_worker_task is not None and not workflow_worker_task.done():
354374
await workflow_worker_task
355375
except Exception:
356376
logger.warning("Failed to shutdown worker", exc_info=True)
357377
finally:
358378
# We must shutdown here
359379
try:
360-
bridge_worker.initiate_shutdown()
361-
await bridge_worker.finalize_shutdown()
380+
if bridge_worker_scope is not None:
381+
bridge_worker_scope.initiate_shutdown()
382+
await bridge_worker_scope.finalize_shutdown()
362383
except Exception:
363384
logger.warning("Failed to finalize shutdown", exc_info=True)
364385

0 commit comments

Comments
 (0)