- Remove config.seeds from workflow and crawl detail endpoints
- Add new paginated GET /crawls/{crawl_id}/seeds and /crawlconfigs/{cid}/seeds endpoints to retrieve seeds for a crawl or workflow
- Include firstSeed in GET /crawlconfigs/{cid} endpoint (was missing before)
- Modify frontend to fetch seeds from new /seeds endpoints with loading indicator
---------
Co-authored-by: Tessa Walsh <tessa@bitarchivist.net>
		
	
			
		
			
				
	
	
		
			467 lines
		
	
	
		
			14 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			467 lines
		
	
	
		
			14 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| import time
 | |
| 
 | |
| import requests
 | |
| 
 | |
| from .conftest import API_PREFIX
 | |
| 
 | |
| 
 | |
| cid = None
 | |
| UPDATED_NAME = "Updated name"
 | |
| UPDATED_DESCRIPTION = "Updated description"
 | |
| UPDATED_TAGS = ["tag3", "tag4"]
 | |
| 
 | |
| _coll_id = None
 | |
| _admin_crawl_cid = None
 | |
| 
 | |
| 
 | |
| def test_crawl_config_usernames(
 | |
|     crawler_auth_headers, default_org_id, crawler_config_id
 | |
| ):
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{crawler_config_id}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["createdByName"]
 | |
|     assert data["modifiedByName"]
 | |
|     assert data["lastStartedByName"]
 | |
| 
 | |
| 
 | |
| def test_add_crawl_config(crawler_auth_headers, default_org_id, sample_crawl_data):
 | |
|     # Create crawl config
 | |
|     sample_crawl_data["schedule"] = "0 0 * * *"
 | |
|     r = requests.post(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json=sample_crawl_data,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     global cid
 | |
|     cid = data["id"]
 | |
| 
 | |
| 
 | |
| def test_update_name_only(crawler_auth_headers, default_org_id):
 | |
|     # update name only
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"name": "updated name 1"},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["updated"]
 | |
|     assert data["metadata_changed"] == True
 | |
|     assert data["settings_changed"] == False
 | |
| 
 | |
| 
 | |
| def test_update_desription_only(crawler_auth_headers, default_org_id):
 | |
|     # update description only
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"description": "updated description"},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["updated"]
 | |
|     assert data["metadata_changed"] == True
 | |
|     assert data["settings_changed"] == False
 | |
| 
 | |
| 
 | |
| def test_update_crawl_config_metadata(crawler_auth_headers, default_org_id):
 | |
|     # Make a new collection
 | |
|     r = requests.post(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/collections",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={
 | |
|             "crawlIds": [],
 | |
|             "name": "autoAddUpdate",
 | |
|         },
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     global _coll_id
 | |
|     _coll_id = data["id"]
 | |
|     assert _coll_id
 | |
| 
 | |
|     # Update crawl config
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={
 | |
|             "name": UPDATED_NAME,
 | |
|             "description": UPDATED_DESCRIPTION,
 | |
|             "tags": UPDATED_TAGS,
 | |
|             "autoAddCollections": [_coll_id],
 | |
|         },
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["updated"]
 | |
|     assert data["metadata_changed"] == True
 | |
|     assert data["settings_changed"] == False
 | |
| 
 | |
| 
 | |
| def test_verify_update(crawler_auth_headers, default_org_id):
 | |
|     # Verify update was successful
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["name"] == UPDATED_NAME
 | |
|     assert data["description"] == UPDATED_DESCRIPTION
 | |
|     assert sorted(data["tags"]) == sorted(UPDATED_TAGS)
 | |
|     assert data["autoAddCollections"] == [_coll_id]
 | |
|     assert data["firstSeed"] == "https://example.com/"
 | |
| 
 | |
| 
 | |
| def test_update_config_invalid_format(
 | |
|     crawler_auth_headers, default_org_id, sample_crawl_data
 | |
| ):
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={
 | |
|             "config": {
 | |
|                 "seeds": ["https://example.com/"],
 | |
|                 "scopeType": "domain",
 | |
|                 "limit": 10,
 | |
|             }
 | |
|         },
 | |
|     )
 | |
| 
 | |
|     assert r.status_code == 422
 | |
| 
 | |
| 
 | |
| def test_update_config_data(crawler_auth_headers, default_org_id, sample_crawl_data):
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={
 | |
|             "config": {
 | |
|                 "seeds": [{"url": "https://example.com/"}],
 | |
|                 "scopeType": "domain",
 | |
|             }
 | |
|         },
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["config"]["scopeType"] == "domain"
 | |
