@danhachuel/thunderbolt 0.6.34 → 0.6.36

package/app/social_networks_ui.py

@@ -591,6 +591,7 @@ def render_social_networks(settings: dict[str, Any]) -> None:
         data = st.session_state.get("social_instagram_result", {}) if st.session_state.get("social_instagram_ok") else {}
         if data:
             characters, _ = _characters(settings)
+            result_widget_id = _instagram_profile_storage_id(data)
             with st.container(border=True):
                 st.subheader("Conta Instagram encontrada")
                 preview_cols = st.columns([0.8, 2.2, 1.2, 1.2, 1.2])
@@ -607,20 +608,20 @@ def render_social_networks(settings: dict[str, Any]) -> None:
                     st.metric("Seguidores", _metric(_profile_metric(data, "subscriber_count", "followers_count", "follower_count", "followers", "edge_followed_by")))
                 with preview_cols[4]:
                     st.metric("seguindo", _metric(_profile_metric(data, "following_count", "following", "follows", "followingCount", "edge_follow")))
-                with st.form("social_instagram_save_public_profile"):
+                with st.form(f"social_instagram_save_public_profile_{result_widget_id}"):
                     form_cols = st.columns(2)
                     with form_cols[0]:
-                        name = st.text_input("Nome", value=_clean(data.get("name")), key="social_instagram_result_name")
-                        bio = st.text_area("Bio", value=_profile_bio(data), key="social_instagram_result_bio")
-                        country = st.selectbox("País", _country_options(), index=_country_index(_profile_country(data)), format_func=_country_label, key="social_instagram_result_country")
-                        language = st.selectbox("Idioma", list(LANGUAGE_CODES), index=_language_index(data.get("language")), format_func=language_label, key="social_instagram_result_language")
+                        name = st.text_input("Nome", value=_clean(data.get("name")), key=f"social_instagram_result_name_{result_widget_id}")
+                        bio = st.text_area("Bio", value=_profile_bio(data), key=f"social_instagram_result_bio_{result_widget_id}")
+                        country = st.selectbox("País", _country_options(), index=_country_index(_profile_country(data)), format_func=_country_label, key=f"social_instagram_result_country_{result_widget_id}")
+                        language = st.selectbox("Idioma", list(LANGUAGE_CODES), index=_language_index(data.get("language")), format_func=language_label, key=f"social_instagram_result_language_{result_widget_id}")
                     with form_cols[1]:
-                        posts = st.number_input("posts", min_value=0, value=_metric_input(_profile_metric(data, "post_count", "posts", "media_count")), placeholder="Não encontrado", key="social_instagram_result_posts")
-                        followers = st.number_input("Seguidores", min_value=0, value=_metric_input(_profile_metric(data, "subscriber_count", "followers_count", "follower_count", "followers", "edge_followed_by")), placeholder="Não encontrado", key="social_instagram_result_followers")
-                        following = st.number_input("seguindo", min_value=0, value=_metric_input(_profile_metric(data, "following_count", "following", "follows", "followingCount", "edge_follow")), placeholder="Não encontrado", key="social_instagram_result_following")
+                        posts = st.number_input("posts", min_value=0, value=_metric_input(_profile_metric(data, "post_count", "posts", "media_count")), placeholder="Não encontrado", key=f"social_instagram_result_posts_{result_widget_id}")
+                        followers = st.number_input("Seguidores", min_value=0, value=_metric_input(_profile_metric(data, "subscriber_count", "followers_count", "follower_count", "followers", "edge_followed_by")), placeholder="Não encontrado", key=f"social_instagram_result_followers_{result_widget_id}")
+                        following = st.number_input("seguindo", min_value=0, value=_metric_input(_profile_metric(data, "following_count", "following", "follows", "followingCount", "edge_follow")), placeholder="Não encontrado", key=f"social_instagram_result_following_{result_widget_id}")
                     character_options = [""] + [_clean(item.get("id")) for item in characters if _clean(item.get("id"))]
                     character_labels = {"": "Sem personagem associado"} | {_clean(item.get("id")): _clean(item.get("name")) or _clean(item.get("id")) for item in characters}
-                    selected_character = st.selectbox("Personagem", character_options, format_func=lambda value: character_labels.get(value, value), key="social_instagram_result_character")
+                    selected_character = st.selectbox("Personagem", character_options, format_func=lambda value: character_labels.get(value, value), key=f"social_instagram_result_character_{result_widget_id}")
                     save_profile = st.form_submit_button("Cadastrar conta Instagram", type="primary", use_container_width=True)
                 if save_profile:
                     profile_data = dict(data)

package/integrations/instagram_public.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import re
 import json
+import os
 import shutil
 import subprocess
 from dataclasses import dataclass
