Skip to content

Commit f7dfd4d

Browse files
committed
Add override for tasks
1 parent 7ff8122 commit f7dfd4d

2 files changed

Lines changed: 33 additions & 6 deletions

File tree

backend/onyx/background/celery/apps/light.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ def on_task_postrun(
4949
state: str | None = None,
5050
**kwds: Any,
5151
) -> None:
52-
app_base.on_task_postrun(sender, task_id, task, args, kwargs, retval, state, **kwds)
52+
app_base.on_task_postrun(sender, task_id, task,
53+
args, kwargs, retval, state, **kwds)
5354

5455

5556
@celeryd_init.connect
@@ -66,7 +67,8 @@ def on_worker_init(sender: Worker, **kwargs: Any) -> None:
6667
logger.info(f"Concurrency: {sender.concurrency}") # type: ignore
6768

6869
SqlEngine.set_app_name(POSTGRES_CELERY_WORKER_LIGHT_APP_NAME)
69-
SqlEngine.init_engine(pool_size=sender.concurrency, max_overflow=EXTRA_CONCURRENCY) # type: ignore
70+
SqlEngine.init_engine(pool_size=sender.concurrency,
71+
max_overflow=EXTRA_CONCURRENCY) # type: ignore
7072

7173
if MANAGED_VESPA:
7274
httpx_init_vespa_pool(
@@ -75,7 +77,8 @@ def on_worker_init(sender: Worker, **kwargs: Any) -> None:
7577
ssl_key=VESPA_CLOUD_KEY_PATH,
7678
)
7779
else:
78-
httpx_init_vespa_pool(sender.concurrency + EXTRA_CONCURRENCY) # type: ignore
80+
httpx_init_vespa_pool(sender.concurrency +
81+
EXTRA_CONCURRENCY) # type: ignore
7982

8083
app_base.wait_for_redis(sender, **kwargs)
8184
app_base.wait_for_db(sender, **kwargs)
@@ -99,9 +102,7 @@ def on_worker_shutdown(sender: Any, **kwargs: Any) -> None:
99102

100103

101104
@signals.setup_logging.connect
102-
def on_setup_logging(
103-
loglevel: Any, logfile: Any, format: Any, colorize: Any, **kwargs: Any
104-
) -> None:
105+
def on_setup_logging(loglevel: Any, logfile: Any, format: Any, colorize: Any, **kwargs: Any) -> None:
105106
app_base.on_setup_logging(loglevel, logfile, format, colorize, **kwargs)
106107

107108

@@ -113,5 +114,6 @@ def on_setup_logging(
113114
"onyx.background.celery.tasks.doc_permission_syncing",
114115
"onyx.background.celery.tasks.user_file_folder_sync",
115116
"onyx.background.celery.tasks.indexing",
117+
"onyx.background.celery.tasks.eea",
116118
]
117119
)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from celery import shared_task
2+
from onyx.configs.constants import OnyxCeleryTask
3+
from onyx.configs.app_configs import JOB_TIMEOUT
4+
from celery import Task
5+
6+
7+
@shared_task(
8+
name=OnyxCeleryTask.CHECK_FOR_DOC_PERMISSIONS_SYNC,
9+
ignore_result=True,
10+
soft_time_limit=JOB_TIMEOUT,
11+
bind=True,
12+
)
13+
def check_for_doc_permissions_sync(self: Task, *, tenant_id: str) -> bool | None:
14+
# override of tasks in ee/light to avoid errors in background worker due to wrongly registered tasks
15+
pass
16+
17+
18+
@shared_task(
19+
name=OnyxCeleryTask.CHECK_FOR_EXTERNAL_GROUP_SYNC,
20+
ignore_result=True,
21+
soft_time_limit=JOB_TIMEOUT,
22+
bind=True,
23+
)
24+
def check_for_external_group_sync(self: Task, *, tenant_id: str) -> bool | None:
25+
pass

0 commit comments

Comments
 (0)