code cleanup
This commit is contained in:
@@ -12,7 +12,7 @@ class MediaConsumer(WebsocketConsumer):
|
|||||||
self.accept()
|
self.accept()
|
||||||
self.file_uuid = [] # List to store file uuids
|
self.file_uuid = [] # List to store file uuids
|
||||||
self.send(text_data=json.dumps({
|
self.send(text_data=json.dumps({
|
||||||
"message": "Connected to WebSocket server!"
|
"response": "Pong!"
|
||||||
}))
|
}))
|
||||||
|
|
||||||
def receive(self, text_data):
|
def receive(self, text_data):
|
||||||
@@ -23,15 +23,12 @@ class MediaConsumer(WebsocketConsumer):
|
|||||||
if "file_uuid" in data:
|
if "file_uuid" in data:
|
||||||
uuid = data["file_uuid"]
|
uuid = data["file_uuid"]
|
||||||
self.file_uuid.append(uuid)
|
self.file_uuid.append(uuid)
|
||||||
self.send(text_data=json.dumps({"response": f"UUID {uuid} stored."}))
|
|
||||||
elif message == "ping":
|
elif message == "ping":
|
||||||
self.send(text_data=json.dumps({"response": "pong"}))
|
self.send(text_data=json.dumps({"response": "pong"}))
|
||||||
else:
|
else:
|
||||||
self.send(text_data=json.dumps({"response": f"Received: {message}"}))
|
self.send(text_data=json.dumps({"response": f"Received: {message}"}))
|
||||||
|
|
||||||
def disconnect(self, close_code):
|
def disconnect(self, close_code):
|
||||||
print("Disconnected from Websocket")
|
|
||||||
print("Stored file UUIDs:", self.file_uuid)
|
|
||||||
for file_uuid in self.file_uuid:
|
for file_uuid in self.file_uuid:
|
||||||
dir_path = os.path.join(UPLOAD_DIR, file_uuid);
|
dir_path = os.path.join(UPLOAD_DIR, file_uuid);
|
||||||
zip_path = os.path.join(UPLOAD_DIR, f"{file_uuid}.zip")
|
zip_path = os.path.join(UPLOAD_DIR, f"{file_uuid}.zip")
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ def resample_audio_task(file_path, sr):
|
|||||||
def music_separation_task(file_path):
|
def music_separation_task(file_path):
|
||||||
"""Celery task to separate music audio into sources"""
|
"""Celery task to separate music audio into sources"""
|
||||||
file_path = Path(file_path)
|
file_path = Path(file_path)
|
||||||
print("File path is ", file_path)
|
|
||||||
|
|
||||||
# Determine the base directory (output path)
|
# Determine the base directory (output path)
|
||||||
output_path = file_path.parent
|
output_path = file_path.parent
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ function ProcessingPage() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (res.status === 200) {
|
if (res.status === 200) {
|
||||||
console.log("Download successful");
|
|
||||||
await handleDownload(res.data);
|
await handleDownload(res.data);
|
||||||
} else {
|
} else {
|
||||||
console.log("Failed to download the file");
|
console.log("Failed to download the file");
|
||||||
@@ -79,7 +78,6 @@ function ProcessingPage() {
|
|||||||
setLogs((prevLogs) => [...prevLogs, formatLogMessage(`freqsplit/postprocessing: Downloading file`)]);
|
setLogs((prevLogs) => [...prevLogs, formatLogMessage(`freqsplit/postprocessing: Downloading file`)]);
|
||||||
}, 100);
|
}, 100);
|
||||||
if (res.status === 200) {
|
if (res.status === 200) {
|
||||||
console.log("Download successful");
|
|
||||||
const blob = new Blob([res.data], { type: "audio/wav" });
|
const blob = new Blob([res.data], { type: "audio/wav" });
|
||||||
const fileURL = URL.createObjectURL(blob);
|
const fileURL = URL.createObjectURL(blob);
|
||||||
|
|
||||||
@@ -165,7 +163,6 @@ function ProcessingPage() {
|
|||||||
fileURLs.push({ name: filename, url: fileURL, spectrogram: res.data.spectrogram, spec_sr: res.data.spec_sr });
|
fileURLs.push({ name: filename, url: fileURL, spectrogram: res.data.spectrogram, spec_sr: res.data.spec_sr });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(fileURLs)
|
|
||||||
setExtractedFiles(fileURLs);
|
setExtractedFiles(fileURLs);
|
||||||
setProgress(100);
|
setProgress(100);
|
||||||
};
|
};
|
||||||
@@ -176,7 +173,6 @@ function ProcessingPage() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Starting processing...");
|
|
||||||
|
|
||||||
processStep("/api/normalize", formatLogMessage("freqsplit/preprocessing: Applying amplitude scaling"), () => {
|
processStep("/api/normalize", formatLogMessage("freqsplit/preprocessing: Applying amplitude scaling"), () => {
|
||||||
processStep("/api/trim", formatLogMessage("freqsplit/preprocessing: Pruning silent segments from audio"), () => {
|
processStep("/api/trim", formatLogMessage("freqsplit/preprocessing: Pruning silent segments from audio"), () => {
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ import { formatLogMessage } from "../utils/logUtils";
|
|||||||
function ResultsPage() {
|
function ResultsPage() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { mediaFile, response, extractedFiles, downloadedFileURL, downloadedFileSpectrogram, setLogs } = useMediaContext();
|
const { mediaFile, response, extractedFiles, downloadedFileURL, downloadedFileSpectrogram, setLogs } = useMediaContext();
|
||||||
console.log("Extracted files are", extractedFiles);
|
|
||||||
// const [isPlaying, setIsPlaying] = useState(false);
|
|
||||||
const audioClass = response.audio_class
|
const audioClass = response.audio_class
|
||||||
const isVideo = mediaFile?.type.includes('video');
|
const isVideo = mediaFile?.type.includes('video');
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ function UploadPage() {
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { socket, isConnected } = useWebSocket();
|
const { socket, isConnected } = useWebSocket();
|
||||||
const { setMediaFile, setResponse, response, setLogs } = useMediaContext();
|
const { setMediaFile, setResponse, setLogs } = useMediaContext();
|
||||||
const [file, setFile] = useState<File | null>(null);
|
const [file, setFile] = useState<File | null>(null);
|
||||||
const [isDragging, setIsDragging] = useState(false);
|
const [isDragging, setIsDragging] = useState(false);
|
||||||
const [fileError, setFileError] = useState("");
|
const [fileError, setFileError] = useState("");
|
||||||
@@ -158,8 +158,6 @@ function UploadPage() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log("Upload response:", res);
|
|
||||||
|
|
||||||
if (res.status === 201 && res.data) {
|
if (res.status === 201 && res.data) {
|
||||||
setResponse( ({
|
setResponse( ({
|
||||||
audio_class: res.data.audio_class,
|
audio_class: res.data.audio_class,
|
||||||
@@ -184,9 +182,6 @@ function UploadPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
console.log("Updated response:", response);
|
|
||||||
}, [response]);
|
|
||||||
return (
|
return (
|
||||||
<Container maxWidth="md" sx={{ py: 4 }}>
|
<Container maxWidth="md" sx={{ py: 4 }}>
|
||||||
<StepperComponent activeStep={0} />
|
<StepperComponent activeStep={0} />
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ export const WebSocketProvider: React.FC<{ children: React.ReactNode }> = ({ chi
|
|||||||
const newSocket = new WebSocket(WEBSOCKET_URL);
|
const newSocket = new WebSocket(WEBSOCKET_URL);
|
||||||
|
|
||||||
newSocket.onopen = () => {
|
newSocket.onopen = () => {
|
||||||
console.log("Connected to WebSocket!");
|
|
||||||
setIsConnected(true);
|
setIsConnected(true);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -34,7 +33,7 @@ export const WebSocketProvider: React.FC<{ children: React.ReactNode }> = ({ chi
|
|||||||
};
|
};
|
||||||
|
|
||||||
newSocket.onmessage = (event) => {
|
newSocket.onmessage = (event) => {
|
||||||
console.log("Message from server:", event.data);
|
console.log("ws/freqsplit: ", JSON.parse(event.data).response);
|
||||||
};
|
};
|
||||||
|
|
||||||
setSocket(newSocket);
|
setSocket(newSocket);
|
||||||
|
|||||||
Reference in New Issue
Block a user