Sync framework updates

Author: yqzhishen

lib/config/core.py

@@ -27,11 +27,16 @@ class ConfigBaseModel(BaseModel):
     __field_scopes__: ClassVar[dict] = {}  # {field_name: scope_bitmask}
 
     def __init__(self, **data):
-        token = _current_scope.set(0)
         try:
+            _current_scope.get()
+        except LookupError:
+            token = _current_scope.set(0)
+            try:
+                super().__init__(**data)
+            finally:
+                _current_scope.reset(token)
+        else:
             super().__init__(**data)
-        finally:
-            _current_scope.reset(token)
 
     @classmethod
     def __pydantic_init_subclass__(cls, **kwargs):
@@ -64,7 +69,8 @@ def validate_fields_by_scope(self) -> "ConfigBaseModel":
         current_scope = _current_scope.get()
         for name in type(self).model_fields:
             if name in self.__field_scopes__ and not (current_scope & self.__field_scopes__[name]):
-                delattr(self, name)
+                if name in self.__dict__:
+                    delattr(self, name)
         return self
 
     def _resolve_recursive(self, current: "ConfigBaseModel", context: ConfigOperationContext):

lib/config/formatter.py

@@ -1,3 +1,4 @@
+import re
 from typing import Any, List, Optional, Tuple
 
 from pydantic import BaseModel
@@ -6,6 +7,12 @@
     "ModelFormatter",
 ]
 
+_ANSI_RE = re.compile(r'\033\[[0-9;]*m')
+
+
+def _strip_ansi(s: str) -> str:
+    return _ANSI_RE.sub('', s)
+
 
 class ModelFormatter:
     def __init__(self, line_width: int = 80, indent: int = 4, connector: str = ": ", separator: str = ", "):
@@ -33,7 +40,7 @@ def current_remaining_width(self):
         return self.current_max_width() - self.current_width
 
     def get_width(self, key: Optional[str], value: Any) -> int:
-        cache_key = id(value)
+        cache_key = (key, id(value))
         if cache_key in self.width_cache:
             return self.width_cache[cache_key]
 
@@ -98,6 +105,7 @@ def add_entry(self, key: Optional[str], value: Any):
 
         def _process(_elements: List[Tuple[Optional[str], Any]], _prefix: str, _suffix: str):
             self.current_line.append(_prefix)
+            self.current_width += len(_strip_ansi(_prefix))
             if width > self.current_max_width():
                 self.new_line()
                 self.current_level += 1
@@ -106,6 +114,7 @@ def _process(_elements: List[Tuple[Optional[str], Any]], _prefix: str, _suffix:
                 self.new_line()
                 self.current_level -= 1
             self.current_line.append(_suffix)
+            self.current_width += len(_strip_ansi(_suffix))
 
         if isinstance(value, tuple):
             _process([(None, item) for item in value], prefix + "(", ")")