Merge pull request #103 from yanghua/CUBE-100

[CUBE #100] Refactor code based on pyflakes check result

myapp/__init__.py

@@ -1,14 +1,12 @@
 # 避免多进程同时启动对系统cpu负载过高
-import time,random
 # time.sleep(random.randint(1,10))
-from flask import g
 from copy import deepcopy
 import json
 import logging
 from logging.handlers import TimedRotatingFileHandler
-from flask import redirect, g, flash, request, session, abort
+from flask import g, abort
 import os
-from flask import render_template,redirect
+from flask import render_template
 from flask import Flask, redirect
 from flask_appbuilder import AppBuilder, IndexView, SQLA
 from flask_appbuilder.baseviews import expose
@@ -19,11 +17,9 @@
 from werkzeug.middleware.proxy_fix import ProxyFix
 import wtforms_json
 
-from myapp import config
 from myapp.security import MyappSecurityManager
 from myapp.utils.core import pessimistic_connection_handling, setup_cache
 from myapp.utils.log import DBEventLogger
-import pysnooper
 wtforms_json.init()
 
 # 在这个文件里面只创建app，不要做view层面的事情。
@@ -273,7 +269,7 @@ def check_login():
         return
 
     if not g.user or not g.user.get_id():
-        redirect_url = appbuilder.get_url_for_login  # +"?login_url="+request.url
+        appbuilder.get_url_for_login  # +"?login_url="+request.url
         # return redirect(redirect_url)
         abort(401)
 
@@ -292,7 +288,7 @@ def myapp_after_request(resp):
 
 
 
-    except Exception as e:
+    except Exception:
         # print(e)
         resp.set_cookie('myapp_username', 'myapp')
         # resp.delete_cookie('id')
@@ -327,9 +323,6 @@ def page_not_found(e):
     app.logger.handlers = gunicorn_logger.handlers
     app.logger.setLevel(gunicorn_logger.level)
 
-# 引入视图
-from myapp import views
-
 
 # def can_access(menuitem):
 #     print(menuitem.name,menuitem.label)

myapp/check_tables.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import os
-import pysnooper
 # @pysnooper.snoop()
 def check_tables():
     SQLALCHEMY_DATABASE_URI = os.getenv('MYSQL_SERVICE','')

myapp/cli.py

@@ -1,24 +1,14 @@
 #!/usr/bin/env python
 from datetime import datetime
-import logging
-from subprocess import Popen
-from sys import stdout
-
-import click
-from colorama import Fore, Style
-from flask import g
 import json
 from myapp import app, appbuilder, db, security_manager
-from myapp.models.model_notebook import Notebook
 from myapp.models.model_team import Project,Project_User
 from myapp.models.model_job import Repository,Images,Job_Template,Pipeline,Task
 from myapp.models.model_dataset import Dataset
 from myapp.models.model_serving import Service,InferenceService
 from myapp.models.model_train_model import Training_Model
-import csv
 import uuid
 conf = app.config
-import requests
 
 def create_app(script_info=None):
     return app
@@ -27,8 +17,6 @@ def create_app(script_info=None):
 def make_shell_context():
     return dict(app=app, db=db)
 
-import pysnooper
-
 # https://dormousehole.readthedocs.io/en/latest/cli.html
 @app.cli.command('init')
 # @pysnooper.snoop()

myapp/create_db.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 import os
-import pysnooper
 # @pysnooper.snoop()
 def init_db():
     SQLALCHEMY_DATABASE_URI = os.getenv('MYSQL_SERVICE','')

myapp/forms.py

@@ -1,14 +1,12 @@
 """Contains the logic to create cohesive forms on the explore view"""
-from flask_appbuilder.fieldwidgets import BS3TextFieldWidget
 from wtforms import Field
-from flask_appbuilder.fieldwidgets import BS3TextFieldWidget,BS3PasswordFieldWidget,DatePickerWidget,DateTimePickerWidget,Select2ManyWidget,Select2Widget
-from wtforms import widgets
+from flask_appbuilder.fieldwidgets import BS3TextFieldWidget
 from myapp import app
 
 conf = app.config
 
 
-from wtforms.validators import DataRequired, Length, NumberRange, Optional,Regexp,ValidationError
+from wtforms.validators import ValidationError
 # from myapp.models.base import MyappModelBase
 # model_base=MyappModelBase()
 #
@@ -90,16 +88,9 @@ def filter_not_empty_values(value):
 
 
 
-import pysnooper,datetime,time,json
+import json
 from wtforms.widgets.core import HTMLString,html_params
-
-try:
-    from html import escape
-except ImportError:
-    from cgi import escape
-from wtforms.compat import text_type, iteritems
-
-
+from wtforms.compat import text_type
 
 class MyCodeArea(object):
     def __init__(self, code=''):

myapp/jinja_context.py

@@ -4,7 +4,7 @@
 import json
 import random
 import time
-from typing import Any, List, Optional, Tuple
+from typing import Any, List, Optional
 import uuid
 
 from dateutil.relativedelta import relativedelta

myapp/models/__init__.py

@@ -1,4 +1 @@
 
-from . import log
-from . import model_job
-from . import user_attributes  # noqa

myapp/models/base.py

@@ -1,4 +1,3 @@
-from flask_appbuilder import Model
 from flask_babel import lazy_gettext as _
 import re
 from myapp.utils import core

myapp/models/helpers.py

@@ -14,7 +14,6 @@
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm.exc import MultipleResultsFound
 import yaml
-import pysnooper
 
 from myapp.utils.core import QueryStatus
 

myapp/models/log.py

@@ -3,27 +3,17 @@
 from datetime import datetime
 from flask_appbuilder import Model
 from sqlalchemy import (
-    Boolean,
     Column,
-    create_engine,
     DateTime,
     ForeignKey,
     Integer,
-    MetaData,
     String,
-    Table,
     Text,
 )
 
-from sqlalchemy.orm import relationship, sessionmaker, subqueryload
-from myapp import (
-    app,
-    appbuilder,
-    conf,
-    db
-)
+from sqlalchemy.orm import relationship
 from myapp.models.base import MyappModelBase
-from myapp import app, db, is_feature_enabled, security_manager
+from myapp import app
 from myapp.security import MyUser
 
 

myapp/models/model_aihub.py

@@ -1,27 +1,13 @@
 from flask_appbuilder import Model
 
-from sqlalchemy import (
-    Boolean,
-    Column,
-    create_engine,
-    DateTime,
-    ForeignKey,
-    Integer,
-    MetaData,
-    String,
-    Table,
-    Text,
-    Enum,
-)
+from sqlalchemy import Text
 
-from myapp import app,db
+from myapp import app
 from myapp.models.helpers import ImportMixin
-# from myapp.models.base import MyappModel
-from sqlalchemy import Column, Integer, String, ForeignKey ,Date,DateTime
+from sqlalchemy import Column, Integer, String
 
 from flask import Markup
 from myapp.models.base import MyappModelBase
-import datetime
 metadata = Model.metadata
 conf = app.config
 

myapp/models/model_dataset.py

@@ -1,30 +1,12 @@
 from flask_appbuilder import Model
 
-from sqlalchemy import (
-    Boolean,
-    Column,
-    create_engine,
-    DateTime,
-    ForeignKey,
-    Integer,
-    MetaData,
-    String,
-    Table,
-    Text,
-    Enum,
-)
-
-from myapp.models.helpers import AuditMixinNullable, ImportMixin
-from flask import escape, g, Markup, request
-from .model_team import Project
-from myapp import app,db
-from myapp.models.helpers import ImportMixin
-# from myapp.models.base import MyappModel
-from sqlalchemy import Column, Integer, String, ForeignKey ,Date,DateTime
-from flask_appbuilder.models.decorators import renders
+from sqlalchemy import Text
+
+from myapp.models.helpers import AuditMixinNullable
+from myapp import app
+from sqlalchemy import Column, Integer, String
 from flask import Markup
 from myapp.models.base import MyappModelBase
-import datetime
 metadata = Model.metadata
 conf = app.config
 

myapp/models/model_dimension.py

@@ -1,32 +1,13 @@
 from flask_appbuilder import Model
-from sqlalchemy import Column, Integer, String, ForeignKey,Float
-from sqlalchemy.orm import relationship
-import datetime,time,json
-from sqlalchemy import (
-    Boolean,
-    Column,
-    create_engine,
-    DateTime,
-    ForeignKey,
-    Integer,
-    MetaData,
-    String,
-    Table,
-    Text,
-    Enum,
-)
-from sqlalchemy import String,Column,Integer,ForeignKey,UniqueConstraint,BigInteger,TIMESTAMP
+from sqlalchemy import Text
+from sqlalchemy import UniqueConstraint
 
-from flask import escape, g, Markup, request
-from .model_team import Project
-from myapp import app,db
+from flask import g
+from myapp import app
 from myapp.models.helpers import ImportMixin
-# from myapp.models.base import MyappModel
-from sqlalchemy import Column, Integer, String, ForeignKey ,Date,DateTime
-from flask_appbuilder.models.decorators import renders
+from sqlalchemy import Column, Integer, String
 from flask import Markup
 from myapp.models.base import MyappModelBase
-import datetime
 metadata = Model.metadata
 conf = app.config
 
@@ -60,7 +41,7 @@ def table_html(self):
 
     @property
     def operate_html(self):
-        url=f'''
+        url='''
         <a target=_blank href="/dimension_table_modelview/api/create_external_table/%s">创建远程表</a>  | <a target=_blank href="/dimension_table_modelview/api/external/%s">建外表示例</a> | <a href="/dimension_table_modelview/api/clear/%s">清空表记录</a>
         '''%(self.id,self.id,self.id)
         return Markup(url)

myapp/models/model_docker.py

@@ -1,29 +1,15 @@
 from flask_appbuilder import Model
-from sqlalchemy import Column, Integer, String, ForeignKey,Float
 from sqlalchemy.orm import relationship
-import datetime,time,json
 from sqlalchemy import (
     Boolean,
-    Column,
-    create_engine,
-    DateTime,
-    ForeignKey,
-    Integer,
-    MetaData,
-    String,
-    Table,
-    Text,
-    Enum,
+    Text
 )
-import pysnooper
 from myapp.models.base import MyappModelBase
-from myapp.models.helpers import AuditMixinNullable, ImportMixin
-from flask import escape, g, Markup, request
-from myapp import app,db
-from sqlalchemy import Column, Integer, String, ForeignKey ,Date,DateTime
+from myapp.models.helpers import AuditMixinNullable
+from myapp import app
+from sqlalchemy import Column, Integer, String, ForeignKey
 
 from flask import Markup
-import datetime
 metadata = Model.metadata
 conf = app.config
 # from myapp.utils.py.py_k8s import K8s

myapp/models/model_etl_pipeline.py

@@ -1,32 +1,16 @@
 from flask_appbuilder import Model
-from sqlalchemy import Column, Integer, String, ForeignKey,Float
 from sqlalchemy.orm import relationship
-import datetime,time,json
-from sqlalchemy import (
-    Boolean,
-    Column,
-    create_engine,
-    DateTime,
-    ForeignKey,
-    Integer,
-    MetaData,
-    String,
-    Table,
-    Text,
-    Enum,
-)
-
-from myapp.models.helpers import AuditMixinNullable, ImportMixin
-
-from myapp import app,db
+from sqlalchemy import Text
+
+from myapp.models.helpers import AuditMixinNullable
+
+from myapp import app
 from myapp.models.helpers import ImportMixin
-# from myapp.models.base import MyappModel
 
-from sqlalchemy import Column, Integer, String, ForeignKey ,Date,DateTime
+from sqlalchemy import Column, Integer, String, ForeignKey
 from flask_appbuilder.models.decorators import renders
 from flask import Markup
 from myapp.models.base import MyappModelBase
-import datetime
 metadata = Model.metadata
 conf = app.config