Rename BaseTask → BaseWorker and reserve "task" for asyncio
Replaces every "task" identifier that referred to the BaseTask abstraction with "worker". Asyncio task plumbing (asyncio.Task, BaseTaskManager, TaskManager, create_task, cancel_task, etc.) stays untouched. Highlights: - Classes: BaseTask → BaseWorker, PipelineTask → PipelineWorker, LLMTask → LLMWorker, LLMContextTask → LLMContextWorker, TaskBus → WorkerBus, TaskRegistry → WorkerRegistry, TaskActivationArgs → WorkerActivationArgs, TaskReadyData → WorkerReadyData, TaskRegistryEntry → WorkerRegistryEntry, TaskObserver → WorkerObserver, all Bus*TaskMessage → Bus*WorkerMessage, BusAddTaskMessage.task field → worker, BusWorkerRegistryMessage.tasks field → workers. - Methods/decorators: activate_task → activate_worker, deactivate_task → deactivate_worker, add_task → add_worker, watch_task → watch_worker, @task_ready → @worker_ready, setup_pipeline_task hook → setup_pipeline_worker. - Params/fields: FrameProcessorSetup.pipeline_task and FunctionCallParams.pipeline_task → pipeline_worker. Parameter names like task_name → worker_name; spawn/run accept worker:. - Files: pipeline/base_task.py → base_worker.py, pipeline/task.py → worker.py (plus a re-export shim at pipeline/task.py), task_observer.py → worker_observer.py, task_ready_decorator.py → worker_ready_decorator.py, pipecat.tasks → pipecat.workers, llm_task.py → llm_worker.py, llm_context_task.py → llm_context_worker.py, examples/multi-task → examples/multi-worker. Back-compat: - PipelineTask kept as a deprecated subclass of PipelineWorker that warns on construction. - pipecat.pipeline.task re-exports PipelineWorker/PipelineTask/etc. so existing user imports keep working. - FrameProcessor.pipeline_task kept as a deprecated property that forwards to pipeline_worker. Local variables in examples that hold a worker (task = PipelineTask(...)) are renamed to worker = PipelineWorker(...). Asyncio-task locals (runner_task, etc.) are preserved.
This commit is contained in:
@@ -15,7 +15,7 @@ from pipecat.adapters.schemas.direct_function import DirectFunctionWrapper
|
||||
from pipecat.clocks.system_clock import SystemClock
|
||||
from pipecat.frames.frames import EndFrame, Frame, StartFrame
|
||||
from pipecat.pipeline.pipeline import Pipeline
|
||||
from pipecat.pipeline.task import PipelineTask, PipelineTaskParams
|
||||
from pipecat.pipeline.worker import PipelineWorker, PipelineWorkerParams
|
||||
from pipecat.processors.aggregators.llm_context import LLMContext
|
||||
from pipecat.processors.frame_processor import FrameDirection, FrameProcessor, FrameProcessorSetup
|
||||
from pipecat.services.llm_service import (
|
||||
@@ -64,7 +64,7 @@ class TestFunctionCallParamsAppResources(unittest.TestCase):
|
||||
tool_call_id="1",
|
||||
arguments={},
|
||||
llm=None, # type: ignore[arg-type]
|
||||
pipeline_task=None, # type: ignore[arg-type]
|
||||
pipeline_worker=None, # type: ignore[arg-type]
|
||||
context=LLMContext(),
|
||||
result_callback=AsyncMock(),
|
||||
)
|
||||
@@ -77,7 +77,7 @@ class TestFunctionCallParamsAppResources(unittest.TestCase):
|
||||
tool_call_id="1",
|
||||
arguments={},
|
||||
llm=None, # type: ignore[arg-type]
|
||||
pipeline_task=None, # type: ignore[arg-type]
|
||||
pipeline_worker=None, # type: ignore[arg-type]
|
||||
context=LLMContext(),
|
||||
result_callback=AsyncMock(),
|
||||
app_resources=resources,
|
||||
@@ -91,7 +91,7 @@ class TestFunctionCallParamsAppResources(unittest.TestCase):
|
||||
tool_call_id="1",
|
||||
arguments={},
|
||||
llm=None, # type: ignore[arg-type]
|
||||
pipeline_task=None, # type: ignore[arg-type]
|
||||
pipeline_worker=None, # type: ignore[arg-type]
|
||||
context=LLMContext(),
|
||||
result_callback=AsyncMock(),
|
||||
app_resources=resources,
|
||||
@@ -105,8 +105,8 @@ class TestLLMServiceFunctionCallReadsAppResources(unittest.IsolatedAsyncioTestCa
|
||||
async def test_function_call_params_receives_app_resources(self):
|
||||
service = _MockLLMService()
|
||||
resources = _Resources(user_name="John")
|
||||
# Stub the pipeline task with just the bit LLMService reads.
|
||||
service._pipeline_task = SimpleNamespace(app_resources=resources) # type: ignore[assignment]
|
||||
# Stub the pipeline worker with just the bit LLMService reads.
|
||||
service._pipeline_worker = SimpleNamespace(app_resources=resources) # type: ignore[assignment]
|
||||
|
||||
captured: dict[str, Any] = {}
|
||||
|
||||
@@ -137,7 +137,7 @@ class TestLLMServiceFunctionCallReadsAppResources(unittest.IsolatedAsyncioTestCa
|
||||
async def test_direct_function_params_receives_app_resources(self):
|
||||
service = _MockLLMService()
|
||||
resources = _Resources(user_name="John")
|
||||
service._pipeline_task = SimpleNamespace(app_resources=resources) # type: ignore[assignment]
|
||||
service._pipeline_worker = SimpleNamespace(app_resources=resources) # type: ignore[assignment]
|
||||
captured: dict[str, Any] = {}
|
||||
|
||||
async def lookup(params: FunctionCallParams):
|
||||
@@ -174,7 +174,7 @@ class TestLLMServiceFunctionCallReadsAppResources(unittest.IsolatedAsyncioTestCa
|
||||
setup = FrameProcessorSetup(
|
||||
clock=SystemClock(),
|
||||
task_manager=task_manager,
|
||||
pipeline_task=SimpleNamespace(app_resources=None), # type: ignore[arg-type]
|
||||
pipeline_worker=SimpleNamespace(app_resources=None), # type: ignore[arg-type]
|
||||
tool_resources=resources,
|
||||
)
|
||||
|
||||
@@ -186,29 +186,29 @@ class TestLLMServiceFunctionCallReadsAppResources(unittest.IsolatedAsyncioTestCa
|
||||
class TestPipelineTaskAppResources(unittest.TestCase):
|
||||
def test_getter_returns_constructor_value(self):
|
||||
resources = _Resources(user_name="John")
|
||||
task = PipelineTask(Pipeline([]), app_resources=resources)
|
||||
self.assertIs(task.app_resources, resources)
|
||||
worker = PipelineWorker(Pipeline([]), app_resources=resources)
|
||||
self.assertIs(worker.app_resources, resources)
|
||||
|
||||
def test_default_app_resources_is_none(self):
|
||||
task = PipelineTask(Pipeline([]))
|
||||
self.assertIsNone(task.app_resources)
|
||||
worker = PipelineWorker(Pipeline([]))
|
||||
self.assertIsNone(worker.app_resources)
|
||||
|
||||
def test_tool_resources_kwarg_warns_and_aliases_app_resources(self):
|
||||
resources = _Resources(user_name="John")
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
task = PipelineTask(Pipeline([]), tool_resources=resources)
|
||||
self.assertIs(task.app_resources, resources)
|
||||
worker = PipelineWorker(Pipeline([]), tool_resources=resources)
|
||||
self.assertIs(worker.app_resources, resources)
|
||||
|
||||
def test_app_resources_takes_precedence_over_tool_resources(self):
|
||||
new = _Resources(user_name="new")
|
||||
old = _Resources(user_name="old")
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
task = PipelineTask(Pipeline([]), app_resources=new, tool_resources=old)
|
||||
self.assertIs(task.app_resources, new)
|
||||
worker = PipelineWorker(Pipeline([]), app_resources=new, tool_resources=old)
|
||||
self.assertIs(worker.app_resources, new)
|
||||
|
||||
|
||||
class _RecordingProcessor(FrameProcessor):
|
||||
"""Records the pipeline_task it sees once StartFrame reaches it."""
|
||||
"""Records the pipeline_worker it sees once StartFrame reaches it."""
|
||||
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
@@ -218,10 +218,10 @@ class _RecordingProcessor(FrameProcessor):
|
||||
async def process_frame(self, frame: Frame, direction: FrameDirection):
|
||||
await super().process_frame(frame, direction)
|
||||
if isinstance(frame, StartFrame):
|
||||
# setup() runs before any frame reaches us, so pipeline_task is wired up.
|
||||
assert self.pipeline_task is not None
|
||||
self.observed_task = self.pipeline_task
|
||||
self.observed_app_resources = self.pipeline_task.app_resources
|
||||
# setup() runs before any frame reaches us, so pipeline_worker is wired up.
|
||||
assert self.pipeline_worker is not None
|
||||
self.observed_task = self.pipeline_worker
|
||||
self.observed_app_resources = self.pipeline_worker.app_resources
|
||||
await self.push_frame(frame, direction)
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ class _LegacyToolResourcesReader(FrameProcessor):
|
||||
|
||||
Models a previously-written user FrameProcessor whose ``setup()``
|
||||
override hasn't been migrated yet. The field is populated by
|
||||
``PipelineTask`` for backwards compatibility; reading it emits a
|
||||
``PipelineWorker`` for backwards compatibility; reading it emits a
|
||||
DeprecationWarning.
|
||||
"""
|
||||
|
||||
@@ -244,7 +244,7 @@ class _LegacyToolResourcesReader(FrameProcessor):
|
||||
|
||||
async def process_frame(self, frame: Frame, direction: FrameDirection):
|
||||
# Forward all frames so the EndFrame reaches the pipeline sink and
|
||||
# ``task.run()`` can return cleanly.
|
||||
# ``worker.run()`` can return cleanly.
|
||||
await super().process_frame(frame, direction)
|
||||
await self.push_frame(frame, direction)
|
||||
|
||||
@@ -254,29 +254,29 @@ class TestFrameProcessorSetupToolResourcesBackwardsCompat(unittest.IsolatedAsync
|
||||
resources = _Resources(user_name="John")
|
||||
legacy = _LegacyToolResourcesReader()
|
||||
pipeline = Pipeline([legacy])
|
||||
task = PipelineTask(pipeline, app_resources=resources)
|
||||
worker = PipelineWorker(pipeline, app_resources=resources)
|
||||
|
||||
await task.queue_frame(EndFrame())
|
||||
await worker.queue_frame(EndFrame())
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
await task.run(PipelineTaskParams(loop=asyncio.get_event_loop()))
|
||||
await worker.run(PipelineWorkerParams(loop=asyncio.get_event_loop()))
|
||||
|
||||
self.assertIs(legacy.captured_tool_resources, resources)
|
||||
|
||||
async def test_legacy_processor_receives_value_via_deprecated_tool_resources_kwarg(
|
||||
self,
|
||||
):
|
||||
# If the user is still constructing PipelineTask with the deprecated
|
||||
# If the user is still constructing PipelineWorker with the deprecated
|
||||
# ``tool_resources`` kwarg (and hasn't migrated to ``app_resources``),
|
||||
# legacy processors must still see the value too.
|
||||
resources = _Resources(user_name="John")
|
||||
legacy = _LegacyToolResourcesReader()
|
||||
pipeline = Pipeline([legacy])
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
task = PipelineTask(pipeline, tool_resources=resources)
|
||||
worker = PipelineWorker(pipeline, tool_resources=resources)
|
||||
|
||||
await task.queue_frame(EndFrame())
|
||||
await worker.queue_frame(EndFrame())
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
await task.run(PipelineTaskParams(loop=asyncio.get_event_loop()))
|
||||
await worker.run(PipelineWorkerParams(loop=asyncio.get_event_loop()))
|
||||
|
||||
self.assertIs(legacy.captured_tool_resources, resources)
|
||||
|
||||
@@ -286,18 +286,18 @@ class TestFrameProcessorPipelineTaskAccess(unittest.IsolatedAsyncioTestCase):
|
||||
resources = _Resources(user_name="John")
|
||||
recorder = _RecordingProcessor()
|
||||
pipeline = Pipeline([recorder])
|
||||
task = PipelineTask(pipeline, app_resources=resources)
|
||||
worker = PipelineWorker(pipeline, app_resources=resources)
|
||||
|
||||
await task.queue_frame(EndFrame())
|
||||
await task.run(PipelineTaskParams(loop=asyncio.get_event_loop()))
|
||||
await worker.queue_frame(EndFrame())
|
||||
await worker.run(PipelineWorkerParams(loop=asyncio.get_event_loop()))
|
||||
|
||||
self.assertIs(recorder.observed_task, task)
|
||||
self.assertIs(recorder.observed_task, worker)
|
||||
self.assertIs(recorder.observed_app_resources, resources)
|
||||
|
||||
def test_pipeline_task_raises_when_not_set_up(self):
|
||||
recorder = _RecordingProcessor()
|
||||
with self.assertRaises(Exception):
|
||||
_ = recorder.pipeline_task
|
||||
_ = recorder.pipeline_worker
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
Reference in New Issue
Block a user