sunholo 0.71.2__py3-none-any.whl → 0.71.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- sunholo/components/vectorstore.py +1 -3
- sunholo/discovery_engine/discovery_engine_client.py +5 -0
- sunholo/llamaindex/import_files.py +10 -5
- sunholo/vertex/memory_tools.py +4 -3
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/METADATA +2 -2
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/RECORD +10 -10
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/LICENSE.txt +0 -0
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/WHEEL +0 -0
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/entry_points.txt +0 -0
- {sunholo-0.71.2.dist-info → sunholo-0.71.4.dist-info}/top_level.txt +0 -0
|
@@ -101,6 +101,11 @@ class DiscoveryEngineClient:
|
|
|
101
101
|
str: The name of the long-running operation for data store creation.
|
|
102
102
|
"""
|
|
103
103
|
|
|
104
|
+
if chunk_size > 500:
|
|
105
|
+
chunk_size = 500
|
|
106
|
+
elif chunk_size < 100:
|
|
107
|
+
chunk_size = 100
|
|
108
|
+
|
|
104
109
|
# https://cloud.google.com/python/docs/reference/discoveryengine/latest/google.cloud.discoveryengine_v1alpha.types.DocumentProcessingConfig
|
|
105
110
|
doc_config = discoveryengine.DocumentProcessingConfig(
|
|
106
111
|
chunking_config=discoveryengine.DocumentProcessingConfig.ChunkingConfig(
|
|
@@ -69,11 +69,16 @@ def do_llamaindex(message_data, metadata, vector_name):
|
|
|
69
69
|
rag_id = value.get('rag_id')
|
|
70
70
|
project_id = gcp_config.get('project_id')
|
|
71
71
|
location = gcp_config.get('location')
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
72
|
+
try:
|
|
73
|
+
corpus = fetch_corpus(
|
|
74
|
+
project_id=project_id or global_project_id,
|
|
75
|
+
location=location or global_location,
|
|
76
|
+
rag_id=rag_id or global_rag_id
|
|
77
|
+
)
|
|
78
|
+
except Exception as err:
|
|
79
|
+
log.warning(f"Failed to fetch LlamaIndex corpus: {err=}")
|
|
80
|
+
continue
|
|
81
|
+
|
|
77
82
|
corpuses.append(corpus)
|
|
78
83
|
if not corpuses:
|
|
79
84
|
log.error("Could not find a RAG corpus to import data to")
|
sunholo/vertex/memory_tools.py
CHANGED
|
@@ -62,8 +62,8 @@ def get_vertex_memories(vector_name):
|
|
|
62
62
|
if rag_id is None:
|
|
63
63
|
raise ValueError("Must specify rag_id if using vectorstore: llamaindex")
|
|
64
64
|
|
|
65
|
-
project_id = gcp_config.get('project_id')
|
|
66
|
-
location = gcp_config.get('location')
|
|
65
|
+
project_id = value.get('project_id') or gcp_config.get('project_id')
|
|
66
|
+
location = value.get('location') or gcp_config.get('location')
|
|
67
67
|
|
|
68
68
|
try:
|
|
69
69
|
corpus = fetch_corpus(
|
|
@@ -87,7 +87,8 @@ def get_vertex_memories(vector_name):
|
|
|
87
87
|
elif vectorstore == "discovery_engine" or vectorstore == "vertex_ai_search":
|
|
88
88
|
|
|
89
89
|
try:
|
|
90
|
-
|
|
90
|
+
project_id = value.get('project_id') or get_gcp_project()
|
|
91
|
+
de = DiscoveryEngineClient(vector_name, project_id=project_id)
|
|
91
92
|
log.info(f"Found vectorstore {vectorstore}")
|
|
92
93
|
|
|
93
94
|
data_store_path = f"{de.data_store_path()}/dataStores/{vector_name}"
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: sunholo
|
|
3
|
-
Version: 0.71.
|
|
3
|
+
Version: 0.71.4
|
|
4
4
|
Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
|
|
5
5
|
Home-page: https://github.com/sunholo-data/sunholo-py
|
|
6
|
-
Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.71.
|
|
6
|
+
Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.71.4.tar.gz
|
|
7
7
|
Author: Holosun ApS
|
|
8
8
|
Author-email: multivac@sunholo.com
|
|
9
9
|
License: Apache License, Version 2.0
|
|
@@ -46,7 +46,7 @@ sunholo/cli/swagger.py,sha256=absYKAU-7Yd2eiVNUY-g_WLl2zJfeRUNdWQ0oH8M_HM,1564
|
|
|
46
46
|
sunholo/components/__init__.py,sha256=IDoylb74zFKo6NIS3RQqUl0PDFBGVxM1dfUmO7OJ44U,176
|
|
47
47
|
sunholo/components/llm.py,sha256=T4we3tGmqUj4tPwxQr9M6AXv_BALqZV_dRSvINan-oU,10374
|
|
48
48
|
sunholo/components/retriever.py,sha256=jltG91N5r2P9RWKPW8A8tU3ilghciBczxapauW83Ir8,6377
|
|
49
|
-
sunholo/components/vectorstore.py,sha256=
|
|
49
|
+
sunholo/components/vectorstore.py,sha256=zUJ90L1S4IyxLB0JUWopeuwVjcsSqdhj1QreEfsJhsE,5548
|
|
50
50
|
sunholo/database/__init__.py,sha256=Zz0Shcq-CtStf9rJGIYB_Ybzb8rY_Q9mfSj-nviM490,241
|
|
51
51
|
sunholo/database/alloydb.py,sha256=d9W0pbZB0jTVIGF5OVaQ6kXHo-X3-6e9NpWNmV5e9UY,10464
|
|
52
52
|
sunholo/database/alloydb_client.py,sha256=AYA0SSaBy-1XEfeZI97sMGehfrwnfbwZ8sE0exzI2E0,7254
|
|
@@ -63,7 +63,7 @@ sunholo/database/sql/sb/setup.sql,sha256=CvoFvZQev2uWjmFa3aj3m3iuPFzAAJZ0S7Qi3L3
|
|
|
63
63
|
sunholo/discovery_engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
64
64
|
sunholo/discovery_engine/chunker_handler.py,sha256=H1HHDqWMCkchJER1_oU9TOLxqf2PygiMO6CL3uKZP64,4563
|
|
65
65
|
sunholo/discovery_engine/create_new.py,sha256=7oZG78T6lW0EspRzlo7-qRyXFSuFxDn2dfSAVEaqlqY,978
|
|
66
|
-
sunholo/discovery_engine/discovery_engine_client.py,sha256=
|
|
66
|
+
sunholo/discovery_engine/discovery_engine_client.py,sha256=cUdyXdXvFS_IxNqwJkGdGpXH-k18MQDKuUFn_7E7pKo,14922
|
|
67
67
|
sunholo/embedder/__init__.py,sha256=sI4N_CqgEVcrMDxXgxKp1FsfsB4FpjoXgPGkl4N_u4I,44
|
|
68
68
|
sunholo/embedder/embed_chunk.py,sha256=d_dIzeNF630Q0Ar-u1hxos60s0tLIImJccAvuo_LTIw,6814
|
|
69
69
|
sunholo/gcs/__init__.py,sha256=DtVw_AZwQn-IguR5BJuIi2XJeF_FQXizhJikzRNrXiE,50
|
|
@@ -76,7 +76,7 @@ sunholo/langfuse/prompts.py,sha256=HO4Zy9usn5tKooBPCKksuw4Lff3c03Ny5wqn4ce_xZM,1
|
|
|
76
76
|
sunholo/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
77
77
|
sunholo/llamaindex/generate.py,sha256=l1Picr-hVwkmAUD7XmTCa63qY9ERliFHQXwyX3BqB2Q,686
|
|
78
78
|
sunholo/llamaindex/get_files.py,sha256=6rhXCDqQ_lrIapISQ_OYQDjiSATXvS_9m3qq53-oIl0,781
|
|
79
|
-
sunholo/llamaindex/import_files.py,sha256=
|
|
79
|
+
sunholo/llamaindex/import_files.py,sha256=_v1yIFksUQvqLgdH19bWFfIkG4R3srYRg6EwduAPxms,5844
|
|
80
80
|
sunholo/lookup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
81
81
|
sunholo/lookup/model_lookup.yaml,sha256=O7o-jP53MLA06C8pI-ILwERShO-xf6z_258wtpZBv6A,739
|
|
82
82
|
sunholo/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -111,11 +111,11 @@ sunholo/vertex/__init__.py,sha256=JvHcGFuv6R_nAhY2AdoqqhMpJ5ugeWPZ_svGhWrObBk,13
|
|
|
111
111
|
sunholo/vertex/extensions.py,sha256=d-Ikt9gHFf-jUMPmyU-xHwYe22QtEyr90Ua1LDKgTws,11026
|
|
112
112
|
sunholo/vertex/extensions_class.py,sha256=0-XMrMvfhMN380ZdGXl11Mt7R9kCu9rB4Vduiflk8QA,9202
|
|
113
113
|
sunholo/vertex/init.py,sha256=RLjQppTUwubWgwf2PoAke-EtcwlVkFPaPMYvUsMw1KQ,2029
|
|
114
|
-
sunholo/vertex/memory_tools.py,sha256=
|
|
114
|
+
sunholo/vertex/memory_tools.py,sha256=x4Z4Hlpd1VNFu_DfA7xtF0ySF0-IXbkLJJLa6RTpks0,5871
|
|
115
115
|
sunholo/vertex/safety.py,sha256=3meAX0HyGZYrH7rXPUAHxtI_3w_zoy_RX7Shtkoa660,1275
|
|
116
|
-
sunholo-0.71.
|
|
117
|
-
sunholo-0.71.
|
|
118
|
-
sunholo-0.71.
|
|
119
|
-
sunholo-0.71.
|
|
120
|
-
sunholo-0.71.
|
|
121
|
-
sunholo-0.71.
|
|
116
|
+
sunholo-0.71.4.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
|
|
117
|
+
sunholo-0.71.4.dist-info/METADATA,sha256=VBbB2GrEwZczEWC0--p2AOwLFU4naCvztxA5j5rTre8,6613
|
|
118
|
+
sunholo-0.71.4.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
|
|
119
|
+
sunholo-0.71.4.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
|
|
120
|
+
sunholo-0.71.4.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
|
|
121
|
+
sunholo-0.71.4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|