Fix pai maxcompute tests (#2501)

* WIP fix pai maxcompute tests

* wip should update models version

* update models version

Author: typhoonzero

cmd/sqlflowserver/e2e_pai_maxcompute_test.go

@@ -478,6 +478,10 @@ func TestEnd2EndMaxComputePAI(t *testing.T) {
 	// write model to current MaxCompute project
 	caseInto = "my_dnn_model"
 
+	if err := prepareTestData(dbConnStr); err != nil {
+		t.FailNow()
+	}
+
 	go start(modelDir, caCrt, caKey, unitTestPort, false)
 	server.WaitPortReady(fmt.Sprintf("localhost:%d", unitTestPort), 0)
 

docker/dev/build.sh

@@ -72,7 +72,7 @@ if [[ ! -d models ]]; then
 fi
 cd models
 git fetch origin # The residual local repo might not be on a branch.
-git checkout v0.0.3 -b v0.0.3
+git checkout v0.0.4 -b v0.0.4
 python setup.py bdist_wheel -q --dist-dir $SQLFLOW_BIN > /dev/null
 
 echo "Convert tutorials from Markdown to IPython notebooks ..."

pkg/codegen/pai/template_tf.go

@@ -144,12 +144,14 @@ sklearn2pmml==0.56.0
 const tfPredictTmplText = tfImportsText + `
 import os
 import types
+import traceback
 from sqlflow_submitter.tensorflow import predict
 
 try:
     import sqlflow_models
 except Exception as e:
     print("error importing sqlflow_models: %s" % e)
+    traceback.print_exc()
 try:
     tf.enable_eager_execution()
 except:

pkg/codegen/tensorflow/template_train.go

@@ -37,6 +37,7 @@ type trainFiller struct {
 
 const tfTrainTemplateText = `
 import copy
+import traceback
 import tensorflow as tf
 import sqlflow_submitter
 from sqlflow_submitter.tensorflow.train import train
@@ -59,6 +60,7 @@ try:
     import sqlflow_models
 except Exception as e:
     print("failed to import sqlflow_models: %s", e)
+    traceback.print_exc()
 
 feature_column_names = [{{range $target, $desclist := .FieldDescs}}{{range $desclist}}
 "{{.Name}}",

python/sqlflow_submitter/tensorflow/keras_with_feature_column_input.py

@@ -38,7 +38,10 @@ def init_model_with_feature_column(estimator,
        NOTE: initalize estimator model can also use this function since estimators all have
        "feature_column" argument.
     """
-    argspec = inspect.getargspec(estimator)
+    if inspect.isclass(estimator):
+        argspec = inspect.getargspec(estimator.__init__)
+    else:
+        argspec = inspect.getargspec(estimator)
     if "feature_columns" not in argspec.args and not has_none_optimizer:
         feature_columns = model_params["feature_columns"]
         del model_params["feature_columns"]