scmcp-shared 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

scmcp_shared/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.2"

scmcp_shared/agent.py

@@ -4,7 +4,7 @@ import os
 
 from agno.agent import Agent
 from agno.models.openai import OpenAILike
-from scmcp_shared.kb import load_kb
+from .kb import load_kb
 
 model = OpenAILike(
     id=os.getenv("MODEL"),
@@ -13,13 +13,16 @@ model = OpenAILike(
 )
 
 
-def rag_agent(task, software=None):
+def rag_agent(task, software="scmcp"):
     knowledge_base = load_kb(software=software)
     agent = Agent(
         model=model,
         knowledge=knowledge_base,
         show_tool_calls=True,
         search_knowledge=True,
+        instructions="""
+        MUST query the knowledge base, and return the code example that can be used to solve the task.
+        """,
     )
     query = f"""
     <task>

scmcp_shared/kb.py

@@ -3,12 +3,9 @@ from agno.embedder.openai import OpenAIEmbedder
 from agno.models.deepseek import DeepSeek
 from agno.vectordb.lancedb import LanceDb
 from agno.knowledge.agent import AgentKnowledge
-import importlib.resources
 import os
 import requests
 import zipfile
-import tempfile
-import shutil
 from pathlib import Path
 import logging
 
@@ -21,12 +18,6 @@ model_id = os.getenv("MODEL")
 model_api_key = os.getenv("API_KEY")
 model_base_url = os.getenv("BASE_URL")
 
-# 配置信息
-config = {
-    "local_dir": "vector_db",
-    "huggingface_url": "https://huggingface.co/datasets/huangshing/scmcp_vector_db/resolve/main/vector_db.zip",
-}
-
 
 def download_vector_db(source="huggingface"):
     """
@@ -36,9 +27,7 @@ def download_vector_db(source="huggingface"):
         source: 下载源 ("huggingface" 或 "github")
     """
 
-    # 获取本地存储路径
-    package_path = importlib.resources.path("scmcp_shared", "")
-    local_dir = Path(package_path) / config["local_dir"]
+    local_dir = Path(__file__).parent
     local_dir.mkdir(exist_ok=True)
 
     # 检查是否已存在
@@ -48,51 +37,32 @@ def download_vector_db(source="huggingface"):
 
     logger.info(f"Downloading vector database from {source}...")
 
-    # 创建临时目录用于下载和解压
-    with tempfile.TemporaryDirectory() as temp_dir:
-        temp_path = Path(temp_dir)
-        zip_path = temp_path / "vector_db.zip"
-
-        try:
-            # 下载文件
-            if source == "huggingface":
-                url = config["huggingface_url"]
-            else:
-                raise ValueError(f"Unsupported source: {source}")
-
-            logger.info(f"Downloading from: {url}")
-            response = requests.get(url, stream=True)
-            response.raise_for_status()
+    # 下载文件
+    if source == "huggingface":
+        url = "https://huggingface.co/datasets/huangshing/scmcp_vector_db/resolve/main/vector_db.zip"
+    else:
+        raise ValueError(f"Unsupported source: {source}")
 
-            with open(zip_path, "wb") as f:
-                for chunk in response.iter_content(chunk_size=8192):
-                    f.write(chunk)
+    logger.info(f"Downloading from: {url}")
+    response = requests.get(url, stream=True)
+    response.raise_for_status()
 
-            # 解压文件
-            logger.info("Extracting downloaded archive...")
-            _extract_archive(zip_path, local_dir)
+    # 下载到目标目录
+    zip_path = local_dir / "vector_db.zip"
+    with open(zip_path, "wb") as f:
+        for chunk in response.iter_content(chunk_size=8192):
+            f.write(chunk)
 
-            logger.info(f"Vector database downloaded and extracted to: {local_dir}")
-            return str(local_dir)
+    # 解压文件
+    logger.info("Extracting downloaded archive...")
+    with zipfile.ZipFile(zip_path, "r") as zip_ref:
+        zip_ref.extractall(local_dir)
 
-        except requests.RequestException as e:
-            raise RuntimeError(f"Failed to download vector database: {e}")
-        except Exception as e:
-            raise RuntimeError(f"Failed to process vector database: {e}")
+    # 删除zip文件
+    zip_path.unlink()
 
-
-def _extract_archive(archive_path, extract_dir):
-    """解压归档文件"""
-    with zipfile.ZipFile(archive_path, "r") as zip_ref:
-        zip_ref.extractall(extract_dir)
-
-    # 如果解压后只有一个子目录，移动内容到目标目录
-    extracted_items = list(Path(extract_dir).iterdir())
-    if len(extracted_items) == 1 and extracted_items[0].is_dir():
-        subdir = extracted_items[0]
-        for item in subdir.iterdir():
-            shutil.move(str(item), str(extract_dir / item.name))
-        subdir.rmdir()
+    logger.info(f"Vector database downloaded and extracted to: {local_dir}")
+    return str(local_dir)
 
 
 def load_kb(software=None, auto_download=True, download_source="huggingface"):
@@ -105,16 +75,16 @@ def load_kb(software=None, auto_download=True, download_source="huggingface"):
         download_source: 下载源 ("huggingface" 或 "github")
     """
     # 获取向量数据库路径
-    try:
-        vector_db_path = importlib.resources.path("scmcp_shared", "vector_db")
-    except FileNotFoundError:
+    vector_db_path = Path(__file__).parent / "vector_db"
+
+    # 如果不存在且允许自动下载，则下载
+    if not (vector_db_path / "scmcp.lance").exists():
         if auto_download:
-            logger.info("Vector database not found in package, attempting download...")
-            vector_db_path = download_vector_db(download_source)
+            logger.info("Vector database not found, downloading...")
+            download_vector_db(download_source)
         else:
             raise FileNotFoundError(
-                "Vector database not found. Set auto_download=True to download automatically, "
-                "or manually place the vector database in the scmcp_shared package."
+                "Vector database not found. Set auto_download=True to download automatically."
             )
 
     vector_db = LanceDb(

scmcp_shared/server/rag.py

@@ -9,5 +9,5 @@ rag_mcp = FastMCP("RAG-Server")
 def retrieve_knowledge(
     task: str = Field(description="The tasks or questions that needs to be solved"),
 ):
-    """search function and parameters that can be used to solve the user's tasks or questions"""
+    """search guide or code example that can be used to solve the user's tasks or questions"""
     return rag_agent(task, software="scmcp")

{scmcp_shared-0.6.0.dist-info → scmcp_shared-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scmcp_shared
-Version: 0.6.0
+Version: 0.6.2
 Summary: A shared function libray for scmcphub
 Project-URL: Homepage, http://scmcphub.org/
 Project-URL: Repository, https://github.com/scmcphub/scmcp-shared

{scmcp_shared-0.6.0.dist-info → scmcp_shared-0.6.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-scmcp_shared/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
-scmcp_shared/agent.py,sha256=pC1g09BgUrahxoYN1JlxPi1_kOeuwWAGwMtR4oKUruc,1142
+scmcp_shared/__init__.py,sha256=jFlbxEJFS0G44LE-yXXVSwXACA1J_NyYDk5E20_2zpc,22
+scmcp_shared/agent.py,sha256=IRzsyxdf0bwAyhH_wHW7gVKqza_E8ldOQSCMvTcOTuE,1274
 scmcp_shared/backend.py,sha256=PyxHhg7ThHE5u6XtWwleAiJ3aqdLHbXoXuyw5QeF4Qw,1695
 scmcp_shared/cli.py,sha256=zYz_E3SlZ_mtYOrSdDJhDmHsppkwzEi2rZ6D3a_ga1c,5603
-scmcp_shared/kb.py,sha256=Wy0ib43DdvIXqSUStRQzK-It-fGqZI1lb4mQY6UnJ3o,4491
+scmcp_shared/kb.py,sha256=mRT3EzSOzXZ1_h1RV4Z7Maqzk2wSwmkpb4DrpBOOJtk,3218
 scmcp_shared/logging_config.py,sha256=Z5jLgOCfir4UGxM-ZQvYv7Iyl_zF78qqPNQ_aSE77f0,838
 scmcp_shared/mcp_base.py,sha256=v8sBqObTVzLEvoeQe3la2cfnDWZE7DkY07SqEb_1srA,7277
 scmcp_shared/util.py,sha256=LNrpoHBdA4x-Tt16uT_9A72_QZ41SrqZ0zy3Ozwa858,11163
@@ -22,14 +22,14 @@ scmcp_shared/schema/preset/util.py,sha256=1twQ9kiaKI6XubJIuYywG7vr-T2cCCblehhYXJ
 scmcp_shared/server/__init__.py,sha256=qwJEKZnBjcTi7wXcPpeQ-EP4YY9jJo9BYXkfCyn662c,198
 scmcp_shared/server/auto.py,sha256=FQKbUDuWlgfkcakLGm28lzrJTBm2vynwskHDdVLV2Dk,1966
 scmcp_shared/server/code.py,sha256=_uNIZ7sVfpBAhX1qPJ8f3zquSEgZXA3jWkPaRx3ph9k,56
-scmcp_shared/server/rag.py,sha256=tKENjR9PuzkektduaTYHf0hDDyo4ypAqCJTyulLSZn4,402
+scmcp_shared/server/rag.py,sha256=2b7ILYaFjVXfIjX4_J3EpARwrB1dds_7MEdea8oU7vQ,400
 scmcp_shared/server/preset/__init__.py,sha256=2DdRR0MaipsxREZ4dWvnGfNRAaHQY7BGGVNgGQEyfbo,318
 scmcp_shared/server/preset/io.py,sha256=2QigfUHR8HJtVdI4nIfRh0tm8WhVu8Hge1AAos6afZM,4059
 scmcp_shared/server/preset/pl.py,sha256=pQx7yD1-vRSnNky_8tapI6vU1lqcZ5S4zs5y1aamtcc,16774
 scmcp_shared/server/preset/pp.py,sha256=9WtTQ8aHnN_G_7Rm9hZsa7GU3A7xHBoNf8tE-gsDDHY,17114
 scmcp_shared/server/preset/tl.py,sha256=LtrGMNkeTlTqe2Cyw1OwZXpeTbyGqgENYYC76BKXgpg,19716
 scmcp_shared/server/preset/util.py,sha256=vek2SOEfiyAyCUEjwsFf1uqwT9YuzDHVQJ-dprIDWME,13519
-scmcp_shared-0.6.0.dist-info/METADATA,sha256=j--ns9ClsoFmoTvxc-DeQD_N-aeE29cTzFX2A9LBROU,2514
-scmcp_shared-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-scmcp_shared-0.6.0.dist-info/licenses/LICENSE,sha256=YNr1hpea195yq-wGtB8j-2dGtt7A5G00WENmxa7JGco,1495
-scmcp_shared-0.6.0.dist-info/RECORD,,
+scmcp_shared-0.6.2.dist-info/METADATA,sha256=G9fDdQvtdg4DHARkVp9_LyE_lhlRkwbtjedqSUWnb6Y,2514
+scmcp_shared-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+scmcp_shared-0.6.2.dist-info/licenses/LICENSE,sha256=YNr1hpea195yq-wGtB8j-2dGtt7A5G00WENmxa7JGco,1495
+scmcp_shared-0.6.2.dist-info/RECORD,,