isage-middleware 0.1.1__py3-none-any.whl → 0.1.4__py3-none-any.whl

sage/middleware/services/__init__.py

@@ -0,0 +1,37 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    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/graph/__init__.py

@@ -1,8 +1,37 @@
 """
-Graph Service Module
-图数据库服务模块
+SAGE - Streaming-Augmented Generative Execution
 """
 
-from .graph_service import GraphService, create_graph_service_factory
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
 
-__all__ = ["GraphService", "create_graph_service_factory"]
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/services/graph/examples/graph_demo.py

@@ -3,7 +3,7 @@ Graph Service 使用示例
 展示如何使用Graph微服务进行知识图谱构建和查询
 """
 from sage.core.api.local_environment import LocalEnvironment
-from sage.middleware.services.services.graph import create_graph_service_factory
+from sage.middleware.services.graph import create_graph_service_factory
 
 
 def test_graph_service():
@@ -21,7 +21,8 @@ def test_graph_service():
         max_nodes=10000,
         max_relationships=50000
     )
-    env.register_service("demo_graph_service", graph_factory)
+    # 使用服务工厂注册（与 SAGE Kernel 的 ServiceFactory 对齐）
+    env.register_service_factory("demo_graph_service", graph_factory)
     
     print("✅ Graph Service registered with memory backend")
     print("   - Max nodes: 10,000")

sage/middleware/services/graph/graph_service.py

@@ -371,6 +371,14 @@ class GraphService(BaseService):
     
     # Graph操作方法 - 这些方法可以通过服务调用机制被调用
     
+    # 兼容API：add_node(dict) 与 create_node(labels, properties, node_id)
+    def add_node(self, node: Dict[str, Any]) -> str:
+        """兼容 MemoryService 的 add_node 接口: {'id','labels','properties'}"""
+        labels = node.get("labels", []) or []
+        properties = node.get("properties", {}) or {}
+        node_id = node.get("id")
+        return self.create_node(labels=labels, properties=properties, node_id=node_id)
+
     def create_node(self, labels: List[str], properties: Dict[str, Any], 
                    node_id: Optional[str] = None) -> str:
         """创建节点"""
@@ -386,6 +394,17 @@ class GraphService(BaseService):
         self.logger.debug(f"Created node: {result}")
         return result
     
+    # 兼容API：add_relationship(dict) 与 create_relationship(from,to,type,...)
+    def add_relationship(self, rel: Dict[str, Any]) -> str:
+        """兼容 MemoryService 的 add_relationship 接口: {'from_node','to_node','rel_type','properties','id'}"""
+        return self.create_relationship(
+            from_node=rel.get("from_node"),
+            to_node=rel.get("to_node"),
+            rel_type=rel.get("rel_type"),
+            properties=rel.get("properties"),
+            rel_id=rel.get("id")
+        )
+
     def create_relationship(self, from_node: str, to_node: str, rel_type: str,
                           properties: Optional[Dict[str, Any]] = None,
                           rel_id: Optional[str] = None) -> str:
@@ -417,6 +436,55 @@ class GraphService(BaseService):
                 "created_at": node.created_at
             }
         return None
+
+    # 兼容 MemoryService 查询使用的便捷方法
+    def get_node_context(self, node_id: str, depth: int = 1) -> Dict[str, Any]:
+        """获取节点的邻域上下文（简单一层或多层展开）"""
+        context = {"node": self.get_node(node_id), "neighbors": [], "relationships": []}
+        if not context["node"]:
+            return context
+        rels = self.get_node_relationships(node_id, direction="both") if hasattr(self.backend, 'get_node_relationships') else []
+        context["relationships"] = rels
+        neighbor_ids = set()
+        for r in rels:
+            neighbor_ids.add(r.get("from_node") if isinstance(r, dict) else r.from_node)
+            neighbor_ids.add(r.get("to_node") if isinstance(r, dict) else r.to_node)
+        neighbor_ids.discard(node_id)
+        for nid in neighbor_ids:
+            n = self.get_node(nid)
+            if n:
+                context["neighbors"].append(n)
+        return context
+
+    def get_session_graph(self, session_id: str) -> Dict[str, Any]:
+        """根据会话ID返回简单的图统计（基于节点属性 session_id）"""
+        # 简单按属性筛选
+        try:
+            nodes = self.find_nodes(properties={"session_id": session_id})
+        except Exception:
+            nodes = []
+        node_ids = {n["id"] if isinstance(n, dict) else n.id for n in nodes}
+        # 关系筛选
+        relationships = []
+        if hasattr(self.backend, 'relationships'):
+            for rel in getattr(self.backend, 'relationships', {}).values():
+                src = rel.get("from_node") if isinstance(rel, dict) else rel.from_node
+                dst = rel.get("to_node") if isinstance(rel, dict) else rel.to_node
+                if src in node_ids or dst in node_ids:
+                    relationships.append({
+                        "id": rel.get("id") if isinstance(rel, dict) else rel.id,
+                        "from_node": src,
+                        "to_node": dst,
+                        "rel_type": rel.get("rel_type") if isinstance(rel, dict) else rel.rel_type,
+                        "properties": rel.get("properties") if isinstance(rel, dict) else rel.properties,
+                    })
+        return {
+            "session_id": session_id,
+            "node_count": len(nodes),
+            "relationship_count": len(relationships),
+            "nodes": nodes,
+            "relationships": relationships,
+        }
     
     def find_nodes(self, labels: Optional[List[str]] = None,
                   properties: Optional[Dict[str, Any]] = None) -> List[Dict[str, Any]]:

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

@@ -0,0 +1,37 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    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/kv/__init__.py

@@ -1,8 +1,37 @@
 """
