Update app.py

app.py

@@ -10,17 +10,29 @@ from shapely.geometry import Polygon
 from PIL import Image
 from io import BytesIO
 from concurrent.futures import ThreadPoolExecutor
-from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
-from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
+from googleapiclient.http import MediaIoBaseUpload
 import gspread
 import time
 
+# --- SEÇÃO DE SECRETS CORRIGIDA PARA LER VARIÁVEIS DE AMBIENTE ---
+
 # 🔥 Initialize Roboflow
-API_KEY = st.secrets["roboflow_api_key"]
-rf = roboflow.Roboflow(api_key=API_KEY )
-project = rf.workspace(st.secrets["roboflow_workspace"]).project(st.secrets["roboflow_project"])
-model = project.version(st.secrets["roboflow_version"]).model
+# Lê as variáveis de ambiente passadas pelo comando 'docker run -e'
+API_KEY = os.environ.get("roboflow_api_key" )
+roboflow_workspace = os.environ.get("roboflow_workspace")
+roboflow_project = os.environ.get("roboflow_project")
+roboflow_version = os.environ.get("roboflow_version")
+
+# Validação para garantir que as variáveis foram passadas
+if not all([API_KEY, roboflow_workspace, roboflow_project, roboflow_version]):
+    st.error("Um ou mais segredos do Roboflow não foram encontrados! Verifique as variáveis de ambiente: roboflow_api_key, roboflow_workspace, roboflow_project, roboflow_version.")
+    st.stop()
+
+rf = roboflow.Roboflow(api_key=API_KEY)
+project = rf.workspace(roboflow_workspace).project(roboflow_project)
+model = project.version(int(roboflow_version)).model # Garante que a versão seja um inteiro
 model.confidence = 80
 model.overlap = 25
 dpi_value = 300
@@ -28,36 +40,34 @@ dpi_value = 300
 with st.expander("⚙️ Advanced Settings", expanded=True):
     model.confidence = st.slider("Model Confidence (%)", 20, 100, 80)
 
-# 📁 Setup Google Drive and Sheets (Híbrido: Local e Hugging Face)
-scope = ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/spreadsheets"]
-creds = None
-
-# Tenta carregar as credenciais a partir do segredo do Hugging Face
-# st.secrets.get( ) retorna None se o segredo não existir, evitando erros.
-token_json_secret = st.secrets.get("GOOGLE_TOKEN_JSON")
-
-if token_json_secret:
-    # Se estiver no Hugging Face, carrega as credenciais a partir do segredo
-    creds = Credentials.from_authorized_user_info(json.loads(token_json_secret), scope)
-else:
-    # Se estiver rodando localmente, usa o fluxo de arquivos token.json/credentials.json
-    if os.path.exists('token.json'):
-        creds = Credentials.from_authorized_user_file('token.json', scope)
-    
-    if not creds or not creds.valid:
-        if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-        else:
-            flow = InstalledAppFlow.from_client_secrets_file('credentials.json', scope)
-            creds = flow.run_local_server(port=0)
-        # Salva o token para futuras execuções locais
-        with open('token.json', 'w') as token:
-            token.write(creds.to_json())
-
-# Constrói os serviços com as credenciais obtidas
-drive_service = build("drive", "v3", credentials=creds)
-sheets_client = gspread.authorize(creds)
-sheet = sheets_client.open_by_url(st.secrets["feedback_sheet_url"]).sheet1
+# 📁 Setup Google Drive and Sheets
+# Lê a variável de ambiente para a URL da planilha
+feedback_sheet_url = os.environ.get("feedback_sheet_url")
+if not feedback_sheet_url:
+    st.error("Secret 'feedback_sheet_url' não foi encontrado! Verifique a variável de ambiente.")
+    st.stop()
+
+# Lê a variável de ambiente para o token do Google
+google_token_json = os.environ.get("GOOGLE_TOKEN_JSON")
+if not google_token_json:
+    st.error("Secret 'GOOGLE_TOKEN_JSON' não foi encontrado! Verifique a variável de ambiente.")
+    st.stop()
+
+try:
+    # Autenticação do Google a partir do token JSON passado como variável de ambiente
+    scope = ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/spreadsheets"]
+    # Carrega as informações do token a partir da string JSON
+    token_info = json.loads(google_token_json ) 
+    creds = Credentials.from_authorized_user_info(token_info, scope)
+
+    drive_service = build("drive", "v3", credentials=creds)
+    sheets_client = gspread.authorize(creds)
+    sheet = sheets_client.open_by_url(feedback_sheet_url).sheet1
+except Exception as e:
+    st.error(f"Falha ao autenticar com o Google. Verifique o GOOGLE_TOKEN_JSON. Erro: {e}")
+    st.stop()
+
+# --- FIM DA SEÇÃO DE SECRETS ---
 
 
 # 📌 Helper Functions
@@ -290,4 +300,4 @@ if results:
                 except Exception as e:
                     st.error(f"An error occurred during the upload to Google Drive: {e}")
             else:
-                st.success("✅ Feedback saved successfully!")
+                st.success("✅ Feedback saved successfully!")