Update app.py

app.py

@@ -15,8 +15,10 @@ CSV_FILE = 'endpoints.csv'
 # -------------------------------------------------------------------------
 
 def load_data():
+    """Loads the endpoints from the CSV file."""
     if not os.path.exists(CSV_FILE):
         return []
+    
     data = []
     try:
         with open(CSV_FILE, 'r', encoding='utf-8') as f:
@@ -30,66 +32,138 @@ def load_data():
         return []
 
 def get_type1_choices():
+    """Extracts unique TYPE1 categories."""
     data = load_data()
     if not data:
         return []
     return list(set([item.get('TYPE1') for item in data if item.get('TYPE1')]))
 
 def get_type2_choices(selected_type1):
+    """Extracts TYPE2 options based on selected TYPE1."""
     data = load_data()
     if not data or not selected_type1:
         return []
+    
     choices = [item.get('TYPE2') for item in data if item.get('TYPE1') == selected_type1]
     unique_choices = list(set(choices))
     unique_choices.sort()
+    
     all_option = f"ALL {selected_type1.upper()} REPORTS"
     return [all_option] + unique_choices
 
 # -------------------------------------------------------------------------
-# LINK RESOLVER
+# ROBUST LINK RESOLVER
 # -------------------------------------------------------------------------
 
 def resolve_tiktok_link(url):
+    """
+    Attempts to fetch Object ID, Owner ID, and SecUID from a TikTok URL.
+    """
     if not url:
         return "", "", "", "", "❌ Error: Please enter a URL first."
 
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
         "Referer": "https://www.tiktok.com/",
+        "Accept-Language": "en-US,en;q=0.9",
     }
     
     try:
-        response = requests.get(url, headers=headers, timeout=15)
+        response = requests.get(url, headers=headers, timeout=15, allow_redirects=True)
+        final_url = response.url
         html = response.text
-        data_found = {"object_id": "", "owner_id": "", "sec_uid": "", "nickname": ""}
-
-        # Regex fallback strategies
-        vid_match = re.search(r'/video/(\d+)', response.url)
-        if vid_match:
-            data_found['object_id'] = vid_match.group(1)
         
