Update api_executor.py

api_executor.py

@@ -5,7 +5,7 @@ Flare – API Executor  (v2.0 · session-aware token management)
 from __future__ import annotations
 import json, re, time, requests
 from typing import Any, Dict, Optional, Union
-from utils import log
+from logger import log_info, log_error, log_warning, log_debug
 from config_provider import ConfigProvider, APIConfig
 from session import Session
 
@@ -107,7 +107,7 @@ def _fetch_token(api: APIConfig, session: Session) -> None:
     if not api.auth or not api.auth.enabled:
         return
         
-    log(f"🔑 Fetching token for {api.name}")
+    log_info(f"🔑 Fetching token for {api.name}")
     
     try:
         # Use _render_json for body to preserve types
@@ -138,10 +138,10 @@ def _fetch_token(api: APIConfig, session: Session) -> None:
             "refresh_token": json_data.get("refresh_token")
         }
         
-        log(f"✅ Token obtained for {api.name}")
+        log_info(f"✅ Token obtained for {api.name}")
         
     except Exception as e:
-        log(f"❌ Token fetch failed for {api.name}: {e}")
+        log_error(f"❌ Token fetch failed for {api.name}", e)
         raise
 
 def _refresh_token(api: APIConfig, session: Session) -> bool:
@@ -153,7 +153,7 @@ def _refresh_token(api: APIConfig, session: Session) -> bool:
     if not token_info.get("refresh_token"):
         return False
     
-    log(f"🔄 Refreshing token for {api.name}")
+    log_info(f"🔄 Refreshing token for {api.name}")
     
     try:
         body = _render_json(api.auth.token_refresh_body or {}, session, api.name)
@@ -182,11 +182,11 @@ def _refresh_token(api: APIConfig, session: Session) -> bool:
             "refresh_token": json_data.get("refresh_token", token_info["refresh_token"])
         }
         
-        log(f"✅ Token refreshed for {api.name}")
+        log_info(f"✅ Token refreshed for {api.name}")
         return True
         
     except Exception as e:
-        log(f"❌ Token refresh failed for {api.name}: {e}")
+        log_error(f"❌ Token refresh failed for {api.name}", e)
         return False
 
 def _ensure_token(api: APIConfig, session: Session) -> None:
@@ -254,21 +254,21 @@ def call_api(api: APIConfig, session: Session) -> requests.Response:
     
     for attempt in range(retry_count + 1):
         try:
-            log(f"🌐 API call: {api.name} {api.method} {api.url} (attempt {attempt + 1}/{retry_count + 1})")
-            log(f"📋 Request body: {json.dumps(body, ensure_ascii=False)}")
+            log_info(f"🌐 API call: {api.name} {api.method} {api.url} (attempt {attempt + 1}/{retry_count + 1})")
+            log_info(f"📋 Request body: {json.dumps(body, ensure_ascii=False)}")
             
             response = requests.request(**request_params)
             
             # Handle 401 Unauthorized
             if response.status_code == 401 and api.auth and api.auth.enabled and attempt < retry_count:
-                log(f"🔒 Got 401, refreshing token for {api.name}")
+                log_info(f"🔒 Got 401, refreshing token for {api.name}")
                 _fetch_token(api, session)  # Force new token
                 headers = _render(api.headers, session, api.name)  # Re-render headers
                 request_params["headers"] = headers
                 continue
             
             response.raise_for_status()
-            log(f"✅ API call successful: {api.name} ({response.status_code})")
+            log_info(f"✅ API call successful: {api.name} ({response.status_code})")
             
             # Response mapping işlemi
             if response.status_code in (200, 201, 202, 204) and hasattr(api, 'response_mappings') and api.response_mappings:
@@ -308,27 +308,27 @@ def call_api(api: APIConfig, session: Session) -> requests.Response:
                                 
                                 # Session'a kaydet
                                 session.variables[var_name] = value
-                                log(f"📝 Mapped response value: {var_name} = {value}")
+                                log_info(f"📝 Mapped response value: {var_name} = {value}")
                                 
                 except Exception as e:
-                    log(f"⚠️ Response mapping error: {e}")
+                    log_error("⚠️ Response mapping error", e)
             
             return response
             
         except requests.exceptions.Timeout as e:
             last_error = e
-            log(f"⏱️ API timeout for {api.name} (attempt {attempt + 1})")
+            log_warning(f"⏱️ API timeout for {api.name} (attempt {attempt + 1})")
             
         except requests.exceptions.RequestException as e:
             last_error = e
-            log(f"❌ API error for {api.name}: {e}")
+            log_error(f"❌ API error for {api.name}", e)
             
         # Retry backoff
         if attempt < retry_count:
             backoff = api.retry.backoff_seconds if api.retry else 2
             if api.retry and api.retry.strategy == "exponential":
                 backoff = backoff * (2 ** attempt)
-            log(f"⏳ Waiting {backoff}s before retry...")
+            log_info(f"⏳ Waiting {backoff}s before retry...")
             time.sleep(backoff)
     
     # All retries failed