Spaces:

themehmi
/

OCULL-AI-DRIVING-ASSISTANT

Sleeping

App Files Files Community

themehmi commited on Jun 23

Commit

d403c94

verified ·

1 Parent(s): 8bde276

Upload 12 files

Browse files

Files changed (4) hide show

app.py +26 -3
oauth_6a3a2795fb802155791e0630.json +1 -0
requirements.txt +1 -0
templates/index.html +90 -86

app.py CHANGED Viewed

@@ -36,6 +36,7 @@ from ytmusicapi import YTMusic
 from curl_cffi import requests as cffi_requests
 import requests
 import socket
 import urllib3.util.connection as urllib3_cn
 def allowed_gai_family():
@@ -305,6 +306,26 @@ def api_oauth_poll():
 def api_status():
     return jsonify(system_status)
 @app.route('/api/frame', methods=['POST'])
 def api_frame():
     global start_closed_time, last_announced_state, smoothed_ear
@@ -540,12 +561,14 @@ def api_voice():
                     user = get_db().users.find_one({'_id': ObjectId(user_id)})
                 has_oauth = False
                 try:
                     if user and user.get('oauth_token'):
                         filepath = f"oauth_{user_id}.json"
                         with open(filepath, 'w') as f:
                             f.write(user['oauth_token'])
-                        ytmusic = YTMusic(filepath)
                         has_oauth = True
                         # Read back in case of refresh
                         with open(filepath, 'r') as f:
@@ -553,9 +576,9 @@ def api_voice():
                         if refreshed != user['oauth_token']:
                             get_db().users.update_one({'_id': ObjectId(user_id)}, {'$set': {'oauth_token': refreshed}})
                     else:
-                        ytmusic = YTMusic()
                 except Exception:
-                    ytmusic = YTMusic()
                 is_personal = any(phrase in song.lower() for phrase in ["my liked", "my playlist", "my mix", "my supermix"])

 from curl_cffi import requests as cffi_requests
 import requests
 import socket
+from pytubefix import YouTube
 import urllib3.util.connection as urllib3_cn
 def allowed_gai_family():
 def api_status():
     return jsonify(system_status)
+@app.route('/api/music_url', methods=['GET'])
+def api_music_url():
+    video_id = request.args.get('video_id')
+    if not video_id:
+        return jsonify({"error": "No video_id provided"}), 400
+    try:
+        url = f"https://www.youtube.com/watch?v={video_id}"
+        yt = YouTube(url, use_oauth=False, allow_oauth_cache=False)
+        audio_stream = yt.streams.get_audio_only()
+        return jsonify({
+            "url": audio_stream.url,
+            "title": yt.title,
+            "artist": yt.author,
+            "thumbnail": yt.thumbnail_url
+        })
+    except Exception as e:
+        print(f"[pytubefix error] {repr(e)}")
+        return jsonify({"error": str(e)}), 500
 @app.route('/api/frame', methods=['POST'])
 def api_frame():
     global start_closed_time, last_announced_state, smoothed_ear
                     user = get_db().users.find_one({'_id': ObjectId(user_id)})
                 has_oauth = False
+                # Inject a Chrome-impersonated session to bypass YouTube bot blocking on Hugging Face Spaces
+                custom_session = cffi_requests.Session(impersonate="chrome")
                 try:
                     if user and user.get('oauth_token'):
                         filepath = f"oauth_{user_id}.json"
                         with open(filepath, 'w') as f:
                             f.write(user['oauth_token'])
+                        ytmusic = YTMusic(filepath, requests_session=custom_session)
                         has_oauth = True
                         # Read back in case of refresh
                         with open(filepath, 'r') as f:
                         if refreshed != user['oauth_token']:
                             get_db().users.update_one({'_id': ObjectId(user_id)}, {'$set': {'oauth_token': refreshed}})
                     else:
+                        ytmusic = YTMusic(requests_session=custom_session)
                 except Exception:
+                    ytmusic = YTMusic(requests_session=custom_session)
                 is_personal = any(phrase in song.lower() for phrase in ["my liked", "my playlist", "my mix", "my supermix"])

oauth_6a3a2795fb802155791e0630.json ADDED Viewed

	@@ -0,0 +1 @@