-        # User ID fallbacks
-        id_match = re.search(r'"ownerId":"(\d+)"', html) or re.search(r'"authorId":"(\d+)"', html)
-        if id_match:
-            data_found['owner_id'] = id_match.group(1)
-            # If profile, object_id is the owner_id
-            if "/@ " in response.url or not data_found['object_id']:
-                 data_found['object_id'] = data_found['owner_id']
-
-        sec_match = re.search(r'"secUid":"(MS4w[^"]+)"', html)
-        if sec_match:
-            data_found['sec_uid'] = sec_match.group(1)
-            
-        nick_match = re.search(r'"uniqueId":"([^"]+)"', html)
-        if nick_match:
-            data_found['nickname'] = nick_match.group(1)
+        data_found = {
+            "object_id": "", 
+            "owner_id": "", 
+            "sec_uid": "",
+            "nickname": ""
+        }
+
+        # Strategy 1: Universal Data
+        script_match = re.search(r'<script id="__UNIVERSAL_DATA_FOR_REHYDRATION__" type="application/json">([^<]+)</script>', html)
+        if script_match:
+            try:
+                json_data = json.loads(script_match.group(1))
+                default_scope = json_data.get('__DEFAULT_SCOPE__', {})
+
+                # Video Detail
+                video_detail = default_scope.get('webapp.video-detail', {})
+                if video_detail and 'itemInfo' in video_detail:
+                    item_struct = video_detail['itemInfo'].get('itemStruct', {})
+                    data_found['object_id'] = item_struct.get('id', '')
+                    author = item_struct.get('author', {})
+                    data_found['owner_id'] = author.get('id', '')
+                    data_found['sec_uid'] = author.get('secUid', '')
+                    data_found['nickname'] = author.get('uniqueId', '')
+
+                # User Detail
+                elif 'webapp.user-detail' in default_scope:
+                    user_detail = default_scope.get('webapp.user-detail', {})
+                    user_info = user_detail.get('userInfo', {}).get('user', {})
+                    if user_info:
+                        data_found['object_id'] = user_info.get('id', '')
+                        data_found['owner_id'] = user_info.get('id', '') 
+                        data_found['sec_uid'] = user_info.get('secUid', '')
+                        data_found['nickname'] = user_info.get('uniqueId', '')
+            except:
+                pass
+
+        # Strategy 2: SIGI State
+        if not data_found['object_id']:
+            sigi_match = re.search(r'<script id="SIGI_STATE" type="application/json">([^<]+)</script>', html)
+            if sigi_match:
+                try:
+                    sigi_data = json.loads(sigi_match.group(1))
+                    item_module = sigi_data.get('ItemModule', {})
+                    if item_module:
+                        video_data = list(item_module.values())[0]
+                        data_found['object_id'] = video_data.get('id', '')
+                        data_found['owner_id'] = video_data.get('authorId', '')
+                        data_found['nickname'] = video_data.get('author', '')
+                        user_module = sigi_data.get('UserModule', {}).get('users', {})
+                        if data_found['nickname'] in user_module:
+                            data_found['sec_uid'] = user_module[data_found['nickname']].get('secUid', '')
+                    elif 'UserModule' in sigi_data:
+                        user_module = sigi_data.get('UserModule', {}).get('users', {})
+                        if user_module:
+                            user_data = list(user_module.values())[0]
+                            data_found['object_id'] = user_data.get('id', '')
+                            data_found['owner_id'] = user_data.get('id', '')
+                            data_found['sec_uid'] = user_data.get('secUid', '')
+                            data_found['nickname'] = user_data.get('uniqueId', '')
+                except:
+                    pass
+
+        # Strategy 3: URL/Regex Fallback
+        if not data_found['object_id'] and "/video/" in final_url:
+            vid_match = re.search(r'/video/(\d+)', final_url)
+            if vid_match:
+                data_found['object_id'] = vid_match.group(1)
+
+        if not data_found['owner_id']:
+            owner_match = re.search(r'"ownerId":"(\d+)"', html) or re.search(r'"authorId":"(\d+)"', html)
+            if owner_match:
+                data_found['owner_id'] = owner_match.group(1)
+
+        if not data_found['sec_uid']:
+            sec_match = re.search(r'"secUid":"(MS4w[^"]+)"', html)
+            if sec_match:
+                data_found['sec_uid'] = sec_match.group(1)
 
         if data_found['object_id']:
-            return data_found['object_id'], data_found['owner_id'], data_found['sec_uid'], data_found['nickname'], f"✅ Resolved: {data_found['object_id']}"
-        return "", "", "", "", "⚠️ Could not resolve IDs."
+            return (
+                data_found['object_id'],
+                data_found['owner_id'],
+                data_found['sec_uid'],
+                data_found['nickname'],
+                f"✅ Success! Resolved: {data_found['nickname']} (Obj ID: {data_found['object_id']})"
+            )
+        else:
+            return "", "", "", "", "⚠️ Failed to resolve. Check the link or enter IDs manually."
 
     except Exception as e:
-        return "", "", "", "", f"❌ Error: {str(e)}"
+        return "", "", "", "", f"❌ Network Error: {str(e)}"
 
 # -------------------------------------------------------------------------
 # REPORT EXECUTION LOGIC
@@ -111,14 +185,6 @@ def patch_url(original_url, new_params):
         if new_value and new_value.strip():
             query_params[param_key] = [new_value.strip()]
 
-    # REMOVE INVALID SIGNATURES
-    # Since we changed the data, these signatures are now invalid and will cause rejection.
-    # It is cleaner to send NO signature than a WRONG signature, though the API may still require one.
-    keys_to_remove = ['X-Bogus', 'msToken', '_signature', 'X-Gnarly']
-    for k in keys_to_remove:
-        if k in query_params:
-            del query_params[k]
-
     new_query = urlencode(query_params, doseq=True)
     new_url = urlunparse(parsed._replace(query=new_query))
     return new_url
