-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Synchronize with enterprise version (#4325)
### Type of change - [x] Refactoring
- Loading branch information
Showing
6 changed files
with
94 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,60 @@ | ||
| # | ||
| # Copyright 2024 The InfiniFlow Authors. All Rights Reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| import logging | ||
| import time | ||
| import traceback | ||
|
|
||
| from api.db.db_models import close_connection | ||
| from api.db.services.task_service import TaskService | ||
| from rag.utils.storage_factory import STORAGE_IMPL | ||
| from rag.utils.redis_conn import REDIS_CONN | ||
|
|
||
|
|
||
| def collect(): | ||
| doc_locations = TaskService.get_ongoing_doc_name() | ||
| logging.debug(doc_locations) | ||
| if len(doc_locations) == 0: | ||
| time.sleep(1) | ||
| return | ||
| return doc_locations | ||
|
|
||
| def main(): | ||
| locations = collect() | ||
| if not locations: | ||
| return | ||
| logging.info(f"TASKS: {len(locations)}") | ||
| for kb_id, loc in locations: | ||
| try: | ||
| if REDIS_CONN.is_alive(): | ||
| try: | ||
| key = "{}/{}".format(kb_id, loc) | ||
| if REDIS_CONN.exist(key): | ||
| continue | ||
| file_bin = STORAGE_IMPL.get(kb_id, loc) | ||
| REDIS_CONN.transaction(key, file_bin, 12 * 60) | ||
| logging.info("CACHE: {}".format(loc)) | ||
| except Exception as e: | ||
| traceback.print_stack(e) | ||
| except Exception as e: | ||
| traceback.print_stack(e) | ||
|
|
||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| while True: | ||
| main() | ||
| close_connection() | ||
| # | ||
| # Copyright 2024 The InfiniFlow Authors. All Rights Reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| import logging | ||
| import time | ||
| import traceback | ||
|
|
||
| from api.db.db_models import close_connection | ||
| from api.db.services.task_service import TaskService | ||
| from rag.utils.minio_conn import MINIOs | ||
| from rag.utils.redis_conn import REDIS_CONN | ||
|
|
||
|
|
||
| def collect(): | ||
| doc_locations = TaskService.get_ongoing_doc_name() | ||
| logging.debug(doc_locations) | ||
| if len(doc_locations) == 0: | ||
| time.sleep(1) | ||
| return | ||
| return doc_locations | ||
|
|
||
|
|
||
| def main(): | ||
| locations = collect() | ||
| if not locations: | ||
| return | ||
| logging.info(f"TASKS: {len(locations)}") | ||
| for kb_id, loc in locations: | ||
| try: | ||
| if REDIS_CONN.is_alive(): | ||
| try: | ||
| key = "{}/{}".format(kb_id, loc) | ||
| if REDIS_CONN.exist(key): | ||
| continue | ||
| file_bin = MINIOs.get(kb_id, loc) | ||
| REDIS_CONN.transaction(key, file_bin, 12 * 60) | ||
| logging.info("CACHE: {}".format(loc)) | ||
| except Exception as e: | ||
| traceback.print_stack(e) | ||
| except Exception as e: | ||
| traceback.print_stack(e) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| while True: | ||
| main() | ||
| close_connection() | ||
| time.sleep(1) |