rainbow-rb-utils 0.1.1__tar.gz → 0.1.2.dev2__tar.gz

{rainbow_rb_utils-0.1.1 → rainbow_rb_utils-0.1.2.dev2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rainbow-rb-utils
-Version: 0.1.1
+Version: 0.1.2.dev2
 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.1
+Requires-Dist: rainbow-rb-log==0.1.2.dev2
 
 # rb_utils
 

{rainbow_rb_utils-0.1.1 → rainbow_rb_utils-0.1.2.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainbow-rb-utils"
-version = "0.1.1"
+version = "0.1.2.dev2"
 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.1",
+    "rainbow-rb-log==0.1.2.dev2",
 ]
 
 [tool.setuptools]

{rainbow_rb_utils-0.1.1 → rainbow_rb_utils-0.1.2.dev2}/src/rainbow/rb_utils/parser.py

@@ -139,11 +139,11 @@ def _normalize_filter(filter_: Any) -> dict:
         try:
             data = json.loads(s)
         except Exception as e:
-            raise TypeError(f"filter_ JSON 파싱 실패: {e}") from e
+            raise TypeError(f"filter_ JSON parse failed: {e}") from e
         if not isinstance(data, dict):
-            raise TypeError("filter_ 문자열은 JSON object여야 합니다.")
+            raise TypeError("filter_ string must be a JSON object.")
         return data
-    raise TypeError(f"filter_ 타입이 잘못되었습니다: {type(filter_)}")
+    raise TypeError(f"filter_ has an invalid type: {type(filter_)}")
 
 
 def to_json(obj: Any) -> str:

rainbow_rb_utils-0.1.2.dev2/src/rainbow/rb_utils/path_utils.py

@@ -0,0 +1,36 @@
+import re
+
+# `{name}` 또는 `{name:path}`. group(1)=이름, group(2)=converter(없으면 None)
+PLACEHOLDER_PATTERN = r"{(\w+)(?::(\w+))?}"
+# 하위 호환용. 새 코드는 template_to_regex_str
+REGEX_PATTERN = r"(?P<\1>[^/]+)"
+
+
+def normalize_topic(topic: str) -> str:
+    parts = [part for part in topic.split("/") if part]
+    return "/".join(parts)
+
+
+def _placeholder_to_group(m: re.Match) -> str:
+    name, converter = m.group(1), m.group(2)
+    # `{x:path}` 는 슬래시 포함 1개 이상 세그먼트(FastAPI 의 :path 와 동일 의미)
+    return f"(?P<{name}>.+)" if converter == "path" else f"(?P<{name}>[^/]+)"
+
+
+def template_to_regex_str(path: str) -> str:
+    # "plugin/{id}/{path:path}" -> "plugin/(?P<id>[^/]+)/(?P<path>.+)"
+    return re.sub(PLACEHOLDER_PATTERN, _placeholder_to_group, normalize_topic(path))
+
+
+def is_match_path(path: str, regex: str) -> bool:
+    if not isinstance(path, str) or "{" not in path:
+        return False
+    return re.fullmatch(template_to_regex_str(path), normalize_topic(regex)) is not None
+
+
+def build_path_regex(path: str):
+    return re.compile(f"^{template_to_regex_str(path)}$")
+
+
+def extract_path_params(path: str) -> list[str]:
+    return [m.group(1) for m in re.finditer(PLACEHOLDER_PATTERN, path)]

{rainbow_rb_utils-0.1.1 → rainbow_rb_utils-0.1.2.dev2}/src/rainbow/rb_utils/program.py

@@ -109,7 +109,10 @@ def get_timeout_sec(data, error_prefix: str, default: float | None = None) -> in
 
 def get_required_field(data, field_name: str, error_prefix: str):
     value = data.get(field_name)
-    if value in (None, "", Ellipsis):
+    # numpy array 등 element-wise __eq__를 오버라이드하는 값이 올 수 있어
+    # `value in (None, "", Ellipsis)` 는 "truth value of an array is ambiguous"로 깨진다.
+    # is 비교 + 문자열 한정 "" 비교로 element-wise 비교를 피한다.
+    if value is None or value is Ellipsis or (isinstance(value, str) and value == ""):
         raise ValueError(f"{error_prefix}: {field_name} is required")
     return value
 

{rainbow_rb_utils-0.1.1 → rainbow_rb_utils-0.1.2.dev2}/src/rainbow_rb_utils.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: rainbow-rb-utils
-Version: 0.1.1
+Version: 0.1.2.dev2
 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.1
+Requires-Dist: rainbow-rb-log==0.1.2.dev2
 
 # rb_utils
 

rainbow_rb_utils-0.1.2.dev2/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.dev2

rainbow_rb_utils-0.1.1/src/rainbow/rb_utils/path_utils.py

@@ -1,29 +0,0 @@
-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.1.1/src/rainbow_rb_utils.egg-info/requires.txt

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