From 513f7e69aaf7041bc369d47a232d519719326843 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@supervision.ltd>
Date: Thu, 18 Jul 2024 16:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docker-compose.yml | 3 +++
requirements.txt | 10 ++++++++++
.../enterprise_busi_model.py | 20 ++++++++++---------
website/db/file/file.py | 2 +-
.../handlers/enterprise_busi_model/handler.py | 11 ++++++----
website/handlers/user/handler.py | 2 ++
6 files changed, 34 insertions(+), 14 deletions(-)
create mode 100644 requirements.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index e0c5ea9..8679f90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,8 @@ services:
# - "80:80"
# - "443:443"
- "8989:8989"
+ environment:
+ TZ: Asia/Shanghai
volumes:
- ./nginx.conf:/etc/nginx/conf.d/lemon.conf
- ./dist:/app/lemon/dist
@@ -59,6 +61,7 @@ services:
environment:
MYSQL_ROOT_PASSWORD: SghjdA887#
MYSQL_DATABASE: aiplatform
+ TZ: Asia/Shanghai
volumes:
- /data/mysql_data:/var/lib/mysql
- ./mysql_auth.sql:/docker-entrypoint-initdb.d/auth.sql
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..124db6e
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,10 @@
+aiofiles==24.1.0
+M2Crypto==0.41.0
+pandas==2.2.2
+Pillow==10.4.0
+pycryptodome==3.20.0
+redis==5.0.7
+requests==2.27.1
+SQLAlchemy==2.0.31
+tornado==6.4.1
+xlwt==1.3.0
diff --git a/website/db/enterprise_busi_model/enterprise_busi_model.py b/website/db/enterprise_busi_model/enterprise_busi_model.py
index a32bda1..8827275 100644
--- a/website/db/enterprise_busi_model/enterprise_busi_model.py
+++ b/website/db/enterprise_busi_model/enterprise_busi_model.py
@@ -5,13 +5,13 @@ import logging
from typing import Any, Dict, List, Optional
from sqlalchemy import Column, Integer, String, DateTime, func
-from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy import text
+from sqlalchemy.ext.declarative import declarative_base
from website.db.alg_model import alg_model as DB_alg_model
from website.db.enterprise_entity.enterprise_entity import EnterpriseEntityRepository
from website.db.enterprise_node import enterprise_node as DB_Node
-from website.db_mysql import get_session, to_json_list, to_json, Row, dict_to_obj
+from website.db_mysql import get_session, to_json_list, Row, dict_to_obj
from website.util import shortuuid
Base = declarative_base()
@@ -73,6 +73,7 @@ class EnterpriseBusiModel(Base):
filtered_data = {key: value for key, value in kwargs.items() if key in valid_columns}
super().__init__(**filtered_data)
+
class EnterpriseBusiModelRepository(object):
def get_by_id(self, id: int) -> Optional[EnterpriseBusiModel]:
@@ -161,7 +162,7 @@ class EnterpriseBusiModelRepository(object):
"""
with get_session() as session:
total_count = session.query(func.count(EnterpriseBusiModel.id)).filter(
- EnterpriseBusiModel.entity_id == entity_id).scalar()
+ EnterpriseBusiModel.entity_id == entity_id).filter(EnterpriseBusiModel.delete == 0).scalar()
models = (
session.query(
@@ -170,6 +171,7 @@ class EnterpriseBusiModelRepository(object):
EnterpriseBusiModel.create_time
)
.filter(EnterpriseBusiModel.entity_id == entity_id)
+ .filter(EnterpriseBusiModel.delete == 0)
.offset((page_no - 1) * page_size)
.limit(page_size)
.all()
@@ -204,6 +206,7 @@ class EnterpriseBusiModelRepository(object):
session.commit()
return
+
class EnterpriseBusiModelNode(Base):
__tablename__ = 'enterprise_busi_model_node'
@@ -277,19 +280,18 @@ class EnterpriseBusiModelNodeRepository(object):
.offset((page_no - 1) * page_size)
.limit(page_size)
.all()
- )
-
+ )
total_count = session.query(func.count(EnterpriseBusiModelNode.id)).filter(
EnterpriseBusiModelNode.node_id == node_id).scalar()
return {
- "count": total_count,
+ "count": total_count,
"data": [
{
- "busi_model_id": model.busi_model_id,
- "busi_model_name": model.busi_model_name,
- "create_time": model.create_time.strftime("%Y-%m-%d %H:%M:%S"),
+ "busi_model_id": model.busi_model_id,
+ "busi_model_name": model.busi_model_name,
+ "create_time": model.create_time.strftime("%Y-%m-%d %H:%M:%S"),
} for model in models
]
}
diff --git a/website/db/file/file.py b/website/db/file/file.py
index f38f805..0fd14b4 100644
--- a/website/db/file/file.py
+++ b/website/db/file/file.py
@@ -53,7 +53,7 @@ class FileRepository(object):
for file in files:
obj_dict = file.__dict__
del obj_dict['_sa_instance_state']
- print(obj_dict)
+ # print(obj_dict)
resp.append(dict_to_obj(obj_dict))
# return session.query(File).filter(File.md5_str.in_(md5_list)).all()
diff --git a/website/handlers/enterprise_busi_model/handler.py b/website/handlers/enterprise_busi_model/handler.py
index 60500cd..1d91f19 100644
--- a/website/handlers/enterprise_busi_model/handler.py
+++ b/website/handlers/enterprise_busi_model/handler.py
@@ -148,11 +148,14 @@ class InfoHandler(APIHandler):
db_file = DB_File.FileRepository()
files = db_file.get_file_by_md5([busi_model_data.business_conf_file, busi_model_data.business_logic])
- business_conf_name = files[0].filename
- business_logic_name = files[1].filename
+ business_logic_name = ""
+ business_conf_name = ""
+ for item in files:
+ if item.md5_str == busi_model_data.business_logic:
+ business_logic_name = item.filename
+ else:
+ business_conf_name = item.filename
- # business_conf_name = db_file.get_file_by_md5(busi_model_data.business_conf_file)
- # business_logic_name = db_file.get_file_by_md5(busi_model_data.business_logic)
basemodel_list = json.loads(busi_model_data.base_models)
entity_suid = busi_model_data.entity_suid
diff --git a/website/handlers/user/handler.py b/website/handlers/user/handler.py
index 8d08478..0b23923 100644
--- a/website/handlers/user/handler.py
+++ b/website/handlers/user/handler.py
@@ -4,6 +4,7 @@ import json
import logging
import uuid
from io import BytesIO
+from typing import Optional, Awaitable
from sqlalchemy import text
@@ -18,6 +19,7 @@ from website.util.captcha import create_validate_code
class CaptchaHandler(APIHandler):
+
def get(self):
self.set_header("Content-Type", "image/png")
image, image_str = create_validate_code()