Skip to content

Commit e9d674c

Browse files
authored
fix: avoid circular imports (#16)
1 parent 2f6b687 commit e9d674c

File tree

9 files changed

+12
-10
lines changed

9 files changed

+12
-10
lines changed

livekit/audio_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from livekit import AudioFrame
1+
from .audio_frame import AudioFrame
22

33
from ._ffi_client import FfiHandle, ffi_client
44
from ._proto import audio_frame_pb2 as proto_audio_frame

livekit/audio_stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from pyee.asyncio import AsyncIOEventEmitter
44

5-
from livekit import Track
5+
from .track import Track
66

77
from ._ffi_client import FfiHandle, ffi_client
88
from ._proto import audio_frame_pb2 as proto_audio_frame

livekit/participant.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import TYPE_CHECKING, List, Optional, Union
55
from weakref import ref
66

7-
from livekit import DataPacketKind, TrackPublishOptions
7+
from ._proto.room_pb2 import DataPacketKind, TrackPublishOptions
88

99
from ._ffi_client import ffi_client
1010
from ._proto import ffi_pb2 as proto_ffi
@@ -18,7 +18,7 @@
1818
)
1919

2020
if TYPE_CHECKING:
21-
from livekit import Room
21+
from .room import Room
2222

2323

2424
class PublishTrackError(Exception):

livekit/room.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
from pyee.asyncio import AsyncIOEventEmitter
66

7-
from livekit import ConnectionState, TrackKind
7+
from ._proto.room_pb2 import ConnectionState
8+
from ._proto.track_pb2 import TrackKind
89

910
from ._ffi_client import FfiHandle, ffi_client
1011
from ._proto import ffi_pb2 as proto_ffi

livekit/track.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from ._proto import track_pb2 as proto_track
66

77
if TYPE_CHECKING:
8-
from livekit import AudioSource, VideoSource
8+
from .audio_source import AudioSource
9+
from .video_source import VideoSource
910

1011

1112
class Track():

livekit/track_publication.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from .track import Track
99

1010
if TYPE_CHECKING:
11-
from livekit import LocalParticipant, RemoteParticipant
11+
from .participant import LocalParticipant, RemoteParticipant
1212

1313

1414
class TrackPublication():

livekit/video_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import ctypes
22

3-
from livekit import VideoFormatType, VideoFrameBufferType, VideoRotation
3+
from ._proto.video_frame_pb2 import VideoFormatType, VideoFrameBufferType, VideoRotation
44

55
from ._ffi_client import ffi_client, FfiHandle
66
from ._proto import ffi_pb2 as proto_ffi

livekit/video_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from livekit import VideoFrame
1+
from .video_frame import VideoFrame
22

33
from ._ffi_client import ffi_client, FfiHandle
44
from ._proto import ffi_pb2 as proto_ffi

livekit/video_stream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from pyee.asyncio import AsyncIOEventEmitter
44

5-
from livekit import Track
5+
from .track import Track
66

77
from ._ffi_client import ffi_client, FfiHandle
88
from ._proto import ffi_pb2 as proto_ffi

0 commit comments

Comments
 (0)