Fix CI bugs

Author: CRZbulabula

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeCallInferenceIT.java

@@ -58,6 +58,7 @@ public class AINodeCallInferenceIT {
 
   private static final String CALL_INFERENCE_SQL_TEMPLATE =
       "CALL INFERENCE(%s, \"SELECT s%d FROM root.AI LIMIT %d\", generateTime=true, outputLength=%d)";
+  private static final int DEFAULT_INPUT_LENGTH = 256;
   private static final int DEFAULT_OUTPUT_LENGTH = 48;
 
   @BeforeClass
@@ -100,7 +101,7 @@ public void callInferenceTest(Statement statement, AINodeTestUtils.FakeModelInfo
               CALL_INFERENCE_SQL_TEMPLATE,
               modelInfo.getModelId(),
               i,
-              DEFAULT_OUTPUT_LENGTH,
+              DEFAULT_INPUT_LENGTH,
               DEFAULT_OUTPUT_LENGTH);
       try (ResultSet resultSet = statement.executeQuery(callInferenceSQL)) {
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
@@ -119,7 +120,7 @@ public void callInferenceTest(Statement statement, AINodeTestUtils.FakeModelInfo
   public void errorCallInferenceTestInTree() throws SQLException {
     try (Connection connection = EnvFactory.getEnv().getConnection(BaseEnv.TREE_SQL_DIALECT);
         Statement statement = connection.createStatement()) {
-      String sql = "CALL INFERENCE(notFound404, \"select s0,s1,s2 from root.AI\", window=head(5))";
+      String sql = "CALL INFERENCE(notFound404, \"select s0,s1,s2 from root.AI\")";
       errorTest(statement, sql, "1505: model [notFound404] has not been created.");
     }
   }

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeConcurrentForecastIT.java

@@ -97,8 +97,7 @@ public void concurrentGPUForecastTest(AINodeTestUtils.FakeModelInfo modelInfo)
       final String devices = "0,1";
       statement.execute(
           String.format("LOAD MODEL %s TO DEVICES '%s'", modelInfo.getModelId(), devices));
-      checkModelOnSpecifiedDevice(
-          statement, modelInfo.getModelId(), modelInfo.getModelType(), devices);
+      checkModelOnSpecifiedDevice(statement, modelInfo.getModelId(), devices);
       long startTime = System.currentTimeMillis();
       concurrentInference(statement, forecastSQL, threadCnt, loop, forecastLength);
       long endTime = System.currentTimeMillis();

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeForecastIT.java

@@ -46,12 +46,12 @@ public class AINodeForecastIT {
 
   private static final String[] WRITE_SQL_IN_TABLE =
       new String[] {
-        "CREATE DATABASE root",
-        "CREATE TABLE root.AI (s0 FLOAT FIELD, s1 DOUBLE FIELD, s2 INT32 FIELD, s3 INT64 FIELD)",
+        "CREATE DATABASE db",
+        "CREATE TABLE db.AI (s0 FLOAT FIELD, s1 DOUBLE FIELD, s2 INT32 FIELD, s3 INT64 FIELD)",
       };
 
   private static final String FORECAST_TABLE_FUNCTION_SQL_TEMPLATE =
-      "SELECT * FROM FORECAST(model_id=>'%s', input=>(SELECT time, s%d FROM root.AI) ORDER BY time)";
+      "SELECT * FROM FORECAST(model_id=>'%s', input=>(SELECT time, s%d FROM db.AI) ORDER BY time)";
 
   @BeforeClass
   public static void setUp() throws Exception {

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeInstanceManagementIT.java

@@ -86,11 +86,11 @@ private void basicManagementTest(Statement statement) throws SQLException, Inter
 
     // Load sundial to each device
     statement.execute(String.format("LOAD MODEL sundial TO DEVICES '%s'", TARGET_DEVICES));
-    checkModelOnSpecifiedDevice(statement, "sundial", "sundial", TARGET_DEVICES.toString());
+    checkModelOnSpecifiedDevice(statement, "sundial", TARGET_DEVICES.toString());
 
     // Load timer_xl to each device
     statement.execute(String.format("LOAD MODEL timer_xl TO DEVICES '%s'", TARGET_DEVICES));
-    checkModelOnSpecifiedDevice(statement, "timer_xl", "timer_xl", TARGET_DEVICES.toString());
+    checkModelOnSpecifiedDevice(statement, "timer_xl", TARGET_DEVICES.toString());
 
     // Clean every device
     statement.execute(String.format("UNLOAD MODEL sundial FROM DEVICES '%s'", TARGET_DEVICES));
@@ -107,7 +107,7 @@ public void repeatLoadAndUnloadTest() throws SQLException, InterruptedException
         Statement statement = connection.createStatement()) {
       for (int i = 0; i < LOOP_CNT; i++) {
         statement.execute("LOAD MODEL sundial TO DEVICES \"cpu,0,1\"");
-        checkModelOnSpecifiedDevice(statement, "sundial", "sundial", TARGET_DEVICES.toString());
+        checkModelOnSpecifiedDevice(statement, "sundial", TARGET_DEVICES.toString());
         statement.execute("UNLOAD MODEL sundial FROM DEVICES \"cpu,0,1\"");
         checkModelNotOnSpecifiedDevice(statement, "sundial", TARGET_DEVICES.toString());
       }

integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeModelManageIT.java

@@ -131,15 +131,15 @@ private void userDefinedModelManagementTest(Statement statement)
   public void dropBuiltInModelErrorTestInTree() throws SQLException {
     try (Connection connection = EnvFactory.getEnv().getConnection(BaseEnv.TREE_SQL_DIALECT);
         Statement statement = connection.createStatement()) {
-      errorTest(statement, "drop model sundial", "1501: Built-in model sundial can't be removed");
+      errorTest(statement, "drop model sundial", "1510: Built-in model sundial can't be removed");
     }
   }
 
   @Test
   public void dropBuiltInModelErrorTestInTable() throws SQLException {
     try (Connection connection = EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
         Statement statement = connection.createStatement()) {
-      errorTest(statement, "drop model sundial", "1501: Built-in model sundial can't be removed");
+      errorTest(statement, "drop model sundial", "1510: Built-in model sundial can't be removed");
     }
   }
 

integration-test/src/test/java/org/apache/iotdb/ainode/utils/AINodeTestUtils.java

@@ -45,9 +45,9 @@ public class AINodeTestUtils {
   public static final Map<String, FakeModelInfo> BUILTIN_LTSM_MAP =
       Stream.of(
               new AbstractMap.SimpleEntry<>(
-                  "sundial", new FakeModelInfo("sundial", "sundial", "BUILT-IN", "ACTIVE")),
+                  "sundial", new FakeModelInfo("sundial", "sundial", "builtin", "active")),
               new AbstractMap.SimpleEntry<>(
-                  "timer_xl", new FakeModelInfo("timer_xl", "timer", "BUILT-IN", "ACTIVE")))
+                  "timer_xl", new FakeModelInfo("timer_xl", "timer", "builtin", "active")))
           .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
   public static final Map<String, FakeModelInfo> BUILTIN_MODEL_MAP;
@@ -56,27 +56,25 @@ public class AINodeTestUtils {
     Map<String, FakeModelInfo> tmp =
         Stream.of(
                 new AbstractMap.SimpleEntry<>(
-                    "arima", new FakeModelInfo("arima", "Arima", "BUILT-IN", "ACTIVE")),
+                    "arima", new FakeModelInfo("arima", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
-                    "holtwinters",
-                    new FakeModelInfo("holtwinters", "HoltWinters", "BUILT-IN", "ACTIVE")),
+                    "holtwinters", new FakeModelInfo("holtwinters", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
                     "exponential_smoothing",
-                    new FakeModelInfo(
-                        "exponential_smoothing", "ExponentialSmoothing", "BUILT-IN", "ACTIVE")),
+                    new FakeModelInfo("exponential_smoothing", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
                     "naive_forecaster",
-                    new FakeModelInfo("naive_forecaster", "NaiveForecaster", "BUILT-IN", "ACTIVE")),
+                    new FakeModelInfo("naive_forecaster", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
                     "stl_forecaster",
-                    new FakeModelInfo("stl_forecaster", "StlForecaster", "BUILT-IN", "ACTIVE")),
+                    new FakeModelInfo("stl_forecaster", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
                     "gaussian_hmm",
-                    new FakeModelInfo("gaussian_hmm", "GaussianHmm", "BUILT-IN", "ACTIVE")),
+                    new FakeModelInfo("gaussian_hmm", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
-                    "gmm_hmm", new FakeModelInfo("gmm_hmm", "GmmHmm", "BUILT-IN", "ACTIVE")),
+                    "gmm_hmm", new FakeModelInfo("gmm_hmm", "sktime", "builtin", "active")),
                 new AbstractMap.SimpleEntry<>(
-                    "stray", new FakeModelInfo("stray", "Stray", "BUILT-IN", "ACTIVE")))
+                    "stray", new FakeModelInfo("stray", "sktime", "builtin", "active")))
             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     tmp.putAll(BUILTIN_LTSM_MAP);
     BUILTIN_MODEL_MAP = Collections.unmodifiableMap(tmp);
@@ -134,8 +132,7 @@ public static void concurrentInference(
     }
   }
 
