isage-middleware 0.1.0__py3-none-any.whl → 0.1.3__py3-none-any.whl

sage/middleware/services/memory/examples/memory_demo.py

@@ -12,7 +12,7 @@ from sage.middleware.services import (
     create_graph_service_factory,
     create_memory_service_factory
 )
-from sage.middleware.services.api.memory_api import MemoryServiceAPI
+from sage.middleware.api.memory_api import MemoryServiceAPI
 
 
 def test_memory_service_api():
@@ -32,7 +32,7 @@ def test_memory_service_api():
         backend_type="memory",
         max_size=10000
     )
-    env.register_service("demo_kv", kv_factory)
+    env.register_service_factory("demo_kv", kv_factory)
     print("   ✅ KV Service registered")
     
     # VDB服务
@@ -41,7 +41,7 @@ def test_memory_service_api():
         embedding_dimension=384,
         index_type="IndexFlatL2"
     )
-    env.register_service("demo_vdb", vdb_factory)
+    env.register_service_factory("demo_vdb", vdb_factory)
     print("   ✅ VDB Service registered")
     
     # Graph服务
@@ -50,7 +50,7 @@ def test_memory_service_api():
         backend_type="memory",
         max_nodes=5000
     )
-    env.register_service("demo_graph", graph_factory)
+    env.register_service_factory("demo_graph", graph_factory)
     print("   ✅ Graph Service registered")
     
     # Memory编排服务

sage/middleware/services/memory/memory_service.py

@@ -9,7 +9,7 @@ import logging
 import time
 import uuid
 
-from sage.kernel.runtime.service.base_service import BaseService
+from sage.core.api.service.base_service import BaseService
 
 if TYPE_CHECKING:
     from sage.core.factory.service_factory import ServiceFactory
@@ -36,17 +36,20 @@ class MemoryService(BaseService):
     在SAGE DAG中作为服务节点使用
     """
     
-    def __init__(self, service_factory: 'ServiceFactory', ctx: 'ServiceContext' = None):
+    def __init__(self, service_factory: 'ServiceFactory' = None, ctx: 'ServiceContext' = None, config: MemoryConfig | None = None):
+        # 兼容 ServiceFactory 注入与直接使用
         super().__init__(service_factory, ctx)
-        
-        # 从service_factory获取配置
-        self.config: MemoryConfig = getattr(service_factory, 'config', MemoryConfig())
-        
-        self.logger.info(f"Memory Service '{self.service_name}' initialized")
-        self.logger.info(f"KV Service: {self.config.kv_service_name}")
-        self.logger.info(f"VDB Service: {self.config.vdb_service_name}")
-        self.logger.info(f"Graph Service: {self.config.graph_service_name}")
-    
+        if service_factory is not None and hasattr(service_factory, 'config') and service_factory.config is not None:
+            self.config: MemoryConfig = service_factory.config
+        else:
+            # 允许直接传入 config（便于单测或直接构造）
+            self.config: MemoryConfig = config or MemoryConfig()
+
+        # 日志配置预览
+        self.logger.info(f"KV Service: {getattr(self.config, 'kv_service_name', 'kv_service')}")
+        self.logger.info(f"VDB Service: {getattr(self.config, 'vdb_service_name', 'vdb_service')}")
+        self.logger.info(f"Graph Service: {getattr(self.config, 'graph_service_name', 'graph_service')}")
+
     def _start_service_instance(self):
         """启动Memory服务实例"""
         self.logger.info(f"Memory Service '{self.service_name}' started")

sage/middleware/services/memory/utils/__init__.py

@@ -0,0 +1,56 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从 sage-common 包加载版本信息"""
+    try:
+        # 优先从 sage-common 包加载版本
+        from sage.common._version import __version__
+        return {
+            'version': __version__,
+            'author': 'SAGE Team',
+            'email': 'shuhao_zhang@hust.edu.cn'
+        }
+    except ImportError:
+        # 如果 sage-common 不可用，从项目根目录加载（开发环境）
+        try:
+            from pathlib import Path
+            current_file = Path(__file__).resolve()
+            # 根据当前文件位置计算到项目根目录的层数
+            parts = current_file.parts
+            sage_index = -1
+            for i, part in enumerate(parts):
+                if part == 'SAGE':
+                    sage_index = i
+                    break
+            
+            if sage_index >= 0:
+                root_dir = Path(*parts[:sage_index+1])
+                version_file = root_dir / "_version.py"
+                
+                if version_file.exists():
+                    version_globals = {}
+                    with open(version_file, 'r', encoding='utf-8') as f:
+                        exec(f.read(), version_globals)
+                    return {
+                        'version': version_globals.get('__version__', '0.1.4'),
+                        'author': version_globals.get('__author__', 'SAGE Team'),
+                        'email': version_globals.get('__email__', 'shuhao_zhang@hust.edu.cn')
+                    }
+        except Exception:
+            pass
+    
+    # 最后的默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
+
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/services/vdb/__init__.py

