Removed_workers removed

Author: lsbardel

fluid/utils/text.py

@@ -1,4 +1,3 @@
-import json
 import uuid
 from typing import Any
 
@@ -34,12 +33,6 @@ def as_uuid(uid: Any) -> str | None:
     return None
 
 
-def nice_json(data: Any) -> str:
-    if not isinstance(data, str):
-        return json.dumps(data, indent=4)
-    return data
-
-
 def trim_docstring(docstring: str) -> str:
     """Uniformly trims leading/trailing whitespace from doc-strings"""
     if not docstring or not docstring.strip():

fluid/utils/worker.py

@@ -60,7 +60,7 @@ async def start(cls, worker: Worker) -> Self:
         return await waiter
 
     async def shutdown(self) -> None:
-        if self.task is None:
+        if self.task is None:   # pragma: no cover
             return
         elif not self.started_shutdown:
             self.started_shutdown = True
@@ -427,16 +427,6 @@ def add_workers(self, *workers: Worker) -> None:
             if worker not in self._workers:
                 self._workers.append(worker)
 
-    def remove_workers(self, *workers: Worker) -> None:
-        "remove workers from the workers"
-        for worker in workers:
-            try:
-                self._workers.remove(worker)
-            except ValueError:
-                pass
-            else:
-                worker.gracefully_stop()
-
     @property
     def num_workers(self) -> int:
         return len(self._workers)

tests/utils/test_rest.py

@@ -0,0 +1,10 @@
+from fluid.utils.text import as_uuid, create_uid
+from uuid import uuid4
+
+
+def test_as_uuid() -> None:
+    assert as_uuid(None) is None
+    assert as_uuid("a") == None
+    uid = uuid4()
+    assert as_uuid(uid) == uid.hex
+    assert as_uuid(uid.hex) == uid.hex

tests/utils/test_worker.py

@@ -7,6 +7,12 @@
 from fluid.utils.worker import QueueConsumerWorker, Worker, Workers, WorkerState
 
 
+class NiceWorker(Worker):
+    async def run(self):
+        while self.is_running():
+            await asyncio.sleep(0.1)
+
+
 class BadWorker(Worker):
     async def run(self):
         while True:
@@ -84,3 +90,20 @@ async def test_exeception3() -> None:
     with pytest.raises(asyncio.CancelledError):
         await worker.wait_for_shutdown()
     assert worker.is_stopped()
+
+
+async def test_workers() -> None:
+    workers = Workers(NiceWorker())
+    assert workers.num_workers == 1
+    assert workers.has_started() is False
+    await workers.startup()
+    assert workers.has_started()
+    status = await workers.status()
+    assert status
+    assert workers.is_running()
+    [nice] = list(workers.workers())
+    assert nice.is_running()
+    nice.gracefully_stop()
+    assert nice.is_stopping()
+    await workers.wait_for_shutdown()
+    assert workers.is_stopped()