-KV Service Module
-键值存储服务模块
+SAGE - Streaming-Augmented Generative Execution
 """
 
-from .kv_service import KVService, create_kv_service_factory
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
 
-__all__ = ["KVService", "create_kv_service_factory"]
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

sage/middleware/services/kv/examples/kv_demo.py

@@ -4,7 +4,7 @@ KV Service API 使用示例
 """
 import time
 from sage.core.api.local_environment import LocalEnvironment
-from sage.middleware.services.kv.kv_service import create_kv_service_factory
+from sage.middleware.services import create_kv_service_factory
 from sage.middleware.api.kv_api import KVServiceAPI
 
 

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

@@ -0,0 +1,37 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    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/memory/__init__.py

@@ -1,12 +1,37 @@
 """
-Memory Service Module
-记忆服务模块 - 提供统一的记忆管理和编排服务
+SAGE - Streaming-Augmented Generative Execution
 """
 
-# 主要的记忆服务
-from .memory_service import MemoryService, create_memory_service_factory
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    return {
+        'version': '0.1.4',
+        'author': 'SAGE Team', 
+        'email': 'shuhao_zhang@hust.edu.cn'
+    }
 
-__all__ = [
-    "MemoryService", 
-    "create_memory_service_factory"
-]
+# 加载信息
+_info = _load_version()
+__version__ = _info['version']
+__author__ = _info['author']
+__email__ = _info['email']

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

@@ -35,16 +35,15 @@ class SampleApplication:
             max_size=1000,
             ttl_seconds=3600  # 1小时过期
         )
-        self.env.register_service("kv_service", kv_factory.service_class, kv_factory)
+    self.env.register_service_factory("kv_service", kv_factory)
         
         # 注册VDB服务
         vdb_factory = create_vdb_service_factory(
             service_name="vdb_service",
-            collection_name="demo_vectors",
-            dimension=384,
-            persist_directory="./demo_vectors"
+            embedding_dimension=384,
+            index_type="IndexFlatL2",
         )
-        self.env.register_service("vdb_service", vdb_factory.service_class, vdb_factory)
+        self.env.register_service_factory("vdb_service", vdb_factory)
         
         # 注册Memory编排服务
         memory_factory = create_memory_service_factory(
@@ -52,7 +51,7 @@ class SampleApplication:
             kv_service_name="kv_service",
             vdb_service_name="vdb_service"
         )
-        self.env.register_service("memory_service", memory_factory.service_class, memory_factory)
+    self.env.register_service_factory("memory_service", memory_factory)
         
         print("✅ 所有服务已注册")
     
@@ -174,9 +173,9 @@ def create_conversation_dag():
     env = LocalEnvironment("conversation_app", {})
     
     # 注册微服务
-    env.register_service("kv_service", KVService, create_kv_service_factory())
-    env.register_service("vdb_service", VDBService, create_vdb_service_factory())
-    env.register_service("memory_service", MemoryService, create_memory_service_factory())
+    env.register_service_factory("kv_service", create_kv_service_factory())
+    env.register_service_factory("vdb_service", create_vdb_service_factory())
+    env.register_service_factory("memory_service", create_memory_service_factory())
     
     # 创建数据流
     stream = env.from_kafka_source(...)

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,37 @@
+"""
+SAGE - Streaming-Augmented Generative Execution
+"""
+
+# 动态版本加载
+def _load_version():
+    """从项目根目录动态加载版本信息"""
+    from pathlib import Path
+    
+    # 获取项目根目录
+    current_file = Path(__file__).resolve()
+    root_dir = current_file.parent.parent.parent.parent.parent.parent.parent.parent
+    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')
+        }
+    
+    # 默认值
+    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']