-  public static void checkModelOnSpecifiedDevice(
-      Statement statement, String modelId, String modelType, String device)
+  public static void checkModelOnSpecifiedDevice(Statement statement, String modelId, String device)
       throws SQLException, InterruptedException {
     Set<String> targetDevices = ImmutableSet.copyOf(device.split(","));
     LOGGER.info("Checking model: {} on target devices: {}", modelId, targetDevices);
@@ -146,13 +143,9 @@ public static void checkModelOnSpecifiedDevice(
         while (resultSet.next()) {
           String deviceId = resultSet.getString("DeviceId");
           String loadedModelId = resultSet.getString("ModelId");
-          String loadedModelType = resultSet.getString("ModelType");
           int count = resultSet.getInt("Count(instances)");
           LOGGER.info("Model {} found in device {}, count {}", loadedModelId, deviceId, count);
-          if (loadedModelId.equals(modelId)
-              && loadedModelType.equals(modelType)
-              && targetDevices.contains(deviceId)
-              && count > 0) {
+          if (loadedModelId.equals(modelId) && targetDevices.contains(deviceId) && count > 0) {
             foundDevices.add(deviceId);
             LOGGER.info("Model {} is loaded to device {}", modelId, device);
           }

iotdb-core/ainode/iotdb/ainode/core/constant.py

@@ -64,7 +64,7 @@
 AINODE_MODELS_DIR = os.path.join(IOTDB_AINODE_HOME, "data/ainode/models")
 AINODE_MODELS_BUILTIN_DIR = "iotdb.ainode.core.model"
 AINODE_SYSTEM_DIR = os.path.join(IOTDB_AINODE_HOME, "data/ainode/system")
-AINODE_LOG_DIR = "logs"
+AINODE_LOG_DIR = os.path.join(IOTDB_AINODE_HOME, "logs")
 
 # AINode log
 LOG_FILE_TYPE = ["all", "info", "warn", "error"]
@@ -93,27 +93,6 @@ def get_status_code(self) -> int:
         return self.value
 
 
-class TaskType(Enum):
-    FORECAST = "forecast"
-
-
-class OptionsKey(Enum):
-    # common
-    TASK_TYPE = "task_type"
-    MODEL_TYPE = "model_type"
-    AUTO_TUNING = "auto_tuning"
-    INPUT_VARS = "input_vars"
-
-    # forecast
-    INPUT_LENGTH = "input_length"
-    PREDICT_LENGTH = "predict_length"
-    PREDICT_INDEX_LIST = "predict_index_list"
-    INPUT_TYPE_LIST = "input_type_list"
-
-    def name(self) -> str:
-        return self.value
-
-
 class HyperparameterName(Enum):
     # Training hyperparameter
     LEARNING_RATE = "learning_rate"
@@ -132,10 +111,3 @@ class HyperparameterName(Enum):
 
     def name(self):
         return self.value
-
-
-class ModelInputName(Enum):
-    DATA_X = "data_x"
-    TIME_STAMP_X = "time_stamp_x"
-    TIME_STAMP_Y = "time_stamp_y"
-    DEC_INP = "dec_inp"