Skip to content

Commit 0c0b4b3

Browse files
committed
Pick up core crate renames
1 parent a4c50ee commit 0c0b4b3

File tree

5 files changed

+20
-78
lines changed

5 files changed

+20
-78
lines changed

temporalio/bridge/sdk-core

Submodule sdk-core updated 38 files

temporalio/runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def formatted(self) -> str:
140140
"""Return a formatted form of this filter."""
141141
# We intentionally aren't using __str__ or __format__ so they can keep
142142
# their original dataclass impls
143-
return f"{self.other_level},temporal_sdk_core={self.core_level},temporal_client={self.core_level},temporal_sdk={self.core_level}"
143+
return f"{self.other_level},temporalio_sdk_core={self.core_level},temporalio_client={self.core_level},temporalio_sdk={self.core_level}"
144144

145145

146146
@dataclass(frozen=True)

tests/test_plugins.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def configure_client(self, config: ClientConfig) -> ClientConfig:
8282
return config
8383

8484
def configure_worker(self, config: WorkerConfig) -> WorkerConfig:
85-
config["task_queue"] = "combined"
85+
config["task_queue"] = "combined" + str(uuid.uuid4())
8686
return config
8787

8888
async def connect_service_client(
@@ -114,7 +114,7 @@ def run_replayer(
114114

115115
class MyWorkerPlugin(temporalio.worker.Plugin):
116116
def configure_worker(self, config: WorkerConfig) -> WorkerConfig:
117-
config["task_queue"] = "replaced_queue"
117+
config["task_queue"] = "replaced_queue" + str(uuid.uuid4())
118118
runner = config.get("workflow_runner")
119119
if isinstance(runner, SandboxedWorkflowRunner):
120120
config["workflow_runner"] = dataclasses.replace(
@@ -146,11 +146,11 @@ def run_replayer(
146146
async def test_worker_plugin_basic_config(client: Client) -> None:
147147
worker = Worker(
148148
client,
149-
task_queue="queue",
149+
task_queue="queue" + str(uuid.uuid4()),
150150
activities=[never_run_activity],
151151
plugins=[MyWorkerPlugin()],
152152
)
153-
assert worker.config().get("task_queue") == "replaced_queue"
153+
assert worker.config().get("task_queue").startswith("replaced_queue")
154154
assert [p.name() for p in worker.config().get("plugins", [])] == [
155155
MyWorkerPlugin().name()
156156
]
@@ -159,20 +159,20 @@ async def test_worker_plugin_basic_config(client: Client) -> None:
159159
new_config = client.config()
160160
new_config["plugins"] = [MyCombinedPlugin()]
161161
client = Client(**new_config)
162-
worker = Worker(client, task_queue="queue", activities=[never_run_activity])
163-
assert worker.config().get("task_queue") == "combined"
162+
worker = Worker(client, task_queue="queue" + str(uuid.uuid4()), activities=[never_run_activity])
163+
assert worker.config().get("task_queue").startswith("combined")
164164
assert [p.name() for p in worker.config().get("plugins", [])] == [
165165
MyCombinedPlugin().name()
166166
]
167167

168168
# Test both. Client propagated plugins are called first, so the worker plugin overrides in this case
169169
worker = Worker(
170170
client,
171-
task_queue="queue",
171+
task_queue="queue" + str(uuid.uuid4()),
172172
activities=[never_run_activity],
173173
plugins=[MyWorkerPlugin()],
174174
)
175-
assert worker.config().get("task_queue") == "replaced_queue"
175+
assert worker.config().get("task_queue").startswith("replaced_queue")
176176
assert [p.name() for p in worker.config().get("plugins", [])] == [
177177
MyCombinedPlugin().name(),
178178
MyWorkerPlugin().name(),
@@ -201,7 +201,7 @@ def new_worker_wrapper(runtime_ref, client_ref, config):
201201
plugin2 = SimplePlugin("test-worker-plugin2")
202202
worker = Worker(
203203
client,
204-
task_queue="queue",
204+
task_queue="queue" + str(uuid.uuid4()),
205205
activities=[never_run_activity],
206206
plugins=[plugin1, plugin2],
207207
)
@@ -217,7 +217,7 @@ async def test_worker_duplicated_plugin(client: Client) -> None:
217217
with warnings.catch_warnings(record=True) as warning_list:
218218
worker = Worker(
219219
client,
220-
task_queue="queue",
220+
task_queue="queue" + str(uuid.uuid4()),
221221
activities=[never_run_activity],
222222
plugins=[MyCombinedPlugin()],
223223
)
@@ -230,7 +230,7 @@ async def test_worker_sandbox_restrictions(client: Client) -> None:
230230
with warnings.catch_warnings(record=True) as warning_list:
231231
worker = Worker(
232232
client,
233-
task_queue="queue",
233+
task_queue="queue" + str(uuid.uuid4()),
234234
activities=[never_run_activity],
235235
plugins=[MyWorkerPlugin()],
236236
)
@@ -332,7 +332,7 @@ async def test_simple_plugins(client: Client) -> None:
332332
# Test without plugin registered in client
333333
worker = Worker(
334334
client,
335-
task_queue="queue",
335+
task_queue="queue" + str(uuid.uuid4()),
336336
activities=[never_run_activity],
337337
workflows=[HelloWorkflow],
338338
plugins=[plugin],
@@ -343,7 +343,7 @@ async def test_simple_plugins(client: Client) -> None:
343343
# Test with plugin registered in client
344344
worker = Worker(
345345
new_client,
346-
task_queue="queue",
346+
task_queue="queue" + str(uuid.uuid4()),
347347
activities=[never_run_activity],
348348
)
349349
assert worker.config().get("workflows") == [HelloWorkflow2]
@@ -380,7 +380,7 @@ def converter(old: Optional[DataConverter]):
380380
)
381381
worker = Worker(
382382
client,
383-
task_queue="queue",
383+
task_queue="queue" + str(uuid.uuid4()) + str(uuid.uuid4()),
384384
workflows=[HelloWorkflow],
385385
activities=[never_run_activity],
386386
plugins=[plugin],
@@ -394,13 +394,13 @@ def __init__(self):
394394

395395
def configure_worker(self, config: WorkerConfig) -> WorkerConfig:
396396
config = super().configure_worker(config)
397-
config["task_queue"] = "override"
397+
config["task_queue"] = "override" + str(uuid.uuid4())
398398
return config
399399

400400

401401
async def test_medium_plugin(client: Client) -> None:
402402
plugin = MediumPlugin()
403403
worker = Worker(
404-
client, task_queue="queue", plugins=[plugin], workflows=[HelloWorkflow]
404+
client, task_queue="queue" + str(uuid.uuid4()), plugins=[plugin], workflows=[HelloWorkflow]
405405
)
406-
assert worker.config().get("task_queue") == "override"
406+
assert worker.config().get("task_queue").startswith("override")

tests/test_runtime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ async def has_log() -> bool:
188188
# Check record
189189
record = next((l for l in log_queue_list if "Failing workflow task" in l.message))
190190
assert record.levelno == logging.WARNING
191-
assert record.name == f"{logger.name}-sdk_core::temporal_sdk_core::worker::workflow"
191+
assert record.name == f"{logger.name}-sdk_core::temporalio_sdk_core::worker::workflow"
192192
assert record.temporal_log.fields["run_id"] == handle.result_run_id # type: ignore
193193

194194

tests/worker/test_worker.py

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -221,64 +221,6 @@ def my_signal(self, value: str) -> None:
221221
workflow.logger.info(f"Signal: {value}")
222222

223223

224-
async def test_worker_versioning(client: Client, env: WorkflowEnvironment):
225-
if env.supports_time_skipping:
226-
pytest.skip("Java test server does not support worker versioning")
227-
if not await worker_versioning_enabled(client):
228-
pytest.skip("This server does not have worker versioning enabled")
229-
230-
task_queue = f"worker-versioning-{uuid.uuid4()}"
231-
await client.update_worker_build_id_compatibility(
232-
task_queue, BuildIdOpAddNewDefault("1.0")
233-
)
234-
235-
async with new_worker(
236-
client,
237-
WaitOnSignalWorkflow,
238-
activities=[say_hello],
239-
task_queue=task_queue,
240-
build_id="1.0",
241-
use_worker_versioning=True,
242-
):
243-
wf1 = await client.start_workflow(
244-
WaitOnSignalWorkflow.run,
245-
id=f"worker-versioning-1-{uuid.uuid4()}",
246-
task_queue=task_queue,
247-
)
248-
# Sleep for a beat, otherwise it's possible for new workflow to start on 2.0
249-
await asyncio.sleep(0.1)
250-
await client.update_worker_build_id_compatibility(
251-
task_queue, BuildIdOpAddNewDefault("2.0")
252-
)
253-
wf2 = await client.start_workflow(
254-
WaitOnSignalWorkflow.run,
255-
id=f"worker-versioning-2-{uuid.uuid4()}",
256-
task_queue=task_queue,
257-
)
258-
async with new_worker(
259-
client,
260-
WaitOnSignalWorkflow,
261-
activities=[say_hello],
262-
task_queue=task_queue,
263-
build_id="2.0",
264-
use_worker_versioning=True,
265-
):
266-
# Confirm reachability type parameter is respected. If it wasn't, list would have
267-
# `OPEN_WORKFLOWS` in it.
268-
reachability = await client.get_worker_task_reachability(
269-
build_ids=["2.0"],
270-
reachability_type=TaskReachabilityType.CLOSED_WORKFLOWS,
271-
)
272-
assert reachability.build_id_reachability["2.0"].task_queue_reachability[
273-
task_queue
274-
] == [TaskReachabilityType.NEW_WORKFLOWS]
275-
276-
await wf1.signal(WaitOnSignalWorkflow.my_signal, "finish")
277-
await wf2.signal(WaitOnSignalWorkflow.my_signal, "finish")
278-
await wf1.result()
279-
await wf2.result()
280-
281-
282224
async def test_worker_validate_fail(client: Client, env: WorkflowEnvironment):
283225
if env.supports_time_skipping:
284226
pytest.skip("Java test server does not appear to fail on invalid namespace")

0 commit comments

Comments
 (0)