+ {"access_token": "ya29.a0AT3oNZ-PuKzIRRXTb7bPX0SN0KYTcIu9lC__Wzknc4vgasQRkpIZiXGbgTOZICSwWlSoDm2P5yKY6O3j57SH9dy1ia0Km_I0QpjZo9hXm87VY0RITmBH9kSdjGke-q7Pup-dkA-Kac8mjR6Zfjvrp1RSJOypgDfN9OIezfzUH5lUOfvh8qXPA3Cga_0UBU9AHs4HfJMaCgYKAQkSARMSFQHGX2MiG9DepMZw2wSjU4GYDs3iqw0206", "expires_in": 3599, "refresh_token": "1//05IRxCRE98oyGCgYIARAAGAUSNwF-L9IrrajZ_3yapvGMF8TTsZ0rCuItI83YsyBp3o6ane8mMDxZopFh8FpuWNSKfDN-xtEscRI", "scope": "https://www.googleapis.com/auth/youtube", "token_type": "Bearer", "refresh_token_expires_in": 604799, "client_id": "491487047585-lho8et7iouct8o0r4f7hd6djlgnrroff.apps.googleusercontent.com", "client_secret": "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"}

requirements.txt CHANGED Viewed

@@ -11,3 +11,4 @@ httpx<0.28.0
 ytmusicapi
 pymongo
 requests

 ytmusicapi
 pymongo
 requests
+pytubefix

templates/index.html CHANGED Viewed

@@ -793,7 +793,6 @@
         }
         }
     </style>
-    <script src="https://www.youtube.com/iframe_api"></script>
 </head>
 <body>
@@ -885,8 +884,8 @@
                 <canvas id="canvasElement" style="display:none;"></canvas>
             </div>
-            <!-- YOUTUBE IFRAME PLAYER (Hidden) -->
-            <div id="youtube-player" style="display:none;"></div>
         </main>
         <!-- Right Sidebar for Copilot -->
@@ -1062,94 +1061,103 @@
         let recognition = null;
-        // --- YOUTUBE IFRAME API PLAYER ---
-        let ytPlayer = null;
         let isMmpPlaying = false;
-        let currentQueue = [];
-        let currentQueueIndex = 0;
-        function onYouTubeIframeAPIReady() {
-            ytPlayer = new YT.Player('youtube-player', {
-                height: '0',
-                width: '0',
-                videoId: '',
-                playerVars: {
-                    'autoplay': 1,
-                    'controls': 0,
-                    'disablekb': 1,
-                    'fs': 0,
-                    'modestbranding': 1,
-                    'rel': 0
-                },
-                events: {
-                    'onReady': onPlayerReady,
-                    'onStateChange': onPlayerStateChange,
-                    'onError': onPlayerError
-                }
-            });
-        }
-        function onPlayerReady(event) {
-            console.log("YouTube Player Ready");
-        }
-        function onPlayerStateChange(event) {
-            if (event.data == YT.PlayerState.PLAYING) {
-                document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-pause"></i>';
-                isMmpPlaying = true;
-                // Try to get actual video title
-                if (ytPlayer && ytPlayer.getVideoData) {
-                    const data = ytPlayer.getVideoData();
-                    if (data && data.title) {
-                        document.getElementById('mmp-title').innerText = data.title;
-                    }
-                }
-            } else if (event.data == YT.PlayerState.PAUSED) {
-                document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
-                isMmpPlaying = false;
-            } else if (event.data == YT.PlayerState.BUFFERING) {
-                document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-spinner fa-spin"></i>';
-                isMmpPlaying = false;
-            } else if (event.data == YT.PlayerState.ENDED) {
-                document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
-                isMmpPlaying = false;
-                if (currentQueue.length > currentQueueIndex + 1) {
-                    currentQueueIndex++;
-                    playNativeAudio(currentQueue[currentQueueIndex], "Up Next...");
-                } else {
-                    document.getElementById('custom-media-player').style.display = 'none';
-                }
             }
-        }
-        function onPlayerError(event) {
-            console.error("YouTube Player Error:", event.data);
             document.getElementById('mmp-title').innerText = "Playback Failed";
             document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
             appendMessage('assistant', "Failed to load audio stream. Please try another song.");
             isMmpPlaying = false;
-        }
         function toggleMmpPlay() {
-            if (!ytPlayer) return;
             if (isMmpPlaying) {
-                ytPlayer.pauseVideo();
             } else {
-                ytPlayer.playVideo();
             }
         }