@@ -1,8 +1,56 @@
 """
-VDB Service Module
-向量数据库服务模块
+SAGE - Streaming-Augmented Generative Execution
 """
 
-from .vdb_service import VDBService, create_vdb_service_factory
+# 动态版本加载
+def _load_version():
+    """从 sage-common 包加载版本信息"""
+    try:
+        # 优先从 sage-common 包加载版本
+        from sage.common._version import __version__
+        return {
+            'version': __version__,
+            'author': 'SAGE Team',
+            'email': 'shuhao_zhang@hust.edu.cn'
+        }
+    except ImportError:
+        # 如果 sage-common 不可用，从项目根目录加载（开发环境）
+        try:
+            from pathlib import Path
+            current_file = Path(__file__).resolve()
+            # 根据当前文件位置计算到项目根目录的层数
+            parts = current_file.parts
+            sage_index = -1
+            for i, part in enumerate(parts):
+                if part == 'SAGE':
+                    sage_index = i
+                    break
+            
+            if sage_index >= 0:
+                root_dir = Path(*parts[:sage_index+1])
+                version_file = root_dir / "_version.py"
+                
+                if version_file.exists():
+                    version_globals = {}
+                    with open(version_file, 'r', encoding='utf-8') as f:
+                        exec(f.read(), version_globals)
+                    return {
+                        'version': version_globals.get('__version__', '0.1.4'),
+                        'author': version_globals.get('__author__', 'SAGE Team'),
+                        'email': version_globals.get('__email__', 'shuhao_zhang@hust.edu.cn')
+                    }
+        except Exception:
+            pass
+    
+    # 最后的默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
 
-__all__ = ["VDBService", "create_vdb_service_factory"]
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/services/vdb/examples/vdb_demo.py

@@ -4,8 +4,8 @@ VDB Service API 使用示例
 """
 import numpy as np
 from sage.core.api.local_environment import LocalEnvironment
-from sage.middleware.services.services.vdb import create_vdb_service_factory
-from sage.middleware.services.api.vdb_api import VDBServiceAPI
+from sage.middleware.services.vdb import create_vdb_service_factory
+from sage.middleware.api.vdb_api import VDBServiceAPI
 
 
 def test_vdb_service_api():

sage/middleware/services/vdb/search_engine/__init__.py

@@ -0,0 +1,56 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从 sage-common 包加载版本信息"""
+    try:
+        # 优先从 sage-common 包加载版本
+        from sage.common._version import __version__
+        return {
+            'version': __version__,
+            'author': 'SAGE Team',
+            'email': 'shuhao_zhang@hust.edu.cn'
+        }
+    except ImportError:
+        # 如果 sage-common 不可用，从项目根目录加载（开发环境）
+        try:
+            from pathlib import Path
+            current_file = Path(__file__).resolve()
+            # 根据当前文件位置计算到项目根目录的层数
+            parts = current_file.parts
+            sage_index = -1
+            for i, part in enumerate(parts):
+                if part == 'SAGE':
+                    sage_index = i
+                    break
+            
+            if sage_index >= 0:
+                root_dir = Path(*parts[:sage_index+1])
+                version_file = root_dir / "_version.py"
+                
+                if version_file.exists():
+                    version_globals = {}
+                    with open(version_file, 'r', encoding='utf-8') as f:
+                        exec(f.read(), version_globals)
+                    return {
+                        'version': version_globals.get('__version__', '0.1.4'),
+                        'author': version_globals.get('__author__', 'SAGE Team'),
+                        'email': version_globals.get('__email__', 'shuhao_zhang@hust.edu.cn')
+                    }
+        except Exception:
+            pass
+    
+    # 最后的默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
+
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/services/vdb/vdb_service.py

@@ -55,22 +55,24 @@ class FaissVDBBackend:
         # 导入FaissIndex
         try:
             from sage.middleware.services.vdb.search_engine.faiss_index import FaissIndex
