From 230266512e48279cbf84d0298fc4b955504ab177 Mon Sep 17 00:00:00 2001 From: Haiqi Xu <14502009+haiqi96@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:06:19 -0400 Subject: [PATCH] Remove Extract IR related change --- .../job_orchestration/scheduler/job_config.py | 7 ------- .../scheduler/query/query_scheduler.py | 3 +-- .../job_orchestration/scheduler/scheduler_data.py | 13 +------------ components/webui/imports/api/search/constants.js | 1 - 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/components/job-orchestration/job_orchestration/scheduler/job_config.py b/components/job-orchestration/job_orchestration/scheduler/job_config.py index fda83af6b0..c43d797bc3 100644 --- a/components/job-orchestration/job_orchestration/scheduler/job_config.py +++ b/components/job-orchestration/job_orchestration/scheduler/job_config.py @@ -43,13 +43,6 @@ class AggregationConfig(BaseModel): class QueryConfig(BaseModel, ABC): ... -class ExtractConfig(QueryConfig): - orig_file_id: str - msg_ix: int - file_split_id: typing.Optional[str] = None - target_size: typing.Optional[int] = None - - class SearchConfig(QueryConfig): query_string: str max_num_results: int diff --git a/components/job-orchestration/job_orchestration/scheduler/query/query_scheduler.py b/components/job-orchestration/job_orchestration/scheduler/query/query_scheduler.py index 94247cf015..f3fdde31be 100644 --- a/components/job-orchestration/job_orchestration/scheduler/query/query_scheduler.py +++ b/components/job-orchestration/job_orchestration/scheduler/query/query_scheduler.py @@ -41,7 +41,7 @@ from clp_py_utils.sql_adapter import SQL_Adapter from job_orchestration.executor.query.fs_search_task import search from job_orchestration.scheduler.constants import QueryJobStatus, QueryJobType, QueryTaskStatus -from job_orchestration.scheduler.job_config import ExtractConfig, SearchConfig +from job_orchestration.scheduler.job_config import SearchConfig from job_orchestration.scheduler.query.reducer_handler import ( handle_reducer_connection, ReducerHandlerMessage, @@ -49,7 +49,6 @@ ReducerHandlerMessageType, ) from job_orchestration.scheduler.scheduler_data import ( - ExtractJob, InternalJobState, QueryJob, QueryTaskResult, diff --git a/components/job-orchestration/job_orchestration/scheduler/scheduler_data.py b/components/job-orchestration/job_orchestration/scheduler/scheduler_data.py index e05abb7e85..433e6fb9cb 100644 --- a/components/job-orchestration/job_orchestration/scheduler/scheduler_data.py +++ b/components/job-orchestration/job_orchestration/scheduler/scheduler_data.py @@ -9,7 +9,7 @@ QueryJobType, QueryTaskStatus, ) -from job_orchestration.scheduler.job_config import ExtractConfig, QueryConfig, SearchConfig +from job_orchestration.scheduler.job_config import QueryConfig, SearchConfig from job_orchestration.scheduler.query.reducer_handler import ReducerHandlerMessageQueues from pydantic import BaseModel, validator @@ -53,17 +53,6 @@ def type(self) -> QueryJobType: ... def job_config(self) -> QueryConfig: ... -class ExtractJob(QueryJob): - extract_config: ExtractConfig - archive_id: str - - def type(self) -> QueryJobType: - return QueryJobType.EXTRACT_IR - - def job_config(self) -> QueryConfig: - return self.extract_config - - class SearchJob(QueryJob): search_config: SearchConfig num_archives_to_search: int diff --git a/components/webui/imports/api/search/constants.js b/components/webui/imports/api/search/constants.js index 908367b76e..fa24a40f0c 100644 --- a/components/webui/imports/api/search/constants.js +++ b/components/webui/imports/api/search/constants.js @@ -91,7 +91,6 @@ let enumQueryType; */ const QUERY_JOB_TYPE = Object.freeze({ SEARCH: (enumQueryType = 0), - EXTRACT_IR: ++enumQueryType, }); /* eslint-enable sort-keys */