adam-community 1.0.23__py3-none-any.whl → 1.0.24__py3-none-any.whl

adam_community/__version__.py

@@ -1 +1 @@
-__version__ = "1.0.23"
+__version__ = "1.0.24"

adam_community/util.py

@@ -10,6 +10,7 @@ import logging
 import ssl
 from functools import wraps
 from subprocess import run, CalledProcessError
+import time
 
 logger = logging.getLogger(__name__)
 
@@ -18,6 +19,7 @@ ADAM_API_TOKEN = os.getenv('ADAM_API_TOKEN')
 ADAM_TASK_ID = os.getenv('ADAM_TASK_ID')
 ADAM_USER_ID = os.getenv('ADAM_USER_ID')
 CONDA_ENV = os.getenv('CONDA_ENV')
+ADAM_TASK_DIR = os.getenv('ADAM_TASK_DIR')
 
 
 def _build_akb_query_command(query: str, collection: str) -> str:
@@ -368,3 +370,195 @@ def markdown_terminal(content, conda_env="base", user="Adam", workdir=""):
     user = markdown_color(f"{user}@Adam", "green")
     workdir = markdown_color(f":~/{workdir}", "blue")
     return f'({conda_env}) {user}{workdir}$ {content}'
+
+
+# ========== States Management ==========
+
+class _StatesManager:
+    """内部状态管理类"""
+    _tool_name = "tool"
+
+    def _get_states_file(self) -> str:
+        """获取 states.json 文件路径"""
+        # 1. 优先使用环境变量
+        task_dir = ADAM_TASK_DIR
+        if task_dir:
+            return os.path.join(task_dir, ".slurm", "states.json")
+
+        # 2. 尝试当前目录的 .slurm
+        current_dir = os.getcwd()
+        local_states = os.path.join(current_dir, ".slurm", "states.json")
+        if os.path.exists(local_states):
+            return local_states
+
+        # 3. 在当前目录创建
+        return local_states
+
+    def _read(self) -> dict:
+        """读取 states.json，保留所有来源的数据"""
+        states_file = self._get_states_file()
+        if not os.path.exists(states_file):
+            return {
+                "files": {"updated_at": None, "sources": {}},
+                "states": {"source": None, "updated_at": None, "data": {}}
+            }
+        try:
+            with open(states_file, 'r', encoding='utf-8') as f:
+                return json.load(f)
+        except (json.JSONDecodeError, IOError):
+            return {
+                "files": {"updated_at": None, "sources": {}},
+                "states": {"source": None, "updated_at": None, "data": {}}
+            }
+
+    def _write(self, data: dict):
+        """写入 states.json"""
+        states_file = self._get_states_file()
+        os.makedirs(os.path.dirname(states_file), exist_ok=True)
+        with open(states_file, 'w', encoding='utf-8') as f:
+            json.dump(data, f, ensure_ascii=False, indent=2)
+
+    def _set_nested(self, data: dict, key: str, value):
+        """设置嵌套值，支持 dot notation"""
+        keys = key.split('.')
+        current = data
+        for k in keys[:-1]:
+            current = current.setdefault(k, {})
+        current[keys[-1]] = value
+
+    def _get_nested(self, data: dict, key: str, default=None):
+        """获取嵌套值，支持 dot notation"""
+        keys = key.split('.')
+        current = data
+        for k in keys:
+            if isinstance(current, dict):
+                current = current.get(k)
+            else:
+                return default
+            if current is None:
+                return default
+        return current
+
+    def set(self, key: str, value):
+        """
+        设置状态
+
+        特殊 key:
+            "files" - 记录文件列表，会自动补充到 files.sources[tool_name]
+            其他 - 记录到 states.data
+        """
+        data = self._read()
+
+        if key == "files":
+            data["files"]["sources"][self._tool_name] = {
+                "updated_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+                "items": value
+            }
+        else:
+            self._set_nested(data["states"]["data"], key, value)
+
+        self._write(data)
+
+    def get(self, key: str):
+        """
+        获取状态
+
+        Returns:
+            状态值，不存在返回 None
+        """
+        data = self._read()
+
+        if key == "files":
+            # 合并所有来源的文件列表
+            merged = {}
+            for source, content in data["files"]["sources"].items():
+                for item in content.get("items", []):
+                    path = item.get("path")
+                    if not path:
+                        continue
+                    mtime = item.get("mtime", 0)
+                    if path not in merged or mtime > merged[path]["mtime"]:
+                        merged[path] = item
+            result = list(merged.values())
+            # 按 mtime 降序排序
+            result.sort(key=lambda x: x.get("mtime", 0), reverse=True)
+            return result
+
+        return self._get_nested(data["states"]["data"], key)
+
+    def cleanup(self):
+        """清理当前工具的所有记录"""
+        data = self._read()
+        data["files"]["sources"].pop(self._tool_name, None)
+        self._write(data)
+
+    def trackPath(self, path: str, max_items: int = 30):
+        """
+        追踪文件/目录，自动检测文件信息并记录
+
+        Args:
+            path: 文件或目录路径
+            max_items: 最大记录数量，先进先出
+        """
+        if not os.path.exists(path):
+            return
+
+        # 检测文件信息
+        try:
+            is_dir = os.path.isdir(path)
+            mtime = int(os.path.getmtime(path))
+            # 从环境变量获取 task_dir
+            task_dir = os.getenv('ADAM_TASK_DIR')
+            if task_dir:
+                rel_path = os.path.relpath(path, task_dir)
+            else:
+                rel_path = path
+        except (OSError, ValueError):
+            return
+
+        # 获取当前文件列表
+        data = self._read()
+        source = self._tool_name
+        items = data["files"]["sources"].get(source, {}).get("items", [])
+
+        # 检查是否已存在相同路径，存在则移除（后面会加到末尾，保持最新追踪的在最后）
+        items = [item for item in items if item.get("path") != rel_path]
+
+        # 添加到末尾（最新的位置）
+        items.append({"path": rel_path, "is_dir": is_dir, "mtime": mtime})
+
+        # 先进先出，保留最多 max_items 条
+        if len(items) > max_items:
+            items = items[-max_items:]
+
+        # 写回
+        data["files"]["sources"][source] = {
+            "updated_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+            "items": items
+        }
+        self._write(data)
+
+
+# 全局实例
+_states = _StatesManager()
+
+
+def setState(key: str, value):
+    """设置状态"""
+    return _states.set(key, value)
+
+
+def getState(key: str):
+    """获取状态"""
+    return _states.get(key)
+
+
+def trackPath(path: str, max_items: int = 30):
+    """
+    追踪文件/目录，自动检测文件信息并记录
+
+    Args:
+        path: 文件或目录路径
+        max_items: 最大记录数量，先进先出，默认 30
+    """
+    return _states.trackPath(path, max_items)

