Skip to content

Commit ee78cbf

Browse files
chore: move conversation to models/shared
1 parent 1c266ae commit ee78cbf

6 files changed

Lines changed: 6 additions & 12 deletions

File tree

src/askui/agent_base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from askui.locators.locators import Locator
1515
from askui.models.shared.agent_message_param import MessageParam
1616
from askui.models.shared.agent_on_message_cb import OnMessageCb
17+
from askui.models.shared.conversation import Conversation, Speakers
1718
from askui.models.shared.settings import (
1819
ActSettings,
1920
CacheWritingSettings,
@@ -45,7 +46,7 @@
4546
from .models.types.response_schemas import ResponseSchema
4647
from .reporting import CompositeReporter, Reporter
4748
from .retry import ConfigurableRetry, Retry
48-
from .speaker import CacheExecutor, Conversation, Speakers
49+
from .speaker import CacheExecutor
4950

5051
logger = logging.getLogger(__name__)
5152

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
TruncationStrategyFactory,
2828
)
2929
from askui.reporting import NULL_REPORTER, Reporter
30-
31-
from .speaker import SpeakerResult, Speakers
30+
from askui.speaker.speaker import SpeakerResult, Speakers
3231

3332
if TYPE_CHECKING:
3433
from askui.utils.caching.cache_manager import CacheManager

src/askui/speaker/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@
1111

1212
from .agent_speaker import AgentSpeaker
1313
from .cache_executor import CacheExecutor
14-
from .conversation import Conversation, ConversationException
1514
from .speaker import Speaker, SpeakerResult, Speakers
1615

1716
__all__ = [
1817
"AgentSpeaker",
1918
"CacheExecutor",
20-
"Conversation",
21-
"ConversationException",
2219
"Speaker",
2320
"SpeakerResult",
2421
"Speakers",

src/askui/speaker/agent_speaker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111
from .speaker import Speaker, SpeakerResult
1212

1313
if TYPE_CHECKING:
14+
from askui.models.shared.conversation import Conversation
1415
from askui.utils.caching.cache_manager import CacheManager
1516

16-
from .conversation import Conversation
17-
1817
logger = logging.getLogger(__name__)
1918

2019

src/askui/speaker/cache_executor.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@
2929
from .speaker import Speaker, SpeakerResult
3030

3131
if TYPE_CHECKING:
32+
from askui.models.shared.conversation import Conversation
3233
from askui.models.shared.settings import CacheFile
3334
from askui.models.shared.tools import ToolCollection
3435
from askui.reporting import Reporter
3536

36-
from .conversation import Conversation
37-
3837
logger = logging.getLogger(__name__)
3938

4039

src/askui/speaker/speaker.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
from askui.models.shared.agent_message_param import MessageParam, UsageParam
1111

1212
if TYPE_CHECKING:
13+
from askui.models.shared.conversation import Conversation
1314
from askui.utils.caching.cache_manager import CacheManager
1415

15-
from .conversation import Conversation
16-
1716
logger = logging.getLogger(__name__)
1817

1918
SPEAKER_RESULT_STATUS = Literal["continue", "switch_speaker", "done", "failed"]

0 commit comments

Comments
 (0)