diff --git a/scripts/bidi/test_bidi_openai.py b/scripts/bidi/test_bidi_openai.py index 50d2d2f55..677c12981 100644 --- a/scripts/bidi/test_bidi_openai.py +++ b/scripts/bidi/test_bidi_openai.py @@ -10,7 +10,7 @@ from strands_tools import calculator from strands.experimental.bidi.agent.agent import BidiAgent -from strands.experimental.bidi.models.openai import BidiOpenAIRealtimeModel +from strands.experimental.bidi.models.openai_realtime import BidiOpenAIRealtimeModel async def play(context): diff --git a/src/strands/experimental/bidi/__init__.py b/src/strands/experimental/bidi/__init__.py index 7e2ad2bb3..57986062e 100644 --- a/src/strands/experimental/bidi/__init__.py +++ b/src/strands/experimental/bidi/__init__.py @@ -18,12 +18,8 @@ from .io.audio import BidiAudioIO # Model interface (for custom implementations) -from .models.bidi_model import BidiModel - -# Model providers - What users need to create models -from .models.gemini_live import BidiGeminiLiveModel -from .models.novasonic import BidiNovaSonicModel -from .models.openai import BidiOpenAIRealtimeModel +from .models.model import BidiModel +from .models.nova_sonic import BidiNovaSonicModel # Built-in tools from .tools import stop_conversation @@ -53,9 +49,7 @@ # IO channels "BidiAudioIO", # Model providers - "BidiGeminiLiveModel", "BidiNovaSonicModel", - "BidiOpenAIRealtimeModel", # Built-in tools "stop_conversation", # Input Event types diff --git a/src/strands/experimental/bidi/agent/agent.py b/src/strands/experimental/bidi/agent/agent.py index 2bfbdb3fa..84e0e1e4f 100644 --- a/src/strands/experimental/bidi/agent/agent.py +++ b/src/strands/experimental/bidi/agent/agent.py @@ -31,8 +31,8 @@ from ...hooks.events import BidiAgentInitializedEvent from ...tools import ToolProvider from .._async import stop_all -from ..models.bidi_model import BidiModel -from ..models.novasonic import BidiNovaSonicModel +from ..models.model import BidiModel +from ..models.nova_sonic import BidiNovaSonicModel from ..types.agent import BidiAgentInput from ..types.events import ( BidiAudioInputEvent, diff --git a/src/strands/experimental/bidi/models/__init__.py b/src/strands/experimental/bidi/models/__init__.py index d1221df36..cc62c9987 100644 --- a/src/strands/experimental/bidi/models/__init__.py +++ b/src/strands/experimental/bidi/models/__init__.py @@ -1,14 +1,10 @@ """Bidirectional model interfaces and implementations.""" -from .bidi_model import BidiModel, BidiModelTimeoutError -from .gemini_live import BidiGeminiLiveModel -from .novasonic import BidiNovaSonicModel -from .openai import BidiOpenAIRealtimeModel +from .model import BidiModel, BidiModelTimeoutError +from .nova_sonic import BidiNovaSonicModel __all__ = [ "BidiModel", "BidiModelTimeoutError", - "BidiGeminiLiveModel", "BidiNovaSonicModel", - "BidiOpenAIRealtimeModel", ] diff --git a/src/strands/experimental/bidi/models/gemini_live.py b/src/strands/experimental/bidi/models/gemini_live.py index b8daff291..3af8d707f 100644 --- a/src/strands/experimental/bidi/models/gemini_live.py +++ b/src/strands/experimental/bidi/models/gemini_live.py @@ -25,7 +25,7 @@ from ....types.content import Messages from ....types.tools import ToolResult, ToolSpec, ToolUse from .._async import stop_all -from ..types.bidi_model import AudioConfig +from ..types.model import AudioConfig from ..types.events import ( AudioChannel, AudioSampleRate, @@ -41,7 +41,7 @@ BidiUsageEvent, ModalityUsage, ) -from .bidi_model import BidiModel, BidiModelTimeoutError +from .model import BidiModel, BidiModelTimeoutError logger = logging.getLogger(__name__) diff --git a/src/strands/experimental/bidi/models/bidi_model.py b/src/strands/experimental/bidi/models/model.py similarity index 100% rename from src/strands/experimental/bidi/models/bidi_model.py rename to src/strands/experimental/bidi/models/model.py diff --git a/src/strands/experimental/bidi/models/novasonic.py b/src/strands/experimental/bidi/models/nova_sonic.py similarity index 99% rename from src/strands/experimental/bidi/models/novasonic.py rename to src/strands/experimental/bidi/models/nova_sonic.py index 968c42358..0cfa51181 100644 --- a/src/strands/experimental/bidi/models/novasonic.py +++ b/src/strands/experimental/bidi/models/nova_sonic.py @@ -37,7 +37,7 @@ from ....types.content import Messages from ....types.tools import ToolResult, ToolSpec, ToolUse from .._async import stop_all -from ..types.bidi_model import AudioConfig +from ..types.model import AudioConfig from ..types.events import ( AudioChannel, AudioSampleRate, @@ -53,7 +53,7 @@ BidiTranscriptStreamEvent, BidiUsageEvent, ) -from .bidi_model import BidiModel, BidiModelTimeoutError +from .model import BidiModel, BidiModelTimeoutError logger = logging.getLogger(__name__) diff --git a/src/strands/experimental/bidi/models/openai.py b/src/strands/experimental/bidi/models/openai_realtime.py similarity index 99% rename from src/strands/experimental/bidi/models/openai.py rename to src/strands/experimental/bidi/models/openai_realtime.py index af38ef706..39312c7d3 100644 --- a/src/strands/experimental/bidi/models/openai.py +++ b/src/strands/experimental/bidi/models/openai_realtime.py @@ -19,7 +19,7 @@ from ....types.content import Messages from ....types.tools import ToolResult, ToolSpec, ToolUse from .._async import stop_all -from ..types.bidi_model import AudioConfig +from ..types.model import AudioConfig from ..types.events import ( AudioSampleRate, BidiAudioInputEvent, @@ -37,7 +37,7 @@ Role, StopReason, ) -from .bidi_model import BidiModel, BidiModelTimeoutError +from .model import BidiModel, BidiModelTimeoutError logger = logging.getLogger(__name__) diff --git a/src/strands/experimental/bidi/types/events.py b/src/strands/experimental/bidi/types/events.py index 572ab56db..9d44fc660 100644 --- a/src/strands/experimental/bidi/types/events.py +++ b/src/strands/experimental/bidi/types/events.py @@ -27,7 +27,7 @@ from ....types.streaming import ContentBlockDelta if TYPE_CHECKING: - from ..models.bidi_model import BidiModelTimeoutError + from ..models.model import BidiModelTimeoutError AudioChannel = Literal[1, 2] """Number of audio channels. diff --git a/src/strands/experimental/bidi/types/bidi_model.py b/src/strands/experimental/bidi/types/model.py similarity index 100% rename from src/strands/experimental/bidi/types/bidi_model.py rename to src/strands/experimental/bidi/types/model.py diff --git a/tests/strands/experimental/bidi/models/test_gemini_live.py b/tests/strands/experimental/bidi/models/test_gemini_live.py index a880bb223..c92211816 100644 --- a/tests/strands/experimental/bidi/models/test_gemini_live.py +++ b/tests/strands/experimental/bidi/models/test_gemini_live.py @@ -13,7 +13,7 @@ import pytest from google.genai import types as genai_types -from strands.experimental.bidi.models.bidi_model import BidiModelTimeoutError +from strands.experimental.bidi.models.model import BidiModelTimeoutError from strands.experimental.bidi.models.gemini_live import BidiGeminiLiveModel from strands.experimental.bidi.types.events import ( BidiAudioInputEvent, diff --git a/tests/strands/experimental/bidi/models/test_novasonic.py b/tests/strands/experimental/bidi/models/test_nova_sonic.py similarity index 99% rename from tests/strands/experimental/bidi/models/test_novasonic.py rename to tests/strands/experimental/bidi/models/test_nova_sonic.py index 39524e434..7ec0c32a1 100644 --- a/tests/strands/experimental/bidi/models/test_novasonic.py +++ b/tests/strands/experimental/bidi/models/test_nova_sonic.py @@ -13,10 +13,10 @@ import pytest_asyncio from aws_sdk_bedrock_runtime.models import ModelTimeoutException, ValidationException -from strands.experimental.bidi.models.novasonic import ( +from strands.experimental.bidi.models.nova_sonic import ( BidiNovaSonicModel, ) -from strands.experimental.bidi.models.bidi_model import BidiModelTimeoutError +from strands.experimental.bidi.models.model import BidiModelTimeoutError from strands.experimental.bidi.types.events import ( BidiAudioInputEvent, BidiAudioStreamEvent, diff --git a/tests/strands/experimental/bidi/models/test_openai.py b/tests/strands/experimental/bidi/models/test_openai_realtime.py similarity index 99% rename from tests/strands/experimental/bidi/models/test_openai.py rename to tests/strands/experimental/bidi/models/test_openai_realtime.py index 04381810e..805144446 100644 --- a/tests/strands/experimental/bidi/models/test_openai.py +++ b/tests/strands/experimental/bidi/models/test_openai_realtime.py @@ -14,8 +14,8 @@ import pytest -from strands.experimental.bidi.models.bidi_model import BidiModelTimeoutError -from strands.experimental.bidi.models.openai import BidiOpenAIRealtimeModel +from strands.experimental.bidi.models.model import BidiModelTimeoutError +from strands.experimental.bidi.models.openai_realtime import BidiOpenAIRealtimeModel from strands.experimental.bidi.types.events import ( BidiAudioInputEvent, BidiAudioStreamEvent,