-        function playNativeAudio(videoId, titleGuess) {
-            if (!ytPlayer) return;
             document.getElementById('custom-media-player').style.display = 'flex';
             document.getElementById('mmp-thumbnail').src = `https://img.youtube.com/vi/${videoId}/hqdefault.jpg`;
-            document.getElementById('mmp-title').innerText = "Loading...";
             document.getElementById('mmp-artist').innerText = titleGuess || "YouTube Music";
             document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-spinner fa-spin"></i>';
-            ytPlayer.loadVideoById(videoId);
         }
         // Pre-load voices on page load
@@ -1167,8 +1175,8 @@
             if (!text) return;
             // lower music volume
-            if (isMmpPlaying && ytPlayer) {
-                ytPlayer.setVolume(20);
             }
             // Filter out markdown
@@ -1188,13 +1196,13 @@
             utterance.onend = () => {
                 isSpeaking = false;
                 // restore music volume
-                if (isMmpPlaying && ytPlayer) {
-                    ytPlayer.setVolume(100);
                 }
             };
             utterance.onerror = () => {
                 isSpeaking = false;
-                if (isMmpPlaying && ytPlayer) ytPlayer.setVolume(100);
             };
             window.speechSynthesis.speak(utterance);
@@ -1234,11 +1242,11 @@
                         currentQueueIndex = 0;
                         playNativeAudio(currentQueue[currentQueueIndex], data.title);
                     } else if (data.action === "pause_native") {
-                        if (ytPlayer) ytPlayer.pauseVideo();
                     } else if (data.action === "resume_native") {
-                        if (ytPlayer) ytPlayer.playVideo();
                     } else if (data.action === "stop_native") {
-                        if (ytPlayer) ytPlayer.stopVideo();
                         document.getElementById('custom-media-player').style.display = 'none';
                     } else if (data.action === "next_native") {
                         if (currentQueue.length > currentQueueIndex + 1) {
@@ -1255,19 +1263,15 @@
                             appendMessage('assistant', "No previous song in queue.");
                         }
                     } else if (data.action === "vol_up_native") {
-                        if (ytPlayer) {
-                            let vol = ytPlayer.getVolume();
-                            ytPlayer.setVolume(Math.min(100, vol + 20));
-                        }
                     } else if (data.action === "vol_down_native") {
-                        if (ytPlayer) {
-                            let vol = ytPlayer.getVolume();
-                            ytPlayer.setVolume(Math.max(0, vol - 20));
-                        }
                     } else if (data.action === "mute_native") {
-                        if (ytPlayer) ytPlayer.mute();
                     } else if (data.action === "unmute_native") {
-                        if (ytPlayer) ytPlayer.unMute();
                     } else if (data.action === "open_url" && data.url) {
                         let newWin = window.open(data.url, "_blank");
                         if (!newWin || newWin.closed || typeof newWin.closed == 'undefined') {

         }
         }
     </style>
 </head>
 <body>
                 <canvas id="canvasElement" style="display:none;"></canvas>
             </div>
+            <!-- NATIVE AUDIO PLAYER (Using Piped API) -->
+            <audio id="nativeAudio" style="display:none;"></audio>
         </main>
         <!-- Right Sidebar for Copilot -->
         let recognition = null;
+        // --- NATIVE AUDIO PLAYER (Using Piped API) ---
+        const nativeAudio = document.getElementById('nativeAudio') || new Audio();
         let isMmpPlaying = false;
+        nativeAudio.addEventListener('play', () => {
+            document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-pause"></i>';
+            isMmpPlaying = true;
+        });
+        nativeAudio.addEventListener('playing', () => {
+            document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-pause"></i>';
+            isMmpPlaying = true;
+        });
+        nativeAudio.addEventListener('pause', () => {
+            document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
+            isMmpPlaying = false;
+        });
+        nativeAudio.addEventListener('waiting', () => {
+            document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-spinner fa-spin"></i>';
+            isMmpPlaying = false;
+        });
+        nativeAudio.addEventListener('ended', () => {
+            document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
+            isMmpPlaying = false;
+            if (currentQueue.length > currentQueueIndex + 1) {
+                currentQueueIndex++;
+                playNativeAudio(currentQueue[currentQueueIndex], "Up Next...");
+            } else {
+                document.getElementById('custom-media-player').style.display = 'none';
             }
+        });
+        nativeAudio.addEventListener('error', (e) => {
+            console.error("Native Audio Player Error:", e);
             document.getElementById('mmp-title').innerText = "Playback Failed";
             document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
             appendMessage('assistant', "Failed to load audio stream. Please try another song.");
             isMmpPlaying = false;
+        });
+        let currentQueue = [];
+        let currentQueueIndex = 0;
+        let currentExtractionId = 0;
         function toggleMmpPlay() {
             if (isMmpPlaying) {
+                nativeAudio.pause();
             } else {
+                if (nativeAudio.src) {
+                    nativeAudio.play().catch(e => console.error("Play error:", e));
+                }
             }
         }
