zhichyu commited on
Commit
768eae1
·
1 Parent(s): 642b6f3

Bump infinity to v0.6.0-dev1 (#4448)

Browse files

### What problem does this PR solve?

Bump infinity to v0.6.0-dev1 and poetry to 2.0.1

### Type of change

- [x] Refactoring

docker/docker-compose-base.yml CHANGED
@@ -39,7 +39,7 @@ services:
39
  container_name: ragflow-infinity
40
  profiles:
41
  - infinity
42
- image: infiniflow/infinity:v0.5.2
43
  volumes:
44
  - infinity_data:/var/infinity
45
  - ./infinity_conf.toml:/infinity_conf.toml
 
39
  container_name: ragflow-infinity
40
  profiles:
41
  - infinity
42
+ image: infiniflow/infinity:v0.6.0-dev1
43
  volumes:
44
  - infinity_data:/var/infinity
45
  - ./infinity_conf.toml:/infinity_conf.toml
docker/infinity_conf.toml CHANGED
@@ -1,5 +1,5 @@
1
  [general]
2
- version = "0.5.0"
3
  time_zone = "utc-8"
4
 
5
  [network]
 
1
  [general]
2
+ version = "0.6.0"
3
  time_zone = "utc-8"
4
 
5
  [network]
docker/init-kibana.sh DELETED
@@ -1,67 +0,0 @@
1
- #!/bin/bash
2
-
3
- # unset http proxy which maybe set by docker daemon
4
- export http_proxy=""; export https_proxy=""; export no_proxy=""; export HTTP_PROXY=""; export HTTPS_PROXY=""; export NO_PROXY=""
5
-
6
- echo "Elasticsearch built-in user: elastic:${ELASTIC_PASSWORD}"
7
-
8
- # Wait Elasticsearch be healthy
9
- while true; do
10
- response=$(curl -s -v -w "\n%{http_code}" -u "elastic:${ELASTIC_PASSWORD}" "http://es01:9200")
11
- exit_code=$?
12
- status=$(echo "$response" | tail -n1)
13
- if [ $exit_code -eq 0 ] && [ "$status" = "200" ]; then
14
- echo "Elasticsearch is healthy"
15
- break
16
- else
17
- echo "Elasticsearch is unhealthy: $exit_code $status"
18
- echo "$response"
19
- sleep 5
20
- fi
21
- done
22
-
23
- # Create new role with all privileges to all indices
24
- # https://www.elastic.co/guide/en/elasticsearch/reference/current/security-privileges.html#privileges-list-indices
25
- echo "Going to create Elasticsearch role own_indices with all privileges to all indices"
26
- while true; do
27
- response=$(curl -s -v -w "\n%{http_code}" -u "elastic:${ELASTIC_PASSWORD}" -X POST http://es01:9200/_security/role/own_indices -H 'Content-Type: application/json' -d '{"indices": [{"names": ["*"], "privileges": ["all"]}]}')
28
- exit_code=$?
29
- status=$(echo "$response" | tail -n1)
30
- if [ $exit_code -eq 0 ] && [ "$status" = "200" ]; then
31
- echo "Elasticsearch role own_indices created"
32
- break
33
- else
34
- echo "Elasticsearch role own_indices failure: $exit_code $status"
35
- echo "$response"
36
- sleep 5
37
- fi
38
- done
39
-
40
- echo "Elasticsearch role own_indices:"
41
- curl -u "elastic:${ELASTIC_PASSWORD}" -X GET "http://es01:9200/_security/role/own_indices"
42
- echo ""
43
-
44
- PAYLOAD="{\"password\": \"${KIBANA_PASSWORD}\", \"roles\": [\"kibana_admin\", \"kibana_system\", \"own_indices\"], \"full_name\": \"${KIBANA_USER}\", \"email\": \"${KIBANA_USER}@example.com\"}"
45
-
46
- echo "Going to create Elasticsearch user ${KIBANA_USER}: ${PAYLOAD}"
47
-
48
- # Create new user
49
- while true; do
50
- response=$(curl -s -v -w "\n%{http_code}" -u "elastic:${ELASTIC_PASSWORD}" -X POST http://es01:9200/_security/user/${KIBANA_USER} -H "Content-Type: application/json" -d "${PAYLOAD}")
51
- exit_code=$?
52
- status=$(echo "$response" | tail -n1)
53
- if [ $exit_code -eq 0 ] && [ "$status" = "200" ]; then
54
- echo "Elasticsearch user ${KIBANA_USER} created"
55
- break
56
- else
57
- echo "Elasticsearch user ${KIBANA_USER} failure: $exit_code $status"
58
- echo "$response"
59
- sleep 5
60
- fi
61
- done
62
-
63
- echo "Elasticsearch user ${KIBANA_USER}:"
64
- curl -u "elastic:${ELASTIC_PASSWORD}" -X GET "http://es01:9200/_security/user/${KIBANA_USER}"
65
- echo ""
66
-
67
- exit 0
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
poetry.lock CHANGED
The diff for this file is too large to render. See raw diff
 
pyproject.toml CHANGED
@@ -48,7 +48,7 @@ hanziconv = "0.3.2"
48
  html-text = "0.6.2"
49
  httpx = "0.27.0"
50
  huggingface-hub = "^0.25.0"
51
- infinity-sdk = "0.5.2"
52
  infinity-emb = "^0.0.66"
53
  itsdangerous = "2.1.2"
54
  markdown = "3.6"
 
48
  html-text = "0.6.2"
49
  httpx = "0.27.0"
50
  huggingface-hub = "^0.25.0"
51
+ infinity-sdk = "0.6.0-dev1"
52
  infinity-emb = "^0.0.66"
53
  itsdangerous = "2.1.2"
54
  markdown = "3.6"
sdk/python/poetry.lock CHANGED
@@ -1,4 +1,4 @@
1
- # This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand.
2
 
3
  [[package]]
4
  name = "beartype"
@@ -6,6 +6,7 @@ version = "0.18.5"
6
  description = "Unbearably fast runtime type checking in pure Python."
7
  optional = false
8
  python-versions = ">=3.8.0"
 
9
  files = [
10
  {file = "beartype-0.18.5-py3-none-any.whl", hash = "sha256:5301a14f2a9a5540fe47ec6d34d758e9cd8331d36c4760fc7a5499ab86310089"},
11
  {file = "beartype-0.18.5.tar.gz", hash = "sha256:264ddc2f1da9ec94ff639141fbe33d22e12a9f75aa863b83b7046ffff1381927"},
@@ -24,6 +25,7 @@ version = "2024.12.14"
24
  description = "Python package for providing Mozilla's CA Bundle."
25
  optional = false
26
  python-versions = ">=3.6"
 
27
  files = [
28
  {file = "certifi-2024.12.14-py3-none-any.whl", hash = "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56"},
29
  {file = "certifi-2024.12.14.tar.gz", hash = "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db"},
@@ -35,6 +37,7 @@ version = "3.4.0"
35
  description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
36
  optional = false
37
  python-versions = ">=3.7.0"
 
38
  files = [
39
  {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6"},
40
  {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b"},
@@ -149,6 +152,8 @@ version = "0.4.6"
149
  description = "Cross-platform colored terminal text."
150
  optional = false
151
  python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 
 
152
  files = [
153
  {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
154
  {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
@@ -160,6 +165,8 @@ version = "1.2.2"
160
  description = "Backport of PEP 654 (exception groups)"
161
  optional = false
162
  python-versions = ">=3.7"
 
 
163
  files = [
164
  {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
165
  {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
@@ -174,6 +181,7 @@ version = "3.10"
174
  description = "Internationalized Domain Names in Applications (IDNA)"
175
  optional = false
176
  python-versions = ">=3.6"
 
177
  files = [
178
  {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
179
  {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
@@ -188,6 +196,7 @@ version = "2.0.0"
188
  description = "brain-dead simple config-ini parsing"
189
  optional = false
190
  python-versions = ">=3.7"
 
191
  files = [
192
  {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
193
  {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
@@ -199,6 +208,7 @@ version = "24.2"
199
  description = "Core utilities for Python packages"
200
  optional = false
201
  python-versions = ">=3.8"
 
202
  files = [
203
  {file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
204
  {file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
@@ -210,6 +220,7 @@ version = "1.5.0"
210
  description = "plugin and hook calling mechanisms for python"
211
  optional = false
212
  python-versions = ">=3.8"
 
213
  files = [
214
  {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"},
215
  {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
@@ -225,6 +236,7 @@ version = "8.3.4"
225
  description = "pytest: simple powerful testing with Python"
226
  optional = false
227
  python-versions = ">=3.8"
 
228
  files = [
229
  {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
230
  {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
@@ -247,6 +259,7 @@ version = "2.32.3"
247
  description = "Python HTTP for Humans."
248
  optional = false
249
  python-versions = ">=3.8"
 
250
  files = [
251
  {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
252
  {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
@@ -268,6 +281,8 @@ version = "2.2.1"
268
  description = "A lil' TOML parser"
269
  optional = false
270
  python-versions = ">=3.8"
 
 
271
  files = [
272
  {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
273
  {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
@@ -309,6 +324,7 @@ version = "2.2.3"
309
  description = "HTTP library with thread-safe connection pooling, file post, and more."
310
  optional = false
311
  python-versions = ">=3.8"
 
312
  files = [
313
  {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
314
  {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
@@ -321,6 +337,6 @@ socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
321
  zstd = ["zstandard (>=0.18.0)"]
322
 
323
  [metadata]
324
- lock-version = "2.0"
325
  python-versions = ">=3.10,<3.13"
326
  content-hash = "dbae1304e0358315b27e6165c39e999cb84e0650c0fd71ed32ab2ead6162b5c0"
 
1
+ # This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand.
2
 
3
  [[package]]
4
  name = "beartype"
 
6
  description = "Unbearably fast runtime type checking in pure Python."
7
  optional = false
8
  python-versions = ">=3.8.0"
9
+ groups = ["main"]
10
  files = [
11
  {file = "beartype-0.18.5-py3-none-any.whl", hash = "sha256:5301a14f2a9a5540fe47ec6d34d758e9cd8331d36c4760fc7a5499ab86310089"},
12
  {file = "beartype-0.18.5.tar.gz", hash = "sha256:264ddc2f1da9ec94ff639141fbe33d22e12a9f75aa863b83b7046ffff1381927"},
 
25
  description = "Python package for providing Mozilla's CA Bundle."
26
  optional = false
27
  python-versions = ">=3.6"
28
+ groups = ["main"]
29
  files = [
30
  {file = "certifi-2024.12.14-py3-none-any.whl", hash = "sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56"},
31
  {file = "certifi-2024.12.14.tar.gz", hash = "sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db"},
 
37
  description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
38
  optional = false
39
  python-versions = ">=3.7.0"
40
+ groups = ["main"]
41
  files = [
42
  {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6"},
43
  {file = "charset_normalizer-3.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b"},
 
152
  description = "Cross-platform colored terminal text."
153
  optional = false
154
  python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
155
+ groups = ["main"]
156
+ markers = "sys_platform == \"win32\""
157
  files = [
158
  {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
159
  {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 
165
  description = "Backport of PEP 654 (exception groups)"
166
  optional = false
167
  python-versions = ">=3.7"
168
+ groups = ["main"]
169
+ markers = "python_version < \"3.11\""
170
  files = [
171
  {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
172
  {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
 
181
  description = "Internationalized Domain Names in Applications (IDNA)"
182
  optional = false
183
  python-versions = ">=3.6"
184
+ groups = ["main"]
185
  files = [
186
  {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
187
  {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
 
196
  description = "brain-dead simple config-ini parsing"
197
  optional = false
198
  python-versions = ">=3.7"
199
+ groups = ["main"]
200
  files = [
201
  {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
202
  {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
 
208
  description = "Core utilities for Python packages"
209
  optional = false
210
  python-versions = ">=3.8"
211
+ groups = ["main"]
212
  files = [
213
  {file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
214
  {file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
 
220
  description = "plugin and hook calling mechanisms for python"
221
  optional = false
222
  python-versions = ">=3.8"
223
+ groups = ["main"]
224
  files = [
225
  {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"},
226
  {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
 
236
  description = "pytest: simple powerful testing with Python"
237
  optional = false
238
  python-versions = ">=3.8"
239
+ groups = ["main"]
240
  files = [
241
  {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
242
  {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
 
259
  description = "Python HTTP for Humans."
260
  optional = false
261
  python-versions = ">=3.8"
262
+ groups = ["main"]
263
  files = [
264
  {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"},
265
  {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"},
 
281
  description = "A lil' TOML parser"
282
  optional = false
283
  python-versions = ">=3.8"
284
+ groups = ["main"]
285
+ markers = "python_version < \"3.11\""
286
  files = [
287
  {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
288
  {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
 
324
  description = "HTTP library with thread-safe connection pooling, file post, and more."
325
  optional = false
326
  python-versions = ">=3.8"
327
+ groups = ["main"]
328
  files = [
329
  {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
330
  {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 
337
  zstd = ["zstandard (>=0.18.0)"]
338
 
339
  [metadata]
340
+ lock-version = "2.1"
341
  python-versions = ">=3.10,<3.13"
342
  content-hash = "dbae1304e0358315b27e6165c39e999cb84e0650c0fd71ed32ab2ead6162b5c0"