@danhachuel/thunderbolt 0.6.22 → 0.6.24

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, normalize_instagram_bio
+from integrations.instagram_public import fetch_public_instagram_posts, fetch_public_instagram_profile, normalize_instagram_bio, normalize_instagram_metric
 from integrations.meta_social import test_facebook_pages_api_card, test_instagram_api_card
 
 
@@ -37,11 +38,29 @@ def _profile_metric(profile: Mapping[str, Any], *keys: str) -> Any:
     return None
 
 
+def _metric_input(value: Any) -> int | None:
+    return normalize_instagram_metric(value)
+
+
 def _language_index(value: Any) -> int:
     code = language_code(value)
     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}"
 
@@ -273,6 +292,7 @@ def _save_public_profile(data: Mapping[str, Any], *, country: str, language: str
         "name": name,
         "url": url,
         "handle": _clean(data.get("handle")),
+        "bio": normalize_instagram_bio(data.get("bio")),
         "country": country.strip(),
         "language": language.strip(),
         "post_count": data.get("post_count"),
@@ -285,6 +305,14 @@ def _save_public_profile(data: Mapping[str, Any], *, country: str, language: str
     return create_channel(name, url, metadata)
 
 
+def _merge_instagram_refresh(existing: Mapping[str, Any], refreshed: Mapping[str, Any]) -> dict[str, Any]:
+    merged = dict(refreshed)
+    for field in ("subscriber_count", "following_count", "post_count", "bio", "avatar_url"):
+        if merged.get(field) in (None, "") and existing.get(field) not in (None, ""):
+            merged[field] = existing[field]
+    return merged
+
+
 def _render_instagram_card(profile: dict[str, Any], characters: list[dict[str, Any]], settings: Mapping[str, Any]) -> None:
     profile_id = _clean(profile.get("id"))
     edit_key = f"edit_instagram_profile_{profile_id}"
@@ -314,10 +342,7 @@ def _render_instagram_card(profile: dict[str, Any], characters: list[dict[str, A
                 if st.button("↻", help="Actualizar posts, seguidores e seguindo", key=f"refresh_instagram_{profile_id}"):
                     result = fetch_public_instagram_profile(_clean(profile.get("url")) or _clean(profile.get("handle")))
                     if result.ok:
-                        refreshed = dict(result.data)
-                        for field in ("subscriber_count", "following_count", "post_count", "bio", "avatar_url"):
-                            if refreshed.get(field) in (None, "") and profile.get(field) not in (None, ""):
-                                refreshed[field] = profile[field]
+                        refreshed = _merge_instagram_refresh(profile, result.data)
                         update_channel(profile_id, {**refreshed, "platform": "instagram", "country": profile.get("country", ""), "language": profile.get("language", ""), "character_id": profile.get("character_id", "")})
                         st.success("Métricas Instagram actualizadas.")
                         st.rerun()
@@ -326,25 +351,43 @@ 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}")
+                    bio = st.text_area("Bio", value=normalize_instagram_bio(profile.get("bio")), key=f"instagram_edit_bio_{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}")
-                    followers = st.number_input("Seguidores", min_value=0, value=int(profile.get("subscriber_count") or 0), key=f"instagram_edit_followers_{profile_id}")
-                    following = st.number_input("seguindo", min_value=0, value=int(profile.get("following_count") or 0), key=f"instagram_edit_following_{profile_id}")
+                    posts = st.number_input("posts", min_value=0, value=_metric_input(profile.get("post_count")), placeholder="Não encontrado", key=f"instagram_edit_posts_{profile_id}")
+                    followers = st.number_input("Seguidores", min_value=0, value=_metric_input(profile.get("subscriber_count")), placeholder="Não encontrado", key=f"instagram_edit_followers_{profile_id}")
+                    following = st.number_input("seguindo", min_value=0, value=_metric_input(profile.get("following_count")), placeholder="Não encontrado", key=f"instagram_edit_following_{profile_id}")
                 save_edit = st.form_submit_button("Guardar alterações", type="primary", use_container_width=True)
             if save_edit:
-                update_channel(profile_id, {"name": name.strip(), "handle": handle.strip(), "country": country.strip(), "language": language, "post_count": int(posts), "subscriber_count": int(followers), "following_count": int(following)})
+                update_channel(profile_id, {"name": name.strip(), "handle": handle.strip(), "bio": normalize_instagram_bio(bio), "country": country.strip(), "language": language, "post_count": _metric_input(posts), "subscriber_count": _metric_input(followers), "following_count": _metric_input(following)})
                 st.session_state.pop(edit_key, None)
                 st.success("Conta Instagram actualizada.")
                 st.rerun()
@@ -404,6 +447,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,19 +460,20 @@ 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")
+                        bio = st.text_area("Bio", value=normalize_instagram_bio(data.get("bio")), key="social_instagram_result_bio")
+                        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")
-                        followers = st.number_input("Seguidores", min_value=0, value=int(data.get("subscriber_count") or 0), key="social_instagram_result_followers")
-                        following = st.number_input("seguindo", min_value=0, value=int(data.get("following_count") or 0), key="social_instagram_result_following")
+                        posts = st.number_input("posts", min_value=0, value=_metric_input(data.get("post_count")), placeholder="Não encontrado", key="social_instagram_result_posts")
+                        followers = st.number_input("Seguidores", min_value=0, value=_metric_input(data.get("subscriber_count")), placeholder="Não encontrado", key="social_instagram_result_followers")
+                        following = st.number_input("seguindo", min_value=0, value=_metric_input(data.get("following_count")), placeholder="Não encontrado", key="social_instagram_result_following")
                     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")
                     save_profile = st.form_submit_button("Cadastrar conta Instagram", type="primary", use_container_width=True)
                 if save_profile:
                     profile_data = dict(data)
-                    profile_data.update({"name": name, "post_count": int(posts), "subscriber_count": int(followers), "following_count": int(following)})
+                    profile_data.update({"name": name, "bio": normalize_instagram_bio(bio), "post_count": _metric_input(posts), "subscriber_count": _metric_input(followers), "following_count": _metric_input(following)})
                     _save_public_profile(profile_data, country=country, language=language, character_id=selected_character)
                     st.success("Conta Instagram cadastrada em Redes Sociais.")
                     for key in ("social_instagram_result", "social_instagram_ok", "social_instagram_message"):

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/hermes_ui/domain.py

@@ -36,6 +36,7 @@ def create_channel(name: str, url: str = "", metadata: dict[str, Any] | None = N
         "platform": "youtube",
         "social_network": "YouTube",
         "handle": "",
+        "bio": "",
         "description": "",
         "description_source": "",
         "niche": "",

package/integrations/instagram_public.py

@@ -117,8 +117,10 @@ 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 = _profile_metric(user, 'edge_followed_by', 'followers', 'follower_count', 'followerCount')
+    following = _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']}",
@@ -136,6 +138,24 @@ def _profile_data_from_api(user: Mapping[str, Any], reference: Mapping[str, str]
     }
 
 
+def normalize_instagram_metric(value: Any) -> int | None:
+    """Normalize an Instagram counter without turning an unknown value into zero."""
+    if isinstance(value, Mapping):
+        value = value.get('count') or value.get('value')
+    if value in (None, ''):
+        return None
+    digits = re.sub(r'[^0-9]', '', str(value))
+    return int(digits) if digits else None
+
+
+def _profile_metric(user: Mapping[str, Any], *keys: str) -> int | None:
+    for key in keys:
+        value = normalize_instagram_metric(user.get(key))
+        if value is not None:
+            return value
+    return None
+
+
 def fetch_public_instagram_profile(source: str) -> IntegrationResult:
     try:
         reference = normalize_instagram_reference(source)
@@ -266,4 +286,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_bio', 'normalize_instagram_reference']
+__all__ = ['IntegrationResult', 'fetch_public_instagram_posts', 'fetch_public_instagram_profile', 'normalize_instagram_bio', 'normalize_instagram_metric', 'normalize_instagram_reference']

package/package.json

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