Skip to content

prevent auto_map gets covered and add model_list for IT #16928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CRZbulabula merged 1 commit into from
Dec 19, 2025
Merged

prevent auto_map gets covered and add model_list for IT #16928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions integration-test/src/test/java/org/apache/iotdb/ainode/it/AINodeConcurrentForecastIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
import java.util.List;

import static org.apache.iotdb.ainode.utils.AINodeTestUtils.BUILTIN_LTSM_MAP;
import static org.apache.iotdb.ainode.utils.AINodeTestUtils.checkModelNotOnSpecifiedDevice;
import static org.apache.iotdb.ainode.utils.AINodeTestUtils.checkModelOnSpecifiedDevice;
import static org.apache.iotdb.ainode.utils.AINodeTestUtils.concurrentInference;
Expand All @@ -48,6 +49,11 @@ public class AINodeConcurrentForecastIT {

private static final Logger LOGGER = LoggerFactory.getLogger(AINodeConcurrentForecastIT.class);

private static final List<AINodeTestUtils.FakeModelInfo> MODEL_LIST =
Arrays.asList(
new AINodeTestUtils.FakeModelInfo("sundial", "sundial", "builtin", "active"),
new AINodeTestUtils.FakeModelInfo("timer_xl", "timer", "builtin", "active"));

private static final String FORECAST_TABLE_FUNCTION_SQL_TEMPLATE =
"SELECT * FROM FORECAST(model_id=>'%s', targets=>(SELECT time,s FROM root.AI) ORDER BY time, output_length=>%d)";

Expand Down Expand Up @@ -78,7 +84,7 @@ private static void prepareDataForTableModel() throws SQLException {

@Test
public void concurrentGPUForecastTest() throws SQLException, InterruptedException {
for (AINodeTestUtils.FakeModelInfo modelInfo : BUILTIN_LTSM_MAP.values()) {
for (AINodeTestUtils.FakeModelInfo modelInfo : MODEL_LIST) {
concurrentGPUForecastTest(modelInfo);
}
}
Expand Down
2 changes: 2 additions & 0 deletions iotdb-core/ainode/iotdb/ainode/core/model/model_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def __repr__(self):
"AutoConfig": "configuration_timer.TimerConfig",
"AutoModelForCausalLM": "modeling_timer.TimerForPrediction",
},
_transformers_registered=True,
),
"sundial": ModelInfo(
model_id="sundial",
Expand All @@ -128,5 +129,6 @@ def __repr__(self):
"AutoConfig": "configuration_sundial.SundialConfig",
"AutoModelForCausalLM": "modeling_sundial.SundialForPrediction",
},
_transformers_registered=True,
),
}
9 changes: 6 additions & 3 deletions iotdb-core/ainode/iotdb/ainode/core/model/model_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,12 @@ def _callback_model_download_result(self, future, model_id: str):
if os.path.exists(config_path):
with open(config_path, "r", encoding="utf-8") as f:
config = json.load(f)
if model_info.model_type == "":
model_info.model_type = config.get("model_type", "")
model_info.auto_map = config.get("auto_map", None)
model_info.model_type = config.get(
"model_type", model_info.model_type
)
model_info.auto_map = config.get(
"auto_map", model_info.auto_map
)
logger.info(
f"Model {model_id} downloaded successfully and is ready to use."
)
Expand Down
Loading