-            
-            # 初始化FAISS索引
+
+            # 初始化FAISS索引（使用我们内部的 FaissIndex 实现）
             self.faiss_index = FaissIndex(
                 name="vdb_index",
                 dim=embedding_dimension,
                 config={
                     "index_type": index_type,
-                    **self.faiss_config
-                }
+                    **self.faiss_config,
+                },
             )
-            
+
             # 文档存储 (id -> VectorDocument)
             self.documents: Dict[str, VectorDocument] = {}
-            
-            self.logger.info(f"FaissVDBBackend initialized with {index_type}, dim={embedding_dimension}")
-            
+
+            self.logger.info(
+                f"FaissVDBBackend initialized with {index_type}, dim={embedding_dimension}"
+            )
+
         except ImportError as e:
             self.logger.error(f"Failed to import FaissIndex: {e}")
             raise ImportError("FAISS dependencies not available. Install with: pip install faiss-cpu")
@@ -102,10 +104,9 @@ class FaissVDBBackend:
                 self.documents[doc.id] = doc
             
             if vector_arrays:
-                # 添加到FAISS索引
-                vectors_np = np.vstack(vector_arrays)
-                self.faiss_index.add(vectors_np, vector_ids)
-                
+                # 添加到FAISS索引（使用 batch_insert 接口）
+                self.faiss_index.batch_insert(vector_arrays, vector_ids)
+
                 self.logger.debug(f"Added {len(vector_ids)} vectors to FAISS index")
                 return vector_ids
             else:
@@ -120,27 +121,31 @@ class FaissVDBBackend:
         """搜索相似向量"""
         try:
             if len(query_vector) != self.embedding_dimension:
-                raise ValueError(f"Query vector dimension mismatch: expected {self.embedding_dimension}, got {len(query_vector)}")
-            
-            # 转换查询向量
-            query_np = np.array([query_vector], dtype=np.float32)
-            
-            # 在FAISS中搜索
-            distances, indices, ids = self.faiss_index.search(query_np, top_k)
-            
-            results = []
-            for i, (distance, doc_id) in enumerate(zip(distances[0], ids[0])):
+                raise ValueError(
+                    f"Query vector dimension mismatch: expected {self.embedding_dimension}, got {len(query_vector)}"
+                )
+
+            # 转换查询向量（FaissIndex.search 接受 1D np.ndarray）
+            query_np = np.array(query_vector, dtype=np.float32)
+
+            # 在FAISS中搜索（返回 string_ids 和 distances）
+            ids, distances = self.faiss_index.search(query_np, top_k)
+
+            results: List[Tuple[VectorDocument, float]] = []
+            for doc_id, distance in zip(ids, distances):
                 if doc_id in self.documents:
                     doc = self.documents[doc_id]
-                    
+
                     # 应用元数据过滤
                     if metadata_filter and not self._matches_filter(doc.metadata, metadata_filter):
                         continue
-                    
+
                     results.append((doc, float(distance)))
                 else:
-                    self.logger.warning(f"Document {doc_id} found in index but not in storage")
-            
+                    self.logger.warning(
+                        f"Document {doc_id} found in index but not in storage"
+                    )
+
             self.logger.debug(f"Search returned {len(results)} results")
             return results
             
@@ -156,18 +161,19 @@ class FaissVDBBackend:
         """删除向量文档"""
         try:
             deleted_count = 0
-            valid_ids = []
-            
+
             for doc_id in doc_ids:
                 if doc_id in self.documents:
                     del self.documents[doc_id]
-                    valid_ids.append(doc_id)
+                    try:
+                        # 从FAISS索引中删除（逐个删除）
+                        self.faiss_index.delete(doc_id)
+                    except Exception as e:
+                        self.logger.warning(
+                            f"Error deleting id {doc_id} from FAISS: {e}"
+                        )
                     deleted_count += 1
             
-            # 从FAISS索引中删除
-            if valid_ids:
-                self.faiss_index.delete(valid_ids)
-            
             self.logger.debug(f"Deleted {deleted_count} vectors")
             return deleted_count
             
@@ -198,8 +204,8 @@ class FaissVDBBackend:
                 dim=self.embedding_dimension,
                 config={
                     "index_type": self.index_type,
-                    **self.faiss_config
-                }
+                    **self.faiss_config,
+                },
             )
         except Exception as e:
             self.logger.error(f"Error reinitializing FAISS index: {e}")
@@ -207,7 +213,7 @@ class FaissVDBBackend:
     def save_index(self, path: str) -> bool:
         """保存索引到磁盘"""
         try:
-            self.faiss_index.save(path)
+            self.faiss_index.store(path)
             return True
         except Exception as e:
             self.logger.error(f"Error saving index: {e}")
