rainbow-rb-utils 0.0.9.dev5__tar.gz → 0.0.9.dev7__tar.gz

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/PKG-INFO

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

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/pyproject.toml

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

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/src/rainbow/rb_utils/file.py

@@ -33,9 +33,9 @@ def get_env_path() -> Path | None:
     meipass = getattr(sys, "_MEIPASS", None)
     if meipass:
         base = Path(meipass)
-        candidate = base / ".env"
-        if candidate.exists():
-            return candidate
+        for candidate in [base / ".env", base / "rb_resources" / ".env"]:
+            if candidate.exists():
+                return candidate
 
     # 개발 환경: __file__ 기준으로 위로 타고 올라가며 .env 검색
     cur = Path(__file__).resolve()

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/src/rainbow/rb_utils/flow_manager.py

@@ -59,58 +59,37 @@ 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*\(")
 
 
 def safe_eval_expr(
     expr: Any,
     variables: dict[str, dict[str, Any]] | None = None,
     get_global_variable: Callable[[str], Any] | None = None,
+    get_var: Callable[..., Any] | None = None,
 ) -> Any:
     if not isinstance(expr, str):
         return expr
 
-    vars_ = variables or {"local": {}}
+    if variables is None:
+        vars_ = {"local": {}, "global": {}}
+    elif isinstance(variables.get("local"), dict) or isinstance(variables.get("global"), dict):
+        vars_ = variables
+    else:
+        vars_ = {"local": variables, "global": {}}
     s = expr.strip()
     if not s:
         return ""
 
-    is_explicit_expression = bool(EXPLICIT_EXPR_PATTERN.search(s) or RB_GLOBAL_PATTERN.search(s))
+    is_explicit_expression = bool(EXPLICIT_EXPR_PATTERN.search(s) or RB_GLOBAL_PATTERN.search(s) or GET_VAR_PATTERN.search(s))
     normalized = EXPLICIT_EXPR_PATTERN.sub(lambda match: match.group()[1:], s)
 
-    # --- 증감(식 전체일 때만 허용) ---------------------------------------------
-    inc_post = re.match(r"^([A-Za-z_]\w*)\s*\+\+$", s)  # a++
-    dec_post = re.match(r"^([A-Za-z_]\w*)\s*--$", s)  # a--
-    inc_pre = re.match(r"^\+\+\s*([A-Za-z_]\w*)$", s)  # ++a
-    dec_pre = re.match(r"^--\s*([A-Za-z_]\w*)$", s)  # --a
-    match = inc_post or dec_post or inc_pre or dec_pre
-    if match:
-        name = match.group(1)
-        exists = name in vars_.get("local", {}) or name in vars_.get("global", {})
-        cur: int | None = (
-            vars_.get("local", {}).get(name)
-            if name in vars_.get("local", {})
-            else vars_.get("global", {}).get(name, 0)
-        )
-
-        if cur is None:
-            raise ValueError(f"variable {name} not found")
-
-        if inc_post:
-            vars_.setdefault("local", {})[name] = cur + 1 if exists else 1
-            return cur
-        if dec_post:
-            vars_.setdefault("local", {})[name] = cur - 1 if exists else -1
-            return cur
-        if inc_pre:
-            v = cur + 1 if exists else 1
-            vars_.setdefault("local", {})[name] = v
-            return v
-        if dec_pre:
-            v = cur - 1 if exists else -1
-            vars_.setdefault("local", {})[name] = v
-            return v
-
     # --- 내부 평가기 ------------------------------------------------------------
+    def _increment_value(cur: Any, delta: int, target_expr: str) -> Any:
+        if not isinstance(cur, int | float) or isinstance(cur, bool):
+            raise ValueError(f"increment target must be numeric: {target_expr}")
+        return cur + delta
+
     def _eval(node: ast.AST) -> Any:
         if isinstance(node, ast.Constant):
             return node.value
@@ -197,6 +176,16 @@ 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 get_var is None:
+                    raise ValueError("get_var is not available in this context")
+                if len(node.args) not in (2, 3):
+                    raise ValueError("get_var requires 2 or 3 arguments: get_var(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)
             fn = _eval(node.func)
             if fn not in ALLOWED_CALLABLES:
                 raise ValueError(f"function not allowed: {fn}")
@@ -220,6 +209,94 @@ def safe_eval_expr(
 
         raise ValueError(f"unsupported expression: {ast.dump(node)}")
 
+    def _eval_subscript_key(node: ast.Subscript) -> Any:
+        sl = node.slice
+        if isinstance(sl, ast.Slice):
+            lo = _eval(sl.lower) if sl.lower else None
+            up = _eval(sl.upper) if sl.upper else None
+            st = _eval(sl.step) if sl.step else None
+            return slice(lo, up, st)
+        return _eval(sl)
+
+    def _apply_increment(target_expr: str, *, delta: int, is_prefix: bool) -> Any:
+        try:
+            target = ast.parse(target_expr, mode="eval").body
+        except SyntaxError:
+            raise ValueError(f"invalid increment target: {target_expr}") from None
+
+        if isinstance(target, ast.Name):
+            name = target.id
+            exists = name in vars_.get("local", {}) or name in vars_.get("global", {})
+            cur = (
+                vars_.get("local", {}).get(name)
+                if name in vars_.get("local", {})
+                else vars_.get("global", {}).get(name, 0)
+            )
+
+            if cur is None:
+                raise ValueError(f"variable {name} not found")
+
+            new_val = _increment_value(cur, delta, target_expr) if exists else delta
+            vars_.setdefault("local", {})[name] = new_val
+            return new_val if is_prefix else cur
+
+        if isinstance(target, ast.Subscript):
+            container = _eval(target.value)
+            key = _eval_subscript_key(target)
+            cur = container[key]
+            if cur is None:
+                raise ValueError(f"target {target_expr} not found")
+
+            new_val = _increment_value(cur, delta, target_expr)
+            container[key] = new_val
+            return new_val if is_prefix else cur
+
+        raise ValueError("only variable or subscript increment targets are allowed")
+
+    def _get_assign_target_value(target: ast.AST) -> Any:
+        if isinstance(target, ast.Name):
+            name = target.id
+            if name in vars_.get("local", {}):
+                return vars_["local"][name]
+            if name in vars_.get("global", {}):
+                return vars_["global"][name]
+            return 0
+
+        if isinstance(target, ast.Subscript):
+            container = _eval(target.value)
+            return container[_eval_subscript_key(target)]
+
+        raise ValueError("only variable or subscript assignment targets are allowed")
+
+    def _set_assign_target_value(target: ast.AST, value: Any) -> Any:
+        if isinstance(target, ast.Name):
+            vars_.setdefault("local", {})[target.id] = value
+            return value
+
+        if isinstance(target, ast.Subscript):
+            container = _eval(target.value)
+            container[_eval_subscript_key(target)] = value
+            return value
+
+        raise ValueError("only variable or subscript assignment targets are allowed")
+
+    # --- 증감(식 전체일 때만 허용) ---------------------------------------------
+    inc_target_pattern = r"([A-Za-z_]\w*(?:\s*\[[^\]]+\])*)"
+    inc_post = re.match(rf"^{inc_target_pattern}\s*\+\+$", normalized)  # a++, a[0]++
+    dec_post = re.match(rf"^{inc_target_pattern}\s*--$", normalized)  # a--, a[0]--
+    inc_pre = re.match(rf"^\+\+\s*{inc_target_pattern}$", normalized)  # ++a, ++a[0]
+    dec_pre = re.match(rf"^--\s*{inc_target_pattern}$", normalized)  # --a, --a[0]
+    match = inc_post or dec_post or inc_pre or dec_pre
+    if match:
+        if inc_post:
+            return _apply_increment(match.group(1).strip(), delta=1, is_prefix=False)
+        if dec_post:
+            return _apply_increment(match.group(1).strip(), delta=-1, is_prefix=False)
+        if inc_pre:
+            return _apply_increment(match.group(1).strip(), delta=1, is_prefix=True)
+        if dec_pre:
+            return _apply_increment(match.group(1).strip(), delta=-1, is_prefix=True)
+
     # --- 단순 대입: a = <expr> (한 문장만 허용) ---------------------------------
     try:
         mod = ast.parse(normalized, mode="exec")
@@ -229,27 +306,11 @@ def safe_eval_expr(
             # 1) 단순 대입: a = <expr>
             if isinstance(stmt, ast.Assign):
                 tgt = stmt.targets[0]
-                if not isinstance(tgt, ast.Name):
-                    raise ValueError("only simple assignment like `a = <expr>` is allowed")
                 val = _eval(stmt.value)
-                vars_.setdefault("local", {})[tgt.id] = val
-                return val
+                return _set_assign_target_value(tgt, val)
 
             # 2) 복합 대입: a *= <expr>  (+=, -=, /= ... 포함)
             if isinstance(stmt, ast.AugAssign):
-                if not isinstance(stmt.target, ast.Name):
-                    raise ValueError("only simple aug assignment like `a *= <expr>` is allowed")
-
-                name = stmt.target.id
-
-                # 현재값 가져오기 (local 우선, 없으면 global, 그래도 없으면 0)
-                if name in vars_.get("local", {}):
-                    cur = vars_["local"][name]
-                elif name in vars_.get("global", {}):
-                    cur = vars_["global"][name]
-                else:
-                    cur = 0
-
                 try:
                     bin_fn = BIN_OPS[type(stmt.op)]
                 except KeyError:
@@ -257,12 +318,10 @@ def safe_eval_expr(
                         f"unsupported operator in aug-assign: {type(stmt.op)}"
                     ) from None
 
+                cur = _get_assign_target_value(stmt.target)
                 rhs = _eval(stmt.value)
                 new_val = bin_fn(cur, rhs)
-
-                # 로컬에 기록(네 증감 로직이랑 일관되게)
-                vars_.setdefault("local", {})[name] = new_val
-                return new_val
+                return _set_assign_target_value(stmt.target, new_val)
     except SyntaxError:
         pass  # 표현식일 수 있으니 아래로 진행
     except Exception as e:
@@ -341,6 +400,7 @@ def eval_value(
     value: Any,
     variables: dict[str, dict[str, Any]] | None = None,
     get_global_variable: Callable[[str], Any] | None = None,
+    get_var: Callable[..., Any] | None = None,
 ) -> Any:
     # 1) 문자열이면 → 기존 safe_eval_expr 호출
     if isinstance(value, str):
@@ -348,26 +408,27 @@ def eval_value(
             value,
             variables=variables,
             get_global_variable=get_global_variable,
+            get_var=get_var,
         )
 
     # 2) 리스트면 → 각 요소를 재귀적으로 평가
     if isinstance(value, list):
         return [
-            eval_value(v, variables=variables, get_global_variable=get_global_variable)
+            eval_value(v, variables=variables, get_global_variable=get_global_variable, get_var=get_var)
             for v in value
         ]
 
     # 3) 튜플도 동일
     if isinstance(value, tuple):
         return tuple(
-            eval_value(v, variables=variables, get_global_variable=get_global_variable)
+            eval_value(v, variables=variables, get_global_variable=get_global_variable, get_var=get_var)
             for v in value
         )
 
     # 4) 딕셔너리면 → value만 재귀적으로 평가 (key는 그대로)
     if isinstance(value, dict):
         return {
-            k: eval_value(v, variables=variables, get_global_variable=get_global_variable)
+            k: eval_value(v, variables=variables, get_global_variable=get_global_variable, get_var=get_var)
             for k, v in value.items()
         }
 

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/src/rainbow/rb_utils/manipulate.py

@@ -130,17 +130,17 @@ def parse_state_core_mv_to_dict(mv: memoryview) -> dict[str, object]:
     return {
         "heartBeat": obj.HeartBeat(),
         "timestampUsecMono": obj.TimestampUsecMono(),
-        "jointQRef": _parse_float_array_struct(obj.JointQRef()),
-        "jointQEnc": _parse_float_array_struct(obj.JointQEnc()),
-        "jointTEsti": _parse_float_array_struct(obj.JointTEsti()),
-        "jointTMeas": _parse_float_array_struct(obj.JointTMeas()),
-        "jointTemper": _parse_float_array_struct(obj.JointTemper()),
-        "carteXRef": _parse_float_array_struct(obj.CarteXRef()),
-        "carteXEnc": _parse_float_array_struct(obj.CarteXEnc()),
-        "carteSpeedRef": _parse_float_array_struct(obj.CarteSpeedRef()),
-        "carteSpeedEnc": _parse_float_array_struct(obj.CarteSpeedEnc()),
+        "jointQRef": _numpy_or_list_to_list(obj.JointQRefAsNumpy()),
+        "jointQEnc": _numpy_or_list_to_list(obj.JointQEncAsNumpy()),
+        "jointTEsti": _numpy_or_list_to_list(obj.JointTEstiAsNumpy()),
+        "jointTMeas": _numpy_or_list_to_list(obj.JointTMeasAsNumpy()),
+        "jointTemper": _numpy_or_list_to_list(obj.JointTemperAsNumpy()),
+        "carteXRef": _numpy_or_list_to_list(obj.CarteXRefAsNumpy()),
+        "carteXEnc": _numpy_or_list_to_list(obj.CarteXEncAsNumpy()),
+        "carteSpeedRef": _numpy_or_list_to_list(obj.CarteSpeedRefAsNumpy()),
+        "carteSpeedEnc": _numpy_or_list_to_list(obj.CarteSpeedEncAsNumpy()),
         "userfSelectionNo": obj.UserfSelectionNo(),
-        "userfXRef": _parse_float_array_struct(obj.UserfXRef()),
+        "userfXRef": _numpy_or_list_to_list(obj.UserfXRefAsNumpy()),
         "toolSelectionNo": obj.ToolSelectionNo(),
         "toolName": _parse_string(obj.ToolName()),
         "toolTcpX": obj.ToolTcpX(),

rainbow_rb_utils-0.0.9.dev7/src/rainbow/rb_utils/path_utils.py

@@ -0,0 +1,29 @@
+import re
+
+PLACEHOLDER_PATTERN = r"{(\w+)}"
+REGEX_PATTERN = r"(?P<\1>[^/]+)"
+
+
+def normalize_topic(topic: str) -> str:
+    # Normalize topic by removing leading/trailing slashes and collapsing multiple slashes, e.g. "/users/{user_id}/posts/{post_id}/" -> "users/{user_id}/posts/{post_id}"
+    parts = [part for part in topic.split("/") if part]
+    return "/".join(parts)
+
+
+def is_match_path(path: str, regex: str) -> bool:
+    # Check if a path matches a path template with placeholders, e.g. "/users/123/posts/456" matches "/users/{user_id}/posts/{post_id}"
+    if not isinstance(path, str) or "{" not in path:
+        return False
+    regex_str = re.sub(PLACEHOLDER_PATTERN, REGEX_PATTERN, normalize_topic(path))
+    return re.fullmatch(regex_str, normalize_topic(regex)) is not None
+
+
+def build_path_regex(path: str):
+    # Convert a path template with placeholders into a regex pattern, e.g. "/users/{user_id}/posts/{post_id}" -> re.compile(r"^/users/(?P<user_id>[^/]+)/posts/(?P<post_id>[^/]+)$")
+    regex_str = re.sub(PLACEHOLDER_PATTERN, REGEX_PATTERN, normalize_topic(path))
+    return re.compile(f"^{regex_str}$")
+
+
+def extract_path_params(path: str) -> list[str]:
+    # Extract parameter names from a path template, e.g. "/users/{user_id}/posts/{post_id}" -> ["user_id", "post_id"]
+    return re.findall(PLACEHOLDER_PATTERN, path)

rainbow_rb_utils-0.0.9.dev7/src/rainbow/rb_utils/program.py

@@ -0,0 +1,12 @@
+from typing import Any
+
+
+def get_task_id(args: Any | None) -> str:
+    if not args:
+        return "unknown_module"
+
+    # FlowManagerArgs 객체와 dict 입력을 모두 허용한다.
+    ctx = args.get("ctx") if isinstance(args, dict) else getattr(args, "ctx", None)
+
+    process_id = getattr(ctx, "process_id", None)
+    return str(process_id) if process_id else "unknown_module"

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/src/rainbow_rb_utils.egg-info/PKG-INFO

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

{rainbow_rb_utils-0.0.9.dev5 → rainbow_rb_utils-0.0.9.dev7}/src/rainbow_rb_utils.egg-info/SOURCES.txt

@@ -9,6 +9,8 @@ src/rainbow/rb_utils/helper.py
 src/rainbow/rb_utils/manipulate.py
 src/rainbow/rb_utils/pagination.py
 src/rainbow/rb_utils/parser.py
+src/rainbow/rb_utils/path_utils.py
+src/rainbow/rb_utils/program.py
 src/rainbow/rb_utils/py.typed
 src/rainbow/rb_utils/service_exception.py
 src/rainbow_rb_utils.egg-info/PKG-INFO

rainbow_rb_utils-0.0.9.dev7/src/rainbow_rb_utils.egg-info/requires.txt

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

rainbow_rb_utils-0.0.9.dev5/src/rainbow_rb_utils.egg-info/requires.txt

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