@@ -126,61 +192,139 @@ def patch_url(original_url, new_params):
 def execute_reports(type1, type2, obj_id, own_id, sec_uid, nick):
     data = load_data()
     if not data:
-        yield "❌ Error: endpoints.csv missing."
+        yield "❌ Error: endpoints.csv not found or empty."
         return
 
     all_check_str = f"ALL {type1.upper()} REPORTS"
-    targets = [item for item in data if item.get('TYPE1') == type1] if type2 == all_check_str else \
-              [item for item in data if item.get('TYPE1') == type1 and item.get('TYPE2') == type2]
+    if type2 == all_check_str:
+        targets = [item for item in data if item.get('TYPE1') == type1]
+        yield f"🚀 Preparing ALL {len(targets)} reports for: {type1}...\n"
+    else:
+        targets = [item for item in data if item.get('TYPE1') == type1 and item.get('TYPE2') == type2]
+        yield f"🚀 Preparing specific report: {type2}...\n"
 
     if not targets:
-        yield "❌ No matching endpoints."
+        yield "❌ No matching endpoints found in CSV."
         return
 
-    custom_data = {'object_id': obj_id, 'owner_id': own_id, 'sec_uid': sec_uid, 'nickname': nick}
+    custom_target_data = {
+        'object_id': obj_id,
+        'owner_id': own_id,
+        'sec_uid': sec_uid,
+        'nickname': nick
+    }
+
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
         "Referer": "https://www.tiktok.com/"
     }
+
+    log_history = ""
     
-    log = ""
     for i, target in enumerate(targets):
-        final_url = patch_url(target.get('URL'), custom_data)
+        original_url = target.get('URL')
+        report_name = target.get('TYPE2')
+        
+        if not original_url:
+            continue
+
+        final_url = patch_url(original_url, custom_target_data)
+
         try:
-            resp = requests.get(final_url, headers=headers)
-            # Log exact response
-            content = "[Empty]" if not resp.text.strip() else resp.text[:200]
-            log += f"[{time.strftime('%H:%M:%S')}] {resp.status_code} ({i+1}/{len(targets)}): {target.get('TYPE2')}\n   ➡ URL: {final_url}\n   ➡ Reply: {content}\n{'-'*40}\n"
-            yield log
-            time.sleep(1)
+            # 1. Send the Request
+            response = requests.get(final_url, headers=headers)
+            timestamp = time.strftime("%H:%M:%S")
+            
+            # 2. Detailed Response Logging
+            response_content = ""
+            if not response.text.strip():
+                response_content = "[Empty Response Body] (Signature mismatch likely)"
+            else:
+                try:
+                    parsed = response.json()
+                    response_content = json.dumps(parsed, ensure_ascii=False)
+                except:
+                    preview = response.text[:300].replace("\n", " ")
+                    response_content = f"Raw: {preview}..." if len(response.text) > 300 else f"Raw: {response.text}"
+
+            status_icon = "✅" if response.status_code == 200 else "⚠️"
+            
+            # 3. Build Log Entry with URL
+            log_entry = (
+                f"[{timestamp}] {status_icon} REQ ({i+1}/{len(targets)}): {report_name}\n"
+                f"   ➡ Sending URL: {final_url}\n"
+                f"   ⬇ Status: {response.status_code}\n"
+                f"   ⬇ Reply:  {response_content}\n"
+                f"{'-'*50}\n"
+            )
+            
+            log_history += log_entry
+            yield log_history
+            time.sleep(1) 
+            
         except Exception as e:
-            log += f"Error: {e}\n"
-            yield log
+            log_history += f"[{time.strftime('%H:%M:%S')}] ❌ ERROR: {str(e)}\n"
+            yield log_history
+
+    yield log_history + "\n✅ DONE. All tasks completed."
 
 # -------------------------------------------------------------------------
 # UI SETUP
 # -------------------------------------------------------------------------
 
 with gr.Blocks(theme=gr.themes.Soft()) as app:
