feat: 改进粒子对象

src/heurams/interface/__init__.py

@@ -6,7 +6,7 @@ from heurams.services.logger import get_logger
 
 from .screens.about import AboutScreen
 from .screens.dashboard import DashboardScreen
-from .screens.nucreator import NucleonCreatorScreen
+from .screens.repocreator import NucleonCreatorScreen
 from .screens.precache import PrecachingScreen
 from .screens.synctool import SyncScreen
 

src/heurams/interface/__main__.py

@@ -7,7 +7,7 @@ from heurams.services.logger import get_logger
 
 from .screens.about import AboutScreen
 from .screens.dashboard import DashboardScreen
-from .screens.nucreator import NucleonCreatorScreen
+from .screens.repocreator import NucleonCreatorScreen
 from .screens.precache import PrecachingScreen
 
 logger = get_logger(__name__)

src/heurams/interface/screens/about.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""关于界面
+"""
 from textual.app import ComposeResult
 from textual.containers import ScrollableContainer
 from textual.screen import Screen

src/heurams/interface/screens/dashboard.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""仪表盘界面
+"""
 import pathlib
 
 from textual.app import ComposeResult
@@ -187,7 +188,7 @@ class DashboardScreen(Screen):
         button_id = event.button.id
 
         if button_id == "new_nucleon_button":
-            from .nucreator import NucleonCreatorScreen
+            from .repocreator import NucleonCreatorScreen
 
             new_screen = NucleonCreatorScreen()
             self.app.push_screen(new_screen)

src/heurams/interface/screens/intelinote.py

@@ -0,0 +1,2 @@
+"""笔记界面
+"""

src/heurams/interface/screens/memointegrity.py

@@ -0,0 +1,2 @@
+"""整体式记忆工作界面
+"""

src/heurams/interface/screens/memoqueue.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""队列式记忆工作界面
+"""
 from enum import Enum, auto
 
 from textual.app import ComposeResult

src/heurams/interface/screens/precache.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""缓存工具界面
+"""
 import pathlib
 
 from textual.app import ComposeResult

src/heurams/interface/screens/preparation.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""记忆准备界面
+"""
 from textual.app import ComposeResult
 from textual.containers import ScrollableContainer
 from textual.reactive import reactive
@@ -130,7 +131,7 @@ class PreparationScreen(Screen):
                         if left_new >= 0:
                             atoms_to_provide.append(i)
             logger.debug(f"ATP: {atoms_to_provide}")
-            from .memorizor import MemScreen
+            from .memoqueue import MemScreen
 
             memscreen = MemScreen(atoms_to_provide)
             self.app.push_screen(memscreen)

src/heurams/interface/screens/radio.py

@@ -0,0 +1,2 @@
+""""前进电台" 界面
+"""

src/heurams/interface/screens/repocreator.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""仓库创建向导界面
+"""
 from pathlib import Path
 
 import toml

src/heurams/interface/screens/synctool.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+"""同步工具界面
+"""
 import pathlib
 import time
 

src/heurams/kernel/particles/atom.py

@@ -3,7 +3,6 @@ import pathlib
 import typing
 from typing import TypedDict
 
-import bidict
 import toml
 
 from heurams.context import config_var
@@ -20,13 +19,11 @@ class AtomRegister_runtime(TypedDict):
     min_rate: int  # 最低评分
     new_activation: bool  # 新激活
 
-
 class AtomRegister(TypedDict):
     nucleon: Nucleon
     electron: Electron
     runtime: AtomRegister_runtime
 
