klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-07 21:29:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify, modularize DB adapters to get automation metadata by user further

Browse Source
This commit is contained in:
Debanjum Singh Solanky
2024-05-01 04:39:45 +05:30
parent 21bdf45d6f
commit 815966cb25
2 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/khoj/database/adapters/__init__.py
View File

@@ -930,21 +930,31 @@ class AutomationAdapters:
yield automation yield automation
@staticmethod @staticmethod
def get_automations_metadata(user: KhojUser): def get_automation_metadata(user: KhojUser, automation: Job):
for automation in AutomationAdapters.get_automations(user): # Perform validation checks
# Check if user is allowed to delete this automation id
if not automation.id.startswith(f"automation_{user.uuid}_"):
raise ValueError("Invalid automation id")
automation_metadata = json.loads(automation.name) automation_metadata = json.loads(automation.name)
crontime = automation_metadata["crontime"] crontime = automation_metadata["crontime"]
timezone = automation.next_run_time.strftime("%Z") timezone = automation.next_run_time.strftime("%Z")
schedule = f"{cron_descriptor.get_description(crontime)} {timezone}" schedule = f"{cron_descriptor.get_description(crontime)} {timezone}"
yield { return {
"id": automation.id, "id": automation.id,
"subject": automation_metadata["subject"], "subject": automation_metadata["subject"],
"query_to_run": re.sub(r"^/automated_task\s*", "", automation_metadata["query_to_run"]), "query_to_run": re.sub(r"^/automated_task\s*", "", automation_metadata["query_to_run"]),
"scheduling_request": automation_metadata["scheduling_request"], "scheduling_request": automation_metadata["scheduling_request"],
"schedule": schedule, "schedule": schedule,
"crontime": crontime,
"next": automation.next_run_time.strftime("%Y-%m-%d %I:%M %p %Z"), "next": automation.next_run_time.strftime("%Y-%m-%d %I:%M %p %Z"),
} }
@staticmethod
def get_automations_metadata(user: KhojUser):
for automation in AutomationAdapters.get_automations(user):
yield AutomationAdapters.get_automation_metadata(user, automation)
@staticmethod @staticmethod
def get_automation(user: KhojUser, automation_id: str) -> Job: def get_automation(user: KhojUser, automation_id: str) -> Job:
# Perform validation checks # Perform validation checks
@@ -964,12 +974,7 @@ class AutomationAdapters:
automation: Job = AutomationAdapters.get_automation(user, automation_id) automation: Job = AutomationAdapters.get_automation(user, automation_id)
# Collate info about user automation to be deleted # Collate info about user automation to be deleted
automation_metadata = json.loads(automation.name) automation_metadata = AutomationAdapters.get_automation_metadata(user, automation)
automation_info = {
"id": automation.id,
"name": automation_metadata["query_to_run"],
"next": automation.next_run_time.strftime("%Y-%m-%d %I:%M %p %Z"),
}
automation.remove() automation.remove()
return automation_info return automation_metadata

20
src/khoj/routers/api.py
View File

@@ -470,16 +470,7 @@ async def post_automation(
) )
# Collate info about the created user automation # Collate info about the created user automation
schedule = f'{cron_descriptor.get_description(crontime)} {automation.next_run_time.strftime("%Z")}' automation_info = AutomationAdapters.get_automation_metadata(user, automation)
automation_info = {
"id": automation.id,
"subject": subject,
"query_to_run": query_to_run,
"scheduling_request": query_to_run,
"schedule": schedule,
"crontime": crontime,
"next": automation.next_run_time.strftime("%Y-%m-%d %I:%M %p %Z"),
}
# Return information about the created automation as a JSON response # Return information about the created automation as a JSON response
return Response(content=json.dumps(automation_info), media_type="application/json", status_code=200) return Response(content=json.dumps(automation_info), media_type="application/json", status_code=200)
@@ -538,12 +529,9 @@ def edit_job(
if automation.trigger != trigger: if automation.trigger != trigger:
automation.reschedule(trigger=trigger) automation.reschedule(trigger=trigger)
# Collate info about the modified user automation # Collate info about the updated user automation
automation_info = { automation = AutomationAdapters.get_automation(user, automation.id)
"id": automation.id, automation_info = AutomationAdapters.get_automation_metadata(user, automation)
"name": automation.name,
"next": automation.next_run_time.strftime("%Y-%m-%d %H:%MS"),
}
# Return modified automation information as a JSON response # Return modified automation information as a JSON response
return Response(content=json.dumps(automation_info), media_type="application/json", status_code=200) return Response(content=json.dumps(automation_info), media_type="application/json", status_code=200)