Update app.py

app.py

@@ -9,43 +9,28 @@ import csv
 
 def get_backlinks(api_login, api_key, target_url, filters):
     encoded_credentials = base64.b64encode(f"{api_login}:{api_key}".encode()).decode()
-    headers = {
-        'Authorization': f'Basic {encoded_credentials}'
-    }
-    post_data = {
-        0: {
-            "target": target_url,
-            "limit": 1000,
-            "mode": "as_is",
-            "filters": filters
-        }
-    }
+    headers = {'Authorization': f'Basic {encoded_credentials}'}
+    post_data = {0: {"target": target_url, "limit": 1000, "mode": "as_is", "filters": filters}}
     response = requests.post("https://api.dataforseo.com/v3/backlinks/backlinks/live", json=post_data, headers=headers)
     if response.status_code == 200:
         response_data = response.json()
-        if 'tasks' in response_data:
-            task_result = response_data['tasks'][0]['result']
-            if task_result and 'items' in task_result[0]:
-                items = task_result[0]['items']
-                df = pd.json_normalize(items)
-                return df
-            else:
-                st.error("Received empty 'result' from API or missing 'items'.")
-                return None
+        if 'tasks' in response_data and 'result' in response_data['tasks'][0]:
+            items = response_data['tasks'][0]['result'][0]['items']
+            df = pd.json_normalize(items)
+            return df
         else:
-            st.error(f"No 'tasks' key in response JSON. Full response: {response_data}")
-            return None
+            st.error("No data found or an error occurred.")
+            return pd.DataFrame()
     else:
-        error_message = response.json().get('status_message', 'No specific error message provided')
-        st.error(f"Error: Code: {response.status_code} Message: {error_message}")
-        return None
+        st.error(f"API Error: {response.status_code}")
+        return pd.DataFrame()
 
 def convert_df_to_csv(df):
     return df.to_csv(index=False).encode('utf-8')
 
 class BacklinkWorker(threading.Thread):
     def __init__(self, jobs, results, api_login, api_key):
-        super().__init__()
+        threading.Thread.__init__(self)
         self.jobs = jobs
         self.results = results
         self.api_login = api_login
@@ -54,16 +39,18 @@ class BacklinkWorker(threading.Thread):
     def run(self):
         while True:
             job = self.jobs.get()
-            if job is None:
+            if job is None:  # Sentinel value to end the thread
+                self.jobs.task_done()
                 break
             url_id, target_url, filters = job
             df = get_backlinks(self.api_login, self.api_key, target_url, filters)
-            self.results.put((url_id, df))
+            self.results[url_id] = df
+            self.jobs.task_done()
 
 def process_pasted_data(data):
-    data_io = StringIO(data.strip())
-    reader = csv.reader(data_io, delimiter='\n', quotechar='"')
-    return [row[0] for row in reader]
+    data_io = StringIO(data)
+    reader = csv.reader(data_io, delimiter='\n')
+    return [row[0] for row in reader if row]
 
 st.sidebar.title("DataForSEO API Parameters")
 api_login = st.sidebar.text_input("API Login", value="[email protected]")
@@ -126,63 +113,49 @@ add_row = st.sidebar.button("Add Row")
 reset = st.sidebar.button("Reset")
 
 if paste_data:
-    pasted_urls = process_pasted_data(data_section)
-    for i, url in enumerate(pasted_urls):
-        st.session_state[f"target_url_{i}"] = url
-    st.session_state["row_count"] = len(pasted_urls)
+    st.session_state.pasted_urls = process_pasted_data(data_section)
+    st.session_state.row_count = len(st.session_state.pasted_urls)
 
 if add_row:
-    row_count = st.session_state.get("row_count", 0) + 1
-    st.session_state["row_count"] = row_count
+    if 'row_count' not in st.session_state:
+        st.session_state.row_count = 1
+    else:
+        st.session_state.row_count += 1
 
 if reset:
     st.session_state.clear()
 
-row_count = st.session_state.get("row_count", 1)
-for i in range(row_count):
-    col1, col2 = st.columns([3, 1])
-    target_url_key = f"target_url_{i}"
-    with col1:
-        target_url = st.text_input(f"Enter the target URL {i + 1}", key=target_url_key)
-    df_key = f"df_{i}"
-    df = st.session_state.get(df_key)
-    with col2:
-        if df is not None:
-            csv = convert_df_to_csv(df)
-            st.download_button(
-                label=f"Download CSV for URL {i + 1}",
-                data=csv,
-                file_name=f'backlinks_{i + 1}.csv',
-                mime='text/csv',
-            )
-        elif df is None and st.sidebar.button("Generate All"):
-            st.error(f"Failed for URL {i + 1}: No data or error.")
-
-if 'generate_clicked' not in st.session_state:
-    st.session_state['generate_clicked'] = False
-
-generate_button = st.sidebar.button("Generate All", key="generate_all")
-
-if generate_button or st.session_state['generate_clicked']:
-    st.session_state['generate_clicked'] = True
+# URL Input Fields
+for i in range(st.session_state.get('row_count', 1)):
+    st.text_input(f"Enter the target URL {i + 1}", key=f"target_url_{i}")
+
+# Generate All Button
+if st.sidebar.button("Generate All", key="generate_all"):
+    st.session_state.generated = True
     jobs = Queue()
-    results = Queue()
+    results = {}
     workers = [BacklinkWorker(jobs, results, api_login, api_key) for _ in range(num_concurrent_calls)]
 
     for worker in workers:
         worker.start()
 
-    for i in range(row_count):
-        target_url = st.session_state.get(f"target_url_{i}", "")
+    for i in range(st.session_state.get('row_count', 1)):
+        target_url = st.session_state.get(f"target_url_{i}")
         if target_url:
-            jobs.put((i, target_url, filters))
+            jobs.put((i, target_url, filters))  # Assume filters are defined elsewhere
 
     for _ in workers:
-        jobs.put(None)
+        jobs.put(None)  # Add sentinel values to stop the workers
 
     for worker in workers:
         worker.join()
 
-    while not results.empty():
-        url_id, df = results.get()
-        st.session_state[f"df_{url_id}"] = df
+    for i, df in results.items():
+        st.session_state[f'df_{i}'] = df
+
+# Display Download Buttons
+for i in range(st.session_state.get('row_count', 1)):
+    df = st.session_state.get(f'df_{i}')
+    if df is not None and not df.empty:
+        csv = convert_df_to_csv(df)
+        st.download_button(f"Download CSV for URL {i + 1}", csv, f"backlinks_{i + 1}.csv", "text/csv", key=f"download_{i}")