-
 class Atom:
     """
     统一处理一系列对象的所有信息与持久化:
@@ -50,62 +47,13 @@ class Atom:
             "orbital": orbital_obj,
             "runtime": dict(),
         }
+        self.init_runtime()
         if self.registry["electron"].is_activated() == 0:
             self.registry["runtime"]["new_activation"] = True
 
     def init_runtime(self):
         self.registry['runtime'] = AtomRegister_runtime(**self.default_runtime)
 
-    def do_eval(self):
-        """
-        执行并以结果替换当前单元的所有 eval 语句
-        TODO: 带有限制的 eval, 异步/多线程执行避免堵塞
-        """
-        # eval 环境设置
-        def eval_with_env(s: str):
-            default = config_var.get()["puzzles"]
-            nucleon = self.registry["nucleon"]
-            payload = nucleon # 兼容历史遗留问题
-            metadata = nucleon # 兼容历史遗留问题
-            eval_value = eval(s)
-            if isinstance(eval_value, (int, float)):
-                ret = str(eval_value)
-            else:
-                ret = eval_value
-            logger.debug(
-                "eval 执行成功: '%s' -> '%s'",
-                s,
-                str(ret)[:50] + "..." if len(ret) > 50 else ret,
-            )
-            return ret
-
-        def traverse(data, modifier):
-            if isinstance(data, dict):
-                for key, value in data.items():
-                    data[key] = traverse(value, modifier)
-                return data
-            elif isinstance(data, list):
-                for i, item in enumerate(data):
-                    data[i] = traverse(item, modifier)
-                return data
-            elif isinstance(data, tuple):
-                return tuple(traverse(item, modifier) for item in data)
-            else:
-                if isinstance(data, str):
-                    if data.startswith("eval:"):
-                        logger.debug("发现 eval 表达式: '%s'", data[5:])
-                        return modifier(data[5:])
-                return data
-
-        try:
-            traverse(self.registry["nucleon"].payload, eval_with_env)
-            traverse(self.registry["nucleon"].metadata, eval_with_env)
-            traverse(self.registry["orbital"], eval_with_env)
-        except Exception as e:
-            ret = f"此 eval 实例发生错误: {e}"
-            logger.warning(ret)
-        logger.debug("EVAL 完成")
-
     def minimize(self, rating):
         """效果等同于 self.registry['runtime']['min_rate'] = min(rating, self.registry['runtime']['min_rate'])
 
@@ -143,22 +91,9 @@ class Atom:
             logger.debug("禁止总评分")
 
     def __getitem__(self, key):
-        logger.debug("Atom.__getitem__: key='%s'", key)
+        return self.registry[key]
-        if key in self.registry:
-            value = self.registry[key]
-            logger.debug("返回 value type: %s", type(value).__name__)
-            return value
-        logger.error("不支持的键: '%s'", key)
-        raise KeyError(f"不支持的键: {key}")
 
     def __setitem__(self, key, value):
-        logger.debug(
+        if key == "ident":
-            "Atom.__setitem__: key='%s', value type: %s", key, type(value).__name__
+            raise AttributeError("应为只读")
-        )
+        self.registry[key] = value
-        if key in self.registry:
-            self.registry[key] = value
-            logger.debug("键 '%s' 已设置", key)
-        else:
-            logger.error("不支持的键: '%s'", key)
-            raise KeyError(f"不支持的键: {key}")
-

src/heurams/kernel/particles/electron.py

@@ -7,13 +7,6 @@ import heurams.kernel.algorithms as algolib
 from copy import deepcopy
 logger = get_logger(__name__)
 
-class QueryType(TypedDict):
-    is_due: bool
-    is_activated: bool
-    rating: int
-    nextdate: int
-    lastdate: int
-
 class Electron:
     """电子: 单算法支持的记忆数据包装"""
 
@@ -30,9 +23,8 @@ class Electron:
         self.algodata = algodata
         self.ident = ident
         self.algo: algolib.BaseAlgorithm = algorithms[algo_name]
-        self.query = dict()
 
-        if self.algo.check_integrity(self.algodata):
+        if not self.algo.check_integrity(self.algodata):
             self.algodata[self.algo.algo_name] = deepcopy(self.algo.defaults)
 
     def activate(self):

src/heurams/kernel/particles/nucleon.py

@@ -1,38 +1,36 @@
 from heurams.services.logger import get_logger
-
+from copy import deepcopy
+from heurams.utils.evalizor import Evalizer
 logger = get_logger(__name__)
 
 class Nucleon:
