Skip to content

Commit c04ac73

Browse files
committed
fix: improve code formatting across multiple files
1 parent 6cb5dd8 commit c04ac73

6 files changed

Lines changed: 50 additions & 30 deletions

File tree

mlx_audio/codec/models/moss_audio_tokenizer/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
Model = MossAudioTokenizer
66

77
DETECTION_HINTS = {
8-
"config_keys": {"quantizer_kwargs", "decoder_kwargs", "downsample_rate", "code_dim"},
8+
"config_keys": {
9+
"quantizer_kwargs",
10+
"decoder_kwargs",
11+
"downsample_rate",
12+
"code_dim",
13+
},
914
"architectures": {"MossAudioTokenizerModel"},
1015
"path_patterns": {"moss_audio_tokenizer", "mossaudiotokenizer", "speech_tokenizer"},
1116
}

mlx_audio/server.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import numpy as np
2525
import uvicorn
2626
import webrtcvad
27-
from mlx_audio.audio_io import sf_read, sf_write
2827
from fastapi import (
2928
FastAPI,
3029
File,
@@ -41,10 +40,10 @@
4140
from pydantic import BaseModel
4241

4342
from mlx_audio.audio_io import read as audio_read
43+
from mlx_audio.audio_io import sf_read, sf_write
4444
from mlx_audio.audio_io import write as audio_write
4545
from mlx_audio.utils import load_model
4646

47-
4847
SpeechConversation = List[Dict[str, Any]]
4948

5049

mlx_audio/tests/test_server.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,12 @@ def test_realtime_ws_streaming_disabled_fallback(client, mock_model_provider):
429429
# Should have legacy-format messages (no 'type' field), not delta/complete
430430
deltas = [m for m in messages if m.get("type") == "delta"]
431431
completes = [m for m in messages if m.get("type") == "complete"]
432-
assert len(deltas) == 0, (
433-
f"Expected no delta messages when streaming disabled, got: {deltas}"
434-
)
435-
assert len(completes) == 0, (
436-
f"Expected no complete messages when streaming disabled, got: {completes}"
437-
)
432+
assert (
433+
len(deltas) == 0
434+
), f"Expected no delta messages when streaming disabled, got: {deltas}"
435+
assert (
436+
len(completes) == 0
437+
), f"Expected no complete messages when streaming disabled, got: {completes}"
438438

439439
# Should have at least one legacy text message
440440
text_msgs = [m for m in messages if "text" in m and "type" not in m]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .moss_tts import Model
21
from .config import ModelConfig
2+
from .moss_tts import Model
33

44
__all__ = ["Model", "ModelConfig"]

mlx_audio/tts/models/moss_tts/processor.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
from __future__ import annotations
22

3-
# pyright: reportMissingImports=false
4-
3+
import re
54
from dataclasses import dataclass
65
from functools import lru_cache
7-
import re
86
from typing import Any, Iterable, List, Optional, Sequence, Tuple
97

108
import mlx.core as mx
119
import numpy as np
1210

11+
# pyright: reportMissingImports=false
12+
1313

1414
AUDIO_PLACEHOLDER = "<|audio|>"
1515

@@ -462,7 +462,11 @@ def _normalize_message(message: dict) -> dict:
462462
ref = message.get("reference")
463463
if isinstance(ref, list):
464464
audio_codes_list = [r for r in ref if isinstance(r, mx.array)]
465-
return {"role": "user", "content": content, "audio_codes_list": audio_codes_list}
465+
return {
466+
"role": "user",
467+
"content": content,
468+
"audio_codes_list": audio_codes_list,
469+
}
466470
if role == "assistant":
467471
return build_assistant_message(
468472
audio_codes_list=message.get("audio_codes_list", []),
@@ -485,12 +489,16 @@ def prepare_conversation_input(
485489

486490
if mode == "generation":
487491
if len(conversation) % 2 == 0:
488-
raise ValueError("generation mode requires odd number of messages (last must be user)")
492+
raise ValueError(
493+
"generation mode requires odd number of messages (last must be user)"
494+
)
489495
if conversation[-1]["role"] != "user":
490496
raise ValueError("generation mode requires last message to be user")
491497
else:
492498
if len(conversation) % 2 != 0:
493-
raise ValueError("continuation mode requires even number of messages (last must be assistant)")
499+
raise ValueError(
500+
"continuation mode requires even number of messages (last must be assistant)"
501+
)
494502
if conversation[-1]["role"] != "assistant":
495503
raise ValueError("continuation mode requires last message to be assistant")
496504

@@ -541,7 +549,9 @@ def build_user_message(self, **kwargs: Any) -> str:
541549
def build_assistant_message(
542550
self, audio_codes_list: List[mx.array], content: str = AUDIO_PLACEHOLDER
543551
) -> dict:
544-
return build_assistant_message(audio_codes_list=audio_codes_list, content=content)
552+
return build_assistant_message(
553+
audio_codes_list=audio_codes_list, content=content
554+
)
545555

546556
def prepare_conversation_input(
547557
self,

mlx_audio/tts/tests/test_moss_tts.py

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
from __future__ import annotations
22

3-
# pyright: reportMissingImports=false
4-
5-
import os
63
import inspect
4+
import os
75
import unittest
86
from types import SimpleNamespace
97
from typing import Any, Dict, List, Optional, cast
@@ -15,33 +13,41 @@
1513

1614
from mlx_audio.codec.models.moss_audio_tokenizer import MossAudioTokenizer
1715
from mlx_audio.tts.models.moss_tts.config import ModelConfig
18-
from mlx_audio.utils import apply_quantization
1916
from mlx_audio.tts.models.moss_tts.moss_tts import (
2017
Model,
2118
_apply_experimental_quantization,
2219
_apply_mixed_precision_rescue,
20+
_encode_reference_audio_with_codec,
2321
_get_experimental_quant_mode,
2422
_get_experimental_quant_patterns,
25-
_get_mixed_precision_rescue_patterns,
26-
_requantize_module_with_mode,
27-
_encode_reference_audio_with_codec,
2823
_get_generated_audio_history,
24+
_get_mixed_precision_rescue_patterns,
2925
_normalize_reference_audio_for_codec,
3026
_path_matches_rescue_pattern,
27+
_requantize_module_with_mode,
3128
_suppress_token_ids,
3229
find_last_equal,
3330
)
34-
from mlx_audio.tts.models.moss_tts.qwen3 import Qwen3Attention
3531
from mlx_audio.tts.models.moss_tts.processor import (
3632
AUDIO_PLACEHOLDER,
37-
MossTTSProcessor,
3833
AssistantMessage,
34+
MossTTSProcessor,
35+
)
36+
from mlx_audio.tts.models.moss_tts.processor import (
3937
apply_de_delay_pattern as processor_apply_de_delay_pattern,
38+
)
39+
from mlx_audio.tts.models.moss_tts.processor import (
4040
apply_delay_pattern as processor_apply_delay_pattern,
41+
)
42+
from mlx_audio.tts.models.moss_tts.processor import (
4143
build_user_message,
4244
parse_output,
4345
prepare_generation_input,
4446
)
47+
from mlx_audio.tts.models.moss_tts.qwen3 import Qwen3Attention
48+
from mlx_audio.utils import apply_quantization
49+
50+
# pyright: reportMissingImports=false
4551

4652

4753
class TestConfig(unittest.TestCase):
@@ -931,20 +937,20 @@ def test_generate_smoke_if_local_weights_exist(self):
931937
if not os.path.isdir(model_dir):
932938
self.skipTest(f"model dir not found: {model_dir} (set MOSS_TTS_MODEL_DIR)")
933939

934-
from mlx_audio.tts.utils import load_model
935-
936940
from pathlib import Path
937941

942+
from mlx_audio.tts.utils import load_model
943+
938944
model = load_model(Path(model_dir))
939945
assert model.generate is not None
940946
results = list(model.generate("Hello from MOSS", max_tokens=64, verbose=False))
941947
self.assertGreaterEqual(len(results), 1)
942948

943949
def test_generate_ref_audio_runs_with_fixture_q8(self):
944-
from mlx_audio.tts.utils import load_model
945-
946950
from pathlib import Path
947951

952+
from mlx_audio.tts.utils import load_model
953+
948954
model_dir = os.environ.get("MOSS_TTS_MODEL_DIR", "./moss-tts-8bit")
949955
if not os.path.isdir(model_dir):
950956
self.skipTest(f"model dir not found: {model_dir} (set MOSS_TTS_MODEL_DIR)")

0 commit comments

Comments
 (0)