adam-community 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

adam_community/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.9"
+__version__ = "1.0.10"

adam_community/util.py

@@ -19,8 +19,31 @@ ADAM_TASK_ID = os.getenv('ADAM_TASK_ID')
 ADAM_USER_ID = os.getenv('ADAM_USER_ID')
 CONDA_ENV = os.getenv('CONDA_ENV')
 
-# 定义可用的知识库集合
-collections = ["DSDP","MPNN","PySCF","RFdiffusion","gaussian","protenix","GPU4PySCF","MolecularDynamics","RDkit","OpenBabel", "SPONGE", "Xponge", "MDAnalysis", "ABACUS"]
+
+def _build_akb_query_command(query: str, collection: str) -> str:
+    """
+    构建 akb 查询命令，包含目录存在性检查
+    
+    Args:
+        query: 查询字符串
+        collection: 知识库名称
+        
+    Returns:
+        完整的 bash 命令字符串
+    """
+    collection_dir = f"/share/programs/akb/database/{collection}"
+    
+    return f"""if [ ! -d "{collection_dir}" ]; then
+    echo "知识库目录不存在: {collection_dir}"
+    exit 1
+fi
+akb simple-query \\
+    -i {collection_dir}/{collection}.index \\
+    -m /share/programs/BAAI/bge-m3 \\
+    -p {collection_dir}/{collection}.parquet \\
+    -l 5 \\
+    -f json -q "{query}\""""
+
 
 class RAG:
     """
@@ -31,17 +54,9 @@ class RAG:
     """
 
     def call(self, query: str, collection: str):
-
-        if collection not in collections:
-            raise ValueError(f"知识库名称必须是下面之一：{collections}")
-
-        cmd = f"""akb simple-query \
-    -i /share/programs/akb/database/{collection}/{collection}.index \
-    -m /share/programs/BAAI/bge-m3 \
-    -p /share/programs/akb/database/{collection}/{collection}.parquet \
-    -l 5 \
-    -f json -q \"{query}\""""
+        cmd = _build_akb_query_command(query, collection)
         logger.info(f"搜索知识库 {collection}: {query}")
+        
         try:
             result = run(cmd, shell='/bin/bash', check=True, text=True, capture_output=True)
         except CalledProcessError as e:

{adam_community-1.0.9.dist-info → adam_community-1.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adam_community
-Version: 1.0.9
+Version: 1.0.10
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community

{adam_community-1.0.9.dist-info → adam_community-1.0.10.dist-info}/RECORD

@@ -1,7 +1,7 @@
 adam_community/__init__.py,sha256=vAmF9VQR6D4peppH0hnrHDmZK5cFeFPh11GIsTKUXhE,429
-adam_community/__version__.py,sha256=q2ACMkQx0Hm5xKo2YKJFBE7rTruciTSIN6AvWWL9nB8,22
+adam_community/__version__.py,sha256=5vGk-8GWz6jojEu9w36UP5aNA0LuiwgbNSJ8Umn2rLA,23
 adam_community/tool.py,sha256=CCzWosxtuZ0yk7mupmnlgMpO59jr1hl-a_brSGIqhDI,4867
-adam_community/util.py,sha256=W4SD4x-Tg_JVAINoi2Q2j5FqbWrQxvg0TRYfE9Yh2WI,11031
+adam_community/util.py,sha256=fkZn0HMM7Hk2e_UnF8rARvp1vvHMcnKRi1L0wHEFgGo,11177
 adam_community/cli/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 adam_community/cli/build.py,sha256=uPS_UUMLAAWQJlMfQ0S6Ed6UIeZ_1eeXfViPmvzvD_E,11214
 adam_community/cli/cli.py,sha256=L_V09KMWuasgdce6zrB2yNOpCl8G7k7C_oKWvLEzS5k,2810
@@ -19,8 +19,8 @@ adam_community/cli/templates/input.json.j2,sha256=LRkIhPln3BnmPRrFebsjUa5t9vcED_
 adam_community/cli/templates/kit_python.py.j2,sha256=fVQ8EVDMaxPCv9CzYjjoV8NLJMmtVCx5tFaM9eO7f8M,2788
 adam_community/cli/templates/long_description.md.j2,sha256=Rj6hcuNzEL0Sp17GQVCRJyNytxO22KcKFvEnZlGpevE,1385
 adam_community/cli/templates/toolbox_python.py.j2,sha256=EOnmsJUvQRrcO7K7c88kI42gMmcM0Z4ab46qwOJXbH8,4192
-adam_community-1.0.9.dist-info/METADATA,sha256=Yu-QNNZgtmNZd-bxSLk_5TUnkpmJNhvsAH_v9wHwOnU,2171
-adam_community-1.0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-adam_community-1.0.9.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
-adam_community-1.0.9.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
-adam_community-1.0.9.dist-info/RECORD,,
+adam_community-1.0.10.dist-info/METADATA,sha256=DQn1WGLxp9K-U2rWzKSzl4I6ILHtI95tfqkMU3SG2jY,2172
+adam_community-1.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+adam_community-1.0.10.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
+adam_community-1.0.10.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
+adam_community-1.0.10.dist-info/RECORD,,