rainbow-rb-utils 0.1.2.dev3__tar.gz → 0.1.2.dev4__tar.gz

{rainbow_rb_utils-0.1.2.dev3 → rainbow_rb_utils-0.1.2.dev4}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rainbow-rb-utils
-Version: 0.1.2.dev3
+Version: 0.1.2.dev4
 Summary: Rainbow Python Utilities
 Author-email: Derek <dfd1123@rainbow-robotics.com>
 Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: psutil<8.0.0,>=7.0.0
-Requires-Dist: rainbow-rb-log==0.1.2.dev3
+Requires-Dist: rainbow-rb-log==0.1.2.dev4
 
 # rb_utils
 

{rainbow_rb_utils-0.1.2.dev3 → rainbow_rb_utils-0.1.2.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainbow-rb-utils"
-version = "0.1.2.dev3"
+version = "0.1.2.dev4"
 requires-python = ">=3.11,<3.14"
 description = "Rainbow Python Utilities"
 authors = [
@@ -14,7 +14,7 @@ readme = "README.md"
 
 dependencies = [
     "psutil>=7.0.0,<8.0.0",
-    "rainbow-rb-log==0.1.2.dev3",
+    "rainbow-rb-log==0.1.2.dev4",
 ]
 
 [tool.setuptools]

{rainbow_rb_utils-0.1.2.dev3 → rainbow_rb_utils-0.1.2.dev4}/src/rainbow/rb_utils/flow_manager.py

@@ -66,7 +66,28 @@ ALLOWED_CONSTS = {
 
 EXPLICIT_EXPR_PATTERN = re.compile(r"\$[A-Za-z_]\w*")
 RB_GLOBAL_PATTERN = re.compile(r"\bRB_[A-Za-z_0-9]*\b")
-GET_VAR_PATTERN = re.compile(r"\bget_var\s*\(")
+# get/update 는 get_var/update_var 별칭. `.get(`/`.update(` (dict 메서드) 은 제외
+GET_VAR_PATTERN = re.compile(r"(?<![\w.])(?:get|update)(?:_var)?\s*\(")
+
+
+def collect_rb_globals(value: Any) -> list[str]:
+    """value(문자열/리스트/딕트 중첩) 안의 RB_ 이름을 순서대로, 중복 없이 모은다."""
+    found: dict[str, None] = {}
+
+    def _walk(v: Any) -> None:
+        if isinstance(v, str):
+            for name in RB_GLOBAL_PATTERN.findall(v):
+                found[name] = None
+        elif isinstance(v, list | tuple | set):
+            for item in v:
+                _walk(item)
+        elif isinstance(v, dict):
+            # eval_value 와 동일하게 값만 본다
+            for item in v.values():
+                _walk(item)
+
+    _walk(value)
+    return list(found)
 
 
 def safe_eval_expr(
@@ -75,6 +96,7 @@ def safe_eval_expr(
     get_global_variable: Callable[[str], Any] | None = None,
     get_var: Callable[..., Any] | None = None,
     on_write: Callable[[str, str], None] | None = None,
+    update_var: Callable[..., Any] | None = None,
 ) -> Any:
     """on_write: 대입/증감 시 (변수명, "local"|"global") 통보. 쓰기 없으면 호출 안 됨."""
     if not isinstance(expr, str):
@@ -202,18 +224,25 @@ def safe_eval_expr(
                 return any(_eval(v) for v in node.values)
 
         if isinstance(node, ast.Call):
-            if isinstance(node.func, ast.Name) and node.func.id == "get_var":
+            if isinstance(node.func, ast.Name) and node.func.id in ("get", "get_var"):
+                # get(name) = 자기 프로세스, get(target, name[, default]) = 다른 프로그램
+                fname = node.func.id
                 if get_var is None:
-                    raise ValueError("get_var is not available in this context")
-                if len(node.args) not in (2, 3):
+                    raise ValueError(f"{fname} is not available in this context")
+                if not 1 <= len(node.args) <= 3 or node.keywords:
                     raise ValueError(
-                        "get_var requires 2 or 3 arguments: get_var(pid_or_model, var_name[, default])"
+                        f"{fname} requires {fname}(var_name) or "
+                        f"{fname}(pid_or_model, var_name[, default])"
                     )
-                pid_or_model = _eval(node.args[0])
-                var_name = _eval(node.args[1])
-                if len(node.args) == 3:
-                    return get_var(pid_or_model, var_name, _eval(node.args[2]))
-                return get_var(pid_or_model, var_name)
+                return get_var(*[_eval(a) for a in node.args])
+            if isinstance(node.func, ast.Name) and node.func.id in ("update", "update_var"):
+                # update({...}) = 자기 프로세스, update(target, {...}) = 다른 프로그램
+                fname = node.func.id
+                if update_var is None:
+                    raise ValueError(f"{fname} is not available in this context")
+                if len(node.args) not in (1, 2) or node.keywords:
+                    raise ValueError(f"{fname} requires {fname}({{...}}) or {fname}(target, {{...}})")
+                return update_var(*[_eval(a) for a in node.args])
             fn = _eval(node.func)
             if fn not in ALLOWED_CALLABLES:
                 raise ValueError(f"function not allowed: {fn}")
@@ -515,6 +544,7 @@ def eval_value(
     get_global_variable: Callable[[str], Any] | None = None,
     get_var: Callable[..., Any] | None = None,
     on_write: Callable[[str, str], None] | None = None,
+    update_var: Callable[..., Any] | None = None,
 ) -> Any:
     # 1) 문자열이면 → 기존 safe_eval_expr 호출
     if isinstance(value, str):
@@ -524,6 +554,7 @@ def eval_value(
             get_global_variable=get_global_variable,
             get_var=get_var,
             on_write=on_write,
+            update_var=update_var,
         )
 
     # 2) 리스트면 → 각 요소를 재귀적으로 평가
@@ -535,6 +566,7 @@ def eval_value(
                 get_global_variable=get_global_variable,
                 get_var=get_var,
                 on_write=on_write,
+                update_var=update_var,
             )
             for v in value
         ]
@@ -548,6 +580,7 @@ def eval_value(
                 get_global_variable=get_global_variable,
                 get_var=get_var,
                 on_write=on_write,
+                update_var=update_var,
             )
             for v in value
         )
@@ -561,6 +594,7 @@ def eval_value(
                 get_global_variable=get_global_variable,
                 get_var=get_var,
                 on_write=on_write,
+                update_var=update_var,
             )
             for k, v in value.items()
         }

{rainbow_rb_utils-0.1.2.dev3 → rainbow_rb_utils-0.1.2.dev4}/src/rainbow/rb_utils/manipulate.py

@@ -228,4 +228,9 @@ def parse_state_core_mv_to_dict(mv: memoryview) -> dict[str, object]:
         "weldInfoRxCurrent": obj.WeldInfoRxCurrent(),
         "weldInfoRxVoltage": obj.WeldInfoRxVoltage(),
         "weldInfoRxFeedrate": obj.WeldInfoRxFeedrate(),
+        "safetyRawDataA0": obj.SafetyRawDataA0(),
+        "safetyRawDataA1": obj.SafetyRawDataA1(),
+        "safetyRawDataB0": obj.SafetyRawDataB0(),
+        "safetyRawDataB1": obj.SafetyRawDataB1(),
+        "realtimeFeedback": obj.RealtimeFeedback(),
     }

{rainbow_rb_utils-0.1.2.dev3 → rainbow_rb_utils-0.1.2.dev4}/src/rainbow_rb_utils.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rainbow-rb-utils
-Version: 0.1.2.dev3
+Version: 0.1.2.dev4
 Summary: Rainbow Python Utilities
 Author-email: Derek <dfd1123@rainbow-robotics.com>
 Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: psutil<8.0.0,>=7.0.0
-Requires-Dist: rainbow-rb-log==0.1.2.dev3
+Requires-Dist: rainbow-rb-log==0.1.2.dev4
 
 # rb_utils
 

rainbow_rb_utils-0.1.2.dev4/src/rainbow_rb_utils.egg-info/requires.txt

@@ -0,0 +1,2 @@
+psutil<8.0.0,>=7.0.0
+rainbow-rb-log==0.1.2.dev4

rainbow_rb_utils-0.1.2.dev3/src/rainbow_rb_utils.egg-info/requires.txt

@@ -1,2 +0,0 @@
-psutil<8.0.0,>=7.0.0
-rainbow-rb-log==0.1.2.dev3