| 
 | |
| 
 | |
| def test_update_config_no_changes(
 | |
|     crawler_auth_headers, default_org_id, sample_crawl_data
 | |
| ):
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={
 | |
|             "config": {
 | |
|                 "seeds": [{"url": "https://example.com/"}],
 | |
|                 "scopeType": "domain",
 | |
|             }
 | |
|         },
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["settings_changed"] == False
 | |
|     assert data["metadata_changed"] == False
 | |
| 
 | |
| 
 | |
| def test_update_crawl_timeout(crawler_auth_headers, default_org_id, sample_crawl_data):
 | |
|     # Verify that updating crawl timeout works
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"crawlTimeout": 60},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["settings_changed"] == True
 | |
|     assert data["metadata_changed"] == False
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["crawlTimeout"] == 60
 | |
| 
 | |
| 
 | |
| def test_update_max_crawl_size(crawler_auth_headers, default_org_id, sample_crawl_data):
 | |
|     # Verify that updating crawl timeout works
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"maxCrawlSize": 4096},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["settings_changed"] == True
 | |
|     assert data["metadata_changed"] == False
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["maxCrawlSize"] == 4096
 | |
| 
 | |
| 
 | |
| def test_verify_delete_tags(crawler_auth_headers, default_org_id):
 | |
|     # Verify that deleting tags and name works as well
 | |
|     r = requests.patch(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"tags": [], "name": None},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert not data["name"]
 | |
|     assert data["tags"] == []
 | |
| 
 | |
| 
 | |
| def test_verify_revs_history(crawler_auth_headers, default_org_id):
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{cid}/revs",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
| 
 | |
|     data = r.json()
 | |
|     assert data["total"] == 3
 | |
|     items = data["items"]
 | |
|     assert len(items) == 3
 | |
|     sorted_data = sorted(items, key=lambda revision: revision["rev"])
 | |
|     assert sorted_data[0]["config"]["scopeType"] == "prefix"
 | |
| 
 | |
| 
 | |
| def test_workflow_total_size_and_last_crawl_stats(
 | |
|     crawler_auth_headers, default_org_id, admin_crawl_id, crawler_crawl_id
 | |
| ):
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["total"] > 0
 | |
|     items = data["items"]
 | |
|     for workflow in items:
 | |
|         assert workflow.get("config") is None
 | |
|         assert workflow["seedCount"]
 | |
|         assert workflow["firstSeed"]
 | |
| 
 | |
|         last_crawl_id = workflow.get("lastCrawlId")
 | |
|         if last_crawl_id and last_crawl_id in (admin_crawl_id, crawler_crawl_id):
 | |
|             assert workflow["totalSize"] > 0
 | |
|             assert workflow["crawlCount"] > 0
 | |
|             assert workflow["crawlSuccessfulCount"] > 0
 | |
| 
 | |
|             assert workflow["lastCrawlId"]
 | |
|             assert workflow["lastCrawlStartTime"]
 | |
|             assert workflow["lastStartedByName"]
 | |
|             assert workflow["lastCrawlTime"]
 | |
|             assert workflow["lastCrawlState"]
 | |
|             assert workflow["lastRun"]
 | |
|             assert workflow["lastCrawlSize"] > 0
 | |
| 
 | |
|             if last_crawl_id == admin_crawl_id:
 | |
|                 global _admin_crawl_cid
 | |
|                 _admin_crawl_cid = workflow["id"]
 | |
|                 assert _admin_crawl_cid
 | |
|         else:
 | |
|             assert workflow["totalSize"] == 0
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{_admin_crawl_cid}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["totalSize"] > 0
 | |
|     assert data["crawlCount"] > 0
 | |
|     assert data["crawlSuccessfulCount"] > 0
 | |
| 
 | |
|     assert data["lastCrawlId"]
 | |
|     assert data["lastCrawlStartTime"]
 | |
|     assert data["lastStartedByName"]
 | |
|     assert data["lastCrawlTime"]
 | |
|     assert data["lastCrawlState"]
 | |
|     assert data["lastRun"]
 | |
|     assert data["lastCrawlSize"] > 0
 | |
| 
 | |
| 
 | |
| def test_incremental_workflow_total_size_and_last_crawl_stats(
 | |
|     crawler_auth_headers, default_org_id, admin_crawl_id, crawler_crawl_id
 | |
| ):
 | |
