Update app.py

app.py

@@ -266,11 +266,12 @@ def flickr_api_call(method, **params):
     return data
 
 
-def flickr_search(search_text, max_images=50, min_width=0, min_height=0):
+def flickr_search(search_text, max_images=50, min_width=0, min_height=0,
+                  method="flickr.photos.search", extra_params=None):
     if not FLICKR_API_KEY:
         raise RuntimeError("No FLICKR_API_KEY found. Add it under Space Settings → Secrets.")
     search_text = search_text.strip()
-    if not search_text:
+    if method == "flickr.photos.search" and not search_text:
         raise ValueError("No Flickr search term was found.")
 
     max_images = min(int(max_images), MAX_IMAGES_HARD_LIMIT)
@@ -280,8 +281,10 @@ def flickr_search(search_text, max_images=50, min_width=0, min_height=0):
 
     while len(results) < max_images:
         data = flickr_api_call(
-            "flickr.photos.search",
-            text=search_text, safe_search="1", per_page=per_page, page=page,
+            method,
+            **({"text": search_text} if method == "flickr.photos.search" else {}),
+            **(extra_params or {}),
+            safe_search="1", per_page=per_page, page=page,
             extras="description,license,date_upload,date_taken,owner_name,tags,views,"
                    "url_sq,url_t,url_s,url_q,url_m,url_n,url_z,url_c,url_l,url_o,"
                    "o_dims,original_format",
@@ -416,6 +419,25 @@ def flickr_photo_candidate(url):
     return flickr_photo_via_html(username, photo_id, page_url)
 
 
+def flickr_photo_and_stream(url, max_images, min_width, min_height, include_stream=True):
+    """Photo page -> the photo itself, then the same photographer's older public photos."""
+    first = flickr_photo_candidate(url)
+    if not first:
+        return None
+    if not (include_stream and FLICKR_API_KEY and max_images > 1):
+        return [first]
+    info = flickr_api_call("flickr.photos.getInfo", photo_id=first["photo_id"])["photo"]
+    stream = flickr_search(
+        "", max_images, min_width, min_height,
+        method="flickr.people.getPublicPhotos",
+        extra_params={
+            "user_id": info["owner"]["nsid"],
+            "max_upload_date": info["dates"]["posted"],  # start at this photo, go older
+        },
+    )
+    return [first] + [s for s in stream if s["photo_id"] != first["photo_id"]]
+
+
 # ============================================================
 # GENERIC HTML
 # ============================================================
@@ -699,7 +721,7 @@ def empty_result(message):
     return [], message, [], pd.DataFrame(), pd.DataFrame(), None, None, None
 
 
-def find_images(url, max_images, min_width, min_height, remove_duplicates):
+def find_images(url, max_images, min_width, min_height, remove_duplicates, include_stream=True):
     url = clean_url(url)
     if not url:
         return empty_result("❌ Please enter a URL.")
@@ -715,10 +737,16 @@ def find_images(url, max_images, min_width, min_height, remove_duplicates):
 
     # ---- Find candidates ----
     try:
-        photo = flickr_photo_candidate(url) if is_flickr_url(url) else None
-        if photo:
-            mode_message = "Flickr photo page mode" + (" (API)" if FLICKR_API_KEY else " (HTML)")
-            candidates = [photo]
+        photo_list = (
+            flickr_photo_and_stream(url, max_images, min_width, min_height, include_stream)
+            if is_flickr_url(url) else None
+        )
+        if photo_list:
+            mode_message = (
+                "Flickr photo page + photostream (API)" if FLICKR_API_KEY
+                else "Flickr photo page (HTML, single photo only: set FLICKR_API_KEY to get more)"
+            )
+            candidates = photo_list
         elif is_flickr_url(url) and FLICKR_API_KEY and extract_flickr_search_text(url):
             mode_message = "Flickr API search mode"
             candidates = flickr_search(
@@ -880,6 +908,10 @@ with gr.Blocks(title=APP_TITLE) as demo:
         min_width = gr.Number(value=0, minimum=0, maximum=10000, step=100, label="Minimum width (px)")
         min_height = gr.Number(value=0, minimum=0, maximum=10000, step=100, label="Minimum height (px)")
         remove_duplicates = gr.Checkbox(value=True, label="Remove duplicates")
+        include_stream = gr.Checkbox(
+            value=True,
+            label="Photo page: also download the photographer's other photos (needs API key)",
+        )
 
     with gr.Row():
         find_button = gr.Button("🔎 Find & Analyze Images", variant="primary")
@@ -913,7 +945,7 @@ with gr.Blocks(title=APP_TITLE) as demo:
 
     find_button.click(
         fn=find_images,
-        inputs=[url_input, max_images, min_width, min_height, remove_duplicates],
+        inputs=[url_input, max_images, min_width, min_height, remove_duplicates, include_stream],
         outputs=[gallery, status, image_state, metadata_table, weekly_table,
                  weekly_plot, xlsx_file, csv_file],
     )