livekit-agents 0.5.dev0__tar.gz → 0.5.dev2__tar.gz

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-agents
-Version: 0.5.dev0
+Version: 0.5.dev2
 Summary: LiveKit Python Agents
 Home-page: https://github.com/livekit/agents
 License: Apache-2.0
@@ -29,6 +29,7 @@ Requires-Dist: python-json-logger~=2.0
 Requires-Dist: attrs~=23.0
 Requires-Dist: watchfiles~=0.21
 Requires-Dist: colorlog~=6.0
+Requires-Dist: psutil~=5.9
 Provides-Extra: codecs
 Requires-Dist: av>=11.0.0; extra == "codecs"
 

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/livekit/agents/ipc/job_main.py

@@ -37,24 +37,7 @@ async def _start(
     close_tx, close_rx = aio.channel()  # used by the JobContext to signal shutdown
 
     auto_subscribe = args.accept_data.auto_subscribe
-    opts = rtc.RoomOptions(auto_subscribe=True)
-    if auto_subscribe != AutoSubscribe.SUBSCRIBE_ALL:
-        opts.auto_subscribe = False
-
-        def on_track_published(pub: rtc.RemoteTrackPublication, *_):
-            if (
-                pub.kind == rtc.TrackKind.KIND_AUDIO
-                and auto_subscribe == AutoSubscribe.AUDIO_ONLY
-            ):
-                pub.set_subscribed(True)
-            elif (
-                pub.kind == rtc.TrackKind.KIND_VIDEO
-                and auto_subscribe == AutoSubscribe.VIDEO_ONLY
-            ):
-                pub.set_subscribed(True)
-
-        if auto_subscribe != AutoSubscribe.SUBSCRIBE_NONE:
-            room.on("track_published", on_track_published)
+    opts = rtc.RoomOptions(auto_subscribe=auto_subscribe == AutoSubscribe.SUBSCRIBE_ALL)
 
     cnt = room.connect(args.url, args.token, options=opts)
     start_req: protocol.StartJobRequest | None = None
@@ -64,6 +47,34 @@ async def _start(
     async def _start_if_valid():
         nonlocal usertask
         if start_req and room.isconnected():
+
+            def on_track_published(pub: rtc.RemoteTrackPublication, *_):
+                if (
+                    pub.kind == rtc.TrackKind.KIND_AUDIO
+                    and auto_subscribe == AutoSubscribe.AUDIO_ONLY
+                ):
+                    pub.set_subscribed(True)
+                elif (
+                    pub.kind == rtc.TrackKind.KIND_VIDEO
+                    and auto_subscribe == AutoSubscribe.VIDEO_ONLY
+                ):
+                    pub.set_subscribed(True)
+
+            if auto_subscribe != AutoSubscribe.SUBSCRIBE_NONE:
+                room.on("track_published", on_track_published)
+
+                for participant in room.participants.values():
+                    for track_pub in participant.tracks.values():
+                        if (
+                            track_pub.kind == rtc.TrackKind.KIND_AUDIO
+                            and auto_subscribe == AutoSubscribe.AUDIO_ONLY
+                        ):
+                            track_pub.set_subscribed(True)
+                        elif (
+                            track_pub.kind == rtc.TrackKind.KIND_VIDEO
+                            and auto_subscribe == AutoSubscribe.VIDEO_ONLY
+                        ):
+                            track_pub.set_subscribed(True)
             # start the job
             await pipe.write(protocol.StartJobResponse())
 
@@ -72,7 +83,7 @@ async def _start(
                 start_req.job,
                 room,
             )
-            usertask = asyncio.create_task(args.accept_data.target(ctx))
+            usertask = asyncio.create_task(args.accept_data.entry(ctx))
 
     async with contextlib.aclosing(aio.select([pipe, cnt, close_rx])) as select:
         while True:

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/livekit/agents/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.5.dev0"
+__version__ = "0.5.dev2"

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/livekit_agents.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-agents
-Version: 0.5.dev0
+Version: 0.5.dev2
 Summary: LiveKit Python Agents
 Home-page: https://github.com/livekit/agents
 License: Apache-2.0
@@ -29,6 +29,7 @@ Requires-Dist: python-json-logger~=2.0
 Requires-Dist: attrs~=23.0
 Requires-Dist: watchfiles~=0.21
 Requires-Dist: colorlog~=6.0
+Requires-Dist: psutil~=5.9
 Provides-Extra: codecs
 Requires-Dist: av>=11.0.0; extra == "codecs"
 

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/livekit_agents.egg-info/requires.txt

@@ -8,6 +8,7 @@ python-json-logger~=2.0
 attrs~=23.0
 watchfiles~=0.21
 colorlog~=6.0
+psutil~=5.9
 
 [codecs]
 av>=11.0.0

{livekit-agents-0.5.dev0 → livekit-agents-0.5.dev2}/setup.py

@@ -57,6 +57,7 @@ setuptools.setup(
         "attrs~=23.0",
         "watchfiles~=0.21",
         "colorlog~=6.0",
+        "psutil~=5.9",
     ],
     extras_require={
         "codecs": ["av>=11.0.0"],