@danhachuel/thunderbolt 0.6.21 → 0.6.23

package/app/social_networks_ui.py

@@ -8,11 +8,12 @@ from typing import Any, Callable, Mapping
 import requests
 import streamlit as st
 
-from hermes_ui.domain import create_channel, update_channel
+from hermes_ui.domain import create_channel, delete_channel, update_channel
 from hermes_ui.influencers import InfluencerBackendError, STANDALONE_CONTENT_INFLUENCER_ID, get_repository
 from hermes_ui.storage import read_json, write_json
+from hermes_ui.countries import COUNTRY_OPTIONS
 from hermes_ui.languages import LANGUAGE_CODES, language_code, language_label
-from integrations.instagram_public import fetch_public_instagram_posts, fetch_public_instagram_profile
+from integrations.instagram_public import fetch_public_instagram_posts, fetch_public_instagram_profile, normalize_instagram_bio
 from integrations.meta_social import test_facebook_pages_api_card, test_instagram_api_card
 
 
@@ -42,6 +43,20 @@ def _language_index(value: Any) -> int:
     return list(LANGUAGE_CODES).index(code) if code in LANGUAGE_CODES else list(LANGUAGE_CODES).index("pt")
 
 
+def _country_options() -> tuple[str, ...]:
+    return ("",) + COUNTRY_OPTIONS
+
+
+def _country_index(value: Any) -> int:
+    options = _country_options()
+    value = _clean(value)
+    return options.index(value) if value in options else 0
+
+
+def _country_label(value: str) -> str:
+    return value or "Não definido"
+
+
 def _instagram_posts_key(profile_id: str) -> str:
     return f"instagram_posts_{profile_id}"
 