-    """原子核: 带有运行时隔离的半只读材料元数据容器
+    """原子核: 带有运行时隔离的模板化只读材料元数据容器
     """
 
     def __init__(self, ident, payload, common):
         self.ident = ident
-        self.payload = payload
+        env = {
-        self.common = common
+            "payload": payload
-        self.rtlayer = dict() # 运行时层
+        }
+        self.evalizer = Evalizer(environment=env)
+        self.data = self.evalizer(deepcopy((payload | common)))
 
     def __getitem__(self, key):
         if key == "ident":
             return self.ident
-        merged = self.rtlayer | self.payload | self.common
+        return self.data[key]
-        return merged[key]
             
     def __setitem__(self, key, value):
-        if key == "ident":
+        raise AttributeError("应为只读")
-            raise AttributeError("ident 应为只读")
-        else:
-            self.rtlayer[key] = value
         
     def __delitem__(self, key):
-        raise AttributeError("Nucleon 包含的数据被设计为无法删除")
+        raise AttributeError("应为只读")
 
     def __iter__(self):
-        merged = self.rtlayer | self.payload | self.common
+        return iter(self.data)
-        return iter(merged)
 
     def __contains__(self, key):
-        return key in (self.rtlayer | self.payload | self.common)
+        return key in (self.data)
     
     def get(self, key, default=None):
         if key in self:
@@ -40,12 +38,10 @@ class Nucleon:
         return default
     
     def __len__(self):
-        return len(self.rtlayer | self.payload | self.common)
+        return len(self.data)
 
     def __repr__(self):
-        return f"""RUNTIME:{repr(self.rtlayer)}
+        return repr(self.data)
-        PAYLOAD:{repr(self.payload)}
-        COMMON:{repr(self.common)}"""
 
     @staticmethod
     def create_on_nucleonic_data(nucleonic_data: tuple):

src/heurams/kernel/repomgr/repo.py

@@ -43,7 +43,7 @@ class Repo():
         self.generate_particles_data()
 
     def generate_particles_data(self):
-        self.nucleonic_data_lict = Lict(list(map(self._attach(self.typedef), self.payload)))
+        self.nucleonic_data_lict = Lict(initlist=list(map(self._attach(self.typedef), self.payload)))
         self.electronic_data_lict = self.algodata
 
     @staticmethod

src/heurams/utils/evalizor.py

@@ -1,28 +1,33 @@
-
-from typing import Any
-
-
 class Evalizer():
+    """几乎无副作用的模板系统
+
+    接受环境信息并创建一个模板解析工具, 工具传入参数支持list, dict及其嵌套  
+    副作用问题: 仅存在于 eval 函数
+    """
+    # TODO: 弃用风险极高的 eval
+    # 理论上已经限制了全局函数 但eval仍有风险
+    # TODO: 异步/多线程执行避免堵塞
     def __init__(self, environment: dict) -> None:
         self.env = environment
     
-    def __call__(self, *args: Any, **kwds: Any) -> Any:
+    def __call__(self, anyobj):
+        return self.travel(anyobj)
     
-
+    def travel(self, anyobj):
-def do_eval(self):
+        if isinstance(anyobj, list):
-    """
+            return list(map(self.travel, anyobj))
-    执行并以结果替换当前单元的所有 eval 语句
+        elif isinstance(anyobj, dict):
-    TODO: 带有限制的 eval, 异步/多线程执行避免堵塞
+            return dict(map(self.travel, anyobj.items()))
-    """
+        elif isinstance(anyobj, str):
-
+            if anyobj.startswith("eval:"):
-    # eval 环境设置
+                return self.eval_with_env(anyobj[5:])
-    def eval_with_env(s: str):
+            else:
-        default = config_var.get()["puzzles"]
+                return anyobj
-        payload = self.registry["nucleon"].payload
-        metadata = self.registry["nucleon"].metadata
-        eval_value = eval(s)
-        if isinstance(eval_value, (int, float)):
-            ret = str(eval_value)
         else:
-            ret = eval_value
+            return anyobj
+
+    def eval_with_env(self, s: str):
+        ret = eval(s, {}, self.env)
+        if not isinstance(ret, str):
+            ret = str(ret)
         return ret