Skip to content

Commit

Permalink
Remove Extract IR related change
Browse files Browse the repository at this point in the history
  • Loading branch information
haiqi96 committed Jun 19, 2024
1 parent f0ee686 commit 2302665
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,14 @@
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,
ReducerHandlerMessageQueues,
ReducerHandlerMessageType,
)
from job_orchestration.scheduler.scheduler_data import (
ExtractJob,
InternalJobState,
QueryJob,
QueryTaskResult,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion components/webui/imports/api/search/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ let enumQueryType;
*/
const QUERY_JOB_TYPE = Object.freeze({
SEARCH: (enumQueryType = 0),
EXTRACT_IR: ++enumQueryType,
});
/* eslint-enable sort-keys */

Expand Down

0 comments on commit 2302665

Please sign in to comment.