-    gr.Markdown("# 🤖 TikTok Report Tool")
+    gr.Markdown("# 🤖 TikTok Report Bot Controller")
+    
     with gr.Row():
-        with gr.Column():
-            link_in = gr.Textbox(label="Link")
-            resolve_btn = gr.Button("Resolve")
-            res_stats = gr.Markdown()
-            obj_id, own_id = gr.Textbox(label="Object ID"), gr.Textbox(label="Owner ID")
-            sec_uid, nick = gr.Textbox(label="SecUID"), gr.Textbox(label="Nickname")
-            t1 = gr.Dropdown(choices=get_type1_choices(), label="Category")
-            t2 = gr.Dropdown(choices=[], label="Type")
-            send = gr.Button("Send", variant="primary")
-            refresh = gr.Button("Reload CSV")
-        with gr.Column():
-            logs = gr.Textbox(label="Logs", lines=20)
-
-    resolve_btn.click(resolve_tiktok_link, link_in, [obj_id, own_id, sec_uid, nick, res_stats])
-    t1.change(lambda x: gr.Dropdown(choices=get_type2_choices(x)), t1, t2)
-    refresh.click(lambda: (gr.Dropdown(choices=get_type1_choices()), gr.Dropdown(choices=[])), None, [t1, t2])
-    send.click(execute_reports, [t1, t2, obj_id, own_id, sec_uid, nick], logs)
+        with gr.Column(scale=1):
+            gr.Markdown("### 1. Target Configuration")
+            with gr.Group():
+                link_input = gr.Textbox(label="TikTok Link", placeholder="https://www.tiktok.com/@username...")
+                resolve_btn = gr.Button("🔍 Resolve IDs from Link", size="sm")
+                resolve_status = gr.Markdown("")
+            
+            with gr.Row():
+                obj_id_input = gr.Textbox(label="Target Object ID", info="User/Video ID")
+                own_id_input = gr.Textbox(label="Target Owner ID", info="Account ID")
+            
+            with gr.Row():
+                sec_uid_input = gr.Textbox(label="SecUID", info="Starts with MS4w...")
+                nick_input = gr.Textbox(label="Nickname", info="Username")
+
+            gr.Markdown("---")
+            gr.Markdown("### 2. Report Settings")
+            t1_input = gr.Dropdown(choices=get_type1_choices(), label="Category")
+            t2_input = gr.Dropdown(choices=[], label="Report Type")
+            
+            send_btn = gr.Button("🚀 Send Report(s)", variant="primary", size="lg")
+            refresh_btn = gr.Button("🔄 Reload CSV", variant="secondary")
+
+        with gr.Column(scale=1):
+            gr.Markdown("### 3. Execution Logs")
+            logs_output = gr.Textbox(
+                show_label=False,
+                placeholder="Server responses will appear here...", 
+                lines=25,
+                max_lines=25,
+                autoscroll=True,
+                elem_id="log-box"
+            )
+
+    resolve_btn.click(fn=resolve_tiktok_link, inputs=link_input, outputs=[obj_id_input, own_id_input, sec_uid_input, nick_input, resolve_status])
+    
+    def update_second_dropdown(choice):
+        new_choices = get_type2_choices(choice)
+        return gr.Dropdown(choices=new_choices, value=new_choices[0] if new_choices else None)
+
+    t1_input.change(fn=update_second_dropdown, inputs=t1_input, outputs=t2_input)
+    
+    send_btn.click(fn=execute_reports, inputs=[t1_input, t2_input, obj_id_input, own_id_input, sec_uid_input, nick_input], outputs=logs_output)
+    
+    def refresh_ui():
+        new_t1 = get_type1_choices()
+        return gr.Dropdown(choices=new_t1), gr.Dropdown(choices=[], value=None)
+        
+    refresh_btn.click(fn=refresh_ui, outputs=[t1_input, t2_input])
 
 if __name__ == "__main__":
     app.launch()