Fix conflicts move audio to adapters types

Author: Damian Fastowiec

dspy/adapters/__init__.py

@@ -1,20 +1,13 @@
 from dspy.adapters.base import Adapter
 from dspy.adapters.chat_adapter import ChatAdapter
 from dspy.adapters.json_adapter import JSONAdapter
-from dspy.adapters.types import Image, History, encode_image, is_image
-from dspy.adapters.audio_utils import Audio, encode_audio, is_audio
-from dspy.adapters.media_utils import try_expand_media_tags
+from dspy.adapters.types import Image, History, Audio
 
 __all__ = [
     'Adapter',
     'ChatAdapter',
     'JSONAdapter',
     'Image',
     'Audio',
-    'encode_image',
-    'encode_audio',
-    'is_image',
-    'is_audio',
-    'try_expand_media_tags',
     "History",
 ]

dspy/adapters/chat_adapter.py

@@ -11,7 +11,6 @@
 from pydantic.fields import FieldInfo
 
 from dspy.adapters.base import Adapter
-from dspy.adapters.types.image import try_expand_image_tags
 from dspy.adapters.types.history import History
 from dspy.adapters.utils import format_field_value, get_annotation_name, parse_value
 from dspy.signatures.field import OutputField
@@ -62,7 +61,7 @@ def format(self, signature: Signature, demos: list[dict[str, Any]], inputs: dict
         else:
             messages.append(self.format_turn(signature, inputs, role="user"))
 
-        messages = try_expand_image_tags(messages)
+        messages = try_expand_media_tags(messages)
         return messages
 
     def parse(self, signature, completion):

dspy/adapters/json_adapter.py

@@ -14,7 +14,7 @@
 
 from dspy.adapters.base import Adapter
 from dspy.adapters.types.image import Image
-from dspy.adapters.audio_utils import Audio
+from dspy.adapters.types.audio import Audio
 from dspy.adapters.types.history import History
 from dspy.adapters.utils import format_field_value, get_annotation_name, parse_value, serialize_for_json
 from dspy.signatures.signature import SignatureMeta

dspy/adapters/types/__init__.py

@@ -1,4 +1,5 @@
 from dspy.adapters.types.history import History
 from dspy.adapters.types.image import Image
+from dspy.adapters.types.audio import Audio
 
-__all__ = ["History", "Image"]
+__all__ = ["History", "Image", "Audio"]

dspy/adapters/audio_utils.py dspy/adapters/types/audio.py

@@ -28,7 +28,7 @@ class MySignature(dspy.Signature):
 from pydantic.fields import FieldInfo
 
 from dspy.adapters.types.image import Image  # noqa: F401
-from dspy.adapters.audio_utils import Audio  # noqa: F401
+from dspy.adapters.types.audio import Audio  # noqa: F401
 from dspy.signatures.field import InputField, OutputField
 
 

dspy/signatures/signature.py

@@ -9,7 +9,7 @@
 import dspy
 from dspy import Predict
 from dspy.utils.dummies import DummyLM
-from dspy.adapters.audio_utils import encode_audio, is_url, is_audio, Audio
+from dspy.adapters.types.audio import encode_audio, is_url, is_audio, Audio
 import tempfile
 import pydantic