{adam_community-1.0.23.dist-info → adam_community-1.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: adam_community
-Version: 1.0.23
+Version: 1.0.24
 Summary: Adam Community Tools and Utilities
 Home-page: https://github.com/yourusername/adam-community
 Author: Adam Community
@@ -80,6 +80,35 @@ classes = parse_directory(Path("./"))
 success, errors, zip_name = build_package(Path("./"))
 ```
 
+### States Management（任务状态管理）
+
+用于在任务执行过程中记录和读取状态，与服务端共享 `states.json` 文件。
+
+```python
+from adam_community.util import setState, getState, trackPath
+
+# 记录文件列表（自动与服务端和其他 Tool 的文件合并）
+setState("files", [
+    {"path": "output/result.json", "is_dir": False, "mtime": 1704100800},
+    {"path": "cache", "is_dir": True, "mtime": 1704100000}
+])
+
+# 获取合并后的文件列表（来自 server + 所有 tools）
+files = getState("files")
+
+# 记录自定义状态（支持嵌套 key）
+setState("stage", "data_cleaning")
+setState("config.threshold", 0.5)
+
+# 获取状态
+stage = getState("stage")              # -> "data_cleaning"
+threshold = getState("config.threshold")  # -> 0.5
+
+# 追踪文件/目录（自动检测 is_dir 和 mtime，先进先出，最多 30 条）
+trackPath("/path/to/output/result.json")
+trackPath("/path/to/cache")
+```
+
 ## 功能特性
 
 - **Python 文件解析**: 自动解析 Python 类和函数的文档字符串

{adam_community-1.0.23.dist-info → adam_community-1.0.24.dist-info}/RECORD

@@ -1,7 +1,7 @@
 adam_community/__init__.py,sha256=vAmF9VQR6D4peppH0hnrHDmZK5cFeFPh11GIsTKUXhE,429
-adam_community/__version__.py,sha256=TsfOxJ6mtxlNs5o5L8PelYBmdcIU2HBCYiJjWJmW9pU,23
+adam_community/__version__.py,sha256=rnKYfyIc2hXBxsPKz6c7OchEPYsBq3xHKgj-1s8ShT8,23
 adam_community/tool.py,sha256=F6jxRU3urqTfgjLIZSW-hVWyj0FpNwvY65jOODXI19w,4954
-adam_community/util.py,sha256=VJVXOWbnwmYAL3K0i4X_yItdmxEnC-IgyuVW74kTU4U,11664
+adam_community/util.py,sha256=SDXnWLHLfJxEJ5WBnwNq_FeHNwXxGK_F36dpI_hVkNc,17766
 adam_community/cli/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 adam_community/cli/build.py,sha256=fCteEXjtU2ZsXXUWa-j61gh_JVU-6xSAH_LpOP5swFc,12623
 adam_community/cli/cli.py,sha256=xlPvn0aq3TpAPjA7z9shsCqR1aHDVtZuhvtc_SNA_cQ,2811
@@ -25,8 +25,8 @@ adam_community/cli/templates/long_description.md.j2,sha256=Rj6hcuNzEL0Sp17GQVCRJ
 adam_community/cli/templates/long_description_en.md.j2,sha256=xSbahwGarXlWopZqHw7lrcv1dQuvwj2ChhZv5pJmUy4,1725
 adam_community/cli/templates/rag_python.py.j2,sha256=YJL7-WIx-Dumt7lHuUGxl3Rbaw0kpkh8hpcCJ5lz9lA,2494
 adam_community/cli/templates/toolbox_python.py.j2,sha256=EOnmsJUvQRrcO7K7c88kI42gMmcM0Z4ab46qwOJXbH8,4192
-adam_community-1.0.23.dist-info/METADATA,sha256=o6xvoDxorc4zgN6epTHlX8RUkk8ebPQxSMsMN_LOO5k,2202
-adam_community-1.0.23.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-adam_community-1.0.23.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
-adam_community-1.0.23.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
-adam_community-1.0.23.dist-info/RECORD,,
+adam_community-1.0.24.dist-info/METADATA,sha256=sxFaC3OQBjjOuHER7x6kcuYZxgV6pwqRlevJ-rVa800,3151
+adam_community-1.0.24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+adam_community-1.0.24.dist-info/entry_points.txt,sha256=4I7yRkn7cHwPY8-fWQLeAvKjc24zUy8Z65VsZNs0Wos,56
+adam_community-1.0.24.dist-info/top_level.txt,sha256=MS8jbePXKZChih9kGizNVX0I1MFZFGWBMCIW_r86qhU,15
+adam_community-1.0.24.dist-info/RECORD,,