From 7cfb16a4056c8c4b17bc6a978493f96ec4309736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B4=94=E4=B8=BA=E4=B9=8B?= <560397@gree.com.cn> Date: Tue, 21 Nov 2023 14:03:22 +0800 Subject: [PATCH] Update project --- application/extensions/init_sqlalchemy.py | 80 +++++++++++------------ application/script/cmdline.py | 48 ++++++++++++-- 2 files changed, 84 insertions(+), 44 deletions(-) diff --git a/application/extensions/init_sqlalchemy.py b/application/extensions/init_sqlalchemy.py index 91f4a62..58295ec 100644 --- a/application/extensions/init_sqlalchemy.py +++ b/application/extensions/init_sqlalchemy.py @@ -39,43 +39,43 @@ def init_database(app: Flask) -> None: app.config.setdefault('SQLALCHEMY_DATABASE_URI', uri.create()) db.app = app db.init_app(app) - with app.app_context(): - db.session.execute(text(f""" - CREATE TABLE IF NOT EXISTS {cfg.TableName} ( - id SERIAL NOT NULL, - date_time TIMESTAMP WITH TIME ZONE NOT NULL, - uuid varchar(100) DEFAULT NULL, - mid varchar(50) DEFAULT NULL, - mid_type varchar(50) DEFAULT NULL, - mac_wifi varchar(50) DEFAULT NULL, - mac_voice varchar(50) DEFAULT NULL, - code smallint DEFAULT NULL, - query varchar(255) DEFAULT NULL, - terminal_domain varchar(50) DEFAULT NULL, - terminal_intent varchar(50) DEFAULT NULL, - distribution_gree_domain varchar(50) DEFAULT NULL, - distribution_gree_intent varchar(50) DEFAULT NULL, - response_text text, - emotion_class varchar(50) DEFAULT NULL, - skill_id varchar(100) DEFAULT NULL, - voice_portal smallint NOT NULL, - service_nlu varchar(50) DEFAULT NULL, - service_type smallint NOT NULL, - slots text, - yzs_request_id varchar(50) DEFAULT NULL, - yzs_remote_ip varchar(15) DEFAULT NULL, - yzs_app_key varchar(50) DEFAULT NULL, - yzs_ud_id varchar(50) DEFAULT NULL, - yzs_user_id varchar(50) DEFAULT NULL, - yzs_intent text, - yzs_general text, - yzs_nlu_time varchar(20) DEFAULT NULL, - get_body_time varchar(20) DEFAULT NULL, - gree_nlu_time varchar(20) DEFAULT NULL, - get_homeid_time varchar(20) DEFAULT NULL, - tencent_nlu_time varchar(20) DEFAULT NULL, - cost_time varchar(20) DEFAULT NULL, - PRIMARY KEY (id, date_time) - ) PARTITION BY RANGE (date_time); - """)) - db.session.commit() + # with app.app_context(): + # db.session.execute(text(f""" + # CREATE TABLE IF NOT EXISTS {cfg.TableName} ( + # id SERIAL NOT NULL, + # date_time TIMESTAMP WITH TIME ZONE NOT NULL, + # uuid varchar(100) DEFAULT NULL, + # mid varchar(50) DEFAULT NULL, + # mid_type varchar(50) DEFAULT NULL, + # mac_wifi varchar(50) DEFAULT NULL, + # mac_voice varchar(50) DEFAULT NULL, + # code smallint DEFAULT NULL, + # query varchar(255) DEFAULT NULL, + # terminal_domain varchar(50) DEFAULT NULL, + # terminal_intent varchar(50) DEFAULT NULL, + # distribution_gree_domain varchar(50) DEFAULT NULL, + # distribution_gree_intent varchar(50) DEFAULT NULL, + # response_text text, + # emotion_class varchar(50) DEFAULT NULL, + # skill_id varchar(100) DEFAULT NULL, + # voice_portal smallint NOT NULL, + # service_nlu varchar(50) DEFAULT NULL, + # service_type smallint NOT NULL, + # slots text, + # yzs_request_id varchar(50) DEFAULT NULL, + # yzs_remote_ip varchar(15) DEFAULT NULL, + # yzs_app_key varchar(50) DEFAULT NULL, + # yzs_ud_id varchar(50) DEFAULT NULL, + # yzs_user_id varchar(50) DEFAULT NULL, + # yzs_intent text, + # yzs_general text, + # yzs_nlu_time varchar(20) DEFAULT NULL, + # get_body_time varchar(20) DEFAULT NULL, + # gree_nlu_time varchar(20) DEFAULT NULL, + # get_homeid_time varchar(20) DEFAULT NULL, + # tencent_nlu_time varchar(20) DEFAULT NULL, + # cost_time varchar(20) DEFAULT NULL, + # PRIMARY KEY (id, date_time) + # ) PARTITION BY RANGE (date_time); + # """)) + # db.session.commit() diff --git a/application/script/cmdline.py b/application/script/cmdline.py index 3646d47..fee59a0 100644 --- a/application/script/cmdline.py +++ b/application/script/cmdline.py @@ -13,6 +13,7 @@ # Import third-party modules import click from flask.cli import with_appcontext +from sqlalchemy import text @click.command("init") @@ -26,7 +27,46 @@ def init(): from application.extensions.init_sqlalchemy import db # Uncomment below lines to create a new log entry. - # click.echo("create log") - # db.session.add(user) - # db.session.commit() - # click.echo("created log") + click.echo('create tables') + with db.app.app_context(): + cfg = db.app.config.Database + db.session.execute(text(f""" + CREATE TABLE IF NOT EXISTS {cfg.TableName} ( + id SERIAL NOT NULL, + date_time TIMESTAMP WITH TIME ZONE NOT NULL, + uuid varchar(100) DEFAULT NULL, + mid varchar(50) DEFAULT NULL, + mid_type varchar(50) DEFAULT NULL, + mac_wifi varchar(50) DEFAULT NULL, + mac_voice varchar(50) DEFAULT NULL, + code smallint DEFAULT NULL, + query varchar(255) DEFAULT NULL, + terminal_domain varchar(50) DEFAULT NULL, + terminal_intent varchar(50) DEFAULT NULL, + distribution_gree_domain varchar(50) DEFAULT NULL, + distribution_gree_intent varchar(50) DEFAULT NULL, + response_text text, + emotion_class varchar(50) DEFAULT NULL, + skill_id varchar(100) DEFAULT NULL, + voice_portal smallint NOT NULL, + service_nlu varchar(50) DEFAULT NULL, + service_type smallint NOT NULL, + slots text, + yzs_request_id varchar(50) DEFAULT NULL, + yzs_remote_ip varchar(15) DEFAULT NULL, + yzs_app_key varchar(50) DEFAULT NULL, + yzs_ud_id varchar(50) DEFAULT NULL, + yzs_user_id varchar(50) DEFAULT NULL, + yzs_intent text, + yzs_general text, + yzs_nlu_time varchar(20) DEFAULT NULL, + get_body_time varchar(20) DEFAULT NULL, + gree_nlu_time varchar(20) DEFAULT NULL, + get_homeid_time varchar(20) DEFAULT NULL, + tencent_nlu_time varchar(20) DEFAULT NULL, + cost_time varchar(20) DEFAULT NULL, + PRIMARY KEY (id, date_time) + ) PARTITION BY RANGE (date_time); + """)) + db.session.commit() + click.echo('created tables') -- GitLab