+        async function playNativeAudio(videoId, titleGuess) {
+            const extractionId = ++currentExtractionId;
+            nativeAudio.pause();
             document.getElementById('custom-media-player').style.display = 'flex';
             document.getElementById('mmp-thumbnail').src = `https://img.youtube.com/vi/${videoId}/hqdefault.jpg`;
+            document.getElementById('mmp-title').innerText = "Extracting Audio Stream...";
             document.getElementById('mmp-artist').innerText = titleGuess || "YouTube Music";
             document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-spinner fa-spin"></i>';
+            try {
+                // Fetch direct audio stream URL from backend
+                const response = await fetch(`/api/music_url?video_id=${videoId}`);
+                const data = await response.json();
+                if (extractionId !== currentExtractionId) return; // Superceded by another play
+                if (data.url) {
+                    document.getElementById('mmp-title').innerText = data.title || titleGuess;
+                    document.getElementById('mmp-artist').innerText = data.artist || "YouTube Music";
+                    nativeAudio.src = data.url;
+                    nativeAudio.volume = 1.0;
+                    nativeAudio.play().catch(e => {
+                        console.error("Autoplay prevented:", e);
+                        document.getElementById('mmp-title').innerText = data.title || titleGuess;
+                        document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
+                        appendMessage('assistant', "Please click the play button manually to start the song.");
+                    });
+                } else {
+                    throw new Error(data.error || "No URL returned");
+                }
+            } catch (err) {
+                console.error("Extraction error:", err);
+                if (extractionId === currentExtractionId) {
+                    document.getElementById('mmp-title').innerText = "Extraction Failed";
+                    document.getElementById('mmp-play-pause').innerHTML = '<i class="fa-solid fa-play"></i>';
+                    appendMessage('assistant', "Failed to extract audio stream for this song. Please try another one.");
+                }
+            }
         }
         // Pre-load voices on page load
             if (!text) return;
             // lower music volume
+            if (isMmpPlaying) {
+                nativeAudio.volume = 0.2;
             }
             // Filter out markdown
             utterance.onend = () => {
                 isSpeaking = false;
                 // restore music volume
+                if (isMmpPlaying) {
+                    nativeAudio.volume = 1.0;
                 }
             };
             utterance.onerror = () => {
                 isSpeaking = false;
+                if (isMmpPlaying) nativeAudio.volume = 1.0;
             };
             window.speechSynthesis.speak(utterance);
                         currentQueueIndex = 0;
                         playNativeAudio(currentQueue[currentQueueIndex], data.title);
                     } else if (data.action === "pause_native") {
+                        nativeAudio.pause();
                     } else if (data.action === "resume_native") {
+                        nativeAudio.play();
                     } else if (data.action === "stop_native") {
+                        nativeAudio.pause();
                         document.getElementById('custom-media-player').style.display = 'none';
                     } else if (data.action === "next_native") {
                         if (currentQueue.length > currentQueueIndex + 1) {
                             appendMessage('assistant', "No previous song in queue.");
                         }
                     } else if (data.action === "vol_up_native") {
+                        let vol = nativeAudio.volume;
+                        nativeAudio.volume = Math.min(1.0, vol + 0.2);
                     } else if (data.action === "vol_down_native") {
+                        let vol = nativeAudio.volume;
+                        nativeAudio.volume = Math.max(0.0, vol - 0.2);
                     } else if (data.action === "mute_native") {
+                        nativeAudio.muted = true;
                     } else if (data.action === "unmute_native") {
+                        nativeAudio.muted = false;
                     } else if (data.action === "open_url" && data.url) {
                         let newWin = window.open(data.url, "_blank");
                         if (!newWin || newWin.closed || typeof newWin.closed == 'undefined') {