Revert assistant HD changes; restore original relay behavior

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -U -r requirements.txt
 COPY app.py relay.py youtube_api.py youtube_manager.py flv_bridge.py stream_monitor.py tiktok_auth.py ingest.py index.html ./
-COPY verify.sh verify_tokens.py probe_live.py test_watchdog.py test_lifecycle.py test_relay.py test_source_reconnect.py test_ingest_routes.py test_transition_ingest.py test_concurrency.py test_flv_bridge.py test_adaptive_format.py test_regressions.py test_completion.py test_channel_switch.py test_dashboard.js test_quality_profile.py ./
+COPY verify.sh verify_tokens.py probe_live.py test_watchdog.py test_lifecycle.py test_relay.py test_source_reconnect.py test_ingest_routes.py test_transition_ingest.py test_concurrency.py test_flv_bridge.py test_adaptive_format.py test_regressions.py test_completion.py test_channel_switch.py test_dashboard.js ./
 
 # TikTok Live Monitor → Direct Relay → YouTube. No local video files.
 ENV TZ=Asia/Baghdad \
@@ -62,9 +62,5 @@ ENV TZ=Asia/Baghdad \
     PYTHONUNBUFFERED=1 \
     YOUTUBE_VIDEO_MODE=original
 
-# Keep this broadcaster's output HD even when TikTok starts with an SD rendition.
-# Override with {} in Space variables to restore the legacy per-group policy.
-ENV YOUTUBE_ACCOUNT_SEND_MODES='{"muhajer_iraqi":"fixed720"}'
-
 EXPOSE 7860
 CMD ["sh", "-c", "exec uvicorn app:app --host 0.0.0.0 --port ${PORT:-7860} --timeout-graceful-shutdown 65 --no-access-log"]

README.md

@@ -112,24 +112,3 @@ PASSWORD=test DATA_DIR="$(mktemp -d)" sh verify.sh
 This application uses YouTube API Services to allow authenticated users to broadcast live content to their own YouTube channels.
 - By using this app, users agree to be bound by the [YouTube Terms of Service](https://www.youtube.com/t/terms) and [Google Privacy Policy](https://www.google.com/policies/privacy).
 - We do not store or share personal user data with third parties.
-
-
-## Per-account HD output (2026-10-10)
-
-`YOUTUBE_ACCOUNT_SEND_MODES` is an optional JSON object mapping usernames to
-`matchgop`, `fixed720`, or `fixed1080`. It takes precedence over the legacy
-`YOUTUBE_FORCE_TRANSCODE_USERS` group for listed accounts only, and uses the same
-encoder-slot limits. Invalid optional settings fall back to the legacy policy.
-
-The image sets `{"muhajer_iraqi":"fixed720"}`: 720×1280 H.264, 4000 kbit/s unless
-`VIDEO_BITRATE` overrides it. This avoids retaining a 360×640 matchgop canvas when
-TikTok later supplies HD. It does not create detail missing from an SD source.
-Other accounts retain their existing policy. Set the Space variable
-`YOUTUBE_ACCOUNT_SEND_MODES` to `{}` to restore the legacy group policy (restart
-required). The dashboard and `[QUALITY]` log distinguish encoder output from
-source metadata; these are not measurements of YouTube's playback renditions.
-
-Checks: `python test_quality_profile.py` covers override isolation, invalid config,
-persisted SD canvas, and unchanged matchgop locking. A local synthetic 1080×1920
-FFmpeg input was also encoded successfully as 720×1280 H.264 at a configured
-4000 kbit/s. Actual YouTube availability still requires a live playback check.

app.py

@@ -356,7 +356,7 @@ def source_brief(item):
     nums=[int(n) for n in re.findall(r'\d+',res)]
     pretty=''
     if len(nums)>=2:
-        h=min(nums[0],nums[1])
+        h=max(nums[0],nums[1])
         pretty='%dp'%h if h>=144 else '%sx%s'%(nums[0],nums[1])
     elif nums:
         pretty='%dp'%nums[0]
@@ -970,8 +970,6 @@ def state():
                 'last_data_time':rs.get('last_data_time'),'relay_alive':rs.get('relay_alive'),
                 'session_title':rs.get('session_title') or '','restarts':rs.get('restarts') or 0,
                 'source_age':rs.get('source_age'),'send_mode':rs.get('send_mode') or '',
-                'output_resolution':rs.get('output_resolution') or '',
-                'output_video_bitrate':rs.get('output_video_bitrate') or '',
                 'youtube_health':str(ye.get('youtube_health') or ''),
                 'youtube_issues':str(ye.get('youtube_issues') or '')[:120],
                 'youtube_status':str(ye.get('youtube_status') or ('relay' if rs.get('relay_alive') else (t.get('state') or '')))})