@@ -298,7 +313,7 @@ def _render_instagram_card(profile: dict[str, Any], characters: list[dict[str, A
         with header_cols[1]:
             st.write(f"**{_clean(profile.get('name')) or 'Sem nome'}**")
             st.caption(f"{_clean(profile.get('handle')) or _clean(profile.get('url')) or 'sem handler'}")
-            bio = _clean(profile.get("bio"))
+            bio = normalize_instagram_bio(profile.get("bio"))
             if bio:
                 st.caption(f"Bio: {bio}")
             st.caption(f"{_clean(profile.get('country')) or 'País não definido'} · {_clean(profile.get('language')) or 'Idioma não definido'}")
@@ -326,17 +341,34 @@ def _render_instagram_card(profile: dict[str, Any], characters: list[dict[str, A
                 if st.button("Editar", key=f"edit_instagram_button_{profile_id}", use_container_width=True):
                     st.session_state[edit_key] = True
                     st.rerun()
+            if st.button("Apagar", key=f"delete_instagram_button_{profile_id}", use_container_width=True):
+                st.session_state[f"confirm_delete_instagram_{profile_id}"] = True
+                st.rerun()
             url = _clean(profile.get("url"))
             if url:
                 st.link_button("Abrir Instagram", url, use_container_width=True)
 
+        if st.session_state.get(f"confirm_delete_instagram_{profile_id}"):
+            st.warning("Apagar este card remove o cadastro da conta Instagram, mas não os ficheiros associados.")
+            confirm_cols = st.columns(2)
+            with confirm_cols[0]:
+                if st.button("Confirmar apagar", type="primary", key=f"confirm_delete_instagram_button_{profile_id}", use_container_width=True):
+                    delete_channel(profile_id)
+                    st.session_state.pop(f"confirm_delete_instagram_{profile_id}", None)
+                    st.success("Conta Instagram apagada.")
+                    st.rerun()
+            with confirm_cols[1]:
+                if st.button("Cancelar", key=f"cancel_delete_instagram_button_{profile_id}", use_container_width=True):
+                    st.session_state.pop(f"confirm_delete_instagram_{profile_id}", None)
+                    st.rerun()
+
         if st.session_state.get(edit_key):
             with st.form(f"edit_instagram_profile_form_{profile_id}"):
                 edit_cols = st.columns(2)
                 with edit_cols[0]:
                     name = st.text_input("Nome", value=_clean(profile.get("name")), key=f"instagram_edit_name_{profile_id}")
                     handle = st.text_input("handler", value=_clean(profile.get("handle")), key=f"instagram_edit_handle_{profile_id}")
-                    country = st.text_input("País", value=_clean(profile.get("country")), key=f"instagram_edit_country_{profile_id}")
+                    country = st.selectbox("País", _country_options(), index=_country_index(profile.get("country")), format_func=_country_label, key=f"instagram_edit_country_{profile_id}")
                     language = st.selectbox("Idioma", list(LANGUAGE_CODES), index=_language_index(profile.get("language")), format_func=language_label, key=f"instagram_edit_language_{profile_id}")
                 with edit_cols[1]:
                     posts = st.number_input("posts", min_value=0, value=int(profile.get("post_count") or 0), key=f"instagram_edit_posts_{profile_id}")
@@ -404,6 +436,9 @@ def render_social_networks(settings: dict[str, Any]) -> None:
                 with preview_cols[1]:
                     st.write(f"**{_clean(data.get('name')) or _clean(data.get('username'))}**")
                     st.caption(_clean(data.get("handle")))
+                    bio = normalize_instagram_bio(data.get("bio"))
+                    if bio:
+                        st.caption(f"Bio: {bio}")
                 with preview_cols[2]:
                     st.metric("posts", _metric(data.get("post_count")))
                 with preview_cols[3]:
@@ -414,7 +449,7 @@ def render_social_networks(settings: dict[str, Any]) -> None:
                     form_cols = st.columns(2)
                     with form_cols[0]:
                         name = st.text_input("Nome", value=_clean(data.get("name")), key="social_instagram_result_name")
-                        country = st.text_input("País", value=_clean(data.get("country")), key="social_instagram_result_country")
+                        country = st.selectbox("País", _country_options(), index=_country_index(data.get("country")), 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")
                     with form_cols[1]:
                         posts = st.number_input("posts", min_value=0, value=int(data.get("post_count") or 0), key="social_instagram_result_posts")

package/hermes_ui/countries.py

@@ -0,0 +1,43 @@
+"""Canonical country catalog for social-account metadata."""
+
+from __future__ import annotations
+
+COUNTRY_OPTIONS: tuple[str, ...] = (
+    "Abecásia", "Afeganistão", "África do Sul", "Albânia", "Alemanha", "Andorra", "Angola",
+    "Antígua e Barbuda", "Arábia Saudita", "Argélia", "Argentina", "Armênia", "Austrália", "Áustria",
+    "Azerbaijão", "Bahamas", "Bahrein", "Bangladesh", "Barbados", "Bélgica", "Belize", "Benim",
+    "Bielorrússia", "Bolívia", "Bósnia e Herzegovina", "Botsuana", "Brasil", "Brunei", "Bulgária",
+    "Burquina Fasso", "Burundi", "Butão", "Cabo Verde", "Camarões", "Camboja", "Canadá", "Catar",
+    "Cazaquistão", "Chade", "Chile", "China", "Chipre", "Chipre do Norte", "Cingapura", "Colômbia",
+    "Comores", "Congo", "Coreia do Norte", "Coreia do Sul", "Costa do Marfim", "Costa Rica", "Croácia",
+    "Cuba", "Dinamarca", "Djibouti", "Dominica", "República Dominicana", "Egito", "El Salvador",
+    "Emirados Árabes Unidos", "Equador", "Eritreia", "Eslováquia", "Eslovênia", "Espanha",
+    "Estados Federados da Micronésia", "Estados Unidos", "Estônia", "Essuatíni (Suazilândia)", "Etiópia",
+    "Fiji", "Filipinas", "Finlândia", "França", "Gabão", "Gâmbia", "Gana", "Geórgia", "Granada",
+    "Grécia", "Guatemala", "Guiana", "Guiné", "Guiné-Bissau", "Guiné Equatorial", "Haiti", "Honduras",
+    "Hungria", "Iêmen", "Ilhas Cook", "Índia", "Indonésia", "Irã", "Irlanda", "Islândia", "Israel",
+    "Itália", "Jamaica", "Japão", "Jordânia", "Kiribati", "Kosovo", "Kuwait", "Laos", "Lesoto",
+    "Letônia", "Líbano", "Libéria", "Líbia", "Liechtenstein", "Lituânia", "Luxemburgo", "Macedônia do Norte",
+    "Madagascar", "Malásia", "Malawi", "Maldivas", "Mali", "Malta", "Marrocos", "Ilhas Marshall",
+    "Maurício", "Mauritânia", "México", "Mianmar", "Moçambique", "Moldávia", "Mônaco", "Mongólia",
+    "Montenegro", "Namíbia", "Nauru", "Nepal", "Nicarágua", "Níger", "Nigéria", "Niue", "Noruega",
+    "Nova Zelândia", "Omã", "Ossétia do Sul", "Países Baixos", "Palau", "Palestina", "Panamá",
+    "Papua-Nova Guiné", "Paquistão", "Paraguai", "Peru", "Polônia", "Portugal", "Quênia", "Quirguistão",
+    "Reino Unido", "República Centro-Africana", "República Checa", "República Democrática do Congo", "Romênia",
+    "Ruanda", "Rússia", "Saara Ocidental (República Árabe Saharaui Democrática)", "Samoa", "San Marino",
+    "Santa Lúcia", "São Cristóvão e Nevis", "São Tomé e Príncipe", "São Vicente e Granadinas", "Senegal",
+    "Serra Leoa", "Sérvia", "Seicheles", "Somália", "Somalilândia", "Sri Lanka", "Sudão", "Sudão do Sul",
+    "Suécia", "Suíça", "Suriname", "Síria", "Tajiquistão", "Tailândia", "Taiwan", "Tanzânia",
+    "Timor-Leste", "Togo", "Tonga", "Transnístria", "Trinidad e Tobago", "Tunísia", "Turcomenistão",
+    "Turquia", "Tuvalu", "Ucrânia", "Uganda", "Uruguai", "Uzbequistão", "Vanuatu", "Vaticano (Santa Sé)",
+    "Venezuela", "Vietnã", "Zâmbia", "Zimbábue",
+)
+
+
+def country_index(value: object) -> int:
+    """Return the selector index while keeping legacy/empty values usable."""
+    value = str(value or "").strip()
+    return COUNTRY_OPTIONS.index(value) if value in COUNTRY_OPTIONS else 0
+
+
+__all__ = ["COUNTRY_OPTIONS", "country_index"]

package/integrations/instagram_public.py

@@ -18,6 +18,16 @@ class IntegrationResult:
     data: dict[str, Any]
 
 
+def normalize_instagram_bio(value: Any) -> str:
+    """Keep the profile biography, never Instagram's metrics summary."""
+    bio = str(value or '').strip()
+    if not bio:
+        return ''
+    if re.search(r'\b(?:followers|following|seguidores|seguindo|posts|publicações)\b', bio, flags=re.IGNORECASE) and re.search(r'\d', bio):
+        return ''
+    return bio
+
+
 def normalize_instagram_reference(source: str) -> dict[str, str]:
     value = str(source or '').strip()
     if not value:
@@ -107,14 +117,16 @@ def _fetch_web_profile_user(username: str) -> dict[str, Any] | None:
 
 
 def _profile_data_from_api(user: Mapping[str, Any], reference: Mapping[str, str]) -> dict[str, Any]:
-    followers = _structured_metric_from_json(json.dumps(user), 'edge_followed_by', 'followers', 'follower_count')
-    following = _structured_metric_from_json(json.dumps(user), 'edge_follow', 'follows', 'following', 'following_count')
+    followers = _direct_profile_metric(user, 'edge_followed_by', 'followers', 'follower_count', 'followerCount')
+    following = _direct_profile_metric(user, 'edge_follow', 'follows', 'following', 'following_count', 'followingCount')
+    followers = followers if followers is not None else _structured_metric_from_json(json.dumps(user), 'edge_followed_by', 'followers', 'follower_count', 'followerCount')
+    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)
     return {
         'id': f"instagram_{reference['username']}",
         **reference,
         'name': str(user.get('full_name') or user.get('username') or reference['username']).strip(),
-        'bio': str(user.get('biography') or '').strip(),
+        'bio': normalize_instagram_bio(user.get('biography')),
         'avatar_url': str(user.get('profile_pic_url_hd') or user.get('profile_pic_url') or '').strip(),
         'subscriber_count': followers,
         'following_count': following,
@@ -126,6 +138,21 @@ def _profile_data_from_api(user: Mapping[str, Any], reference: Mapping[str, str]
     }
 
 
+def _direct_profile_metric(user: Mapping[str, Any], *keys: str) -> int | None:
+    """Read common profile counters before falling back to recursive JSON parsing."""
+    for key in keys:
+        value = user.get(key)
+        if isinstance(value, Mapping):
+            value = value.get('count') or value.get('value')
+        if value in (None, ''):
+            continue
+        try:
+            return int(value)
+        except (TypeError, ValueError):
+            continue
+    return None
+
+
 def fetch_public_instagram_profile(source: str) -> IntegrationResult:
     try:
         reference = normalize_instagram_reference(source)
@@ -137,6 +164,9 @@ def fetch_public_instagram_profile(source: str) -> IntegrationResult:
         return IntegrationResult(False, f'Não foi possível consultar o perfil público do Instagram: {exc}', reference)
     if response.status_code >= 400:
         return IntegrationResult(False, f'O Instagram devolveu HTTP {response.status_code}. Confirme o @handle ou use o cadastro manual.', reference | {'status_code': response.status_code})
+    api_user = _fetch_web_profile_user(reference['username'])
+    if api_user:
+        return IntegrationResult(True, 'Perfil Instagram encontrado publicamente.', _profile_data_from_api(api_user, reference))
     title = _meta(response.text, 'og:title') or reference['username']
     description = _meta(response.text, 'og:description')
     avatar_url = _meta(response.text, 'og:image')
@@ -154,11 +184,7 @@ def fetch_public_instagram_profile(source: str) -> IntegrationResult:
     followers = metric((r'([\d,.]+)\s*(?:mil\s+)?(?:followers|seguidores)',)) or _structured_metric(response.text, 'edge_followed_by', 'followers', 'follower_count') or _structured_metric_from_json(response.text, 'edge_followed_by', 'followers', 'follower_count', 'followerCount')
     following = metric((r'([\d,.]+)\s*(?:mil\s+)?(?:following|seguindo)',)) or _structured_metric(response.text, 'edge_follow', 'follows', 'following', 'following_count', 'followingCount') or _structured_metric_from_json(response.text, 'edge_follow', 'follows', 'following', 'following_count', 'followingCount')
     posts = metric((r'([\d,.]+)\s*(?:mil\s+)?(?:posts|publicações|publications)',)) or _structured_metric(response.text, 'edge_owner_to_timeline_media', 'posts', 'post_count')
-    if followers is None or following is None or not avatar_url:
-        api_user = _fetch_web_profile_user(reference['username'])
-        if api_user:
-            return IntegrationResult(True, 'Perfil Instagram encontrado publicamente.', _profile_data_from_api(api_user, reference))
-    data = {'id': f"instagram_{reference['username']}", **reference, 'name': title.split('(')[0].strip() or reference['username'], 'bio': description, 'avatar_url': avatar_url, 'subscriber_count': followers, 'following_count': following, 'post_count': posts, 'public_lookup': True, 'metrics_source': 'instagram_public_page', 'last_public_lookup_at': datetime.now(timezone.utc).isoformat()}
+    data = {'id': f"instagram_{reference['username']}", **reference, 'name': title.split('(')[0].strip() or reference['username'], 'bio': normalize_instagram_bio(description), 'avatar_url': avatar_url, 'subscriber_count': followers, 'following_count': following, 'post_count': posts, 'public_lookup': True, 'metrics_source': 'instagram_public_page', 'last_public_lookup_at': datetime.now(timezone.utc).isoformat()}
     return IntegrationResult(True, 'Perfil Instagram encontrado publicamente.', data)
 
 
@@ -257,4 +283,4 @@ def fetch_public_instagram_posts(source: str, limit: int = 10) -> IntegrationRes
     return IntegrationResult(bool(posts), 'Posts públicos encontrados.' if posts else 'Não foi possível encontrar posts públicos nesta página do Instagram.', reference | {'posts': posts[:max(1, int(limit))]})
 
 
-__all__ = ['IntegrationResult', 'fetch_public_instagram_posts', 'fetch_public_instagram_profile', 'normalize_instagram_reference']
+__all__ = ['IntegrationResult', 'fetch_public_instagram_posts', 'fetch_public_instagram_profile', 'normalize_instagram_bio', 'normalize_instagram_reference']

package/package.json

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