This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch fix-ainode-compile
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/fix-ainode-compile by this
push:
new 3908eb9bbbf finish
3908eb9bbbf is described below
commit 3908eb9bbbfb02e6448be2b356b08b5ce381c525
Author: Yongzao <[email protected]>
AuthorDate: Mon Sep 8 19:39:12 2025 +0800
finish
---
iotdb-client/client-py/pom.xml | 3 ++
iotdb-core/ainode/.gitignore | 12 ++++++-
iotdb-core/ainode/iotdb/__init__.py | 17 ---------
iotdb-core/ainode/poetry.lock | 69 +------------------------------------
iotdb-core/ainode/pom.xml | 35 +++++--------------
iotdb-core/ainode/pyproject.toml | 14 ++++++--
6 files changed, 35 insertions(+), 115 deletions(-)
diff --git a/iotdb-client/client-py/pom.xml b/iotdb-client/client-py/pom.xml
index a9ab956e76e..eedf50a8d6b 100644
--- a/iotdb-client/client-py/pom.xml
+++ b/iotdb-client/client-py/pom.xml
@@ -127,6 +127,9 @@
<resource>
<directory>${basedir}/../../iotdb-protocol/thrift-confignode/target/generated-sources-python/iotdb/thrift/</directory>
</resource>
+ <resource>
+
<directory>${basedir}/../../iotdb-protocol/thrift-ainode/target/generated-sources-python/iotdb/thrift/</directory>
+ </resource>
</resources>
</configuration>
</execution>
diff --git a/iotdb-core/ainode/.gitignore b/iotdb-core/ainode/.gitignore
index 90ff6facce7..c30efa5f662 100644
--- a/iotdb-core/ainode/.gitignore
+++ b/iotdb-core/ainode/.gitignore
@@ -1,5 +1,15 @@
-# generated by Thrift
+# generated by IoTDB
+/iotdb/dbapi/
+/iotdb/sqlalchemy/
+/iotdb/template/
/iotdb/thrift/
+/iotdb/tsfile/
+/iotdb/utils/
+/iotdb/__init__.py
+/iotdb/Session.py
+/iotdb/SessionPool.py
+/iotdb/table_session.py
+/iotdb/table_session_pool.py
# generated by maven
/ainode/conf/
diff --git a/iotdb-core/ainode/iotdb/__init__.py
b/iotdb-core/ainode/iotdb/__init__.py
index 2a1e720805f..e69de29bb2d 100644
--- a/iotdb-core/ainode/iotdb/__init__.py
+++ b/iotdb-core/ainode/iotdb/__init__.py
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
diff --git a/iotdb-core/ainode/poetry.lock b/iotdb-core/ainode/poetry.lock
index 5c2c59a26f6..3131c697f09 100644
--- a/iotdb-core/ainode/poetry.lock
+++ b/iotdb-core/ainode/poetry.lock
@@ -20,26 +20,6 @@ typing-extensions = ">=4"
[package.extras]
tz = ["backports.zoneinfo ; python_version < \"3.9\""]
-[[package]]
-name = "apache-iotdb"
-version = "2.0.4.dev0"
-description = "Apache IoTDB client API"
-optional = false
-python-versions = ">=3.6"
-groups = ["main"]
-files = [
- {file = "apache_iotdb-2.0.4.dev0-py3-none-any.whl", hash =
"sha256:364639e357bf4f15032c401d65711f1a87aee9943a7886c0cfd38dad5daf214e"},
- {file = "apache_iotdb-2.0.4.dev0.tar.gz", hash =
"sha256:c43d6619d988b6a1bca1ae9ea183b42052fbee9c98fd42482df83685ccf96d7d"},
-]
-
-[package.dependencies]
-numpy = ">=1.0.0"
-pandas = ">=1.0.0"
-sqlalchemy = ">=1.4"
-sqlalchemy-utils = ">=0.37.8"
-thrift = ">=0.14.1"
-tzlocal = ">=4.0"
-
[[package]]
name = "black"
version = "25.1.0"
@@ -1908,35 +1888,6 @@ postgresql-psycopgbinary = ["psycopg[binary] (>=3.0.7)"]
pymysql = ["pymysql"]
sqlcipher = ["sqlcipher3_binary"]
-[[package]]
-name = "sqlalchemy-utils"
-version = "0.41.2"
-description = "Various utility functions for SQLAlchemy."
-optional = false
-python-versions = ">=3.7"
-groups = ["main"]
-files = [
- {file = "SQLAlchemy-Utils-0.41.2.tar.gz", hash =
"sha256:bc599c8c3b3319e53ce6c5c3c471120bd325d0071fb6f38a10e924e3d07b9990"},
- {file = "SQLAlchemy_Utils-0.41.2-py3-none-any.whl", hash =
"sha256:85cf3842da2bf060760f955f8467b87983fb2e30f1764fd0e24a48307dc8ec6e"},
-]
-
-[package.dependencies]
-SQLAlchemy = ">=1.3"
-
-[package.extras]
-arrow = ["arrow (>=0.3.4)"]
-babel = ["Babel (>=1.3)"]
-color = ["colour (>=0.0.4)"]
-encrypted = ["cryptography (>=0.6)"]
-intervals = ["intervals (>=0.7.1)"]
-password = ["passlib (>=1.6,<2.0)"]
-pendulum = ["pendulum (>=2.0.5)"]
-phone = ["phonenumbers (>=5.9.2)"]
-test = ["Jinja2 (>=2.3)", "Pygments (>=1.2)", "backports.zoneinfo ;
python_version < \"3.9\"", "docutils (>=0.10)", "flake8 (>=2.4.0)", "flexmock
(>=0.9.7)", "isort (>=4.2.2)", "pg8000 (>=1.12.4)", "psycopg (>=3.1.8)",
"psycopg2 (>=2.5.1)", "psycopg2cffi (>=2.8.1)", "pymysql", "pyodbc", "pytest
(==7.4.4)", "python-dateutil (>=2.6)", "pytz (>=2014.2)"]
-test-all = ["Babel (>=1.3)", "Jinja2 (>=2.3)", "Pygments (>=1.2)", "arrow
(>=0.3.4)", "backports.zoneinfo ; python_version < \"3.9\"", "colour
(>=0.0.4)", "cryptography (>=0.6)", "docutils (>=0.10)", "flake8 (>=2.4.0)",
"flexmock (>=0.9.7)", "furl (>=0.4.1)", "intervals (>=0.7.1)", "isort
(>=4.2.2)", "passlib (>=1.6,<2.0)", "pendulum (>=2.0.5)", "pg8000 (>=1.12.4)",
"phonenumbers (>=5.9.2)", "psycopg (>=3.1.8)", "psycopg2 (>=2.5.1)",
"psycopg2cffi (>=2.8.1)", "pymysql", "pyodbc", "pytest [...]
-timezone = ["python-dateutil"]
-url = ["furl (>=0.4.1)"]
-
[[package]]
name = "statsmodels"
version = "0.14.5"
@@ -2427,24 +2378,6 @@ files = [
{file = "tzdata-2025.2.tar.gz", hash =
"sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9"},
]
-[[package]]
-name = "tzlocal"
-version = "5.3.1"
-description = "tzinfo object for the local timezone"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
- {file = "tzlocal-5.3.1-py3-none-any.whl", hash =
"sha256:eb1a66c3ef5847adf7a834f1be0800581b683b5608e74f86ecbcef8ab91bb85d"},
- {file = "tzlocal-5.3.1.tar.gz", hash =
"sha256:cceffc7edecefea1f595541dbd6e990cb1ea3d19bf01b2809f362a03dd7921fd"},
-]
-
-[package.dependencies]
-tzdata = {version = "*", markers = "platform_system == \"Windows\""}
-
-[package.extras]
-devenv = ["check-manifest", "pytest (>=4.3)", "pytest-cov", "pytest-mock
(>=3.3)", "zest.releaser"]
-
[[package]]
name = "urllib3"
version = "2.2.2"
@@ -2466,4 +2399,4 @@ zstd = ["zstandard (>=0.18.0)"]
[metadata]
lock-version = "2.1"
python-versions = ">=3.9, <3.13"
-content-hash =
"a064294145a884dcaea09abb52f7fd497ba4f175d479ebd0dfc8d2afd8c5bcf0"
+content-hash =
"38f43b5ee0f35f4170253c1da934b253261bd5831bb72dc7ec5070427b352f12"
diff --git a/iotdb-core/ainode/pom.xml b/iotdb-core/ainode/pom.xml
index 2833011f0da..d9a15aeb0a7 100644
--- a/iotdb-core/ainode/pom.xml
+++ b/iotdb-core/ainode/pom.xml
@@ -30,12 +30,6 @@
<name>IoTDB: Core: AINode</name>
<dependencies>
<!-- These dependencies are just added to ensure the other modules are
built first -->
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-thrift-commons</artifactId>
- <version>2.0.6-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-thrift</artifactId>
@@ -44,13 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-thrift-confignode</artifactId>
- <version>2.0.6-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>iotdb-thrift-ainode</artifactId>
+ <artifactId>iotdb-python-api</artifactId>
<version>2.0.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -70,7 +58,12 @@
<directory>iotdb</directory>
<includes>
<include>ainode/conf/</include>
+ <include>dbapi/</include>
+ <include>sqlalchemy/</include>
+ <include>template/</include>
<include>thrift/</include>
+ <include>tsfile/</include>
+ <include>utils/</include>
</includes>
</fileset>
<fileset>
@@ -132,26 +125,16 @@
</configuration>
<executions>
<execution>
- <id>copy-thrift-python-resources</id>
+ <id>copy-python-dependencies</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
-
<outputDirectory>${basedir}/iotdb/thrift/</outputDirectory>
+
<outputDirectory>${basedir}/iotdb/</outputDirectory>
<resources>
<resource>
-
<directory>${basedir}/../../iotdb-protocol/thrift-commons/target/generated-sources-python/iotdb/thrift/</directory>
- </resource>
- <resource>
-
<directory>${basedir}/../../iotdb-protocol/thrift-confignode/target/generated-sources-python/iotdb/thrift/</directory>
- </resource>
- <resource>
-
<directory>${basedir}/../../iotdb-protocol/thrift-ainode/target/generated-sources-python/iotdb/thrift/</directory>
- </resource>
- <resource>
-
<directory>${basedir}/../../iotdb-protocol/thrift-datanode/target/generated-sources-python/iotdb/thrift/</directory>
- <excludes>rpc/**</excludes>
+
<directory>${basedir}/../../iotdb-client/client-py/iotdb</directory>
</resource>
</resources>
</configuration>
diff --git a/iotdb-core/ainode/pyproject.toml b/iotdb-core/ainode/pyproject.toml
index b9ccc21a3df..41baf989bb9 100644
--- a/iotdb-core/ainode/pyproject.toml
+++ b/iotdb-core/ainode/pyproject.toml
@@ -34,12 +34,21 @@ classifiers = [
"Topic :: Software Development :: Libraries :: Python Modules",
]
include = [
+ {path = "iotdb/*", format = "wheel"},
+ {path = "iotdb/dbapi/*", format = "wheel"},
+ {path = "iotdb/sqlalchemy/*", format = "wheel"},
+ {path = "iotdb/template/*", format = "wheel"},
{path = "iotdb/thrift/*", format = "wheel"},
+ {path = "iotdb/thrift/ainode/*", format = "wheel"},
{path = "iotdb/thrift/common/*", format = "wheel"},
{path = "iotdb/thrift/confignode/*", format = "wheel"},
{path = "iotdb/thrift/datanode/*", format = "wheel"},
- {path = "iotdb/thrift/ainode/*", format = "wheel"},
- {path = "iotdb/ainode/conf/*", format = "wheel"},
+ {path = "iotdb/thrift/rpc/*", format = "wheel"},
+ {path = "iotdb/tsfile/*", format = "wheel"},
+ {path = "iotdb/tsfile/common/*", format = "wheel"},
+ {path = "iotdb/tsfile/common/constant/*", format = "wheel"},
+ {path = "iotdb/tsfile/utils/*", format = "wheel"},
+ {path = "iotdb/utils/*", format = "wheel"},
]
packages = [
{ include = "iotdb/ainode" }
@@ -59,7 +68,6 @@ sktime = "0.38.4"
scikit-learn = "^1.4"
statsmodels = "^0.14"
hmmlearn = "^0.3.0"
-apache-iotdb = "2.0.4.dev0"
einops = "^0.8.1"
safetensors = "^0.5.1"
huggingface_hub = "^0.30.1"
