* Move all pydantic models to models.py to avoid circular dependencies * Include automated crawl details in all-crawls GET endpoints - ensure /all-crawls endpoint resolves names / firstSeed data same as /crawls endpoint for crawls to ensure consistent frontend display. fields added in get and list all-crawl endpoints for automated crawls only: - cid - name - description - firstSeed - seedCount - profileName * Add automated crawl fields to list all-crawls test * Uncomment mongo readinessProbe * cleanup CrawlOutWithResources: - remove 'files' from output model, only resources should be returned - add _files_to_resources() to simplify computing presigned 'resources' from raw 'files' - update upload tests to be more consistent, 'files' never present, 'errors' always none --------- Co-authored-by: Ilya Kreymer <ikreymer@gmail.com>
		
			
				
	
	
		
			72 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """
 | |
| Migration 0005 - Updating scheduled cron jobs after Operator changes
 | |
| """
 | |
| from btrixcloud.models import CrawlConfig, UpdateCrawlConfig
 | |
| from btrixcloud.crawlmanager import CrawlManager
 | |
| from btrixcloud.migrations import BaseMigration
 | |
| 
 | |
| 
 | |
| MIGRATION_VERSION = "0005"
 | |
| 
 | |
| 
 | |
| class Migration(BaseMigration):
 | |
|     """Migration class."""
 | |
| 
 | |
|     def __init__(self, mdb, migration_version=MIGRATION_VERSION):
 | |
|         super().__init__(mdb, migration_version)
 | |
| 
 | |
|     async def migrate_up(self):
 | |
|         """Perform migration up.
 | |
| 
 | |
|         Find existing workflows with schedule and create new crawl_cron_jobs
 | |
|         from template for each, then delete existing scheduled jobs from
 | |
|         crawler namespace.
 | |
| 
 | |
|         Additionally update the configmap for crawl configs with scale > 1
 | |
|         or crawlTimeout > 0.
 | |
|         """
 | |
|         # pylint: disable=too-many-locals, duplicate-code
 | |
|         crawl_configs = self.mdb["crawl_configs"]
 | |
|         crawl_manager = CrawlManager()
 | |
| 
 | |
|         # Update configmap for crawl configs that have non-zero timeout or scale > 1
 | |
|         match_query = {
 | |
|             "$or": [
 | |
|                 {"crawlTimeout": {"$gt": 0}},
 | |
|                 {"scale": {"$gt": 1}},
 | |
|                 {"schedule": {"$nin": ["", None]}},
 | |
|             ]
 | |
|         }
 | |
|         configs_to_update = [res async for res in crawl_configs.find(match_query)]
 | |
|         for config_dict in configs_to_update:
 | |
|             config = CrawlConfig.from_dict(config_dict)
 | |
|             print(
 | |
|                 f"Updating Crawl Config {config.id}: schedule: {config.schedule}, "
 | |
|                 + f"timeout: {config.crawlTimeout}, scale: {config.scale}"
 | |
|             )
 | |
|             try:
 | |
|                 await crawl_manager.update_crawl_config(
 | |
|                     config,
 | |
|                     UpdateCrawlConfig(
 | |
|                         scale=config.scale,
 | |
|                         crawlTimeout=config.crawlTimeout,
 | |
|                         schedule=config.schedule,
 | |
|                     ),
 | |
|                 )
 | |
|             # pylint: disable=broad-except
 | |
|             except Exception as exc:
 | |
|                 print(
 | |
|                     "Skip crawl config migration due to error, likely missing config",
 | |
|                     exc,
 | |
|                 )
 | |
| 
 | |
|         # Delete existing scheduled jobs from crawler namespace
 | |
|         print("Deleting cronjobs from crawler namespace")
 | |
|         await crawl_manager.batch_api.delete_collection_namespaced_cron_job(
 | |
|             namespace=crawl_manager.namespace
 | |
|         )
 | |
|         result = await crawl_manager.batch_api.list_namespaced_cron_job(
 | |
|             namespace=crawl_manager.namespace
 | |
|         )
 | |
|         assert len(result.items) == 0
 |