@@ -13,6 +14,31 @@ from urllib.parse import urlparse
 import requests
 
 
+ABOUT_ACCOUNT_URL = 'https://i.instagram.com/api/v1/bloks/apps/com.instagram.interactions.about_this_account/'
+ABOUT_ACCOUNT_BLOKS_VERSION = '8ca96ca267e30c02cf90888d91eeff09627f0e3fd2bd9df472278c9a6c022cbb'
+
+
+def _instagram_cookies() -> dict[str, str]:
+    cookies = {}
+    sessionid = os.getenv('INSTAGRAM_SESSIONID') or os.getenv('IG_SESSIONID')
+    if sessionid:
+        cookies['sessionid'] = sessionid.strip()
+    for name in ('csrftoken', 'ds_user_id', 'mid', 'ig_did'):
+        value = os.getenv(f'INSTAGRAM_{name.upper()}') or os.getenv(f'IG_{name.upper()}')
+        if value:
+            cookies[name] = value.strip()
+    return cookies
+
+
+def _instagram_headers() -> dict[str, str]:
+    return {
+        'x-ig-app-id': '936619743392459',
+        'User-Agent': 'Instagram 390.0.0.0.50 Android',
+        'Accept': 'application/json, text/plain, */*',
+        'Accept-Language': 'en-US,en;q=0.9',
+    }
+
+
 @dataclass
 class IntegrationResult:
     ok: bool
@@ -104,12 +130,8 @@ def _structured_metric_from_json(document: str, *keys: str) -> int | None:
 
 
 def _fetch_web_profile_user(username: str) -> dict[str, Any] | None:
-    headers = {
-        'x-ig-app-id': '936619743392459',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/131.0 Safari/537.36',
-        'Accept': 'application/json, text/plain, */*',
-        'Accept-Language': 'en-US,en;q=0.9',
-    }
+    headers = _instagram_headers()
+    headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 Chrome/131.0 Safari/537.36'
     # The www host is the current public web endpoint. The legacy i host is
     # retained as a fallback because Instagram rate-limits the two hosts
     # independently and their availability can vary by region.
@@ -117,12 +139,40 @@ def _fetch_web_profile_user(username: str) -> dict[str, Any] | None:
         f'https://www.instagram.com/api/v1/users/web_profile_info/?username={username}',
         f'https://i.instagram.com/api/v1/users/web_profile_info/?username={username}',
     )