index.html

@@ -224,7 +224,6 @@ async function refresh(){
       <p>@${esc(e.username)} · ${esc(e.phase||'')} · YT ${esc(e.youtube_status||'—')}</p>
       <p>المصدر: ${esc(e.source||'—')}</p>
       <p>وضع الإرسال الفعلي: ${esc(e.send_mode||'قيد التحديد')}</p>
-      <p>خرج المرسل إلى يوتيوب: ${esc(e.output_resolution||'غير معروف')} · ${esc(e.output_video_bitrate||'—')}</p>
       ${e.pending_send_mode?`<p>الترميز الثابت ينتظر خانة: ${esc(e.pending_send_mode)}</p>`:''}
       <small>${esc(e.status||e.note||'')} · ${Math.floor(e.output_seconds||0)} ث</small>
       ${e.broadcast_id?`<p><a target="_blank" rel="noopener" href="https://www.youtube.com/watch?v=${encodeURIComponent(e.broadcast_id)}">فتح على يوتيوب</a></p>`:''}

relay.py

@@ -564,16 +564,6 @@ class Sender:
                    '-x264-params','nal-hrd=cbr:force-cfr=1:open-gop=0:scenecut=0:keyint=%s:min-keyint=30'%os.getenv('YOUTUBE_GOP','60'),
                    '-pix_fmt','yuv420p','-fps_mode','cfr',
                    '-colorspace','bt709','-color_primaries','bt709','-color_trc','bt709']
-        # Distinguish the source label from the actual encoder canvas in diagnostics.
-        if mode=='copy':
-            output_w=int((candidate or {}).get('width') or 0)
-            output_h=int((candidate or {}).get('height') or 0)
-        elif mode=='matchgop':
-            output_w,output_h=self._gop_w,self._gop_h
-        else:
-            output_w,output_h=width,height
-        self.set(output_resolution=('%sx%s'%(output_w,output_h)) if output_w and output_h else '',
-                 output_video_bitrate=bitrate if mode!='copy' else 'source')
         # Network output goes through the fifo pseudo-muxer instead of straight to flv.
         # fifo separates encoding from the RTMPS connection and reconnects transparently
         # when YouTube drops it, rather than killing the whole FFmpeg process. That is
@@ -1032,10 +1022,6 @@ class Sender:
                      'إعلان Enhanced-RTMP: hvc1' if '-rtmp_enhanced_codecs' in ' '.join(args)
                      else 'FLV تقليدي: لا إعلان hvc1', self.active_mode or 'unknown'))   # لا إعادة ترميز في هذا الوضع: انقطاع copy لا يترك عملية ورائها
 
-            self.log(user, '[QUALITY] output=%s bitrate=%s mode=%s' % (
-                self.data.get('output_resolution') or 'unknown',
-                self.data.get('output_video_bitrate') or 'unknown', self.active_mode))
-
             def read_errors():
                 # يصنّف أخطاء FFmpeg المختارة؛ لا يُسرّب stderr خامًا ولا روابط البث — الذيل
                 # يُخفى مفتاحه ورابطه قبل أي تخزين أو طباعة.

test_quality_profile.py

