jinhai-2012 commited on
Commit
777b2da
·
1 Parent(s): 8c25b8b

Remove unused settings (#3427)

Browse files

### What problem does this PR solve?

_Briefly describe what this PR aims to solve. Include background context
that will help reviewers understand the purpose of the PR._

### Type of change

- [x] Refactoring

Signed-off-by: jinhai <[email protected]>

Files changed (1) hide show
  1. api/settings.py +1 -64
api/settings.py CHANGED
@@ -16,7 +16,6 @@
16
  import os
17
  from datetime import date
18
  from enum import IntEnum, Enum
19
- from api.utils.file_utils import get_project_base_directory
20
  import rag.utils.es_conn
21
  import rag.utils.infinity_conn
22
 
@@ -27,23 +26,11 @@ from api.utils import get_base_config, decrypt_database_config
27
 
28
  API_VERSION = "v1"
29
  RAG_FLOW_SERVICE_NAME = "ragflow"
30
- SERVER_MODULE = "rag_flow_server.py"
31
- TEMP_DIRECTORY = os.path.join(get_project_base_directory(), "temp")
32
- RAG_FLOW_CONF_PATH = os.path.join(get_project_base_directory(), "conf")
33
  LIGHTEN = int(os.environ.get('LIGHTEN', "0"))
34
 
35
- ERROR_REPORT = True
36
- ERROR_REPORT_WITH_PATH = False
37
-
38
- MAX_TIMESTAMP_INTERVAL = 60
39
- SESSION_VALID_PERIOD = 7 * 24 * 60 * 60
40
-
41
- REQUEST_TRY_TIMES = 3
42
  REQUEST_WAIT_SEC = 2
43
  REQUEST_MAX_WAIT_SEC = 300
44
 
45
- USE_REGISTRY = get_base_config("use_registry")
46
-
47
  LLM = get_base_config("user_default_llm", {})
48
  LLM_FACTORY = LLM.get("factory", "Tongyi-Qianwen")
49
  LLM_BASE_URL = LLM.get("base_url")
@@ -115,16 +102,11 @@ if not LIGHTEN:
115
  EMBEDDING_MDL = default_llm["BAAI"]["embedding_model"] + "@BAAI"
116
  RERANK_MDL = default_llm["BAAI"]["rerank_model"] + "@BAAI"
117
 
118
-
119
  API_KEY = LLM.get("api_key", "")
120
  PARSERS = LLM.get(
121
  "parsers",
122
  "naive:General,qa:Q&A,resume:Resume,manual:Manual,table:Table,paper:Paper,book:Book,laws:Laws,presentation:Presentation,picture:Picture,one:One,audio:Audio,knowledge_graph:Knowledge Graph,email:Email")
123
 
124
- # distribution
125
- DEPENDENT_DISTRIBUTION = get_base_config("dependent_distribution", False)
126
- RAG_FLOW_UPDATE_CHECK = False
127
-
128
  HOST = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("host", "127.0.0.1")
129
  HTTP_PORT = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("http_port")
130
 
@@ -132,64 +114,19 @@ SECRET_KEY = get_base_config(
132
  RAG_FLOW_SERVICE_NAME,
133
  {}).get("secret_key", str(date.today()))
134
 
135
- TOKEN_EXPIRE_IN = get_base_config(
136
- RAG_FLOW_SERVICE_NAME, {}).get(
137
- "token_expires_in", 3600)
138
-
139
- NGINX_HOST = get_base_config(
140
- RAG_FLOW_SERVICE_NAME, {}).get(
141
- "nginx", {}).get("host") or HOST
142
- NGINX_HTTP_PORT = get_base_config(
143
- RAG_FLOW_SERVICE_NAME, {}).get(
144
- "nginx", {}).get("http_port") or HTTP_PORT
145
-
146
- RANDOM_INSTANCE_ID = get_base_config(
147
- RAG_FLOW_SERVICE_NAME, {}).get(
148
- "random_instance_id", False)
149
-
150
- PROXY = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("proxy")
151
- PROXY_PROTOCOL = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("protocol")
152
-
153
  DATABASE_TYPE = os.getenv("DB_TYPE", 'mysql')
154
  DATABASE = decrypt_database_config(name=DATABASE_TYPE)
155
 
156
- # Switch
157
- # upload
158
- UPLOAD_DATA_FROM_CLIENT = True
159
-
160
  # authentication
161
  AUTHENTICATION_CONF = get_base_config("authentication", {})
162
 
163
  # client
164
  CLIENT_AUTHENTICATION = AUTHENTICATION_CONF.get(
165
  "client", {}).get(
166
- "switch", False)
167
  HTTP_APP_KEY = AUTHENTICATION_CONF.get("client", {}).get("http_app_key")
168
  GITHUB_OAUTH = get_base_config("oauth", {}).get("github")
169
  FEISHU_OAUTH = get_base_config("oauth", {}).get("feishu")
170
- WECHAT_OAUTH = get_base_config("oauth", {}).get("wechat")
171
-
172
- # site
173
- SITE_AUTHENTICATION = AUTHENTICATION_CONF.get("site", {}).get("switch", False)
174
-
175
- # permission
176
- PERMISSION_CONF = get_base_config("permission", {})
177
- PERMISSION_SWITCH = PERMISSION_CONF.get("switch")
178
- COMPONENT_PERMISSION = PERMISSION_CONF.get("component")
179
- DATASET_PERMISSION = PERMISSION_CONF.get("dataset")
180
-
181
- HOOK_MODULE = get_base_config("hook_module")
182
- HOOK_SERVER_NAME = get_base_config("hook_server_name")
183
-
184
- ENABLE_MODEL_STORE = get_base_config('enable_model_store', False)
185
- # authentication
186
- USE_AUTHENTICATION = False
187
- USE_DATA_AUTHENTICATION = False
188
- AUTOMATIC_AUTHORIZATION_OUTPUT_DATA = True
189
- USE_DEFAULT_TIMEOUT = False
190
- AUTHENTICATION_DEFAULT_TIMEOUT = 7 * 24 * 60 * 60 # s
191
- PRIVILEGE_COMMAND_WHITELIST = []
192
- CHECK_NODES_IDENTITY = False
193
 
194
  DOC_ENGINE = os.environ.get('DOC_ENGINE', "elasticsearch")
195
  if DOC_ENGINE == "elasticsearch":
 
16
  import os
17
  from datetime import date
18
  from enum import IntEnum, Enum
 
19
  import rag.utils.es_conn
20
  import rag.utils.infinity_conn
21
 
 
26
 
27
  API_VERSION = "v1"
28
  RAG_FLOW_SERVICE_NAME = "ragflow"
 
 
 
29
  LIGHTEN = int(os.environ.get('LIGHTEN', "0"))
30
 
 
 
 
 
 
 
 
31
  REQUEST_WAIT_SEC = 2
32
  REQUEST_MAX_WAIT_SEC = 300
33
 
 
 
34
  LLM = get_base_config("user_default_llm", {})
35
  LLM_FACTORY = LLM.get("factory", "Tongyi-Qianwen")
36
  LLM_BASE_URL = LLM.get("base_url")
 
102
  EMBEDDING_MDL = default_llm["BAAI"]["embedding_model"] + "@BAAI"
103
  RERANK_MDL = default_llm["BAAI"]["rerank_model"] + "@BAAI"
104
 
 
105
  API_KEY = LLM.get("api_key", "")
106
  PARSERS = LLM.get(
107
  "parsers",
108
  "naive:General,qa:Q&A,resume:Resume,manual:Manual,table:Table,paper:Paper,book:Book,laws:Laws,presentation:Presentation,picture:Picture,one:One,audio:Audio,knowledge_graph:Knowledge Graph,email:Email")
109
 
 
 
 
 
110
  HOST = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("host", "127.0.0.1")
111
  HTTP_PORT = get_base_config(RAG_FLOW_SERVICE_NAME, {}).get("http_port")
112
 
 
114
  RAG_FLOW_SERVICE_NAME,
115
  {}).get("secret_key", str(date.today()))
116
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
117
  DATABASE_TYPE = os.getenv("DB_TYPE", 'mysql')
118
  DATABASE = decrypt_database_config(name=DATABASE_TYPE)
119
 
 
 
 
 
120
  # authentication
121
  AUTHENTICATION_CONF = get_base_config("authentication", {})
122
 
123
  # client
124
  CLIENT_AUTHENTICATION = AUTHENTICATION_CONF.get(
125
  "client", {}).get(
126
+ "switch", False)
127
  HTTP_APP_KEY = AUTHENTICATION_CONF.get("client", {}).get("http_app_key")
128
  GITHUB_OAUTH = get_base_config("oauth", {}).get("github")
129
  FEISHU_OAUTH = get_base_config("oauth", {}).get("feishu")
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
130
 
131
  DOC_ENGINE = os.environ.get('DOC_ENGINE', "elasticsearch")
132
  if DOC_ENGINE == "elasticsearch":