@@ -217,11 +223,8 @@ class FaissVDBBackend:
         """从磁盘加载索引"""
         try:
             from sage.middleware.services.vdb.search_engine.faiss_index import FaissIndex
-            self.faiss_index = FaissIndex(
-                name="vdb_index", 
-                dim=self.embedding_dimension,
-                load_path=path
-            )
+            # 使用类方法 load 恢复索引
+            self.faiss_index = FaissIndex.load(name="vdb_index", load_path=path)
             return True
         except Exception as e:
             self.logger.error(f"Error loading index: {e}")

sage/middleware/utils/__init__.py

@@ -1,5 +1,56 @@
 """
-Llm module for SAGE framework
+SAGE - Streaming-Augmented Generative Execution
 """
 
-__version__ = "1.0.0"
+# 动态版本加载
+def _load_version():
+    """从 sage-common 包加载版本信息"""
+    try:
+        # 优先从 sage-common 包加载版本
+        from sage.common._version import __version__
+        return {
+            'version': __version__,
+            'author': 'SAGE Team',
+            'email': 'shuhao_zhang@hust.edu.cn'
+        }
+    except ImportError:
+        # 如果 sage-common 不可用，从项目根目录加载（开发环境）
+        try:
+            from pathlib import Path
+            current_file = Path(__file__).resolve()
+            # 根据当前文件位置计算到项目根目录的层数
+            parts = current_file.parts
+            sage_index = -1
+            for i, part in enumerate(parts):
+                if part == 'SAGE':
+                    sage_index = i
+                    break
+            
+            if sage_index >= 0:
+                root_dir = Path(*parts[:sage_index+1])
+                version_file = root_dir / "_version.py"
+                
+                if version_file.exists():
+                    version_globals = {}
+                    with open(version_file, 'r', encoding='utf-8') as f:
+                        exec(f.read(), version_globals)
+                    return {
+                        'version': version_globals.get('__version__', '0.1.4'),
+                        'author': version_globals.get('__author__', 'SAGE Team'),
+                        'email': version_globals.get('__email__', 'shuhao_zhang@hust.edu.cn')
+                    }
+        except Exception:
+            pass
+    
+    # 最后的默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
+
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/utils/embedding/__init__.py

@@ -1,35 +1,56 @@
 """
-Embedding methods and models for SAGE middleware.
+SAGE - Streaming-Augmented Generative Execution
 """
 
-from .embedding_api import apply_embedding_model
-from .embedding_model import EmbeddingModel
+# 动态版本加载
+def _load_version():
+    """从 sage-common 包加载版本信息"""
+    try:
+        # 优先从 sage-common 包加载版本
+        from sage.common._version import __version__
+        return {
+            'version': __version__,
+            'author': 'SAGE Team',
+            'email': 'shuhao_zhang@hust.edu.cn'
+        }
+    except ImportError:
+        # 如果 sage-common 不可用，从项目根目录加载（开发环境）
+        try:
+            from pathlib import Path
+            current_file = Path(__file__).resolve()
+            # 根据当前文件位置计算到项目根目录的层数
+            parts = current_file.parts
+            sage_index = -1
+            for i, part in enumerate(parts):
+                if part == 'SAGE':
+                    sage_index = i
+                    break
+            
+            if sage_index >= 0:
+                root_dir = Path(*parts[:sage_index+1])
+                version_file = root_dir / "_version.py"
+                
+                if version_file.exists():
+                    version_globals = {}
+                    with open(version_file, 'r', encoding='utf-8') as f:
+                        exec(f.read(), version_globals)
+                    return {
+                        'version': version_globals.get('__version__', '0.1.4'),
+                        'author': version_globals.get('__author__', 'SAGE Team'),
+                        'email': version_globals.get('__email__', 'shuhao_zhang@hust.edu.cn')
+                    }
+        except Exception:
+            pass
+    
+    # 最后的默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
 
-# Import specific embedding implementations
-from . import hf
-from . import ollama
-from . import siliconcloud
-from . import openai
-from . import bedrock
-from . import zhipu
-from . import mockembedder
-from . import _cohere
-from . import nvidia_openai
-from . import lollms
-from . import jina
-
-__all__ = [
-    'apply_embedding_model',
-    'EmbeddingModel',
-    'hf',
-    'ollama', 
-    'siliconcloud',
-    'openai',
-    'bedrock',
-    'zhipu',
-    'mockembedder',
-    '_cohere',
-    'nvidia_openai',
-    'lollms',
-    'jina'
-]
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']