From ec2261e913cc988518681a9aab044a9c9e42a80b Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 27 十二月 2024 10:47:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/config/env_conf/resource_type.json | 23 +++++++
app/task/fetch_agent.py | 28 ++++++++
app/api/excel.py | 82 ++++++---------------------
app/utils/excelmerge/conformity.py | 28 +++++++-
4 files changed, 91 insertions(+), 70 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 9c13103..7b8e792 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -49,12 +49,11 @@
if not user_id:
return JSONResponse(content={"error": "缂哄皯鍙傛暟user_id"}, status_code=400)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
- user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ user_excel = EXCEL_FILES_PATH
create_dir_if_not_exists(user_source)
create_dir_if_not_exists(user_excel)
clear_directory(user_source)
- clear_directory(user_excel)
save_path_list = []
for file in files:
@@ -77,7 +76,7 @@
user_id = str(current_user.id)
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
- user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
+ user_excel = EXCEL_FILES_PATH
create_dir_if_not_exists(user_source)
create_dir_if_not_exists(user_excel)
@@ -85,19 +84,14 @@
data = await websocket.receive_text()
try:
if data == "\"鍚堝苟Excel\"":
- run_excel = run_conformity(user_source, user_excel)
- files = os.listdir(user_excel)
- if run_excel:
- first_file = files[0]
- file_name = os.path.basename(first_file)
- download_url = f"./api/document/download/{first_file}"
+ merge_file = run_conformity(user_source, user_excel)
+ if merge_file is not None:
+
await websocket.send_json({
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "stream",
- "files": [{
- "file_name": file_name,
- "file_url": download_url
- }]
+ "file_name": f"{merge_file}.xlsx",
+ "download_url": f"./api/document/download/{merge_file}.xlsx"
})
await websocket.send_json({
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
@@ -105,28 +99,6 @@
})
else:
await websocket.send_json({"error": "鍚堝苟澶辫触", "type": "stream", "files": []})
- elif data == "\"鏌ヨ鍚堝苟杩涘害\"":
- files = os.listdir(user_excel)
- if not files:
- await websocket.send_json({"step_message": "姝ｅ湪鍚堝苟涓�", "type": "stream", "files": []})
- else:
- await websocket.send_json({"step_message": "鏂囨。鍚堝苟鎴愬姛锛�", "type": "stream", "files": []})
- elif data == "\"鑾峰彇鏂囦欢\"":
- files = os.listdir(user_excel)
- if not files:
- await websocket.send_json({"error": "鐩綍涓嬫病鏈夌敓鎴愮殑鏂囦欢", "type": "stream", "files": []})
- else:
- first_file = files[0]
- file_name = os.path.basename(first_file)
- file_url = f"./api/document/download/{first_file}"
- await websocket.send_json({
- "step_message": "鏂囨。鍚堝苟鎴愬姛锛�",
- "type": "stream",
- "files": [{
- "file_name": file_name,
- "file_url": file_url
- }]
- })
else:
print(f"Received data: {data}")
await websocket.send_json({"error": "鏈煡鎸囦护", "data": str(data)})
@@ -135,38 +107,22 @@
await websocket.close()
-@router.get("/download/excel")
-async def download_file(background_tasks: BackgroundTasks, current_user: UserModel = Depends(get_current_user)):
- user_id = str(current_user.id)
- user_excel = user_file_path(user_id, EXCEL_FILES_PATH)
- user_source = user_file_path(user_id, SOURCE_FILES_PATH)
+@router.get("/download/{file_full_name}")
+async def download_file(background_tasks: BackgroundTasks, file_full_name: str):
+ file_name = os.path.basename(file_full_name)
+ user_excel = EXCEL_FILES_PATH
+ file_path = os.path.join(user_excel, file_full_name)
- if not os.path.exists(user_excel):
- return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍涓嶅瓨鍦�"})
-
- excel_files = [f for f in os.listdir(user_excel) if os.path.isfile(os.path.join(user_excel, f))]
- excel_files.sort(key=lambda x: os.path.getmtime(os.path.join(user_excel, x)), reverse=True)
- if not excel_files:
- return JSONResponse(status_code=404, content={"error": "鐢ㄦ埛鐩綍鍐呮病鏈夋枃浠�"})
-
- filename = excel_files[0]
- file_path = os.path.join(user_excel, filename)
-
- def delete_files_in_directory(directory):
- for root, dirs, files in os.walk(directory, topdown=False):
- for name in files:
- os.remove(os.path.join(root, name))
- for name in dirs:
- os.rmdir(os.path.join(root, name))
+ if not os.path.exists(file_path):
+ return JSONResponse(content={"error": "鏂囦欢涓嶅瓨鍦�"}, status_code=404)
def delete_file():
try:
- delete_files_in_directory(user_excel)
- delete_files_in_directory(user_source)
+ os.unlink(file_path)
except OSError as e:
- print(f"Error deleting file {file_path}: {e}")
+ print(f"Deleting file error")
+ # 寰呬笅杞藉畬鎴愬悗鍒犻櫎鐢熸垚鐨勬枃浠�
background_tasks.add_task(delete_file)
-
- return FileResponse(file_path, filename=filename,
- media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+ return FileResponse(path=file_path, filename=file_name,
+ media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
diff --git a/app/config/env_conf/resource_type.json b/app/config/env_conf/resource_type.json
new file mode 100644
index 0000000..a58d009
--- /dev/null
+++ b/app/config/env_conf/resource_type.json
@@ -0,0 +1,23 @@
+[
+ {
+ "id": "0",
+ "created_at": null,
+ "updated_at": null,
+ "name": "鑿滃崟",
+ "description": "鑿滃崟绫诲瀷浼氭樉绀哄湪绯荤粺棣栭〉宸︿晶鑿滃崟涓�"
+ },
+ {
+ "id": "1",
+ "created_at": null,
+ "updated_at": null,
+ "name": "鍔熻兘",
+ "description": "鍔熻兘绫诲瀷涓嶄細鏄剧ず鍦ㄧ郴缁熼椤靛乏渚ц彍鍗曚腑"
+ },
+ {
+ "id": "3",
+ "created_at": null,
+ "updated_at": null,
+ "name": "鐩綍",
+ "description": null
+ }
+]
\ No newline at end of file
diff --git a/app/task/fetch_agent.py b/app/task/fetch_agent.py
index da17b10..bbb4da9 100644
--- a/app/task/fetch_agent.py
+++ b/app/task/fetch_agent.py
@@ -14,7 +14,7 @@
from app.models.user_model import UserAppModel
from app.models.agent_model import AgentModel
from app.models.base_model import SessionLocal, Base
-from app.models.resource_model import ResourceModel
+from app.models.resource_model import ResourceModel, ResourceTypeModel
from app.service.v2.app_register import AppRegisterDao
# 鍒涘缓鏁版嵁搴撳紩鎿庡拰浼氳瘽宸ュ巶
@@ -431,6 +431,18 @@
db.close()
+def import_type_table(session: Session, node: dict, parent=None):
+ resource_type = ResourceTypeModel(
+ id=node['id'],
+ name=node['name'],
+ description=node.get('description')
+ )
+ if parent:
+ resource_type.parent = parent
+ session.add(resource_type)
+ session.commit()
+
+
def import_tree(session: Session, node: dict, parent=None):
resource = ResourceModel(
id=node['id'],
@@ -460,6 +472,18 @@
def sync_resources_from_json():
db = SessionLocal()
try:
+ if db.query(ResourceTypeModel).count() == 0:
+ with open(os.path.join(ENV_CONF_PATH, "resource_type.json"), 'r', encoding='utf-8') as file:
+ type_json_data = json.load(file)
+
+ db.query(ResourceTypeModel).delete()
+ db.commit()
+
+ for node in type_json_data:
+ import_type_table(db, node)
+ print("add resourceType record successfully")
+ else:
+ print("sync resources successfully")
if db.query(ResourceModel).count() == 0:
with open(os.path.join(ENV_CONF_PATH, "resource.json"), 'r', encoding='utf-8') as file:
json_data = json.load(file)
@@ -473,7 +497,7 @@
else:
print("sync resources successfully")
except Exception as e:
- print(f"Failed to sync resources: {str(e)}")
+ print(f"Failed to sync resources or resource type: {str(e)}")
finally:
db.close()
diff --git a/app/utils/excelmerge/conformity.py b/app/utils/excelmerge/conformity.py
index bca8868..3df2e86 100644
--- a/app/utils/excelmerge/conformity.py
+++ b/app/utils/excelmerge/conformity.py
@@ -1,6 +1,10 @@
-from openpyxl import load_workbook
-from datetime import datetime
import os
+import random
+import shutil
+import string
+from datetime import datetime
+
+from openpyxl import load_workbook
def clear_blank_rows(sheet):
@@ -55,11 +59,25 @@
template_sheets[name].cell(row=i, column=1).value = i - start_row + 1
timestamp = datetime.now().strftime('%Y_%m_%d_%H_%M_%S')
- output_path = os.path.join(print_path, f'{timestamp}.xlsx')
+ random_string = ''.join(random.choice(string.ascii_letters + string.digits) for i in range(5))
+ file_name = f'{random_string}_{timestamp}'
+ output_path = os.path.join(print_path, f'{file_name}.xlsx')
template_excel.save(output_path)
template_excel.close()
- return True
+ # 鍚堝苟瀹屾垚鍚庡垹闄ゆ棤鐢ㄦ枃浠�
+ for filename in os.listdir(file_path):
+ file_path_full = os.path.join(file_path, filename)
+ try:
+ if os.path.isfile(file_path_full) or os.path.islink(file_path_full):
+ os.unlink(file_path_full)
+ elif os.path.isdir(file_path_full):
+ shutil.rmtree(file_path_full)
+ os.rmdir(file_path)
+ except Exception as e:
+ print(f"鍒犻櫎鏂囦欢鏃跺彂鐢熼敊璇�: {e}")
+
+ return file_name
except Exception as e:
print(f"璇诲彇鏁版嵁鍙戠敓閿欒: {e}")
- return False
+ return None
--
Gitblit v1.8.0