Yifei Wang commited on
Commit
61b0f36
·
1 Parent(s): 7ec03ef

Update space asset usage (chroma binary)

Browse files
Files changed (2) hide show
  1. infer_hybrid_RAG.py +39 -3
  2. requirements.txt +2 -1
infer_hybrid_RAG.py CHANGED
@@ -10,16 +10,17 @@ from typing import Iterator
10
 
11
  sys.path.insert(0, str(Path(__file__).resolve().parent / "src"))
12
 
13
- from numen_scriptorium.inference.qwen import generate, load_model, stream_generate
14
-
15
 
16
  RAG_BASE_MODEL = os.getenv("NS_RAG_BASE_MODEL", os.getenv("NS_BASE_MODEL", "Qwen/Qwen2.5-7B-Instruct"))
17
  RAG_ADAPTER = os.getenv("NS_RAG_ADAPTER", os.getenv("NS_ADAPTER", "ICGenAIShare06/boh-qlora-adapter/best")).strip() or None
18
  RAG_USE_4BIT = os.getenv("NS_RAG_USE_4BIT", os.getenv("NS_USE_4BIT", "1")) == "1"
19
- RAG_CHROMA_DIR = os.getenv("NS_RAG_CHROMA_DIR", "chroma_data")
 
20
  RAG_COLLECTION = os.getenv("NS_RAG_COLLECTION", "mansus_lore")
21
  RAG_ALIAS_FILE = os.getenv("NS_RAG_ALIAS_FILE", "data/hours_merged.json")
22
  RAG_EMBED_MODEL = os.getenv("NS_RAG_EMBED_MODEL", "moka-ai/m3e-base")
 
 
23
 
24
 
25
  def _resolve_repo_path(path_like: str) -> Path:
@@ -29,6 +30,37 @@ def _resolve_repo_path(path_like: str) -> Path:
29
  return Path(__file__).resolve().parent / p
30
 
31
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
32
  class HybridRetriever:
33
  def __init__(self, chroma_dir: str, collection_name: str, alias_file: str, embed_model: str):
34
  import chromadb
@@ -36,6 +68,7 @@ class HybridRetriever:
36
  from sentence_transformers import SentenceTransformer
37
 
38
  chroma_path = _resolve_repo_path(chroma_dir)
 
39
  self.chroma_client = chromadb.PersistentClient(path=str(chroma_path))
40
  self.collection = self.chroma_client.get_or_create_collection(name=collection_name)
41
 
@@ -92,6 +125,7 @@ def get_hybrid_retriever() -> HybridRetriever:
92
 
93
  @lru_cache(maxsize=1)
94
  def get_rag_runtime():
 
95
  return load_model(base_model=RAG_BASE_MODEL, lora_dir=RAG_ADAPTER, use_4bit=RAG_USE_4BIT)
96
 
97
 