+    def profile_quality(user: Mapping[str, Any]) -> int:
+        return sum(bool(user.get(key)) for key in ('biography', 'edge_follow', 'edge_followed_by', 'edge_owner_to_timeline_media', 'username'))
+
+    def merge_profile(base: dict[str, Any] | None, candidate: Mapping[str, Any]) -> dict[str, Any]:
+        merged = dict(base or {})
+        for key, value in candidate.items():
+            if value not in (None, '', [], {}):
+                if isinstance(value, Mapping) and isinstance(merged.get(key), Mapping):
+                    merged[key] = {**merged[key], **value}
+                else:
+                    merged[key] = value
+        return merged
+
+    best_user: dict[str, Any] | None = None
+    for endpoint in endpoints:
+        try:
+            response = requests.get(endpoint, headers=headers, timeout=15)
+            if response.status_code >= 400:
+                continue
+            payload = response.json()
+        except (requests.RequestException, ValueError, AttributeError):
+            continue
+        user = ((payload.get('data') or {}).get('user') if isinstance(payload, dict) else None)
+        if isinstance(user, dict):
+            best_user = merge_profile(best_user, user)
+            if profile_quality(best_user) >= 4:
+                return best_user
+
     curl = shutil.which('curl')
     if curl:
         for endpoint in endpoints:
             try:
                 completed = subprocess.run(
-                    [curl, '-L', '--max-time', '20', '-sS', '-A', headers['User-Agent'], '-H', f"x-ig-app-id: {headers['x-ig-app-id']}", '-H', 'Accept: application/json, text/plain, */*', endpoint],
+                    [curl, '-L', '--max-time', '20', '-sS', '-A', headers['User-Agent'], '-H', f"x-ig-app-id: {headers['x-ig-app-id']}", '-H', 'Accept', 'application/json, text/plain, */*', endpoint],
                     capture_output=True,
                     text=True,
                     encoding='utf-8',
@@ -133,21 +183,66 @@ def _fetch_web_profile_user(username: str) -> dict[str, Any] | None:
                 payload = json.loads(completed.stdout) if completed.returncode == 0 and completed.stdout else None
                 user = ((payload.get('data') or {}).get('user') if isinstance(payload, dict) else None)
                 if isinstance(user, dict):
-                    return user
+                    best_user = merge_profile(best_user, user)
+                    if profile_quality(best_user) >= 4:
+                        return best_user
             except (OSError, subprocess.SubprocessError, ValueError):
                 continue
-    for endpoint in endpoints:
-        try:
-            response = requests.get(endpoint, headers=headers, timeout=15)
-            if response.status_code >= 400:
-                continue
-            payload = response.json()
-        except (requests.RequestException, ValueError, AttributeError):
-            continue
-        user = ((payload.get('data') or {}).get('user') if isinstance(payload, dict) else None)
-        if isinstance(user, dict):
-            return user
-    return None
+    return best_user
+
+
+def _country_from_bloks(value: Any) -> str:
+    if isinstance(value, Mapping):
+        data_key = str(value.get('key') or '').casefold()
+        if data_key in PUBLIC_COUNTRY_KEYS:
+            serialized = value.get('initial_lispy') or value.get('value')
+            if isinstance(serialized, str) and 'bk.action.array.Make' in serialized:
+                country = _country_value(serialized.rsplit('bk.action.array.Make,', 1)[-1].split(')', 1)[0].replace('\\"', '"').replace('"', '').strip())
+            else:
+                country = _country_value(serialized)
+            if country:
+                return country
+        for key, candidate in value.items():
+            if str(key).casefold() in PUBLIC_COUNTRY_KEYS:
+                if isinstance(candidate, str) and 'bk.action.array.Make' in candidate:
+                    country = _country_value(candidate.rsplit('bk.action.array.Make,', 1)[-1].split(')', 1)[0].replace('\\"', '"').replace('"', '').strip())
+                else:
+                    country = _country_value(candidate)
+                if country:
+                    return country
+            country = _country_from_bloks(candidate)
+            if country:
+                return country
+    elif isinstance(value, list):
+        for candidate in value:
+            country = _country_from_bloks(candidate)
+            if country:
+                return country
+    elif isinstance(value, str) and 'about_this_account_country' in value:
+        marker = 'bk.action.array.Make,'
+        if marker in value:
+            country = value.rsplit(marker, 1)[-1].split(')', 1)[0].replace('\\"', '"').replace('"', '').strip()
+            return _country_value(country)
+    return ''
+
+
+def _fetch_instagram_about_country(user_id: Any) -> str:
+    cookies = _instagram_cookies()
+    if not cookies or not str(user_id or '').strip():
+        return ''
+    payload = {
+        'referer_type': 'ProfileUsername',
+        'target_user_id': str(user_id),
+        'bk_client_context': json.dumps({'bloks_version': ABOUT_ACCOUNT_BLOKS_VERSION, 'style_id': 'instagram'}, separators=(',', ':')),
+        'bloks_versioning_id': ABOUT_ACCOUNT_BLOKS_VERSION,
+    }
+    try:
+        response = requests.post(ABOUT_ACCOUNT_URL, data=payload, headers=_instagram_headers(), cookies=cookies, timeout=20)
+        if response.status_code >= 400:
+            return ''
+        return _country_from_bloks(response.json())
+    except (requests.RequestException, ValueError, TypeError):
+        return ''
 
 
 def _profile_data_from_api(user: Mapping[str, Any], reference: Mapping[str, str]) -> dict[str, Any]:
@@ -157,7 +252,7 @@ def _profile_data_from_api(user: Mapping[str, Any], reference: Mapping[str, str]
     following = following if following is not None else _structured_metric_from_json(json.dumps(user), 'edge_follow', 'follows', 'following', 'following_count', 'followingCount')
     media = ((user.get('edge_owner_to_timeline_media') or {}).get('count') if isinstance(user.get('edge_owner_to_timeline_media'), dict) else None)
     biography = str(user.get('biography') or '').strip()
-    country = extract_public_instagram_country(user)
+    country = extract_public_instagram_country(user) or _fetch_instagram_about_country(user.get('id') or user.get('pk'))
     return {
         'id': f"instagram_{reference['username']}",
         **reference,
@@ -188,7 +283,7 @@ def normalize_instagram_metric(value: Any) -> int | None:
 
 
 PUBLIC_COUNTRY_KEYS = {
-    'account_based_in', 'account_country', 'country_name',
+    'about_this_account_country', 'account_based_in', 'account_country', 'country_name',
     'country_of_origin', 'country_of_registration', 'location_country', 'transparency_country',
 }
 PUBLIC_TRANSPARENCY_KEYS = {'about', 'about_account', 'account_transparency', 'transparency', 'account_info'}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danhachuel/thunderbolt",
-  "version": "0.6.34",
+  "version": "0.6.36",
   "description": "Thunderbolt — interface local para operação de canais faceless e motor MoneyPrinterTurbo",
   "license": "MIT",
   "main": "scripts/cli.mjs",