|     # Get baseline values
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{_admin_crawl_cid}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["crawlCount"] == 1
 | |
|     assert data["crawlSuccessfulCount"] == 1
 | |
|     total_size = data["totalSize"]
 | |
|     last_crawl_id = data["lastCrawlId"]
 | |
|     last_crawl_started = data["lastCrawlStartTime"]
 | |
|     last_crawl_finished = data["lastCrawlTime"]
 | |
|     last_run = data["lastRun"]
 | |
| 
 | |
|     # Run new crawl in this workflow
 | |
|     r = requests.post(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{_admin_crawl_cid}/run",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     crawl_id = r.json()["started"]
 | |
| 
 | |
|     # Wait for it to complete
 | |
|     while True:
 | |
|         r = requests.get(
 | |
|             f"{API_PREFIX}/orgs/{default_org_id}/crawls/{crawl_id}/replay.json",
 | |
|             headers=crawler_auth_headers,
 | |
|         )
 | |
|         data = r.json()
 | |
|         if data["state"] == "complete":
 | |
|             break
 | |
|         time.sleep(5)
 | |
| 
 | |
|     # Give time for stats to re-compute
 | |
|     time.sleep(10)
 | |
| 
 | |
|     # Re-check stats
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{_admin_crawl_cid}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["crawlCount"] == 2
 | |
|     assert data["crawlSuccessfulCount"] == 2
 | |
|     assert data["totalSize"] > total_size
 | |
|     assert data["lastCrawlId"] == crawl_id
 | |
|     assert data["lastCrawlStartTime"] > last_crawl_started
 | |
|     assert data["lastCrawlTime"] > last_crawl_finished
 | |
|     assert data["lastRun"] > last_run
 | |
| 
 | |
|     # Delete new crawl
 | |
|     r = requests.post(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawls/delete",
 | |
|         headers=crawler_auth_headers,
 | |
|         json={"crawl_ids": [crawl_id]},
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["deleted"] == 1
 | |
| 
 | |
|     # Re-check stats
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{_admin_crawl_cid}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
| 
 | |
|     assert data["crawlCount"] == 1
 | |
|     assert data["crawlSuccessfulCount"] == 1
 | |
|     assert data["totalSize"] == total_size
 | |
|     assert data["lastCrawlId"] == last_crawl_id
 | |
|     assert data["lastCrawlStartTime"] == last_crawl_started
 | |
|     assert data["lastCrawlTime"] == last_crawl_finished
 | |
|     assert data["lastRun"] == last_run
 | |
| 
 | |
| 
 | |
| def test_get_config_seeds(crawler_auth_headers, default_org_id, url_list_config_id):
 | |
|     # Make sure seeds aren't included in the crawlconfig detail
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{url_list_config_id}",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     assert r.json().get("config").get("seeds") is None
 | |
| 
 | |
|     # Test getting seeds from separate endpoint
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{url_list_config_id}/seeds",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["total"] == 3
 | |
| 
 | |
|     EXPECTED_SEED_URLS = [
 | |
|         "https://webrecorder.net",
 | |
|         "https://example.com",
 | |
|         "https://specs.webrecorder.net",
 | |
|     ]
 | |
|     found_seed_urls = []
 | |
| 
 | |
|     for item in data["items"]:
 | |
|         found_seed_urls.append(item["url"])
 | |
| 
 | |
|     assert sorted(found_seed_urls) == sorted(EXPECTED_SEED_URLS)
 | |
| 
 | |
|     # Test getting seeds with low page size
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{url_list_config_id}/seeds?pageSize=2",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["total"] == 3
 | |
|     items = data["items"]
 | |
|     assert len(items) == 2
 | |
|     for item in items:
 | |
|         assert item["url"] in EXPECTED_SEED_URLS
 | |
| 
 | |
|     r = requests.get(
 | |
|         f"{API_PREFIX}/orgs/{default_org_id}/crawlconfigs/{url_list_config_id}/seeds?pageSize=2&page=2",
 | |
|         headers=crawler_auth_headers,
 | |
|     )
 | |
|     assert r.status_code == 200
 | |
|     data = r.json()
 | |
|     assert data["total"] == 3
 | |
|     items = data["items"]
 | |
|     assert len(items) == 1
 | |
|     assert items[0]["url"] in EXPECTED_SEED_URLS
 |