YueHuihui
/
RAGflow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 移除未使用的导入和冗余代码，修复自动化测试报错 (#9) 

清理多个文件中的未使用导入和冗余代码，以提高代码的可读性和维护性。主要改动包括移除未使用的模块导入和删除重复的版权声明。
This commit is contained in:
zstar 2025-04-01 00:37:22 +08:00 committed by GitHub
parent 699c4c7f0b
commit 55c7856a04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/ragflow_server.py
View File

@ -1,26 +1,3 @@
#
# 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.
#
# from beartype import BeartypeConf
# from beartype.claw import beartype_all # <-- you didn't sign up for this
# beartype_all(conf=BeartypeConf(violation_type=UserWarning)) # <-- emit warnings from all code
from api.utils.log_utils import initRootLogger
initRootLogger("ragflow_server")
import logging import logging
import os import os
import signal import signal
@ -29,14 +6,12 @@ import time
import traceback import traceback
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
import threading import threading
from werkzeug.serving import run_simple from werkzeug.serving import run_simple
from api import settings from api import settings
from api.apps import app from api.apps import app
from api.db.runtime_config import RuntimeConfig from api.db.runtime_config import RuntimeConfig
from api.db.services.document_service import DocumentService from api.db.services.document_service import DocumentService
from api import utils from api import utils
from api.db.db_models import init_database_tables as init_web_db from api.db.db_models import init_database_tables as init_web_db
from api.db.init_data import init_web_data from api.db.init_data import init_web_data
from api.versions import get_ragflow_version from api.versions import get_ragflow_version
@ -44,6 +19,9 @@ from api.utils import show_configs
from rag.settings import print_rag_settings from rag.settings import print_rag_settings
from rag.utils.redis_conn import RedisDistributedLock from rag.utils.redis_conn import RedisDistributedLock
from api.utils.log_utils import initRootLogger
initRootLogger("ragflow_server")
stop_event = threading.Event() stop_event = threading.Event()
def update_progress(): def update_progress():

16
intergrations/chatgpt-on-wechat/plugins/__init__.py
View File

@ -1,19 +1,3 @@
#
# Copyright 2025 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.
#
from beartype.claw import beartype_this_package from beartype.claw import beartype_this_package
beartype_this_package() beartype_this_package()

1
management/server/app.py
View File

@ -1,6 +1,5 @@
from flask import Flask, jsonify, request from flask import Flask, jsonify, request
from flask_cors import CORS from flask_cors import CORS
import mysql.connector
import database import database
app = Flask(__name__) app = Flask(__name__)

1
management/server/database.py
View File

@ -1,7 +1,6 @@
import mysql.connector import mysql.connector
from utils import generate_uuid, encrypt_password from utils import generate_uuid, encrypt_password
from datetime import datetime from datetime import datetime
from tabulate import tabulate
# 数据库连接配置 # 数据库连接配置
db_config = { db_config = {

2
management/server/utils.py
View File

@ -1,6 +1,5 @@
import uuid import uuid
import base64 import base64
from datetime import datetime
from Cryptodome.PublicKey import RSA from Cryptodome.PublicKey import RSA
from Cryptodome.Cipher import PKCS1_v1_5 from Cryptodome.Cipher import PKCS1_v1_5
from werkzeug.security import generate_password_hash from werkzeug.security import generate_password_hash
@ -24,5 +23,4 @@ def rsa_psw(password: str) -> str:
# 加密密码 # 加密密码
def encrypt_password(raw_password: str) -> str: def encrypt_password(raw_password: str) -> str:
base64_password = base64.b64encode(raw_password.encode()).decode() base64_password = base64.b64encode(raw_password.encode()).decode()
encrypted_password = rsa_psw(base64_password)
return generate_password_hash(base64_password) return generate_password_hash(base64_password)

28
rag/svr/task_executor.py
View File

@ -1,32 +1,9 @@
#
# 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.
# from beartype import BeartypeConf
# from beartype.claw import beartype_all # <-- you didn't sign up for this
# beartype_all(conf=BeartypeConf(violation_type=UserWarning)) # <-- emit warnings from all code
import random import random
import sys import sys
from api.utils.log_utils import initRootLogger, get_project_base_directory from api.utils.log_utils import initRootLogger, get_project_base_directory
from graphrag.general.index import run_graphrag from graphrag.general.index import run_graphrag
from graphrag.utils import get_llm_cache, set_llm_cache, get_tags_from_cache, set_tags_to_cache from graphrag.utils import get_llm_cache, set_llm_cache, get_tags_from_cache, set_tags_to_cache
from rag.prompts import keyword_extraction, question_proposal, content_tagging from rag.prompts import keyword_extraction, question_proposal, content_tagging
CONSUMER_NO = "0" if len(sys.argv) < 2 else sys.argv[1]
CONSUMER_NAME = "task_executor_" + CONSUMER_NO
import logging import logging
import os import os
from datetime import datetime from datetime import datetime
@ -43,10 +20,8 @@ import signal
import trio import trio
import exceptiongroup import exceptiongroup
import faulthandler import faulthandler
import numpy as np import numpy as np
from peewee import DoesNotExist from peewee import DoesNotExist
from api.db import LLMType, ParserType, TaskStatus from api.db import LLMType, ParserType, TaskStatus
from api.db.services.document_service import DocumentService from api.db.services.document_service import DocumentService
from api.db.services.llm_service import LLMBundle from api.db.services.llm_service import LLMBundle
@ -65,6 +40,9 @@ from rag.utils.redis_conn import REDIS_CONN
from rag.utils.storage_factory import STORAGE_IMPL from rag.utils.storage_factory import STORAGE_IMPL
from graphrag.utils import chat_limiter from graphrag.utils import chat_limiter
CONSUMER_NO = "0" if len(sys.argv) < 2 else sys.argv[1]
CONSUMER_NAME = "task_executor_" + CONSUMER_NO
BATCH_SIZE = 64 BATCH_SIZE = 64
FACTORY = { FACTORY = {

21
sdk/python/ragflow_sdk/__init__.py
View File

@ -1,24 +1,5 @@
#
# Copyright 2025 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.
#
from beartype.claw import beartype_this_package from beartype.claw import beartype_this_package
beartype_this_package()
import importlib.metadata import importlib.metadata
from .ragflow import RAGFlow from .ragflow import RAGFlow
from .modules.dataset import DataSet from .modules.dataset import DataSet
from .modules.chat import Chat from .modules.chat import Chat
@ -27,6 +8,8 @@ from .modules.document import Document
from .modules.chunk import Chunk from .modules.chunk import Chunk
from .modules.agent import Agent from .modules.agent import Agent
beartype_this_package()
__version__ = importlib.metadata.version("ragflow_sdk") __version__ = importlib.metadata.version("ragflow_sdk")
__all__ = [ __all__ = [