Ver 1.4.1: httpx -> requests for proxy issue

Author: AnyaCoder

build.py

@@ -28,10 +28,15 @@
         "--output-filename=fish",
         "--include-data-dir=assets=assets",
         "--include-data-dir=locales=locales",
-        "--windows-disable-console",
+        "--windows-console-mode=disable",
         "--enable-plugins=pkg-resources",
         "--enable-plugins=pyqt6",
-        "--nofollow-import-to=numpy,mkl,click",
+        "--nofollow-import-to=torch.cuda,torgb,torch.nn,torch.optim,\
+            torch.utils,torch.distributed,torch.compiler,torch.functional,\
+            torch.jit,torch.linalg,torch.amp,torch.ao,torch.autograd\
+            torch.xpu,torch.mps,torch.npu,torch.fft,torch.func",
+        # --follow-import-to=numpy
+        "--nofollow-import-to=mkl,click,scipy,pandas,matplotlib",
         "--include-qt-plugins=sensible,multimedia",
         "--show-memory",
         "--show-progress",

fish/chat.py

@@ -68,8 +68,9 @@ def __init__(
         # Add form layout and buttons to the main layout
         layout.addLayout(form_layout)
         button_layout = QHBoxLayout()
-        button_layout.addWidget(cancel_button)
+
         button_layout.addWidget(save_button)
+        button_layout.addWidget(cancel_button)
         layout.addLayout(button_layout)
 
         self.setLayout(layout)
@@ -81,6 +82,10 @@ def save_settings(self):
 
         if self.chat_api_url and self.system_prompt:  # Ensure both fields are not empty
             self.accept()
+        else:
+            QMessageBox.warning(
+                self, "Invalid", "Input non-empty valid API URL and System Prompt"
+            )
 
 
 class MessageBubble(QWidget):
@@ -403,10 +408,6 @@ def open_settings(self):
                 f"Chat API is saved as: \n{self.chat_api_url}\n\n"
                 + f"System Prompt is saved as: \n{self.system_prompt}",
             )
-        else:
-            QMessageBox.warning(
-                self, "Invalid", "Input non-empty valid API URL and System Prompt"
-            )
 
     def toggle_voice_mode(self):
         self.voice_mode_enabled = not self.voice_mode_enabled

fish/modules/worker.py

@@ -1,17 +1,15 @@
 import os
-
-os.environ["no_proxy"] = "localhost, 127.0.0.1, 0.0.0.0"
 import re
 import subprocess
 import time
 import wave
 from pathlib import Path
 
-import httpx
 import numpy as np
 import ormsgpack
 import psutil
 import pyaudio
+import requests
 import sounddevice as sd
 from PyQt6.QtCore import QMutex, QMutexLocker, QThread, pyqtSignal
 
@@ -193,32 +191,29 @@ def _process_audio_stream(self):
             f = open(self.audio_path, "wb")
 
         self.f = f
-        with httpx.Client() as client:
-            with client.stream(
-                "POST",
-                self.backend,
-                content=ormsgpack.packb(
-                    request, option=ormsgpack.OPT_SERIALIZE_PYDANTIC
-                ),
-                headers={
-                    "authorization": f"Bearer {self.api_key}",
-                    "content-type": "application/msgpack",
-                },
-                timeout=None,
-            ) as response:
-                for chunk in response.iter_bytes(chunk_size=frames_per_buffer):
-                    if first_packet_time is None:
-                        first_packet_time = self.elapsed
-                        self.time_worker.stop()
-
-                    if self.is_interrupted:
-                        return
-
-                    if streaming:
-                        stream.write(chunk)
-                        f.writeframesraw(chunk)
-                    else:
-                        f.write(chunk)
+        response = requests.post(
+            self.backend,
+            data=ormsgpack.packb(request, option=ormsgpack.OPT_SERIALIZE_PYDANTIC),
+            stream=streaming,
+            headers={
+                "authorization": f"Bearer {self.api_key}",
+                "content-type": "application/msgpack",
+            },
+        )
+
+        for chunk in response.iter_content(chunk_size=frames_per_buffer):
+            if first_packet_time is None:
+                first_packet_time = self.elapsed
+                self.time_worker.stop()
+
+            if self.is_interrupted:
+                return
+
+            if streaming:
+                stream.write(chunk)
+                f.writeframesraw(chunk)
+            else:
+                f.write(chunk)
 
         self.finish()
 

fish/utils/context.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass
+from typing import Literal
+
+from pydantic import BaseModel
+from pydantic.functional_validators import SkipValidation
+
+
+class ServeVQPart(BaseModel):
+    type: Literal["vq"] = "vq"
+    codes: SkipValidation[list[list[int]]]
+
+
+class ServeTextPart(BaseModel):
+    type: Literal["text"] = "text"
+    text: str
+
+
+class ServeAudioPart(BaseModel):
+    type: Literal["audio"] = "audio"
+    audio: bytes
+
+
+@dataclass(kw_only=True)
+class BasePart:
+    pass

fish/utils/schema.py

@@ -24,7 +24,7 @@ def main():
     splash.show()
     QtWidgets.QApplication.processEvents()  # assure display splash
     window = MainWindow()
-    qdarktheme.setup_theme(config.theme)
+    # qdarktheme.setup_theme(config.theme)
     # Make output to demonstrate real-time capture
 
     print("This laziman message is redirected to the console.", file=sys.stderr)

main.py

@@ -1,6 +1,6 @@
 [project]
 name = "fish-speech-gui"
-version = "1.3.1"
+version = "1.4.1"
 description = "fish-speech comfortable GUI"
 readme = "README.md"
 requires-python = "<3.12,>=3.10"