Compare commits

...

5 Commits

Author SHA1 Message Date
efd826f677 一些兼容问题 2025-12-20 19:47:50 +08:00
ad17b905c4 修复ToolFile中SaveAsJson的一些问题 2025-11-23 20:03:44 +08:00
4ba5bfdfee 新增函数泛型注解 2025-11-06 20:37:30 +08:00
8121899d32 修复ToolFile中文件枚举函数的错误 2025-11-06 10:54:53 +08:00
a79ba69443 修复无依赖时Architecture注册的错误 2025-11-05 17:49:31 +08:00
4 changed files with 8 additions and 8 deletions

View File

@@ -131,15 +131,16 @@ class Architecture:
if slot in cls._RegisteringRuntime:
raise InvalidOperationError("Illegal duplicate registrations")
cls._RegisteringRuntime[slot] = Architecture.Registering(slot, target, DependenceModel(Architecture.TypeQuery(dependence) for dependence in dependences), action)
dependences = cls._RegisteringRuntime[slot].dependences
cls._InternalRegisteringComplete()
return cls._RegisteringRuntime[slot].dependences
return dependences
@classmethod
def Contains(cls, type_:type) -> bool:
return type_ in cls._RegisteredObjects
@classmethod
def Get(cls, type_:type) -> Any:
def Get[T](cls, type_:Typen[T]) -> T:
return cls._RegisteredObjects[type_]
@classmethod

View File

@@ -187,10 +187,10 @@ def InternalImportingThrow(
):
with lock_guard():
requierds_str = ",".join([f"<{r}>" for r in requierds])
print(f"Internal Convention package is not installed.\n{messageBase.format_map({
print("Internal Convention package is not installed.\n", messageBase.format_map({
"module": moduleName,
"required": requierds_str
})}\n[{ConsoleFrontColor.RESET}{format_traceback_info(back=2)}{ConsoleFrontColor.RED}]")
}), "\n[",ConsoleFrontColor.RESET,format_traceback_info(back=2),ConsoleFrontColor.RED,"]")
def ReleaseFailed2Requirements():
global ImportingFailedSet

View File

@@ -327,7 +327,7 @@ class ToolFile(BaseModel):
except:
pass
with open(self.OriginFullPath, 'w', encoding='utf-8') as f:
json.dump(json_data, f, indent=4)
json.dump(json_data, f, indent=4, ensure_ascii=False)
return self
def SaveAsCsv(self, csv_data:"pd.DataFrame"):
'''
@@ -504,12 +504,11 @@ class ToolFile(BaseModel):
return result
def DirWalk(
self,
top,
topdown: bool = True,
onerror: Optional[Callable] = None,
followlinks: bool = False
) -> Iterator[tuple[dir_name_type, list[dir_name_type], list[file_name_type]]]:
return os.walk(self.OriginFullPath, top=top, topdown=topdown, onerror=onerror, followlinks=followlinks)
return os.walk(self.OriginFullPath, topdown=topdown, onerror=onerror, followlinks=followlinks)
def bool(self):

View File

@@ -228,7 +228,7 @@ class GlobalConfig:
return self
# 配置查找
def FindItem[T](self, key: str, default: Optional[T] = None) -> Optional[T]:
def FindItem(self, key: str, default: Optional[Any] = None) -> Optional[Any]:
"""查找配置项,支持默认值"""
if key in self._data_pair:
return self._data_pair[key]