by-framework 0.2.2.dev15__py3-none-any.whl → 0.2.2.dev16__py3-none-any.whl

by_framework/worker/runner.py

@@ -83,6 +83,7 @@ class WorkerRunner:
         self.worker = worker
         self.group_name = group_name or self._auto_group_name()
         self.consumer_name = worker.worker_id
+        self.max_concurrency = max_concurrency
         self.semaphore = asyncio.Semaphore(max_concurrency)
         self.fetch_count = fetch_count
         # OTel for worker.execute is emitted via a live wrapping span (see
@@ -121,6 +122,14 @@ class WorkerRunner:
             float(self.worker.heartbeat_lease_ttl_seconds) * 2.0,
             stream_block_seconds * 3.0,
         )
+        # Poll interval used by _acquire_slot() while waiting for a saturated
+        # semaphore. Derived from _consumer_health_timeout_seconds (not a
+        # hardcoded constant) so it stays well under the health-check
+        # deadline under any configuration, with a floor to avoid busy-
+        # polling if the timeout is configured very small.
+        self._slot_wait_poll_seconds = max(
+            self._consumer_health_timeout_seconds / 4.0, 1.0
+        )
         # Set as the first step of _shutdown() - see
         # docs/architecture/worker-readiness-endpoint.md Decision 6.
         self._draining: bool = False
@@ -386,9 +395,23 @@ class WorkerRunner:
         finally:
             await self.redis.xack(stream_name, self.group_name, msg_id)
 
+    async def _acquire_slot(self) -> None:
+        """Wait for a concurrency slot, marking the consumer tick on every
+        poll so a saturated-but-alive loop isn't judged stalled.
+
+        Polling on `len(self._running_tasks)` instead of wrapping
+        `semaphore.acquire()` in `asyncio.wait_for()` avoids relying on
+        Semaphore cancellation semantics for a lock this runner is the only
+        waiter on — see design.md's "why not asyncio.wait_for" section.
+        """
+        while len(self._running_tasks) >= self.max_concurrency:
+            self._mark_consumer_tick()
+            await asyncio.sleep(self._slot_wait_poll_seconds)
+        await self.semaphore.acquire()
+
     async def _run_once(self) -> bool:
         """Fetch and start processing messages."""
-        await self.semaphore.acquire()
+        await self._acquire_slot()
 
         try:
             messages = await self.fetch_messages(
@@ -401,7 +424,7 @@ class WorkerRunner:
 
             for i, (stream_name, msg_id, data_dict) in enumerate(messages):
                 if i > 0:
-                    await self.semaphore.acquire()
+                    await self._acquire_slot()
 
                 task = asyncio.create_task(
                     self._process_and_release(stream_name, msg_id, data_dict)

{by_framework-0.2.2.dev15.dist-info → by_framework-0.2.2.dev16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: by-framework
-Version: 0.2.2.dev15
+Version: 0.2.2.dev16
 Summary: 分布式 Agent 调度框架
 License-File: LICENSE
 Requires-Python: >=3.12

{by_framework-0.2.2.dev15.dist-info → by_framework-0.2.2.dev16.dist-info}/RECORD

@@ -94,12 +94,12 @@ by_framework/worker/context.py,sha256=5As3GcnVrwIE1nCJDDYLt_Ke8-8nzh44CzQBvyncQs
 by_framework/worker/health_server.py,sha256=4Jw3ltAD7Ow4dPHhwTUU_4JjKz-iDCNG7RJzD2VzPlM,6090
 by_framework/worker/heartbeat.py,sha256=trHDS8FUALsA6jyzDPa087hpr8_2vY8ZUFn0ld1kI2o,15465
 by_framework/worker/processor.py,sha256=UgC4_p-bg2KOHVTEILeMXF44rT9VLrRP5vompX0EeiQ,16243
-by_framework/worker/runner.py,sha256=6_L_UUV1Kljys_4Eh_qnwMd7a-gGsikd4M_O5K879NA,51897
+by_framework/worker/runner.py,sha256=nkJDpziUQaqqVEXc8OhoF4DKGiw7fthpvXudDjxYdm0,53093
 by_framework/worker/worker.py,sha256=IaPFLWCFo5U5Xo7PIQHtTt4JmtxZA1O_3nAuGl_g4N0,49527
 by_framework/worker/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 by_framework/worker/sandbox/hook_sandbox.py,sha256=XXSdH5YGX814LvV03vkq-zn5DVIBPYYt2NhRv1lT1Bk,2329
-by_framework-0.2.2.dev15.dist-info/METADATA,sha256=l050msraVm4RdyM0rIA_GXOpYu5pWyuUTdw7e2IBdd4,28018
-by_framework-0.2.2.dev15.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-by_framework-0.2.2.dev15.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
-by_framework-0.2.2.dev15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-by_framework-0.2.2.dev15.dist-info/RECORD,,
+by_framework-0.2.2.dev16.dist-info/METADATA,sha256=3Sbgc5Aw5L6vYzfRQpcfyMK9B-qYs9V-TMvAJGHwrAM,28018
+by_framework-0.2.2.dev16.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+by_framework-0.2.2.dev16.dist-info/entry_points.txt,sha256=5t6kgMjkR0UgJTpOsbuQDo0fOf7zeXjQW9DhkxfAGFc,56
+by_framework-0.2.2.dev16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+by_framework-0.2.2.dev16.dist-info/RECORD,,