Update app.py

app.py

@@ -20,44 +20,44 @@ IMAGES_DIR = os.path.join(OUTPUT_DIR, "images")
 ZIP_FILE = os.path.join(OUTPUT_DIR, "images.zip")
 TRACKING_FILE = os.path.join(OUTPUT_DIR, "used_pages.json")
 
-# Ensure output directory exists
 os.makedirs(OUTPUT_DIR, exist_ok=True)
 
 # Constants
 ITEMS_PER_PAGE = 40
-DAILY_IMAGE_LIMIT = 2000  # Adjusted for free tier limits
-MAX_PAGES = min(DAILY_IMAGE_LIMIT // ITEMS_PER_PAGE, 10)  # Limit to 10 pages
+DAILY_IMAGE_LIMIT = 2000
+MAX_PAGES = min(DAILY_IMAGE_LIMIT // ITEMS_PER_PAGE, 10)
 IMAGES_PER_ROW = 4
 MAX_ROWS = 6
 TOTAL_IMAGES = IMAGES_PER_ROW * MAX_ROWS
 
-# API Configurations (Hardcoded keys)
+# API Configurations (Your original keys reinserted)
 API_CONFIGS = {
     "pexels": {
         "base_url": "https://api.pexels.com/v1/search",
         "headers": {"Authorization": "klHADHclpse2e2xSP9h747AgfE1Rx0wioemGhXYtedjZzvJ1WBUKwz7g"},
         "image_key": "src.medium",
         "result_key": "photos",
-        "delay": 2  # Pexels: 200/hour free tier
+        "delay": 2
     },
     "unsplash": {
         "base_url": "https://api.unsplash.com/search/photos",
-        "headers": {"Authorization": "Client-ID UKkhpD_Rs5-s1gIlVX28iNs_8E4ysPhQniyIpDpKUnU"},
+        "headers": {},
         "image_key": "urls.small",
         "result_key": "results",
-        "delay": 2  # Unsplash: 50/hour free tier
+        "delay": 2,
+        "client_id": "UKkhpD_Rs5-s1gIlVX28iNs_8E4ysPhQniyIpDpKUnU"  # Moved to params in fetch_image_urls
     },
     "pixabay": {
         "base_url": "https://pixabay.com/api/",
         "headers": {},
         "image_key": "webformatURL",
         "result_key": "hits",
-        "delay": 1  # Pixabay: 5000/hour
+        "delay": 1,
+        "api_key": "45122300-cd3621e1539e8e95430ee3efc"  # Used in fetch_image_urls
     }
 }
 
 def load_used_pages():
-    """Load or initialize the used pages tracking file."""
     today = str(date.today())
     if os.path.exists(TRACKING_FILE):
         with open(TRACKING_FILE, "r") as f:
@@ -69,12 +69,10 @@ def load_used_pages():
     return data
 
 def save_used_pages(data):
-    """Save the used pages tracking file."""
     with open(TRACKING_FILE, "w") as f:
         json.dump(data, f)
 
 def get_available_pages(num_pages_needed, api_name):
-    """Get a list of unused page numbers for the specified API."""
     data = load_used_pages()
     used_pages = set(data["used_pages"].get(api_name, []))
     all_pages = set(range(1, MAX_PAGES + 1))
@@ -90,7 +88,6 @@ def get_available_pages(num_pages_needed, api_name):
     return selected_pages
 
 def fetch_image_urls(api_name, category, num_images):
-    """Fetch image URLs from the specified API based on category and desired number of images."""
     config = API_CONFIGS[api_name]
     num_pages_needed = (num_images + ITEMS_PER_PAGE - 1) // ITEMS_PER_PAGE
     pages = get_available_pages(num_pages_needed, api_name)
@@ -103,57 +100,69 @@ def fetch_image_urls(api_name, category, num_images):
     data = load_used_pages()
     for page in pages:
         if api_name == "pixabay":
-            url = f"{config['base_url']}?key=45122300-cd3621e1539e8e95430ee3efc&q={category.lower()}&per_page={ITEMS_PER_PAGE}&page={page}"
-        else:
-            url = f"{config['base_url']}?query={category.lower()}&per_page={ITEMS_PER_PAGE}&page={page}"
+            url = f"{config['base_url']}?key={config['api_key']}&q={category.lower()}&per_page={ITEMS_PER_PAGE}&page={page}"
+            params = {}
+        elif api_name == "unsplash":
+            url = config["base_url"]
+            params = {
+                "query": category.lower(),
+                "per_page": ITEMS_PER_PAGE,
+                "page": page,
+                "client_id": config["client_id"]
+            }
+        else:  # pexels
+            url = config["base_url"]
+            params = {
+                "query": category.lower(),
+                "per_page": ITEMS_PER_PAGE,
+                "page": page
+            }
 
         try:
-            logger.info(f"Requesting {url} for {api_name}")
-            time.sleep(config.get("delay", 0))  # Respect API rate limits
-            response = requests.get(url, headers=config["headers"], timeout=10)
+            logger.info(f"Requesting {url} with params {params} for {api_name}")
+            time.sleep(config.get("delay", 0))
+            response = requests.get(url, headers=config["headers"], params=params, timeout=10)
             response.raise_for_status()
             data_response = response.json()
             
-            if config["result_key"] not in data_response or not data_response[config["result_key"]]:
-                logger.warning(f"No {config['result_key']} found in response for page {page} from {api_name}. Response: {data_response}")
+            results = data_response.get(config["result_key"], [])
+            if not results:
+                logger.warning(f"No {config['result_key']} in response for {api_name}, page {page}: {data_response}")
                 continue
             
             page_urls = []
-            for item in data_response[config["result_key"]]:
+            for item in results:
                 if len(image_urls) >= num_images:
                     break
                 image_url = item.get(config["image_key"])
                 if image_url:
                     page_urls.append(image_url)
                 else:
-                    logger.warning(f"No {config['image_key']} found in item: {item}")
+                    logger.warning(f"No {config['image_key']} in item: {item}")
+            
             if page_urls:
                 image_urls.extend(page_urls)
                 data["used_pages"].setdefault(api_name, []).append(page)
                 save_used_pages(data)
                 logger.info(f"Successfully fetched {len(page_urls)} images from page {page} for {api_name}")
             else:
-                logger.warning(f"No valid image URLs extracted from page {page} for {api_name}")
+                logger.warning(f"No valid URLs extracted from page {page} for {api_name}")
         except requests.exceptions.RequestException as e:
             logger.error(f"Error fetching page {page} from {api_name}: {e}")
-            logger.error(f"Response status: {response.status_code}, content: {response.text}")
+            logger.error(f"Response: {response.text}")
             if response.status_code == 401:
-                logger.error(f"401 Unauthorized for {api_name}. Check your API key.")
-            elif response.status_code == 400:
-                logger.error(f"400 Bad Request for {api_name}. Check parameters or API key.")
+                logger.error(f"401 Unauthorized for {api_name}. Replace API key.")
             elif response.status_code == 429:
-                logger.error(f"429 Rate Limit Exceeded for {api_name}. Wait before retrying.")
+                logger.error(f"429 Rate Limit Exceeded for {api_name}. Increase delay or wait.")
             if page in data["used_pages"].get(api_name, []):
                 data["used_pages"][api_name].remove(page)
                 save_used_pages(data)
-                logger.info(f"Removed failed page {page} from {api_name}")
             break
     
     logger.info(f"Total URLs fetched for {api_name}: {len(image_urls)}")
     return image_urls[:num_images]
 
 def download_images(image_urls):
-    """Download images from the provided URLs and save to IMAGES_DIR."""
     if not image_urls:
         logger.warning("No image URLs provided to download")
         return 0, []
@@ -173,7 +182,7 @@ def download_images(image_urls):
                 for chunk in response.iter_content(chunk_size=8192):
                     if chunk:
                         f.write(chunk)
-            Image.open(image_path).verify()  # Verify it's a valid image
+            Image.open(image_path).verify()
             downloaded_count += 1
             image_paths.append(image_path)
             logger.info(f"Downloaded {idx}/{len(image_urls)}: {url}")
@@ -186,17 +195,15 @@ def download_images(image_urls):
     return downloaded_count, image_paths
 
 def create_zip_file(selected_image_paths):
-    """Create a ZIP file of the selected images."""
     if os.path.exists(ZIP_FILE):
         os.remove(ZIP_FILE)
-    with zipfile.ZipFile(ZIP_FILE, 'w', zipfile.ZIP_DEFLATED) as zipf:
+    with zipfile.ZipFile(ZIP_FILE, "w", zipfile.ZIP_DEFLATED) as zipf:
         for image_path in selected_image_paths:
             arcname = os.path.relpath(image_path, OUTPUT_DIR)
             zipf.write(image_path, arcname)
     return ZIP_FILE
 
 def process_and_display(api_name, category, num_images):
-    """Fetch and download images, then prepare data for display."""
     num_images = int(num_images)
     if num_images > 24:
         num_images = 24
@@ -220,7 +227,6 @@ def process_and_display(api_name, category, num_images):
     return status, None, image_paths, image_outputs, checkbox_outputs
 
 def process_zip_submission(image_paths, *checkbox_states):
-    """Create a ZIP file based on the selected images."""
     if not image_paths:
         return "No images available to process.", None
     
@@ -232,77 +238,21 @@ def process_zip_submission(image_paths, *checkbox_states):
     logger.info(f"ZIP file created with {len(selected_image_paths)} images at {zip_path}")
     return f"ZIP file created with {len(selected_image_paths)} images at {zip_path}", zip_path
 
-# Custom CSS (unchanged)
+# Gradio Interface (unchanged CSS and layout)
 css = """
-    .fetch-button {
-        background-color: #4CAF50;
-        color: white;
-        padding: 10px 20px;
-        border: none;
-        border-radius: 5px;
-        cursor: pointer;
-    }
-    .fetch-button:hover {
-        background-color: #45a049;
-    }
-    .zip-button {
-        background-color: #2196F3;
-        color: white;
-        padding: 10px 20px;
-        border: none;
-        border-radius: 5px;
-        cursor: pointer;
-    }
-    .zip-button:hover {
-        background-color: #1e88e5;
-    }
-    .status-box {
-        border: 1px solid #ddd;
-        background-color: #f9f9f9;
-        padding: 10px;
-        border-radius: 5px;
-    }
-    .input-group {
-        border: 1px solid #ddd;
-        padding: 15px;
-        border-radius: 5px;
-        background-color: #f0f0f0;
-    }
-    .image-container {
-        position: relative;
-        width: 100%;
-        height: 150px;
-        overflow: hidden;
-        border-radius: 5px;
-    }
-    .image-container img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-    }
-    .overlay {
-        position: absolute;
-        bottom: 5px;
-        right: 5px;
-        background-color: rgba(0, 0, 0, 0.6);
-        padding: 5px;
-        border-radius: 5px;
-        display: flex;
-        align-items: center;
-        gap: 5px;
-        color: white;
-        font-size: 12px;
-    }
-    .overlay label {
-        margin: 0;
-        color: white;
-    }
-    .overlay input[type="checkbox"] {
-        margin: 0;
-    }
+    .fetch-button { background-color: #4CAF50; color: white; padding: 10px 20px; border: none; border-radius: 5px; cursor: pointer; }
+    .fetch-button:hover { background-color: #45a049; }
+    .zip-button { background-color: #2196F3; color: white; padding: 10px 20px; border: none; border-radius: 5px; cursor: pointer; }
+    .zip-button:hover { background-color: #1e88e5; }
+    .status-box { border: 1px solid #ddd; background-color: #f9f9f9; padding: 10px; border-radius: 5px; }
+    .input-group { border: 1px solid #ddd; padding: 15px; border-radius: 5px; background-color: #f0f0f0; }
+    .image-container { position: relative; width: 100%; height: 150px; overflow: hidden; border-radius: 5px; }
+    .image-container img { width: 100%; height: 100%; object-fit: cover; }
+    .overlay { position: absolute; bottom: 5px; right: 5px; background-color: rgba(0, 0, 0, 0.6); padding: 5px; border-radius: 5px; display: flex; align-items: center; gap: 5px; color: white; font-size: 12px; }
+    .overlay label { margin: 0; color: white; }
+    .overlay input[type="checkbox"] { margin: 0; }
 """
 
-# Gradio Interface (unchanged)
 with gr.Blocks(title="Stock Photo Downloader", css=css) as demo:
     gr.Markdown("<h1 style='text-align: center; color: #333;'>📸 Stock Photo Downloader</h1>")
     gr.Markdown("<p style='text-align: center; color: #666;'>Fetch high-quality stock photos from Pexels, Unsplash, and Pixabay.</p>")
@@ -310,39 +260,13 @@ with gr.Blocks(title="Stock Photo Downloader", css=css) as demo:
     with gr.Group(elem_classes=["input-group"]):
         gr.Markdown("### 🔍 Choose Your Parameters")
         with gr.Row():
-            api_input = gr.Dropdown(
-                label="API Source",
-                choices=["pexels", "unsplash", "pixabay"],
-                value="pexels",
-                info="Select the stock photo provider."
-            )
-            category_input = gr.Dropdown(
-                label="Category",
-                choices=["nature", "business", "people", "technology", "food", "travel", "animals", "fashion"],
-                value="nature",
-                allow_custom_value=True,
-                info="Choose a category or enter a custom keyword."
-            )
-            num_images_input = gr.Dropdown(
-                label="Number of Images (Max 24)",
-                choices=["4", "8", "12", "16", "20", "24"],
-                value="4",
-                info="How many images to fetch (up to 24)."
-            )
-        download_button = gr.Button(
-            "Fetch and Display Images",
-            elem_classes=["fetch-button"],
-            elem_id="fetch-button"
-        )
+            api_input = gr.Dropdown(label="API Source", choices=["pexels", "unsplash", "pixabay"], value="pexels", info="Select the stock photo provider.")
+            category_input = gr.Dropdown(label="Category", choices=["nature", "business", "people", "technology", "food", "travel", "animals", "fashion"], value="nature", allow_custom_value=True, info="Choose a category or enter a custom keyword.")
+            num_images_input = gr.Dropdown(label="Number of Images (Max 24)", choices=["4", "8", "12", "16", "20", "24"], value="4", info="How many images to fetch (up to 24).")
+        download_button = gr.Button("Fetch and Display Images", elem_classes=["fetch-button"])
 
     gr.Markdown("### 📊 Status")
-    status_output = gr.Textbox(
-        label="Status",
-        interactive=False,
-        placeholder="Status updates will appear here...",
-        elem_classes=["status-box"],
-        show_label=False
-    )
+    status_output = gr.Textbox(label="Status", interactive=False, placeholder="Status updates will appear here...", elem_classes=["status-box"], show_label=False)
 
     gr.Markdown("### 💾 Download Your Images")
     zip_output = gr.File(label="Download ZIP", visible=False)
@@ -353,43 +277,25 @@ with gr.Blocks(title="Stock Photo Downloader", css=css) as demo:
 
     image_outputs = []
     checkbox_outputs = []
-
     for row in range(MAX_ROWS):
         with gr.Row():
             for col in range(IMAGES_PER_ROW):
                 idx = row * IMAGES_PER_ROW + col
                 with gr.Column(min_width=150):
                     with gr.Group(elem_classes=["image-container"]):
-                        image_output = gr.Image(
-                            label=f"Image {idx+1}",
-                            show_label=False,
-                            visible=False,
-                            height=150,
-                            width=150
-                        )
+                        image_output = gr.Image(label=f"Image {idx+1}", show_label=False, visible=False, height=150, width=150)
                         with gr.Row(elem_classes=["overlay"]):
-                            checkbox_output = gr.Checkbox(
-                                label=f"Image {idx+1}",
-                                value=False,
-                                visible=False,
-                                scale=0
-                            )
+                            checkbox_output = gr.Checkbox(label=f"Image {idx+1}", value=False, visible=False, scale=0)
                         image_outputs.append(image_output)
                         checkbox_outputs.append(checkbox_output)
 
     gr.Markdown("### 📦 Create ZIP File")
-    submit_button = gr.Button(
-        "Create ZIP of Selected Images",
-        elem_classes=["zip-button"],
-        elem_id="zip-button"
-    )
+    submit_button = gr.Button("Create ZIP of Selected Images", elem_classes=["zip-button"])
 
     def on_download(api_name, category, num_images):
         status, zip_path, image_paths, image_outs, checkbox_outs = process_and_display(api_name, category, num_images)
         return (
-            status,
-            zip_path,
-            image_paths,
+            status, zip_path, image_paths,
             *[gr.Image(value=img, visible=img is not None, label=f"Image {i+1}", height=150, width=150) if img else gr.Image(value=None, visible=False) for i, img in enumerate(image_outs)],
             *[gr.Checkbox(value=chk, visible=i < len(image_paths), label=f"Image {i+1}", scale=0) for i, chk in enumerate(checkbox_outs)]
         )
@@ -398,16 +304,7 @@ with gr.Blocks(title="Stock Photo Downloader", css=css) as demo:
         status, zip_path = process_zip_submission(image_paths, *checkbox_states)
         return status, gr.File(value=zip_path, visible=True) if zip_path else gr.File(visible=False)
 
-    download_button.click(
-        fn=on_download,
-        inputs=[api_input, category_input, num_images_input],
-        outputs=[status_output, zip_output, image_paths_state] + image_outputs + checkbox_outputs
-    )
-    
-    submit_button.click(
-        fn=on_submit,
-        inputs=[image_paths_state] + checkbox_outputs,
-        outputs=[status_output, zip_output]
-    )
+    download_button.click(fn=on_download, inputs=[api_input, category_input, num_images_input], outputs=[status_output, zip_output, image_paths_state] + image_outputs + checkbox_outputs)
+    submit_button.click(fn=on_submit, inputs=[image_paths_state] + checkbox_outputs, outputs=[status_output, zip_output])
 
 demo.launch()