Skip to content

Commit 3339864

Browse files
CRZbulabulaCRZbulabula
authored
[AINode] Refactor the dependencies to IoTDB (#16369)
1 parent b918b3b commit 3339864

6 files changed

Lines changed: 35 additions & 115 deletions

File tree

‎iotdb-client/client-py/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@
127127
<resource>
128128
<directory>${basedir}/../../iotdb-protocol/thrift-confignode/target/generated-sources-python/iotdb/thrift/</directory>
129129
</resource>
130+
<resource>
131+
<directory>${basedir}/../../iotdb-protocol/thrift-ainode/target/generated-sources-python/iotdb/thrift/</directory>
132+
</resource>
130133
</resources>
131134
</configuration>
132135
</execution>

‎iotdb-core/ainode/.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
# generated by Thrift
1+
# generated by IoTDB
2+
/iotdb/dbapi/
3+
/iotdb/sqlalchemy/
4+
/iotdb/template/
25
/iotdb/thrift/
6+
/iotdb/tsfile/
7+
/iotdb/utils/
8+
/iotdb/__init__.py
9+
/iotdb/Session.py
10+
/iotdb/SessionPool.py
11+
/iotdb/table_session.py
12+
/iotdb/table_session_pool.py
313

414
# generated by maven
515
/ainode/conf/

‎iotdb-core/ainode/iotdb/__init__.py‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +0,0 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
#

‎iotdb-core/ainode/poetry.lock‎

Lines changed: 1 addition & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎iotdb-core/ainode/pom.xml‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
<name>IoTDB: Core: AINode</name>
3131
<dependencies>
3232
<!-- These dependencies are just added to ensure the other modules are built first -->
33-
<dependency>
34-
<groupId>org.apache.iotdb</groupId>
35-
<artifactId>iotdb-thrift-commons</artifactId>
36-
<version>2.0.6-SNAPSHOT</version>
37-
<scope>provided</scope>
38-
</dependency>
3933
<dependency>
4034
<groupId>org.apache.iotdb</groupId>
4135
<artifactId>iotdb-thrift</artifactId>
@@ -44,13 +38,7 @@
4438
</dependency>
4539
<dependency>
4640
<groupId>org.apache.iotdb</groupId>
47-
<artifactId>iotdb-thrift-confignode</artifactId>
48-
<version>2.0.6-SNAPSHOT</version>
49-
<scope>provided</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.apache.iotdb</groupId>
53-
<artifactId>iotdb-thrift-ainode</artifactId>
41+
<artifactId>iotdb-python-api</artifactId>
5442
<version>2.0.6-SNAPSHOT</version>
5543
<scope>provided</scope>
5644
</dependency>
@@ -70,7 +58,12 @@
7058
<directory>iotdb</directory>
7159
<includes>
7260
<include>ainode/conf/</include>
61+
<include>dbapi/</include>
62+
<include>sqlalchemy/</include>
63+
<include>template/</include>
7364
<include>thrift/</include>
65+
<include>tsfile/</include>
66+
<include>utils/</include>
7467
</includes>
7568
</fileset>
7669
<fileset>
@@ -132,26 +125,16 @@
132125
</configuration>
133126
<executions>
134127
<execution>
135-
<id>copy-thrift-python-resources</id>
128+
<id>copy-python-dependencies</id>
136129
<phase>generate-sources</phase>
137130
<goals>
138131
<goal>copy-resources</goal>
139132
</goals>
140133
<configuration>
141-
<outputDirectory>${basedir}/iotdb/thrift/</outputDirectory>
134+
<outputDirectory>${basedir}/iotdb/</outputDirectory>
142135
<resources>
143136
<resource>
144-
<directory>${basedir}/../../iotdb-protocol/thrift-commons/target/generated-sources-python/iotdb/thrift/</directory>
145-
</resource>
146-
<resource>
147-
<directory>${basedir}/../../iotdb-protocol/thrift-confignode/target/generated-sources-python/iotdb/thrift/</directory>
148-
</resource>
149-
<resource>
150-
<directory>${basedir}/../../iotdb-protocol/thrift-ainode/target/generated-sources-python/iotdb/thrift/</directory>
151-
</resource>
152-
<resource>
153-
<directory>${basedir}/../../iotdb-protocol/thrift-datanode/target/generated-sources-python/iotdb/thrift/</directory>
154-
<excludes>rpc/**</excludes>
137+
<directory>${basedir}/../../iotdb-client/client-py/iotdb</directory>
155138
</resource>
156139
</resources>
157140
</configuration>

‎iotdb-core/ainode/pyproject.toml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,21 @@ classifiers = [
3434
"Topic :: Software Development :: Libraries :: Python Modules",
3535
]
3636
include = [
37+
{path = "iotdb/*", format = "wheel"},
38+
{path = "iotdb/dbapi/*", format = "wheel"},
39+
{path = "iotdb/sqlalchemy/*", format = "wheel"},
40+
{path = "iotdb/template/*", format = "wheel"},
3741
{path = "iotdb/thrift/*", format = "wheel"},
42+
{path = "iotdb/thrift/ainode/*", format = "wheel"},
3843
{path = "iotdb/thrift/common/*", format = "wheel"},
3944
{path = "iotdb/thrift/confignode/*", format = "wheel"},
4045
{path = "iotdb/thrift/datanode/*", format = "wheel"},
41-
{path = "iotdb/thrift/ainode/*", format = "wheel"},
42-
{path = "iotdb/ainode/conf/*", format = "wheel"},
46+
{path = "iotdb/thrift/rpc/*", format = "wheel"},
47+
{path = "iotdb/tsfile/*", format = "wheel"},
48+
{path = "iotdb/tsfile/common/*", format = "wheel"},
49+
{path = "iotdb/tsfile/common/constant/*", format = "wheel"},
50+
{path = "iotdb/tsfile/utils/*", format = "wheel"},
51+
{path = "iotdb/utils/*", format = "wheel"},
4352
]
4453
packages = [
4554
{ include = "iotdb/ainode" }
@@ -59,7 +68,6 @@ sktime = "0.38.4"
5968
scikit-learn = "^1.4"
6069
statsmodels = "^0.14"
6170
hmmlearn = "^0.3.0"
62-
apache-iotdb = "2.0.4.dev0"
6371
einops = "^0.8.1"
6472
safetensors = "^0.5.1"
6573
huggingface_hub = "^0.30.1"

0 commit comments

Comments
 (0)