@@ -1,36 +0,0 @@
-"""HD output must not inherit a persisted SD matchgop canvas."""
-import os, unittest
-from unittest.mock import patch
-from relay import Sender
-from youtube_manager import ManagedYouTube
-
-class QualityProfileTests(unittest.TestCase):
-    def test_specific_profile_does_not_change_other_accounts(self):
-        with patch.dict(os.environ, {'YOUTUBE_ACCOUNT_SEND_MODES':'{"muhajer_iraqi":"fixed720"}',
-             'YOUTUBE_FORCE_TRANSCODE_USERS':'muhajer_iraqi,other',
-             'YOUTUBE_FORCE_TRANSCODE_MODE':'matchgop'}):
-            self.assertEqual(ManagedYouTube.forced_mode('@MUHAJER_IRAQI'),'fixed720')
-            self.assertEqual(ManagedYouTube.forced_mode('other'),'matchgop')
-            self.assertEqual(ManagedYouTube.forced_mode('unlisted'),'')
-    def test_invalid_configuration_retains_legacy_policy(self):
-        for value in ('bad', '[]', '{"other":"copy"}'):
-            with patch.dict(os.environ, {'YOUTUBE_ACCOUNT_SEND_MODES':value,
-                 'YOUTUBE_FORCE_TRANSCODE_USERS':'other','YOUTUBE_FORCE_TRANSCODE_MODE':'matchgop'}):
-                self.assertEqual(ManagedYouTube.forced_mode('other'),'matchgop')
-    def test_fixed720_ignores_old_sd_canvas_for_all_sources(self):
-        with patch.dict(os.environ, {'VIDEO_BITRATE':'','YOUTUBE_X264_PRESET':'ultrafast'}):
-            s=Sender('/bin/true',lambda *a:None)
-            s.sticky_mode='fixed720';s._no_copy_recovery=True
-            s._gop_w,s._gop_h=360,640
-            for w,h in ((360,640),(720,1280),(1080,1920)):
-                c={'width':w,'height':h,'codec':'h264','media':'flv'}
-                cmd=s.command('/tmp/test.flv',c)
-                self.assertIn('scale=w=720:h=1280',cmd[cmd.index('-vf')+1])
-                self.assertEqual(cmd[cmd.index('-b:v')+1],'4000k')
-                self.assertEqual(s.snapshot()['output_resolution'],'720x1280')
-    def test_unlisted_matchgop_still_keeps_canvas(self):
-        s=Sender('/bin/true',lambda *a:None)
-        s.lock_gold({'width':360,'height':640})
-        self.assertEqual(s.lock_gold({'width':1080,'height':1920}),(360,640))
-
-if __name__=='__main__':unittest.main()

verify.sh

@@ -17,7 +17,6 @@ assert '/api/download' not in (root/'app.py').read_text()
 print('PASS  no recorder / no video download API')
 PY
 
-python3 test_quality_profile.py
 python3 test_concurrency.py "$ROOT"
 python3 test_channel_switch.py "$ROOT"
 if command -v node >/dev/null 2>&1; then

youtube_manager.py

@@ -2,7 +2,7 @@
 Each event carries the name/title/hashtags of the TikTok account it relays, and each
 account gets its own reusable ingestion stream so concurrent events never mix.
 Fail closed on ambiguous remote creates."""
-import os, re, subprocess, threading, time, uuid, json
+import os, re, subprocess, threading, time, uuid
 from datetime import datetime, timezone, timedelta
 from zoneinfo import ZoneInfo
 from urllib.parse import urlparse, urlunparse, quote
@@ -142,18 +142,6 @@ class ManagedYouTube:
     @staticmethod
     def forced_mode(user):
         """Optional per-account reliability mode; never forces every relay to burn CPU."""
-        # Per-account overrides precede the legacy group mode. This lets one SD-pinned
-        # event use a fixed HD canvas without changing other running broadcasters.
-        name=str(user or '').strip().lower().lstrip('@')
-        try:
-            profiles=json.loads(os.getenv('YOUTUBE_ACCOUNT_SEND_MODES','{}'))
-            if isinstance(profiles,dict):
-                for account,mode in profiles.items():
-                    if str(account).strip().lower().lstrip('@') == name:
-                        if mode in ('matchgop','fixed720','fixed1080'):
-                            return mode
-        except (ValueError,TypeError):
-            pass  # Invalid optional config must not disable the legacy safety policy.
         users={x.strip().lower().lstrip('@') for x in
                os.getenv('YOUTUBE_FORCE_TRANSCODE_USERS','').split(',') if x.strip()}
         if str(user or '').lower().lstrip('@') not in users:
@@ -430,8 +418,6 @@ class ManagedYouTube:
                 'status':s.get('status',''),'source':s.get('source',''),'output_seconds':s.get('output_seconds',0),
                 'send_mode':s.get('send_mode') or ev.get('sender_mode',''),
                 'pending_send_mode':s.get('pending_send_mode') or ev.get('sender_pending_mode',''),
-                'output_resolution':s.get('output_resolution') or '',
-                'output_video_bitrate':s.get('output_video_bitrate') or '',
                 # عمر آخر بايت من المصدر + حدّ الحارس: اللوحة تُظهر «المصدر صامت 12 ث» بدل أن
                 # يظن المشاهد أن البث ميت بينما الجلسة تعمل (ما حدث في تجمّد @viggoo313).
                 # صمت المصدر لحظة آخر قفل: يشرح في اللوحة سبب 187 (جوع تغذية لا رفض مستقبِل).