@@ -155,6 +189,7 @@ def rag_answer(
155
  return ""
156
 
157
  tokenizer, model = get_rag_runtime()
 
158
  rag_instruction = _build_rag_instruction(instruction, rag_dict, vector_context)
159
  return generate(
160
  tokenizer=tokenizer,
@@ -187,6 +222,7 @@ def rag_answer_stream(
187
  return
188
 
189
  tokenizer, model = get_rag_runtime()
 
190
  rag_instruction = _build_rag_instruction(instruction, rag_dict, vector_context)
191
  yield from stream_generate(
192
  tokenizer=tokenizer,
 
10
 
11
  sys.path.insert(0, str(Path(__file__).resolve().parent / "src"))
12
 
 
 
13
 
14
  RAG_BASE_MODEL = os.getenv("NS_RAG_BASE_MODEL", os.getenv("NS_BASE_MODEL", "Qwen/Qwen2.5-7B-Instruct"))
15
  RAG_ADAPTER = os.getenv("NS_RAG_ADAPTER", os.getenv("NS_ADAPTER", "ICGenAIShare06/boh-qlora-adapter/best")).strip() or None
16
  RAG_USE_4BIT = os.getenv("NS_RAG_USE_4BIT", os.getenv("NS_USE_4BIT", "1")) == "1"
17
+ RAG_LOCAL_DIR = os.getenv("NS_RAG_LOCAL_DIR", os.getenv("NS_RAG_CHROMA_DIR", "chroma_data"))
18
+ RAG_CHROMA_DIR = RAG_LOCAL_DIR
19
  RAG_COLLECTION = os.getenv("NS_RAG_COLLECTION", "mansus_lore")
20
  RAG_ALIAS_FILE = os.getenv("NS_RAG_ALIAS_FILE", "data/hours_merged.json")
21
  RAG_EMBED_MODEL = os.getenv("NS_RAG_EMBED_MODEL", "moka-ai/m3e-base")
22
+ RAG_ASSETS_REPO = os.getenv("NS_RAG_ASSETS_REPO", "ICGenAIShare06/numen-scriptorium-rag-assets")
23
+ RAG_ASSETS_FILE = os.getenv("NS_RAG_ASSETS_FILE", "chroma.sqlite3")
24
 
25
 
26
  def _resolve_repo_path(path_like: str) -> Path:
 
30
  return Path(__file__).resolve().parent / p
31
 
32
 
33
+ # Runtime DB download avoids committing binary sqlite into the Space repo.
34
+ # Control via env vars:
35
+ # - NS_RAG_ASSETS_REPO (HF dataset repo)
36
+ # - NS_RAG_ASSETS_FILE (remote sqlite filename)
37
+ # - NS_RAG_LOCAL_DIR (local storage directory)
38
+ def ensure_chroma_sqlite(local_dir: str | Path) -> Path:
39
+ from huggingface_hub import hf_hub_download
40
+
41
+ target_dir = Path(local_dir)
42
+ target_dir.mkdir(parents=True, exist_ok=True)
43
+ local_sqlite_path = target_dir / "chroma.sqlite3"
44
+
45
+ if local_sqlite_path.exists() and local_sqlite_path.stat().st_size > 0:
46
+ return local_sqlite_path
47
+
48
+ downloaded_path = hf_hub_download(
49
+ repo_id=RAG_ASSETS_REPO,
50
+ filename=RAG_ASSETS_FILE,
51
+ repo_type="dataset",
52
+ )
53
+ local_sqlite_path.write_bytes(Path(downloaded_path).read_bytes())
54
+ return local_sqlite_path
55
+
56
+
57
+ @lru_cache(maxsize=1)
58
+ def _get_qwen_fns():
59
+ from numen_scriptorium.inference.qwen import generate, load_model, stream_generate
60
+
61
+ return generate, load_model, stream_generate
62
+
63
+
64
  class HybridRetriever:
65
  def __init__(self, chroma_dir: str, collection_name: str, alias_file: str, embed_model: str):
66
  import chromadb
 
68
  from sentence_transformers import SentenceTransformer
69
 
70
  chroma_path = _resolve_repo_path(chroma_dir)
71
+ ensure_chroma_sqlite(chroma_path)
72
  self.chroma_client = chromadb.PersistentClient(path=str(chroma_path))
73
  self.collection = self.chroma_client.get_or_create_collection(name=collection_name)
74
 
 
125
 
126
  @lru_cache(maxsize=1)
127
  def get_rag_runtime():
128
+ _, load_model, _ = _get_qwen_fns()
129
  return load_model(base_model=RAG_BASE_MODEL, lora_dir=RAG_ADAPTER, use_4bit=RAG_USE_4BIT)
130
 
131
 
 
189
  return ""
190
 
191
  tokenizer, model = get_rag_runtime()
192
+ generate, _, _ = _get_qwen_fns()
193
  rag_instruction = _build_rag_instruction(instruction, rag_dict, vector_context)
194
  return generate(
195
  tokenizer=tokenizer,
 
222
  return
223
 
224
  tokenizer, model = get_rag_runtime()
225
+ _, _, stream_generate = _get_qwen_fns()
226
  rag_instruction = _build_rag_instruction(instruction, rag_dict, vector_context)
227
  yield from stream_generate(
228
  tokenizer=tokenizer,
requirements.txt CHANGED
@@ -6,4 +6,5 @@ accelerate>=0.33.0
6
  sentencepiece>=0.2.0
7
  bitsandbytes
8
  chromadb>=0.5.0
9
- sentence-transformers>=3.0.1
 
 
6
  sentencepiece>=0.2.0
7
  bitsandbytes
8
  chromadb>=0.5.0
9
+ sentence-transformers>=3.0.1
10
+ huggingface_hub>=0.24.0