From 916d984d2628fd8d863183cf5ba9e5a0a7339871 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 18 十二月 2024 11:03:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/excel.py | 24 +++-----
app/utils/excelmerge/conformity.py | 118 ++++++++++++++++++++-------------------
app/service/v2/initialize_data.py | 9 +-
3 files changed, 74 insertions(+), 77 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 77ae5fd..a21ee3f 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,13 +1,7 @@
-from fastapi import APIRouter, File, UploadFile, Depends
+from fastapi import APIRouter, File, UploadFile
from fastapi.responses import JSONResponse, FileResponse
from fastapi.exceptions import HTTPException
-from sqlalchemy.orm import Session
-from starlette.websockets import WebSocket, WebSocketDisconnect
-from werkzeug.utils import secure_filename
-from app.api import get_current_user_websocket
-from app.models.agent_model import AgentModel, AgentType
-from app.models.base_model import get_db
-from app.models.user_model import UserModel
+from starlette.websockets import WebSocket
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -17,6 +11,7 @@
ALLOWED_EXTENSIONS = {'xlsx'}
EXCEL_FILES_PATH = 'data/output'
SOURCE_FILES_PATH = 'data/source'
+
def allowed_file(filename):
return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
@@ -77,19 +72,18 @@
data = await websocket.receive_text()
try:
if data == "\"鍚堝苟Excel\"":
- output_file_path = run_conformity()
- output_file_path = run_conformity()
+ run_excel = run_conformity()
files = os.listdir(EXCEL_FILES_PATH)
- if files:
+ if run_excel:
first_file = files[0]
file_name = os.path.basename(first_file)
- file_url = f"./api/document/download/{first_file}"
+ download_url = f"./api/document/download/{first_file}"
await websocket.send_json({
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "stream",
"files": [{
"file_name": file_name,
- "file_url": file_url
+ "file_url": download_url
}]
})
await websocket.send_json({
@@ -97,7 +91,7 @@
"type": "close",
})
else:
- await websocket.send_json({"error": "鍚堝苟鎿嶄綔鏈敓鎴愭枃浠�", "type": "stream", "files": []})
+ await websocket.send_json({"error": "鍚堝苟澶辫触", "type": "stream", "files": []})
elif data == "\"鏌ヨ鍚堝苟杩涘害\"":
files = os.listdir(EXCEL_FILES_PATH)
if not files:
@@ -136,4 +130,4 @@
except FileNotFoundError:
raise HTTPException(status_code=404, detail="鏂囦欢涓嶅瓨鍦�")
except Exception as e:
- raise HTTPException(status_code=500, detail="鏈嶅姟鍣ㄩ敊璇�")
\ No newline at end of file
+ raise HTTPException(status_code=500, detail="鏈嶅姟鍣ㄩ敊璇�")
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index ce859dd..1bb860c 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -114,6 +114,7 @@
register_dict = {}
token = ""
app_password = await generate_password(10)
+ crypt_password = UserAppModel.encrypted_password(app_password)
for app in app_register:
if app["id"] == 'ragflow_app':
user_rag_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
@@ -127,7 +128,7 @@
app_name = register_info.get("name")
app_id = register_info.get("id")
app_email = register_info.get("email")
- await save_db(db, app_name, user.password, app_email, user.id, app_id, "ragflow_app")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "ragflow_app")
elif app["id"] == 'bisheng_app':
user_bs_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
UserAppModel.app_type == 'bisheng_app').all()
@@ -140,7 +141,7 @@
app_name = register_info.get("name")
app_id = register_info.get("id")
app_email = register_info.get("email")
- await save_db(db, app_name, user.password, app_email, user.id, app_id, "bisheng_app")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "bisheng_app")
elif app["id"] == 'dify_app':
user_df_app = db.query(UserAppModel).filter(UserAppModel.user_id == userid,
UserAppModel.app_type == 'dify_app').all()
@@ -156,9 +157,7 @@
app_name = register_info.get("name")
app_id = register_info.get("id")
app_email = register_info.get("email")
- df_password = await generate_password(10)
- password = cipher_suite.encrypt(df_password.encode("utf-8")).decode("utf-8")
- await save_db(db, app_name, password, app_email, user.id, app_id, "dify_app")
+ await save_db(db, app_name, crypt_password, app_email, user.id, app_id, "dify_app")
else:
raise Exception("鏈煡娉ㄥ唽搴旂敤---")
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index 7276d06..128657d 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -1,73 +1,77 @@
from openpyxl import load_workbook
-from openpyxl.utils import get_column_letter
from datetime import datetime
import os
def run_conformity():
- # 鍔犺浇妯℃澘鏂囦欢
- template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
- template_excel = load_workbook(template_path)
- EXCEL_FILES_PATH = os.path.join('data', 'output')
+ try:
+ # 鍔犺浇妯℃澘鏂囦欢
+ template_path = os.path.join('app', 'utils', 'excelmerge', '鍥界綉涓婃捣鐢靛姏鏁村悎妯＄増.xlsx')
+ template_excel = load_workbook(template_path)
+ EXCEL_FILES_PATH = os.path.join('data', 'output')
- # 鑾峰彇宸ヤ綔琛�
- sheet1 = template_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- sheet2 = template_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- sheet3 = template_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- sheet4 = template_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- sheet5 = template_excel['鍏稿瀷缁忛獙浜ゆ祦']
+ # 鑾峰彇宸ヤ綔琛�
+ sheet1 = template_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ sheet2 = template_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ sheet3 = template_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ sheet4 = template_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ sheet5 = template_excel['鍏稿瀷缁忛獙浜ゆ祦']
- # 鑾峰彇婧愭枃浠惰矾寰�
- source_folder = os.path.join('data', 'source')
- source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
+ # 鑾峰彇婧愭枃浠惰矾寰�
+ source_folder = os.path.join('data', 'source')
+ source_files = [f for f in os.listdir(source_folder) if f.endswith('.xlsx') and not f.startswith('~$')]
- for file in source_files:
- source_path = os.path.join(source_folder, file)
- source_excel = load_workbook(source_path)
+ for file in source_files:
+ source_path = os.path.join(source_folder, file)
+ source_excel = load_workbook(source_path)
- # 鑾峰彇婧愬伐浣滆〃
- ssheet1 = source_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
- ssheet2 = source_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
- ssheet3 = source_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
- ssheet4 = source_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
- ssheet5 = source_excel['鍏稿瀷缁忛獙浜ゆ祦']
+ # 鑾峰彇婧愬伐浣滆〃
+ ssheet1 = source_excel['鎶�鏈洃鐫ｅ伐浣滅粺璁¤〃']
+ ssheet2 = source_excel['鎶�鏈洃鐫ｅ憡锛堥锛夎鍗曠粺璁¤〃']
+ ssheet3 = source_excel['鎶曚骇鍓嶆妧鏈洃鐫ｆ姤鍛婄粺璁¤〃']
+ ssheet4 = source_excel['鎶�鏈洃鐫ｇ粏鍒欏畬鍠勫缓璁�']
+ ssheet5 = source_excel['鍏稿瀷缁忛獙浜ゆ祦']
- # 娓呴櫎鏃犳晥绌虹櫧琛�
- for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
- last_row = ssheet.max_row
- if last_row > 1:
- for row in range(last_row, 1, -1):
- if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
- column=col).value == ''
- for col in range(1, ssheet.max_column + 1)):
- ssheet.delete_rows(row)
+ # 娓呴櫎鏃犳晥绌虹櫧琛�
+ for ssheet in [ssheet1, ssheet2, ssheet3, ssheet4, ssheet5]:
+ last_row = ssheet.max_row
+ if last_row > 1:
+ for row in range(last_row, 1, -1):
+ if all(ssheet.cell(row=row, column=col).value is None or ssheet.cell(row=row,
+ column=col).value == ''
+ for col in range(1, ssheet.max_column + 1)):
+ ssheet.delete_rows(row)
- # 澶嶅埗鏁版嵁
- for (ssheet, tsheet, start_point) in [
- (ssheet1, sheet1, 4),
- (ssheet2, sheet2, 3),
- (ssheet3, sheet3, 3),
- (ssheet4, sheet4, 4),
- (ssheet5, sheet5, 3),
- ]:
- for row in range(start_point, ssheet.max_row + 1):
- a_cell_value = ssheet.cell(row=row, column=1).value
- if isinstance(a_cell_value, (int, float)) and any(
- ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
- tsheet.append([ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
+ # 澶嶅埗鏁版嵁
+ for (ssheet, tsheet, start_point) in [
+ (ssheet1, sheet1, 4),
+ (ssheet2, sheet2, 3),
+ (ssheet3, sheet3, 3),
+ (ssheet4, sheet4, 4),
+ (ssheet5, sheet5, 3),
+ ]:
+ for row in range(start_point, ssheet.max_row + 1):
+ a_cell_value = ssheet.cell(row=row, column=1).value
+ if isinstance(a_cell_value, (int, float)) and any(
+ ssheet.cell(row=row, column=col).value for col in range(2, ssheet.max_column + 1)):
+ tsheet.append(
+ [ssheet.cell(row=row, column=col).value for col in range(1, ssheet.max_column + 1)])
- source_excel.close()
+ source_excel.close()
- # 鍦ㄧ洰鏍囧伐浣滆〃涓坊鍔犲簭鍙�
- for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
- last_row = tsheet.max_row
- for i in range(start_point, last_row + 1):
- tsheet.cell(row=i, column=1).value = i - start_point + 1
+ # 鍦ㄧ洰鏍囧伐浣滆〃涓坊鍔犲簭鍙�
+ for tsheet, start_point in [(sheet1, 4), (sheet2, 3), (sheet3, 3), (sheet4, 4), (sheet5, 3)]:
+ last_row = tsheet.max_row
+ for i in range(start_point, last_row + 1):
+ tsheet.cell(row=i, column=1).value = i - start_point + 1
- # 淇濆瓨鏂囦欢
- timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
- output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
- template_excel.save(output_path)
- template_excel.close()
+ # 淇濆瓨鏂囦欢
+ timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
+ output_path = os.path.join(EXCEL_FILES_PATH, f'{timestamp}.xlsx')
+ template_excel.save(output_path)
+ template_excel.close()
- return timestamp
+ return True
+ except Exception as e:
+ print(f"璇诲彇鏁版嵁鍙戠敓閿欒: {e}")
+ return False
--
Gitblit v1.8.0